debugger, bookmarks: use char[] for string constants

Change-Id: I2ef319e4556da1b93ae82afd597e0445d1f81d8d
Reviewed-on: http://codereview.qt.nokia.com/1692
Reviewed-by: hjk <qthjk@ovi.com>

diff --git a/src/plugins/bookmarks/bookmarks_global.h b/src/plugins/bookmarks/bookmarks_global.h
index 256f203..16c277f 100644 (file)
--- a/src/plugins/bookmarks/bookmarks_global.h
+++ b/src/plugins/bookmarks/bookmarks_global.h
@@ -36,18 +36,18 @@
 namespace Bookmarks {
 namespace Constants {
 
-const char * const BOOKMARKS_TOGGLE_ACTION      = "Bookmarks.Toggle";
-const char * const BOOKMARKS_MOVEUP_ACTION      = "Bookmarks.MoveUp";
-const char * const BOOKMARKS_MOVEDOWN_ACTION    = "Bookmarks.MoveDown";
-const char * const BOOKMARKS_PREV_ACTION        = "Bookmarks.Previous";
-const char * const BOOKMARKS_NEXT_ACTION        = "Bookmarks.Next";
-const char * const BOOKMARKS_PREVDIR_ACTION     = "Bookmarks.PreviousDirectory";
-const char * const BOOKMARKS_NEXTDIR_ACTION     = "Bookmarks.NextDirectory";
-const char * const BOOKMARKS_PREVDOC_ACTION     = "Bookmarks.PreviousDocument";
-const char * const BOOKMARKS_NEXTDOC_ACTION     = "Bookmarks.NextDocument";
+const char BOOKMARKS_TOGGLE_ACTION[]      = "Bookmarks.Toggle";
+const char BOOKMARKS_MOVEUP_ACTION[]      = "Bookmarks.MoveUp";
+const char BOOKMARKS_MOVEDOWN_ACTION[]    = "Bookmarks.MoveDown";
+const char BOOKMARKS_PREV_ACTION[]        = "Bookmarks.Previous";
+const char BOOKMARKS_NEXT_ACTION[]        = "Bookmarks.Next";
+const char BOOKMARKS_PREVDIR_ACTION[]     = "Bookmarks.PreviousDirectory";
+const char BOOKMARKS_NEXTDIR_ACTION[]     = "Bookmarks.NextDirectory";
+const char BOOKMARKS_PREVDOC_ACTION[]     = "Bookmarks.PreviousDocument";
+const char BOOKMARKS_NEXTDOC_ACTION[]     = "Bookmarks.NextDocument";
 
-const char * const BOOKMARKS_MENU               = "Bookmarks.Menu";
-const char * const BOOKMARKS_CONTEXT            = "Bookmarks";
+const char BOOKMARKS_MENU[]               = "Bookmarks.Menu";
+const char BOOKMARKS_CONTEXT[]            = "Bookmarks";
 
 } // namespace Constants
 } // namespace Bookmarks

diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp
index 1f7db41..5537fe0 100644 (file)
--- a/src/plugins/debugger/commonoptionspage.cpp
+++ b/src/plugins/debugger/commonoptionspage.cpp
@@ -148,10 +148,6 @@ CommonOptionsPage::CommonOptionsPage(const QSharedPointer<GlobalDebuggerOptions>
 {
 }
 
-CommonOptionsPage::~CommonOptionsPage()
-{
-}
-
 QString CommonOptionsPage::id() const
 {
     return _(DEBUGGER_COMMON_SETTINGS_ID);
@@ -159,7 +155,8 @@ QString CommonOptionsPage::id() const
 
 QString CommonOptionsPage::displayName() const
 {
-    return QCoreApplication::translate("Debugger", DEBUGGER_COMMON_SETTINGS_NAME);}
+    return QCoreApplication::translate("Debugger", "General");
+}
 
 QString CommonOptionsPage::category() const
 {

diff --git a/src/plugins/debugger/commonoptionspage.h b/src/plugins/debugger/commonoptionspage.h
index ce38976..f3c4e59 100644 (file)
--- a/src/plugins/debugger/commonoptionspage.h
+++ b/src/plugins/debugger/commonoptionspage.h
@@ -73,7 +73,6 @@ class CommonOptionsPage : public Core::IOptionsPage
 
 public:
     explicit CommonOptionsPage(const QSharedPointer<GlobalDebuggerOptions> &go);
-    virtual ~CommonOptionsPage();
 
     // IOptionsPage
     QString id() const;

diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h
index 14e71f2..915a002 100644 (file)
--- a/src/plugins/debugger/debuggerconstants.h
+++ b/src/plugins/debugger/debuggerconstants.h
@@ -39,42 +39,42 @@ namespace Debugger {
 namespace Constants {
 
 // Debug mode
-const char * const MODE_DEBUG           = "Mode.Debug";
+const char MODE_DEBUG[]             = "Mode.Debug";
 
 // Contexts
-const char * const C_DEBUGMODE          = "Debugger.DebugMode";
-const char * const C_CPPDEBUGGER        = "Gdb Debugger";
-const char * const C_QMLDEBUGGER        = "Qml/JavaScript Debugger";
+const char C_DEBUGMODE[]            = "Debugger.DebugMode";
+const char C_CPPDEBUGGER[]          = "Gdb Debugger";
+const char C_QMLDEBUGGER[]          = "Qml/JavaScript Debugger";
 
 // Project Explorer run mode (RUN/DEBUG)
-const char * const DEBUGMODE            = "Debugger.DebugMode";
-const char * const DEBUGMODE2           = "Debugger.DebugMode2"; // Breaks on main.
+const char DEBUGMODE[]              = "Debugger.DebugMode";
+const char DEBUGMODE2[]             = "Debugger.DebugMode2"; // Breaks on main.
 
 // Common actions (accessed by QML inspector)
-const char * const INTERRUPT            = "Debugger.Interrupt";
-const char * const CONTINUE             = "Debugger.Continue";
-const char * const STOP                 = "Debugger.Stop";
-const char * const RESET                = "Debugger.Reset";
-const char * const STEP                 = "Debugger.StepLine";
-const char * const STEPOUT              = "Debugger.StepOut";
-const char * const NEXT                 = "Debugger.NextLine";
-const char * const REVERSE              = "Debugger.ReverseDirection";
-const char * const OPERATE_BY_INSTRUCTION   = "Debugger.OperateByInstruction";
+const char INTERRUPT[]              = "Debugger.Interrupt";
+const char CONTINUE[]               = "Debugger.Continue";
+const char STOP[]                   = "Debugger.Stop";
+const char RESET[]                  = "Debugger.Reset";
+const char STEP[]                   = "Debugger.StepLine";
+const char STEPOUT[]                = "Debugger.StepOut";
+const char NEXT[]                   = "Debugger.NextLine";
+const char REVERSE[]                = "Debugger.ReverseDirection";
+const char OPERATE_BY_INSTRUCTION[] = "Debugger.OperateByInstruction";
 
 // DebuggerMainWindow dock widget names
-const char * const DOCKWIDGET_BREAK      = "Debugger.Docks.Break";
-const char * const DOCKWIDGET_MODULES    = "Debugger.Docks.Modules";
-const char * const DOCKWIDGET_REGISTER   = "Debugger.Docks.Register";
-const char * const DOCKWIDGET_OUTPUT     = "Debugger.Docks.Output";
-const char * const DOCKWIDGET_SNAPSHOTS  = "Debugger.Docks.Snapshots";
-const char * const DOCKWIDGET_STACK      = "Debugger.Docks.Stack";
-const char * const DOCKWIDGET_SOURCE_FILES = "Debugger.Docks.SourceFiles";
-const char * const DOCKWIDGET_THREADS    = "Debugger.Docks.Threads";
-const char * const DOCKWIDGET_WATCHERS   = "Debugger.Docks.LocalsAndWatchers";
-
-const char * const DOCKWIDGET_QML_INSPECTOR = "Debugger.Docks.QmlInspector";
-const char * const DOCKWIDGET_QML_SCRIPTCONSOLE = "Debugger.Docks.ScriptConsole";
-const char * const DOCKWIDGET_DEFAULT_AREA = "Debugger.Docks.DefaultArea";
+const char DOCKWIDGET_BREAK[]        = "Debugger.Docks.Break";
+const char DOCKWIDGET_MODULES[]      = "Debugger.Docks.Modules";
+const char DOCKWIDGET_REGISTER[]     = "Debugger.Docks.Register";
+const char DOCKWIDGET_OUTPUT[]       = "Debugger.Docks.Output";
+const char DOCKWIDGET_SNAPSHOTS[]    = "Debugger.Docks.Snapshots";
+const char DOCKWIDGET_STACK[]        = "Debugger.Docks.Stack";
+const char DOCKWIDGET_SOURCE_FILES[] = "Debugger.Docks.SourceFiles";
+const char DOCKWIDGET_THREADS[]      = "Debugger.Docks.Threads";
+const char DOCKWIDGET_WATCHERS[]     = "Debugger.Docks.LocalsAndWatchers";
+
+const char DOCKWIDGET_QML_INSPECTOR[]     = "Debugger.Docks.QmlInspector";
+const char DOCKWIDGET_QML_SCRIPTCONSOLE[] = "Debugger.Docks.ScriptConsole";
+const char DOCKWIDGET_DEFAULT_AREA[]      = "Debugger.Docks.DefaultArea";
 
 } // namespace Constants
 

diff --git a/src/plugins/debugger/debuggerinternalconstants.h b/src/plugins/debugger/debuggerinternalconstants.h
index 675e4f4..6159e13 100644 (file)
--- a/src/plugins/debugger/debuggerinternalconstants.h
+++ b/src/plugins/debugger/debuggerinternalconstants.h
@@ -38,33 +38,26 @@
 namespace Debugger {
 namespace Constants {
 
-// modes and their priorities
-const int          P_MODE_DEBUG         = 85;
-
-const char * const DEBUGGER_COMMON_SETTINGS_ID = "A.Common";
-const char * const DEBUGGER_COMMON_SETTINGS_NAME =
-    QT_TRANSLATE_NOOP("Debugger", "General");
-const char * const DEBUGGER_SETTINGS_CATEGORY = "O.Debugger";
-const char * const DEBUGGER_SETTINGS_TR_CATEGORY =
-    QT_TRANSLATE_NOOP("Debugger", "Debugger");
-const char * const DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON =
-    ":/core/images/category_debug.png";
+const char DEBUGGER_COMMON_SETTINGS_ID[]   = "A.Common";
+const char DEBUGGER_SETTINGS_CATEGORY[]    = "O.Debugger";
+const char DEBUGGER_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("Debugger", "Debugger");
+const char DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON[] = ":/core/images/category_debug.png";
 
 namespace Internal {
     enum { debug = 0 };
 } // namespace Internal
 
-const char * const OPENED_BY_DEBUGGER         = "OpenedByDebugger";
-const char * const OPENED_WITH_DISASSEMBLY    = "DisassemblerView";
-const char * const OPENED_WITH_MEMORY         = "MemoryView";
+const char OPENED_BY_DEBUGGER[]         = "OpenedByDebugger";
+const char OPENED_WITH_DISASSEMBLY[]    = "DisassemblerView";
+const char OPENED_WITH_MEMORY[]         = "MemoryView";
 
 // Debug action
-const char * const DEBUG                = "Debugger.Debug";
-const int          P_ACTION_DEBUG       = 90; //priority for the modemanager
+const char DEBUG[]                      = "Debugger.Debug";
+const int  P_ACTION_DEBUG               = 90; // Priority for the modemanager.
 #ifdef Q_OS_MAC
-const char * const DEBUG_KEY = "Ctrl+Y";
+const char DEBUG_KEY[] = "Ctrl+Y";
 #else
-const char * const DEBUG_KEY = "F5";
+const char DEBUG_KEY[] = "F5";
 #endif
 
 } // namespace Constants

diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 01f9051..4239efb 100644 (file)
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -524,7 +524,7 @@ public:
         setContext(Context(CC::C_EDITORMANAGER, C_DEBUGMODE, CC::C_NAVIGATION_PANE));
         setDisplayName(DebuggerPlugin::tr("Debug"));
         setIcon(QIcon(QLatin1String(":/fancyactionbar/images/mode_Debug.png")));
-        setPriority(P_MODE_DEBUG);
+        setPriority(85);
         setId(MODE_DEBUG);
         setType(CC::MODE_EDIT_TYPE);
     }