Replaced various '#define' with actual strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

4 files changed, 43 insertions, 43 deletions

diff --git a/src/newui/button.cpp b/src/newui/button.cpp
index ea63ea51..5e900260 100644
--- a/src/newui/button.cpp
+++ b/src/newui/button.cpp
@@ -56,9 +56,9 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
     TQToolTip::add(this, m_realText);
 
     m_assignAccelAction = new TDEAction(i18n("Assign Accelerator..."), 0,
-        TQT_TQOBJECT(this), TQT_SLOT(assignAccel()), TQT_TQOBJECT(this));
+        this, TQT_SLOT(assignAccel()), this);
     m_clearAccelAction = new TDEAction(i18n("Clear Accelerator"), 0,
-        TQT_TQOBJECT(this), TQT_SLOT(clearAccel()), TQT_TQOBJECT(this));
+        this, TQT_SLOT(clearAccel()), this);
 
     TDEConfig *config = kapp->config();
     config->setGroup("UI");
diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp
index 164ecae7..eb217dcb 100644
--- a/src/newui/ddockwindow.cpp
+++ b/src/newui/ddockwindow.cpp
@@ -85,9 +85,9 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position)
     m_widgetStack = new TQWidgetStack(this);
     m_internalLayout->addWidget(m_widgetStack);
 
-    m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) );
-    m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) );
-    m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) );
+    m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, this, TQT_SLOT(moveToDockLeft()), this );
+    m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, this, TQT_SLOT(moveToDockRight()), this );
+    m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, this, TQT_SLOT(moveToDockBottom()), this );
 
     setVisible(m_visible);
 
@@ -375,7 +375,7 @@ void DDockWindow::selectPrevWidget()
 
 void DDockWindow::contextMenu(TQPopupMenu * menu)
 {
-    m_lastContextMenuButton = static_cast<Ideal::Button*>( TQT_TQWIDGET(const_cast<TQObject*>( sender() )) );
+    m_lastContextMenuButton = static_cast<Ideal::Button*>( const_cast<TQObject*>( sender() ) );
 
     menu->insertSeparator();
 
diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp
index bc50b6f4..62a81eca 100644
--- a/src/newui/dmainwindow.cpp
+++ b/src/newui/dmainwindow.cpp
@@ -295,7 +295,7 @@ DDockWindow::Position DMainWindow::dockWidgetPosition(TQWidget *view)
 
 void DMainWindow::widgetDestroyed()
 {
-    TQWidget *w = TQT_TQWIDGET(const_cast<TQObject*>(sender()));
+    TQWidget *w = static_cast<TQWidget*>(const_cast<TQObject*>(sender()));
 
     if (m_docks.contains(w))
     {
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index 65bf0792..8a39730b 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -61,11 +61,11 @@ SimpleMainWindow::SimpleMainWindow(TQWidget* parent, const char *name)
     :DMainWindow(parent, name)
 {
     resize(800, 600); // starts tdevelop at 800x600 the first time
-    m_mainWindowShare = new MainWindowShare(TQT_TQOBJECT(this));
+    m_mainWindowShare = new MainWindowShare(this);
 
-    connect(m_bottomDock, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(raiseEditor()));
-    connect(m_leftDock, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(raiseEditor()));
-    connect(m_rightDock, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(raiseEditor()));
+    connect(m_bottomDock, TQT_SIGNAL(hidden()), this, TQT_SLOT(raiseEditor()));
+    connect(m_leftDock, TQT_SIGNAL(hidden()), this, TQT_SLOT(raiseEditor()));
+    connect(m_rightDock, TQT_SIGNAL(hidden()), this, TQT_SLOT(raiseEditor()));
 }
 
 SimpleMainWindow::~ SimpleMainWindow( )
@@ -97,7 +97,7 @@ void SimpleMainWindow::init()
     if (help_menu)
     {
         help_menu->insertItem(SmallIconSet("contents"), i18n("TDevelop &Programming Handbook"),
-                              TQT_TQOBJECT(this), TQT_SLOT(slotProgrammingHandbook()), 0, -1, 1);
+                              this, TQT_SLOT(slotProgrammingHandbook()), 0, -1, 1);
     }
         
     menuBar()->setEnabled( false );
@@ -116,19 +116,19 @@ void SimpleMainWindow::init()
             i18n("Could Not Find Plugins") );
     }
 
-    connect(Core::getInstance(), TQT_SIGNAL(coreInitialized()), TQT_TQOBJECT(this), TQT_SLOT(slotCoreInitialized()));
-    connect(Core::getInstance(), TQT_SIGNAL(projectOpened()), TQT_TQOBJECT(this), TQT_SLOT(projectOpened()));
-    connect(Core::getInstance(), TQT_SIGNAL(projectClosed()), TQT_TQOBJECT(this), TQT_SLOT(projectClosed()));
+    connect(Core::getInstance(), TQT_SIGNAL(coreInitialized()), this, TQT_SLOT(slotCoreInitialized()));
+    connect(Core::getInstance(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()));
+    connect(Core::getInstance(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()));
     connect(Core::getInstance(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
-        TQT_TQOBJECT(this), TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)));
+        this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)));
     connect(PartController::getInstance(), TQT_SIGNAL(partURLChanged(KParts::ReadOnlyPart *)),
-        TQT_TQOBJECT(this), TQT_SLOT(slotPartURLChanged(KParts::ReadOnlyPart * )));
+        this, TQT_SLOT(slotPartURLChanged(KParts::ReadOnlyPart * )));
     connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
-        TQT_TQOBJECT(this), TQT_SLOT(activePartChanged(KParts::Part*)));
+        this, TQT_SLOT(activePartChanged(KParts::Part*)));
 
     connect(PartController::getInstance(),
         TQT_SIGNAL(documentChangedState(const KURL &, DocumentState)),
-        TQT_TQOBJECT(this), TQT_SLOT(documentChangedState(const KURL&, DocumentState)));
+        this, TQT_SLOT(documentChangedState(const KURL&, DocumentState)));
 
     loadSettings();
 }
@@ -414,64 +414,64 @@ void SimpleMainWindow::createFramework()
     PartController::createInstance( this );
 
     connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
-        TQT_TQOBJECT(this), TQT_SLOT(createGUI(KParts::Part*)));
+        this, TQT_SLOT(createGUI(KParts::Part*)));
 }
 
 void SimpleMainWindow::createActions()
 {
     m_raiseEditor = new TDEAction(i18n("Raise &Editor"), ALT+Key_C,
-        TQT_TQOBJECT(this), TQT_SLOT(raiseEditor()), actionCollection(), "raise_editor");
+        this, TQT_SLOT(raiseEditor()), actionCollection(), "raise_editor");
     m_raiseEditor->setToolTip(i18n("Raise editor"));
     m_raiseEditor->setWhatsThis(i18n("<b>Raise editor</b><p>Focuses the editor."));
 
     m_lowerAllDocks = new TDEAction(i18n("Lower All Docks"), CTRL+SHIFT+Key_C,
-        TQT_TQOBJECT(this), TQT_SLOT(lowerAllDocks()), actionCollection(), "lower_all_docks");
+        this, TQT_SLOT(lowerAllDocks()), actionCollection(), "lower_all_docks");
 
-    new TDEAction(i18n("Switch to next TabWidget"), 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Switch to next TabWidget"), 0, this,
         TQT_SLOT(switchToNextTabWidget()), actionCollection(), "switch_to_next_tabwidget" );
 
     m_splitHor = new TDEAction(i18n("Split &Horizontal"), CTRL+SHIFT+Key_T,
-        TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontalBase()), actionCollection(), "split_h");
+        this, TQT_SLOT(slotSplitHorizontalBase()), actionCollection(), "split_h");
     m_splitHor->setIcon("view_top_bottom");
 
     m_splitVer = new TDEAction(i18n("Split &Vertical"), CTRL+SHIFT+Key_L,
-        TQT_TQOBJECT(this), TQT_SLOT(slotSplitVerticalBase()), actionCollection(), "split_v");
+        this, TQT_SLOT(slotSplitVerticalBase()), actionCollection(), "split_v");
     m_splitVer->setIcon("view_left_right");
 
     m_splitHor1 = new TDEAction(i18n("Split &Horizontal"), 0,
-        TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h1");
+        this, TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h1");
     m_splitHor1->setIcon("view_top_bottom");
 
     m_splitVer1 = new TDEAction(i18n("Split &Vertical"), 0,
-        TQT_TQOBJECT(this), TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v1");
+        this, TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v1");
     m_splitVer1->setIcon("view_left_right");
 
     m_splitHor2 = new TDEAction(i18n("Split &Horizontal and Open"), 0,
-        TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h2");
+        this, TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h2");
     m_splitHor2->setIcon("view_top_bottom");
 
     m_splitVer2 = new TDEAction(i18n("Split &Vertical and Open"), 0,
-        TQT_TQOBJECT(this), TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v2");
+        this, TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v2");
     m_splitVer2->setIcon("view_left_right");
 
     m_raiseLeftDock = new TDEAction(i18n("Switch Left Dock"), CTRL+SHIFT+ALT+Key_L,
-        TQT_TQOBJECT(this), TQT_SLOT(raiseLeftDock()), actionCollection(), "switch_left_dock");
+        this, TQT_SLOT(raiseLeftDock()), actionCollection(), "switch_left_dock");
 
     m_raiseRightDock = new TDEAction(i18n("Switch Right Dock"), CTRL+SHIFT+ALT+Key_R,
-        TQT_TQOBJECT(this), TQT_SLOT(raiseRightDock()), actionCollection(), "switch_right_dock");
+        this, TQT_SLOT(raiseRightDock()), actionCollection(), "switch_right_dock");
 
     m_raiseBottomDock = new TDEAction(i18n("Switch Bottom Dock"), CTRL+SHIFT+ALT+Key_B,
-        TQT_TQOBJECT(this), TQT_SLOT(raiseBottomDock()), actionCollection(), "switch_bottom_dock");
+        this, TQT_SLOT(raiseBottomDock()), actionCollection(), "switch_bottom_dock");
 
-    KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars()),
+    KStdAction::configureToolbars(this, TQT_SLOT(configureToolbars()),
         actionCollection(), "set_configure_toolbars");
 
     m_mainWindowShare->createActions();
 
-    connect(m_mainWindowShare, TQT_SIGNAL(gotoNextWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoNextWindow()));
-    connect(m_mainWindowShare, TQT_SIGNAL(gotoPreviousWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoPreviousWindow()));
-    connect(m_mainWindowShare, TQT_SIGNAL(gotoFirstWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoFirstWindow()));
-    connect(m_mainWindowShare, TQT_SIGNAL(gotoLastWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoLastWindow()));
+    connect(m_mainWindowShare, TQT_SIGNAL(gotoNextWindow()), this, TQT_SLOT(gotoNextWindow()));
+    connect(m_mainWindowShare, TQT_SIGNAL(gotoPreviousWindow()), this, TQT_SLOT(gotoPreviousWindow()));
+    connect(m_mainWindowShare, TQT_SIGNAL(gotoFirstWindow()), this, TQT_SLOT(gotoFirstWindow()));
+    connect(m_mainWindowShare, TQT_SIGNAL(gotoLastWindow()), this, TQT_SLOT(gotoLastWindow()));
 }
 
 void SimpleMainWindow::raiseEditor()
@@ -598,7 +598,7 @@ void SimpleMainWindow::closeTab()
 
 void SimpleMainWindow::tabContext(TQWidget *w, const TQPoint &p)
 {
-    DTabWidget *tabWidget = static_cast<DTabWidget*>(TQT_TQWIDGET(const_cast<TQObject*>(sender())));
+    DTabWidget *tabWidget = static_cast<DTabWidget*>(const_cast<TQObject*>(sender()));
     if (!tabWidget)
         return;
 
@@ -644,7 +644,7 @@ void SimpleMainWindow::tabContext(TQWidget *w, const TQPoint &p)
         ++it;
     }
 
-    connect(&tabMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(tabContextActivated(int)));
+    connect(&tabMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(tabContextActivated(int)));
     tabMenu.exec(p);
 }
 
@@ -679,7 +679,7 @@ void SimpleMainWindow::configureToolbars()
 {
     saveMainWindowSettings(TDEGlobal::config(), "SimpleMainWindow");
     KEditToolbar dlg(factory());
-    connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig()));
+    connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig()));
     dlg.exec();
 }
 
@@ -704,7 +704,7 @@ bool SimpleMainWindow::queryExit()
 void SimpleMainWindow::setupWindowMenu()
 {
     // get the xmlgui created one instead
-    m_windowMenu = static_cast<TQPopupMenu*>(TQT_TQWIDGET(main()->child("window", "TDEPopupMenu")));
+    m_windowMenu = static_cast<TQPopupMenu*>(main()->child("window", "TDEPopupMenu"));
 
     if (!m_windowMenu)
     {
@@ -718,8 +718,8 @@ void SimpleMainWindow::setupWindowMenu()
     actionCollection()->action("file_close_all")->plug(m_windowMenu);
     actionCollection()->action("file_closeother")->plug(m_windowMenu);
 
-    TQObject::connect(m_windowMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(openURL(int)));
-    TQObject::connect(m_windowMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillWindowMenu()));
+    TQObject::connect(m_windowMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openURL(int)));
+    TQObject::connect(m_windowMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(fillWindowMenu()));
 }
 
 void SimpleMainWindow::openURL(int w)