From ba2f29ad267a5ba84cb1fe7bc949ba523506ab98 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 19 Aug 2010 17:09:29 +0000 Subject: [PATCH] * fix warnings in poorman git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38273 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/poorman/constants.cpp | 124 ++++++++++++++++----------------- src/apps/poorman/constants.h | 6 +- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/src/apps/poorman/constants.cpp b/src/apps/poorman/constants.cpp index 880baadf7f..5c82f6c60f 100644 --- a/src/apps/poorman/constants.cpp +++ b/src/apps/poorman/constants.cpp @@ -4,137 +4,137 @@ // ------------------------------------------------------ // PoorMan Window -extern const char* STR_APP_SIG +const char* STR_APP_SIG = "application/x-vnd.Haiku.PoorMan"; char* STR_APP_NAME - = "PoorMan"; -extern const char* STR_ERR_WEB_DIR + = (char*)"PoorMan"; +const char* STR_ERR_WEB_DIR = "Please choose the folder to publish on the web.\n\n" "You can have PoorMan create a default \"public_html\" " "in your home folder.\n" "Or you select one of your own folders instead."; -extern const char* STR_ERR_CANT_START +const char* STR_ERR_CANT_START = "Cannot start the server"; -extern const char* STR_DIR_CREATED +const char* STR_DIR_CREATED = "A default web folder has been created " "at \"/boot/home/public_html.\"\nMake sure there is a HTML " "file named \"index.html\" in that folder."; -extern const char* STR_MNU_FILE +const char* STR_MNU_FILE = "File"; -extern const char* STR_MNU_FILE_SAVE_AS +const char* STR_MNU_FILE_SAVE_AS = "Save console as" B_UTF8_ELLIPSIS; -extern const char* STR_MNU_FILE_SAVE_SELECTION +const char* STR_MNU_FILE_SAVE_SELECTION = "Save console selections as" B_UTF8_ELLIPSIS; -extern const char* STR_MNU_FILE_ABOUT +const char* STR_MNU_FILE_ABOUT = "About PoorMan" B_UTF8_ELLIPSIS; -extern const char* STR_MNU_FILE_QUIT +const char* STR_MNU_FILE_QUIT = "Quit"; -extern const char* STR_MNU_EDIT +const char* STR_MNU_EDIT = "Edit"; -extern const char* STR_MNU_EDIT_COPY +const char* STR_MNU_EDIT_COPY = "Copy"; -extern const char* STR_MNU_EDIT_SELECT_ALL +const char* STR_MNU_EDIT_SELECT_ALL = "Select all"; -extern const char* STR_MNU_EDIT_PREF +const char* STR_MNU_EDIT_PREF = "Settings" B_UTF8_ELLIPSIS; -extern const char* STR_MNU_CTRL +const char* STR_MNU_CTRL = "Controls"; -extern const char* STR_MNU_CTRL_RUN_SERVER +const char* STR_MNU_CTRL_RUN_SERVER = "Run server"; -extern const char* STR_MNU_CTRL_CLEAR_HIT_COUNTER +const char* STR_MNU_CTRL_CLEAR_HIT_COUNTER = "Clear hit counter"; -extern const char* STR_MNU_CTRL_CLEAR_CONSOLE +const char* STR_MNU_CTRL_CLEAR_CONSOLE = "Clear console log"; -extern const char* STR_MNU_CTRL_CLEAR_LOG_FILE +const char* STR_MNU_CTRL_CLEAR_LOG_FILE = "Clear log file"; -extern const char* STR_FILEPANEL_SAVE_CONSOLE +const char* STR_FILEPANEL_SAVE_CONSOLE = "Save log console"; -extern const char* STR_FILEPANEL_SAVE_CONSOLE_SELECTION +const char* STR_FILEPANEL_SAVE_CONSOLE_SELECTION = "Save log console selection"; -extern const char* STR_TXT_VIEW +const char* STR_TXT_VIEW = "Logging view"; // ------------------------------------------------------ // Preferences Window - char* STR_WIN_NAME_PREF - = "PoorMan settings"; +char* STR_WIN_NAME_PREF + = (char*)"PoorMan settings"; -extern const char* STR_SETTINGS_FILE_NAME +const char* STR_SETTINGS_FILE_NAME = "PoorMan settings"; -extern const char* STR_SETTINGS_NEW_FILE_NAME +const char* STR_SETTINGS_NEW_FILE_NAME = "OBOS PoorMan settings"; -extern const char* STR_DEFAULT_WEB_DIRECTORY +const char* STR_DEFAULT_WEB_DIRECTORY = "/boot/home/public_html"; -extern const char* STR_TAB_SITE +const char* STR_TAB_SITE = "Site"; -extern const char* STR_BBX_LOCATION +const char* STR_BBX_LOCATION = "Website location"; -extern const char* STR_TXT_DIRECTORY +const char* STR_TXT_DIRECTORY = "Web folder:"; -extern const char* STR_BTN_DIRECTORY +const char* STR_BTN_DIRECTORY = "Select web folder"; -extern const char* STR_TXT_INDEX +const char* STR_TXT_INDEX = "Start page:"; -extern const char* STR_BBX_OPTIONS +const char* STR_BBX_OPTIONS = "Website options"; -extern const char* STR_CBX_DIR_LIST +const char* STR_CBX_DIR_LIST = "Send file listing if there's no start page"; -extern const char* STR_CBX_DIR_LIST_LABEL +const char* STR_CBX_DIR_LIST_LABEL = "Send file listing if there's no start page"; -extern const char* STR_FILEPANEL_SELECT_WEB_DIR +const char* STR_FILEPANEL_SELECT_WEB_DIR = "Select web folder"; -extern const char* STR_TAB_LOGGING +const char* STR_TAB_LOGGING = "Logging"; -extern const char* STR_BBX_CONSOLE_LOGGING +const char* STR_BBX_CONSOLE_LOGGING = "Console logging"; -extern const char* STR_CBX_LOG_CONSOLE +const char* STR_CBX_LOG_CONSOLE = "Log to console"; -extern const char* STR_BBX_FILE_LOGGING +const char* STR_BBX_FILE_LOGGING = "File logging"; -extern const char* STR_CBX_LOG_FILE +const char* STR_CBX_LOG_FILE = "Log to file"; -extern const char* STR_TXT_LOG_FILE_NAME +const char* STR_TXT_LOG_FILE_NAME = "Log file name:"; -extern const char* STR_BTN_CREATE_LOG_FILE +const char* STR_BTN_CREATE_LOG_FILE = "Create log file"; -extern const char* STR_FILEPANEL_CREATE_LOG_FILE +const char* STR_FILEPANEL_CREATE_LOG_FILE = "Create PoorMan log"; -extern const char* STR_TAB_ADVANCED +const char* STR_TAB_ADVANCED = "Advanced"; -extern const char* STR_BBX_CONNECTION +const char* STR_BBX_CONNECTION = "Connections"; -extern const char* STR_SLD_LABEL +const char* STR_SLD_LABEL = "Max. simultaneous connections:"; - char* STR_SLD_STATUS_LABEL - = "connections"; +char* STR_SLD_STATUS_LABEL + = (char*)"connections"; -extern const char CMD_FILE_SAVE_AS +const char CMD_FILE_SAVE_AS = 'S'; -extern const char CMD_FILE_QUIT +const char CMD_FILE_QUIT = 'Q'; -extern const char CMD_EDIT_COPY +const char CMD_EDIT_COPY = 'C'; -extern const char CMD_EDIT_SELECT_ALL +const char CMD_EDIT_SELECT_ALL = 'A'; -extern const char* STR_ABOUT_TITLE +const char* STR_ABOUT_TITLE = "About PoorMan"; -extern const char* STR_ABOUT_BUTTON +const char* STR_ABOUT_BUTTON = "OK"; -extern const char* STR_ABOUT_DESC +const char* STR_ABOUT_DESC = "Poor Man's web server\n" "Copyright " B_UTF8_COPYRIGHT " 2004-2009 Haiku\n" "All rights reserved.\n\n" "Written by: Philip Harrison, Ma Jie"; // -------------------------------- -extern const rgb_color WHITE = { 255, 255, 255, 255 }; -extern const rgb_color GRAY = { 184, 184, 184, 255 }; -extern const rgb_color BACKGROUND_COLOR = { 216, 216, 216, 255 }; -extern const rgb_color BLACK = { 0, 0, 0, 255 }; -extern const rgb_color RED = { 255, 0, 0, 255}; -extern const rgb_color GREEN = { 0, 255, 0, 255}; +const rgb_color WHITE = { 255, 255, 255, 255 }; +const rgb_color GRAY = { 184, 184, 184, 255 }; +const rgb_color BACKGROUND_COLOR = { 216, 216, 216, 255 }; +const rgb_color BLACK = { 0, 0, 0, 255 }; +const rgb_color RED = { 255, 0, 0, 255}; +const rgb_color GREEN = { 0, 255, 0, 255}; diff --git a/src/apps/poorman/constants.h b/src/apps/poorman/constants.h index ed92891785..3e59e67fb3 100644 --- a/src/apps/poorman/constants.h +++ b/src/apps/poorman/constants.h @@ -83,7 +83,7 @@ extern const char* STR_BBX_OPTIONS; extern const char* STR_CBX_DIR_LIST; extern const char* STR_CBX_DIR_LIST_LABEL; extern const char* STR_FILEPANEL_SELECT_WEB_DIR; - + extern const char* STR_TAB_LOGGING; extern const char* STR_BBX_CONSOLE_LOGGING; extern const char* STR_CBX_LOG_CONSOLE; @@ -92,12 +92,12 @@ extern const char* STR_CBX_LOG_FILE; extern const char* STR_TXT_LOG_FILE_NAME; extern const char* STR_BTN_CREATE_LOG_FILE; extern const char* STR_FILEPANEL_CREATE_LOG_FILE; - + extern const char* STR_TAB_ADVANCED; extern const char* STR_BBX_CONNECTION; extern const char* STR_SLD_LABEL; extern char* STR_SLD_STATUS_LABEL; - + extern const char CMD_FILE_SAVE_AS; extern const char CMD_FILE_QUIT; extern const char CMD_EDIT_COPY;