TQt4 port kdevelop

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

3 files changed, 12 insertions, 11 deletions

diff --git a/kdevdesigner/src/kdevdesigner.cpp b/kdevdesigner/src/kdevdesigner.cpp
index 5e54297e..ebcabad1 100644
--- a/kdevdesigner/src/kdevdesigner.cpp
+++ b/kdevdesigner/src/kdevdesigner.cpp
@@ -59,7 +59,7 @@ KDevDesigner::KDevDesigner()
         // our hands on it
         TQStringList args;
         args.append("in shell");
-        m_part = static_cast<KParts::ReadWritePart *>(factory->create(this,
+        m_part = static_cast<KParts::ReadWritePart *>(factory->create(TQT_TQOBJECT(this),
                                 "kdevdesigner_part", "KParts::ReadWritePart", args));
 
         if (m_part)
@@ -99,16 +99,16 @@ void KDevDesigner::load(const KURL& url)
 
 void KDevDesigner::setupActions()
 {
-/*    KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
-    KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());*/
+/*    KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection());
+    KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());*/
 
-    KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+    KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
     
-    m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection());
-    m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection());
+    m_toolbarAction = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowToolbar()), actionCollection());
+    m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection());
 
-    KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
-    KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+    KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
+    KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
 }
 
 void KDevDesigner::saveProperties(KConfig* /*config*/)
@@ -190,7 +190,7 @@ void KDevDesigner::fileOpen()
     // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar
     // button is clicked
     KURL url =
-        KFileDialog::getOpenURL( TQString::null, TQString::null, this );
+        KFileDialog::getOpenURL( TQString(), TQString(), this );
 
     if (url.isEmpty() == false)
     {
diff --git a/kdevdesigner/src/kdevdesigner.h b/kdevdesigner/src/kdevdesigner.h
index 19a0762e..8a26d288 100644
--- a/kdevdesigner/src/kdevdesigner.h
+++ b/kdevdesigner/src/kdevdesigner.h
@@ -42,6 +42,7 @@ class KToggleAction;
 class KDevDesigner : public KParts::MainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Default Constructor
diff --git a/kdevdesigner/src/main.cpp b/kdevdesigner/src/main.cpp
index a535f575..c06c77dc 100644
--- a/kdevdesigner/src/main.cpp
+++ b/kdevdesigner/src/main.cpp
@@ -41,8 +41,8 @@ static KCmdLineOptions options[] =
 int main(int argc, char **argv)
 {
     KAboutData about("kdevdesigner", I18N_NOOP("KDevDesigner"), version, description,
-                     KAboutData::License_GPL, "KDevDesigner Copyright: (C) 2004-2005 Alexander Dymo\nQt Designer Copyright: (C) 2000-2005 Trolltech AS All Rights Reserved", 0, 0);
-    about.addAuthor( "Trolltech AS", "Qt Designer code (Free Edition)" );
+                     KAboutData::License_GPL, "KDevDesigner Copyright: (C) 2004-2005 Alexander Dymo\nTQt Designer Copyright: (C) 2000-2005 Trolltech AS All Rights Reserved", 0, 0);
+    about.addAuthor( "Trolltech AS", "TQt Designer code (Free Edition)" );
     about.addAuthor( "Alexander Dymo", "Port to KDE, partification", "adymo@kdevelop.org" );
     KCmdLineArgs::init(argc, argv, &about);
     KCmdLineArgs::addCmdLineOptions( options );