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

7 files changed, 19 insertions, 15 deletions

diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp
index dbb0dfc6..9824cdc9 100644
--- a/parts/filter/filterpart.cpp
+++ b/parts/filter/filterpart.cpp
@@ -29,8 +29,8 @@
 static const KDevPluginInfo data("kdevfilter");
 K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( data ) )
 
-FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevPlugin(&data, parent, name ? name : "FilterPart")
+FilterPart::FilterPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevPlugin(&data, tqparent, name ? name : "FilterPart")
 {
     setInstance(FilterFactory::instance());
     setXMLFile("kdevfilter.rc");
diff --git a/parts/filter/filterpart.h b/parts/filter/filterpart.h
index 55b89dbc..939590ed 100644
--- a/parts/filter/filterpart.h
+++ b/parts/filter/filterpart.h
@@ -22,9 +22,10 @@ class ShellFilterDialog;
 class FilterPart : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    FilterPart( TQObject *parent, const char *name, const TQStringList & );
+    FilterPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~FilterPart();
 
 public slots:
diff --git a/parts/filter/kdevfilterIface.h b/parts/filter/kdevfilterIface.h
index d51acdbc..9d22c46b 100644
--- a/parts/filter/kdevfilterIface.h
+++ b/parts/filter/kdevfilterIface.h
@@ -10,6 +10,7 @@ class FilterPart;
 class KDevFilterIface : public TQObject, public DCOPObject
 {
     Q_OBJECT
+//    TQ_OBJECT
     K_DCOP
 public:
     KDevFilterIface( FilterPart* part );
diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp
index 484cb4cc..740762d2 100644
--- a/parts/filter/shellfilterdlg.cpp
+++ b/parts/filter/shellfilterdlg.cpp
@@ -31,18 +31,18 @@
 ShellFilterDialog::ShellFilterDialog()
     : TQDialog(0, "shell filter dialog", true)
 {
-    TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4);
 
     combo = new TQComboBox(true, this);
     combo->setDuplicatesEnabled(false);
-    layout->addWidget(combo);
+    tqlayout->addWidget(combo);
 
     KButtonBox *buttonbox = new KButtonBox(this);
     start_button = buttonbox->addButton(i18n("&Start"));
     start_button->setDefault(true);
     cancel_button = buttonbox->addButton(KStdGuiItem::cancel());
-    buttonbox->layout();
-    layout->addWidget(buttonbox);
+    buttonbox->tqlayout();
+    tqlayout->addWidget(buttonbox);
 
     connect( start_button, TQT_SIGNAL(clicked()),
              this, TQT_SLOT(slotStartClicked()) );
@@ -120,7 +120,7 @@ void ShellFilterDialog::slotProcessExited(KProcess *)
         accept();
     } else {
         KMessageBox::error(this, i18n("Process exited with status %1")
-                           .arg(m_proc->exitStatus()));
+                           .tqarg(m_proc->exitStatus()));
         reject();
     }
 }
diff --git a/parts/filter/shellfilterdlg.h b/parts/filter/shellfilterdlg.h
index 78785a11..842ea928 100644
--- a/parts/filter/shellfilterdlg.h
+++ b/parts/filter/shellfilterdlg.h
@@ -20,9 +20,10 @@ class KDevPlugin;
 class KProcess;
 
 
-class ShellFilterDialog : public QDialog
+class ShellFilterDialog : public TQDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     ShellFilterDialog();
diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp
index e36278b5..17e740b6 100644
--- a/parts/filter/shellinsertdlg.cpp
+++ b/parts/filter/shellinsertdlg.cpp
@@ -32,18 +32,18 @@
 ShellInsertDialog::ShellInsertDialog()
     : TQDialog(0, "shell filter dialog", true)
 {
-    TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4);
 
     combo = new TQComboBox(true, this);
     combo->setDuplicatesEnabled(false);
-    layout->addWidget(combo);
+    tqlayout->addWidget(combo);
 
     KButtonBox *buttonbox = new KButtonBox(this);
     start_button = buttonbox->addButton(i18n("&Start"));
     start_button->setDefault(true);
     cancel_button = buttonbox->addButton(KStdGuiItem::cancel());
-    buttonbox->layout();
-    layout->addWidget(buttonbox);
+    buttonbox->tqlayout();
+    tqlayout->addWidget(buttonbox);
 
     connect( start_button, TQT_SIGNAL(clicked()),
              this, TQT_SLOT(slotStartClicked()) );
@@ -117,7 +117,7 @@ void ShellInsertDialog::slotProcessExited(KProcess *)
         accept();
     } else {
         KMessageBox::error(this, i18n("Process exited with status %1")
-                           .arg(m_proc->exitStatus()));
+                           .tqarg(m_proc->exitStatus()));
         reject();
     }
 }
diff --git a/parts/filter/shellinsertdlg.h b/parts/filter/shellinsertdlg.h
index d532079f..b6954ade 100644
--- a/parts/filter/shellinsertdlg.h
+++ b/parts/filter/shellinsertdlg.h
@@ -20,9 +20,10 @@ class KDevPlugin;
 class KProcess;
 
 
-class ShellInsertDialog : public QDialog
+class ShellInsertDialog : public TQDialog
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
     ShellInsertDialog();