Fix tr-Errors/remove QObject::tr(), mainly in ScriptTools

Note: Those messages are to be translated in Qt 4.6
for the first time.
Reviewed-by: Kent Hansen <khansen@trolltech.com>

8 files changed, 61 insertions, 58 deletions

diff --git a/src/scripttools/debugging/qscriptbreakpointsmodel.cpp b/src/scripttools/debugging/qscriptbreakpointsmodel.cpp
index 82a7c6a..40acebb 100644
--- a/src/scripttools/debugging/qscriptbreakpointsmodel.cpp
+++ b/src/scripttools/debugging/qscriptbreakpointsmodel.cpp
@@ -47,6 +47,7 @@
 #include "private/qabstractitemmodel_p.h"
 
 #include <QtCore/qpair.h>
+#include <QtCore/qcoreapplication.h>
 #include <QtGui/qicon.h>
 #include <QtCore/qdebug.h>
 
@@ -451,17 +452,17 @@ QVariant QScriptBreakpointsModel::headerData(int section, Qt::Orientation orient
     if (orient == Qt::Horizontal) {
         if (role == Qt::DisplayRole) {
             if (section == 0)
-                return QObject::tr("ID");
+                return QCoreApplication::translate("QScriptBreakpointsModel", "ID");
             else if (section == 1)
-                return QObject::tr("Location");
+                return QCoreApplication::translate("QScriptBreakpointsModel", "Location");
             else if (section == 2)
-                return QObject::tr("Condition");
+                return QCoreApplication::translate("QScriptBreakpointsModel", "Condition");
             else if (section == 3)
-                return QObject::tr("Ignore-count");
+                return QCoreApplication::translate("QScriptBreakpointsModel", "Ignore-count");
             else if (section == 4)
-                return QObject::tr("Single-shot");
+                return QCoreApplication::translate("QScriptBreakpointsModel", "Single-shot");
             else if (section == 5)
-                return QObject::tr("Hit-count");
+                return QCoreApplication::translate("QScriptBreakpointsModel", "Hit-count");
         }
     }
     return QVariant();
diff --git a/src/scripttools/debugging/qscriptbreakpointswidget.cpp b/src/scripttools/debugging/qscriptbreakpointswidget.cpp
index 356c6d5..688c7c8 100644
--- a/src/scripttools/debugging/qscriptbreakpointswidget.cpp
+++ b/src/scripttools/debugging/qscriptbreakpointswidget.cpp
@@ -78,7 +78,7 @@ public:
         toolClose = new QToolButton(this);
         toolClose->setIcon(QIcon(QString::fromUtf8(":/qt/scripttools/debugging/images/%1/closetab.png").arg(system)));
         toolClose->setAutoRaise(true);
-        toolClose->setText(QObject::tr("Close"));
+        toolClose->setText(tr("Close"));
         hboxLayout->addWidget(toolClose);
 
         fileNameEdit = new QLineEdit();
@@ -295,13 +295,13 @@ QScriptBreakpointsWidget::QScriptBreakpointsWidget(QWidget *parent)
 
     QIcon newBreakpointIcon;
     newBreakpointIcon.addPixmap(d->pixmap(QString::fromLatin1("new.png")), QIcon::Normal);
-    QAction *newBreakpointAction = new QAction(newBreakpointIcon, QObject::tr("New"), this);
+    QAction *newBreakpointAction = new QAction(newBreakpointIcon, tr("New"), this);
     QObject::connect(newBreakpointAction, SIGNAL(triggered()),
                      this, SLOT(_q_newBreakpoint()));
 
     QIcon deleteBreakpointIcon;
     deleteBreakpointIcon.addPixmap(d->pixmap(QString::fromLatin1("delete.png")), QIcon::Normal);
-    d->deleteBreakpointAction = new QAction(deleteBreakpointIcon, QObject::tr("Delete"), this);
+    d->deleteBreakpointAction = new QAction(deleteBreakpointIcon, tr("Delete"), this);
     d->deleteBreakpointAction->setEnabled(false);
     QObject::connect(d->deleteBreakpointAction, SIGNAL(triggered()),
                      this, SLOT(_q_deleteBreakpoint()));
diff --git a/src/scripttools/debugging/qscriptdebugger.cpp b/src/scripttools/debugging/qscriptdebugger.cpp
index c09e494..58d707f 100644
--- a/src/scripttools/debugging/qscriptdebugger.cpp
+++ b/src/scripttools/debugging/qscriptdebugger.cpp
@@ -882,8 +882,8 @@ void QScriptDebuggerPrivate::_q_goToLine()
     if (!view)
         return;
     bool ok = false;
-    int lineNumber = QInputDialog::getInteger(0, QObject::tr("Go to Line"),
-                                              QObject::tr("Line:"),
+    int lineNumber = QInputDialog::getInteger(0, QScriptDebugger::tr("Go to Line"),
+                                              QScriptDebugger::tr("Line:"),
                                               view->cursorLineNumber(),
                                               1, INT_MAX, 1, &ok);
     if (ok)
@@ -1674,9 +1674,9 @@ QAction *QScriptDebugger::interruptAction(QObject *parent) const
         interruptIcon.addPixmap(d->pixmap(QString::fromLatin1("interrupt.png")), QIcon::Normal);
         interruptIcon.addPixmap(d->pixmap(QString::fromLatin1("d_interrupt.png")), QIcon::Disabled);
         QScriptDebugger *that = const_cast<QScriptDebugger*>(this);
-        that->d_func()->interruptAction = new QAction(interruptIcon, QObject::tr("Interrupt"), parent);
+        that->d_func()->interruptAction = new QAction(interruptIcon, QScriptDebugger::tr("Interrupt"), parent);
         d->interruptAction->setEnabled(!d->interactive);
-        d->interruptAction->setShortcut(QObject::tr("Shift+F5"));
+        d->interruptAction->setShortcut(QScriptDebugger::tr("Shift+F5"));
         QObject::connect(d->interruptAction, SIGNAL(triggered()),
                          that, SLOT(_q_interrupt()));
     }
@@ -1691,9 +1691,9 @@ QAction *QScriptDebugger::continueAction(QObject *parent) const
         continueIcon.addPixmap(d->pixmap(QString::fromLatin1("play.png")), QIcon::Normal);
         continueIcon.addPixmap(d->pixmap(QString::fromLatin1("d_play.png")), QIcon::Disabled);
         QScriptDebugger *that = const_cast<QScriptDebugger*>(this);
-        that->d_func()->continueAction = new QAction(continueIcon, QObject::tr("Continue"), parent);
+        that->d_func()->continueAction = new QAction(continueIcon, QScriptDebugger::tr("Continue"), parent);
         d->continueAction->setEnabled(d->interactive);
-        d->continueAction->setShortcut(QObject::tr("F5"));
+        d->continueAction->setShortcut(QScriptDebugger::tr("F5"));
         QObject::connect(d->continueAction, SIGNAL(triggered()),
                          that, SLOT(_q_continue()));
     }
@@ -1708,9 +1708,9 @@ QAction *QScriptDebugger::stepIntoAction(QObject *parent) const
         stepIntoIcon.addPixmap(d->pixmap(QString::fromLatin1("stepinto.png")), QIcon::Normal);
         stepIntoIcon.addPixmap(d->pixmap(QString::fromLatin1("d_stepinto.png")), QIcon::Disabled);
         QScriptDebugger *that = const_cast<QScriptDebugger*>(this);
-        that->d_func()->stepIntoAction = new QAction(stepIntoIcon, QObject::tr("Step Into"), parent);
+        that->d_func()->stepIntoAction = new QAction(stepIntoIcon, QScriptDebugger::tr("Step Into"), parent);
         d->stepIntoAction->setEnabled(d->interactive);
-        d->stepIntoAction->setShortcut(QObject::tr("F11"));
+        d->stepIntoAction->setShortcut(QScriptDebugger::tr("F11"));
         QObject::connect(d->stepIntoAction, SIGNAL(triggered()),
                          that, SLOT(_q_stepInto()));
     }
@@ -1725,9 +1725,9 @@ QAction *QScriptDebugger::stepOverAction(QObject *parent) const
         stepOverIcon.addPixmap(d->pixmap(QString::fromLatin1("stepover.png")), QIcon::Normal);
         stepOverIcon.addPixmap(d->pixmap(QString::fromLatin1("d_stepover.png")), QIcon::Disabled);
         QScriptDebugger *that = const_cast<QScriptDebugger*>(this);
-        that->d_func()->stepOverAction = new QAction(stepOverIcon, QObject::tr("Step Over"), parent);
+        that->d_func()->stepOverAction = new QAction(stepOverIcon, QScriptDebugger::tr("Step Over"), parent);
         d->stepOverAction->setEnabled(d->interactive);
-        d->stepOverAction->setShortcut(QObject::tr("F10"));
+        d->stepOverAction->setShortcut(QScriptDebugger::tr("F10"));
         QObject::connect(d->stepOverAction, SIGNAL(triggered()),
                          that, SLOT(_q_stepOver()));
     }
@@ -1742,9 +1742,9 @@ QAction *QScriptDebugger::stepOutAction(QObject *parent) const
         stepOutIcon.addPixmap(d->pixmap(QString::fromLatin1("stepout.png")), QIcon::Normal);
         stepOutIcon.addPixmap(d->pixmap(QString::fromLatin1("d_stepout.png")), QIcon::Disabled);
         QScriptDebugger *that = const_cast<QScriptDebugger*>(this);
-        that->d_func()->stepOutAction = new QAction(stepOutIcon, QObject::tr("Step Out"), parent);
+        that->d_func()->stepOutAction = new QAction(stepOutIcon, QScriptDebugger::tr("Step Out"), parent);
         d->stepOutAction->setEnabled(d->interactive);
-        d->stepOutAction->setShortcut(QObject::tr("Shift+F11"));
+        d->stepOutAction->setShortcut(QScriptDebugger::tr("Shift+F11"));
         QObject::connect(d->stepOutAction, SIGNAL(triggered()),
                          that, SLOT(_q_stepOut()));
     }
@@ -1759,9 +1759,9 @@ QAction *QScriptDebugger::runToCursorAction(QObject *parent) const
         runToCursorIcon.addPixmap(d->pixmap(QString::fromLatin1("runtocursor.png")), QIcon::Normal);
         runToCursorIcon.addPixmap(d->pixmap(QString::fromLatin1("d_runtocursor.png")), QIcon::Disabled);
         QScriptDebugger *that = const_cast<QScriptDebugger*>(this);
-        that->d_func()->runToCursorAction = new QAction(runToCursorIcon, QObject::tr("Run to Cursor"), parent);
+        that->d_func()->runToCursorAction = new QAction(runToCursorIcon, QScriptDebugger::tr("Run to Cursor"), parent);
         d->runToCursorAction->setEnabled(d->interactive);
-        d->runToCursorAction->setShortcut(QObject::tr("Ctrl+F10"));
+        d->runToCursorAction->setShortcut(QScriptDebugger::tr("Ctrl+F10"));
         QObject::connect(d->runToCursorAction, SIGNAL(triggered()),
                          that, SLOT(_q_runToCursor()));
     }
@@ -1777,7 +1777,7 @@ QAction *QScriptDebugger::runToNewScriptAction(QObject *parent) const
         runToNewScriptIcon.addPixmap(d->pixmap(QString::fromLatin1("d_breakonscriptload.png")), QIcon::Disabled);
         QScriptDebugger *that = const_cast<QScriptDebugger*>(this);
         that->d_func()->runToNewScriptAction = new QAction(runToNewScriptIcon,
-                                                           QObject::tr("Run to New Script"), parent);
+                                                           QScriptDebugger::tr("Run to New Script"), parent);
         d->runToNewScriptAction->setEnabled(d->interactive);
         QObject::connect(d->runToNewScriptAction, SIGNAL(triggered()),
                          that, SLOT(_q_runToNewScript()));
@@ -1792,8 +1792,8 @@ QAction *QScriptDebugger::toggleBreakpointAction(QObject *parent) const
         QIcon toggleBreakpointIcon;
         QScriptDebugger *that = const_cast<QScriptDebugger*>(this);
         that->d_func()->toggleBreakpointAction = new QAction(toggleBreakpointIcon,
-                                                             QObject::tr("Toggle Breakpoint"), parent);
-        d->toggleBreakpointAction->setShortcut(QObject::tr("F9"));
+                                                             QScriptDebugger::tr("Toggle Breakpoint"), parent);
+        d->toggleBreakpointAction->setShortcut(QScriptDebugger::tr("F9"));
         d->toggleBreakpointAction->setEnabled((d->codeWidget != 0) && (d->codeWidget->currentView() != 0));
         QObject::connect(d->toggleBreakpointAction, SIGNAL(triggered()),
                          that, SLOT(_q_toggleBreakpoint()));
@@ -1807,7 +1807,7 @@ QAction *QScriptDebugger::clearDebugOutputAction(QObject *parent) const
     if (!d->clearDebugOutputAction) {
         QIcon clearDebugOutputIcon;
         QScriptDebugger *that = const_cast<QScriptDebugger*>(this);
-        that->d_func()->clearDebugOutputAction = new QAction(clearDebugOutputIcon, QObject::tr("Clear Debug Output"), parent);
+        that->d_func()->clearDebugOutputAction = new QAction(clearDebugOutputIcon, QScriptDebugger::tr("Clear Debug Output"), parent);
         QObject::connect(d->clearDebugOutputAction, SIGNAL(triggered()),
                          that, SLOT(_q_clearDebugOutput()));
     }
@@ -1820,7 +1820,7 @@ QAction *QScriptDebugger::clearErrorLogAction(QObject *parent) const
     if (!d->clearErrorLogAction) {
         QIcon clearErrorLogIcon;
         QScriptDebugger *that = const_cast<QScriptDebugger*>(this);
-        that->d_func()->clearErrorLogAction = new QAction(clearErrorLogIcon, QObject::tr("Clear Error Log"), parent);
+        that->d_func()->clearErrorLogAction = new QAction(clearErrorLogIcon, QScriptDebugger::tr("Clear Error Log"), parent);
         QObject::connect(d->clearErrorLogAction, SIGNAL(triggered()),
                          that, SLOT(_q_clearErrorLog()));
     }
@@ -1833,7 +1833,7 @@ QAction *QScriptDebugger::clearConsoleAction(QObject *parent) const
     if (!d->clearConsoleAction) {
         QIcon clearConsoleIcon;
         QScriptDebugger *that = const_cast<QScriptDebugger*>(this);
-        that->d_func()->clearConsoleAction = new QAction(clearConsoleIcon, QObject::tr("Clear Console"), parent);
+        that->d_func()->clearConsoleAction = new QAction(clearConsoleIcon, QScriptDebugger::tr("Clear Console"), parent);
         QObject::connect(d->clearConsoleAction, SIGNAL(triggered()),
                          that, SLOT(_q_clearConsole()));
     }
@@ -1847,8 +1847,8 @@ QAction *QScriptDebugger::findInScriptAction(QObject *parent) const
         QIcon findInScriptIcon;
         findInScriptIcon.addPixmap(d->pixmap(QString::fromLatin1("find.png")), QIcon::Normal);
         QScriptDebugger *that = const_cast<QScriptDebugger*>(this);
-        that->d_func()->findInScriptAction = new QAction(findInScriptIcon, QObject::tr("&Find in Script..."), parent);
-        d->findInScriptAction->setShortcut(QObject::tr("Ctrl+F"));
+        that->d_func()->findInScriptAction = new QAction(findInScriptIcon, QScriptDebugger::tr("&Find in Script..."), parent);
+        d->findInScriptAction->setShortcut(QScriptDebugger::tr("Ctrl+F"));
         d->findInScriptAction->setEnabled(
             (d->codeFinderWidget != 0)
             && (d->codeWidget != 0)
@@ -1865,9 +1865,9 @@ QAction *QScriptDebugger::findNextInScriptAction(QObject *parent) const
     if (!d->findNextInScriptAction) {
         QIcon findNextInScriptIcon;
         QScriptDebugger *that = const_cast<QScriptDebugger*>(this);
-        that->d_func()->findNextInScriptAction = new QAction(findNextInScriptIcon, QObject::tr("Find &Next"), parent);
+        that->d_func()->findNextInScriptAction = new QAction(findNextInScriptIcon, QScriptDebugger::tr("Find &Next"), parent);
         d->findNextInScriptAction->setEnabled(d->codeFinderWidget && !d->codeFinderWidget->text().isEmpty());
-        d->findNextInScriptAction->setShortcut(QObject::tr("F3"));
+        d->findNextInScriptAction->setShortcut(QScriptDebugger::tr("F3"));
         QObject::connect(d->findNextInScriptAction, SIGNAL(triggered()),
                          that, SLOT(_q_findNextInScript()));
     }
@@ -1880,9 +1880,9 @@ QAction *QScriptDebugger::findPreviousInScriptAction(QObject *parent) const
     if (!d->findPreviousInScriptAction) {
         QIcon findPreviousInScriptIcon;
         QScriptDebugger *that = const_cast<QScriptDebugger*>(this);
-        that->d_func()->findPreviousInScriptAction = new QAction(findPreviousInScriptIcon, QObject::tr("Find &Previous"), parent);
+        that->d_func()->findPreviousInScriptAction = new QAction(findPreviousInScriptIcon, QScriptDebugger::tr("Find &Previous"), parent);
         d->findPreviousInScriptAction->setEnabled(d->codeFinderWidget && !d->codeFinderWidget->text().isEmpty());
-        d->findPreviousInScriptAction->setShortcut(QObject::tr("Shift+F3"));
+        d->findPreviousInScriptAction->setShortcut(QScriptDebugger::tr("Shift+F3"));
         QObject::connect(d->findPreviousInScriptAction, SIGNAL(triggered()),
                          that, SLOT(_q_findPreviousInScript()));
     }
@@ -1895,8 +1895,8 @@ QAction *QScriptDebugger::goToLineAction(QObject *parent) const
     if (!d->goToLineAction) {
         QIcon goToLineIcon;
         QScriptDebugger *that = const_cast<QScriptDebugger*>(this);
-        that->d_func()->goToLineAction = new QAction(goToLineIcon, QObject::tr("Go to Line"), parent);
-        d->goToLineAction->setShortcut(QObject::tr("Ctrl+G"));
+        that->d_func()->goToLineAction = new QAction(goToLineIcon, QScriptDebugger::tr("Go to Line"), parent);
+        d->goToLineAction->setShortcut(QScriptDebugger::tr("Ctrl+G"));
         d->goToLineAction->setEnabled((d->codeWidget != 0) && (d->codeWidget->currentView() != 0));
         QObject::connect(d->goToLineAction, SIGNAL(triggered()),
                          that, SLOT(_q_goToLine()));
@@ -1907,7 +1907,7 @@ QAction *QScriptDebugger::goToLineAction(QObject *parent) const
 QMenu *QScriptDebugger::createStandardMenu(QWidget *widgetParent, QObject *actionParent)
 {
     QMenu *menu = new QMenu(widgetParent);
-    menu->setTitle(QObject::tr("Debug"));
+    menu->setTitle(QScriptDebugger::tr("Debug"));
     menu->addAction(action(ContinueAction, actionParent));
     menu->addAction(action(InterruptAction, actionParent));
     menu->addAction(action(StepIntoAction, actionParent));
diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp
index 5ef5a0c..8ed0aaa 100644
--- a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp
@@ -138,7 +138,7 @@ QScriptDebuggerCodeFinderWidget::QScriptDebuggerCodeFinderWidget(QWidget *parent
     d->toolClose = new QToolButton(this);
     d->toolClose->setIcon(QIcon(QString::fromUtf8(":/qt/scripttools/debugging/images/%1/closetab.png").arg(system)));
     d->toolClose->setAutoRaise(true);
-    d->toolClose->setText(QObject::tr("Close"));
+    d->toolClose->setText(tr("Close"));
     hboxLayout->addWidget(d->toolClose);
 
     d->editFind = new QLineEdit(this);
diff --git a/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp b/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp
index 15d43f4..9caefce 100644
--- a/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp
@@ -53,6 +53,7 @@
 #include "private/qabstractitemmodel_p.h"
 
 #include <QtCore/qdebug.h>
+#include <QtCore/qcoreapplication.h>
 #include <QtGui/qbrush.h>
 #include <QtGui/qfont.h>
 
@@ -868,9 +869,9 @@ QVariant QScriptDebuggerLocalsModel::headerData(int section, Qt::Orientation ori
     if (orient == Qt::Horizontal) {
         if (role == Qt::DisplayRole) {
             if (section == 0)
-                return QObject::tr("Name");
+                return QCoreApplication::translate("QScriptDebuggerLocalsModel", "Name");
             else if (section == 1)
-                return QObject::tr("Value");
+                return QCoreApplication::translate("QScriptDebuggerLocalsModel", "Value");
         }
     }
     return QVariant();
diff --git a/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp b/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp
index a63ea73..2d56e17 100644
--- a/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp
@@ -45,6 +45,7 @@
 
 #include <QtScript/qscriptcontextinfo.h>
 #include <QtCore/qfileinfo.h>
+#include <QtCore/qcoreapplication.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -157,11 +158,11 @@ QVariant QScriptDebuggerStackModel::headerData(int section, Qt::Orientation orie
         return QVariant();
     if (role == Qt::DisplayRole) {
         if (section == 0)
-            return QObject::tr("Level");
+            return QCoreApplication::translate("QScriptDebuggerStackModel", "Level");
         else if (section == 1)
-            return QObject::tr("Name");
+            return QCoreApplication::translate("QScriptDebuggerStackModel", "Name");
         else if (section == 2)
-            return QObject::tr("Location");
+            return QCoreApplication::translate("QScriptDebuggerStackModel", "Location");
     }
     return QVariant();
 }
diff --git a/src/scripttools/debugging/qscriptedit.cpp b/src/scripttools/debugging/qscriptedit.cpp
index 8db9cea..7f0a5e0 100644
--- a/src/scripttools/debugging/qscriptedit.cpp
+++ b/src/scripttools/debugging/qscriptedit.cpp
@@ -408,14 +408,14 @@ void QScriptEdit::extraAreaMouseEvent(QMouseEvent *e)
                 return;
             bool has = m_breakpoints.contains(lineNumber);
             QMenu *popup = new QMenu();
-            QAction *toggleAct = new QAction(QObject::tr("Toggle Breakpoint"), popup);
+            QAction *toggleAct = new QAction(tr("Toggle Breakpoint"), popup);
             popup->addAction(toggleAct);
-            QAction *disableAct = new QAction(QObject::tr("Disable Breakpoint"), popup);
-            QAction *enableAct = new QAction(QObject::tr("Enable Breakpoint"), popup);
+            QAction *disableAct = new QAction(tr("Disable Breakpoint"), popup);
+            QAction *enableAct = new QAction(tr("Enable Breakpoint"), popup);
             QWidget *conditionWidget = new QWidget();
             {
                 QHBoxLayout *hbox = new QHBoxLayout(conditionWidget);
-                hbox->addWidget(new QLabel(QObject::tr("Breakpoint Condition:")));
+                hbox->addWidget(new QLabel(tr("Breakpoint Condition:")));
                 hbox->addWidget(new QLineEdit());
             }
 //            QWidgetAction *conditionAct = new QWidgetAction(popup);
diff --git a/src/scripttools/debugging/qscriptenginedebugger.cpp b/src/scripttools/debugging/qscriptenginedebugger.cpp
index 7456da0..915d511 100644
--- a/src/scripttools/debugging/qscriptenginedebugger.cpp
+++ b/src/scripttools/debugging/qscriptenginedebugger.cpp
@@ -520,43 +520,43 @@ QMainWindow *QScriptEngineDebugger::standardWindow() const
     QMainWindow *win = new QMainWindow();
     QDockWidget *scriptsDock = new QDockWidget(win);
     scriptsDock->setObjectName(QLatin1String("qtscriptdebugger_scriptsDockWidget"));
-    scriptsDock->setWindowTitle(QObject::tr("Loaded Scripts"));
+    scriptsDock->setWindowTitle(tr("Loaded Scripts"));
     scriptsDock->setWidget(widget(ScriptsWidget));
     win->addDockWidget(Qt::LeftDockWidgetArea, scriptsDock);
 
     QDockWidget *breakpointsDock = new QDockWidget(win);
     breakpointsDock->setObjectName(QLatin1String("qtscriptdebugger_breakpointsDockWidget"));
-    breakpointsDock->setWindowTitle(QObject::tr("Breakpoints"));
+    breakpointsDock->setWindowTitle(tr("Breakpoints"));
     breakpointsDock->setWidget(widget(BreakpointsWidget));
     win->addDockWidget(Qt::LeftDockWidgetArea, breakpointsDock);
 
     QDockWidget *stackDock = new QDockWidget(win);
     stackDock->setObjectName(QLatin1String("qtscriptdebugger_stackDockWidget"));
-    stackDock->setWindowTitle(QObject::tr("Stack"));
+    stackDock->setWindowTitle(tr("Stack"));
     stackDock->setWidget(widget(StackWidget));
     win->addDockWidget(Qt::RightDockWidgetArea, stackDock);
 
     QDockWidget *localsDock = new QDockWidget(win);
     localsDock->setObjectName(QLatin1String("qtscriptdebugger_localsDockWidget"));
-    localsDock->setWindowTitle(QObject::tr("Locals"));
+    localsDock->setWindowTitle(tr("Locals"));
     localsDock->setWidget(widget(LocalsWidget));
     win->addDockWidget(Qt::RightDockWidgetArea, localsDock);
 
     QDockWidget *consoleDock = new QDockWidget(win);
     consoleDock->setObjectName(QLatin1String("qtscriptdebugger_consoleDockWidget"));
-    consoleDock->setWindowTitle(QObject::tr("Console"));
+    consoleDock->setWindowTitle(tr("Console"));
     consoleDock->setWidget(widget(ConsoleWidget));
     win->addDockWidget(Qt::BottomDockWidgetArea, consoleDock);
 
     QDockWidget *debugOutputDock = new QDockWidget(win);
     debugOutputDock->setObjectName(QLatin1String("qtscriptdebugger_debugOutputDockWidget"));
-    debugOutputDock->setWindowTitle(QObject::tr("Debug Output"));
+    debugOutputDock->setWindowTitle(tr("Debug Output"));
     debugOutputDock->setWidget(widget(DebugOutputWidget));
     win->addDockWidget(Qt::BottomDockWidgetArea, debugOutputDock);
 
     QDockWidget *errorLogDock = new QDockWidget(win);
     errorLogDock->setObjectName(QLatin1String("qtscriptdebugger_errorLogDockWidget"));
-    errorLogDock->setWindowTitle(QObject::tr("Error Log"));
+    errorLogDock->setWindowTitle(tr("Error Log"));
     errorLogDock->setWidget(widget(ErrorLogWidget));
     win->addDockWidget(Qt::BottomDockWidgetArea, errorLogDock);
 
@@ -568,14 +568,14 @@ QMainWindow *QScriptEngineDebugger::standardWindow() const
 #ifndef QT_NO_MENUBAR
     win->menuBar()->addMenu(that->createStandardMenu(win));
 
-    QMenu *editMenu = win->menuBar()->addMenu(QObject::tr("Search"));
+    QMenu *editMenu = win->menuBar()->addMenu(tr("Search"));
     editMenu->addAction(action(FindInScriptAction));
     editMenu->addAction(action(FindNextInScriptAction));
     editMenu->addAction(action(FindPreviousInScriptAction));
     editMenu->addSeparator();
     editMenu->addAction(action(GoToLineAction));
 
-    QMenu *viewMenu = win->menuBar()->addMenu(QObject::tr("View"));
+    QMenu *viewMenu = win->menuBar()->addMenu(tr("View"));
     viewMenu->addAction(scriptsDock->toggleViewAction());
     viewMenu->addAction(breakpointsDock->toggleViewAction());
     viewMenu->addAction(stackDock->toggleViewAction());
@@ -593,7 +593,7 @@ QMainWindow *QScriptEngineDebugger::standardWindow() const
     widget(CodeFinderWidget)->hide();
     win->setCentralWidget(central);
 
-    win->setWindowTitle(QObject::tr("Qt Script Debugger"));
+    win->setWindowTitle(tr("Qt Script Debugger"));
     win->setUnifiedTitleAndToolBarOnMac(true);
 
     QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));