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

1 files changed, 27 insertions, 27 deletions

diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp
index 135751e8..8cbf9a7c 100644
--- a/kdevdesigner/designer/kdevdesigner_part.cpp
+++ b/kdevdesigner/designer/kdevdesigner_part.cpp
@@ -40,21 +40,21 @@
 #include "designeraction.h"
 #include "formwindow.h"
 
-KDevDesignerPart::KDevDesignerPart( TQWidget *parentWidget, const char *// widgetName
+KDevDesignerPart::KDevDesignerPart( TQWidget *tqparentWidget, const char *// widgetName
                                     ,
-                                  TQObject *parent, const char *name, const TQStringList &args )
-    : KInterfaceDesigner::Designer(parent, name)
+                                  TQObject *tqparent, const char *name, const TQStringList &args )
+    : KInterfaceDesigner::Designer(tqparent, name)
 {
     setInstance( KDevDesignerPartFactory::instance() );
 
     m_widget = new MainWindow( this, true );
-    m_widget->reparent(parentWidget, TQPoint(0,0));
+    m_widget->reparent(tqparentWidget, TQPoint(0,0));
     setupDesignerWindow();
 
     setWidget(m_widget);
 
     setupActions();
-    if (args.contains("in shell"))
+    if (args.tqcontains("in shell"))
         setXMLFile("kdevdesigner_part_sh.rc");
     else
         setXMLFile("kdevdesigner_part.rc");
@@ -68,7 +68,7 @@ KDevDesignerPart::KDevDesignerPart( TQWidget *parentWidget, const char *// widge
 void KDevDesignerPart::setupDesignerWindow()
 {
     m_widget->menuBar()->hide();
-    m_widget->layoutToolBar->hide();
+    m_widget->tqlayoutToolBar->hide();
     m_widget->projectToolBar->hide();
     m_widget->toolsToolBar->hide();
     m_widget->statusBar()->hide();
@@ -144,21 +144,21 @@ void KDevDesignerPart::setupActions( )
     new KAction(i18n("Configure Toolbox..."), 0, this, TQT_SLOT(toolsConfigureToolbox()), actionCollection(), "tools_toolbox");
     new KAction(i18n("Edit &Custom Widgets..."), 0, this, TQT_SLOT(toolsEditCustomWidgets()), actionCollection(), "tools_editcustomwidgets");
 
-    action = new KAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize");
+    action = new KAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(tqlayoutAdjustSize()), actionCollection(), "tqlayout_adjustsize");
     stateSync(action, m_widget->actionEditAdjustSize);
-    action = new KAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, TQT_SLOT(layoutHLayout()), actionCollection(), "layout_h");
+    action = new KAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithtqlayout.png"), CTRL + Key_H, this, TQT_SLOT(tqlayoutHLayout()), actionCollection(), "tqlayout_h");
     stateSync(action, m_widget->actionEditHLayout);
-    action = new KAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, TQT_SLOT(layoutVLayout()), actionCollection(), "layout_v");
+    action = new KAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvtqlayout.png"), CTRL + Key_V, this, TQT_SLOT(tqlayoutVLayout()), actionCollection(), "tqlayout_v");
     stateSync(action, m_widget->actionEditVLayout);
-    action = new KAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(layoutGridLayout()), actionCollection(), "layout_grid");
+    action = new KAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(tqlayoutGridLayout()), actionCollection(), "tqlayout_grid");
     stateSync(action, m_widget->actionEditGridLayout);
-    action = new KAction(i18n("Lay Out Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith");
+    action = new KAction(i18n("Lay OutQt::Horizontally (in S&plitter)"), createPartIconSet("designer_editvtqlayoutsplit.png"), 0, this, TQT_SLOT(tqlayoutSplitHLayout()), actionCollection(), "tqlayout_splith");
     stateSync(action, m_widget->actionEditSplitHorizontal);
-    action = new KAction(i18n("Lay Out Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv");
+    action = new KAction(i18n("Lay OutQt::Vertically (in Sp&litter)"), createPartIconSet("designer_edithtqlayoutsplit.png"), 0, this, TQT_SLOT(tqlayoutSplitVLayout()), actionCollection(), "tqlayout_splitv");
     stateSync(action, m_widget->actionEditSplitVertical);
-    action = new KAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQT_SLOT(layoutBreak()), actionCollection(), "layout_break");
+    action = new KAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQT_SLOT(tqlayoutBreak()), actionCollection(), "tqlayout_break");
     stateSync(action, m_widget->actionEditBreakLayout);
-    toggle = new KRadioAction(i18n("Add Spacer"), createPartIconSet("designer_spacer.png"), 0, actionCollection(), "layout_spacer");
+    toggle = new KRadioAction(i18n("Add Spacer"), createPartIconSet("designer_spacer.png"), 0, actionCollection(), "tqlayout_spacer");
     setupToolsAction(toggle, m_widget->actionInsertSpacer);
 
     action = new KAction(i18n("Preview &Form"), CTRL + Key_T, this, TQT_SLOT(windowPreview()), actionCollection(), "window_preview");
@@ -256,12 +256,12 @@ KDevDesignerPartFactory::~KDevDesignerPartFactory()
     s_instance = 0L;
 }
 
-KParts::Part* KDevDesignerPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
-                                                        TQObject *parent, const char *name,
+KParts::Part* KDevDesignerPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+                                                        TQObject *tqparent, const char *name,
                                                         const char *classname, const TQStringList &args )
 {
     // Create an instance of our Part
-    KDevDesignerPart* obj = new KDevDesignerPart( parentWidget, widgetName, parent, name, args );
+    KDevDesignerPart* obj = new KDevDesignerPart( tqparentWidget, widgetName, tqparent, name, args );
 
     // See if we are to be read-write or not
     if (TQCString(classname) == "KParts::ReadOnlyPart")
@@ -407,37 +407,37 @@ void KDevDesignerPart::toolsConfigureToolbox( )
     m_widget->toolsConfigure();
 }
 
-void KDevDesignerPart::layoutAdjustSize( )
+void KDevDesignerPart::tqlayoutAdjustSize( )
 {
     m_widget->actionEditAdjustSize->activate();
 }
 
-void KDevDesignerPart::layoutHLayout( )
+void KDevDesignerPart::tqlayoutHLayout( )
 {
     m_widget->actionEditHLayout->activate();
 }
 
-void KDevDesignerPart::layoutVLayout( )
+void KDevDesignerPart::tqlayoutVLayout( )
 {
     m_widget->actionEditVLayout->activate();
 }
 
-void KDevDesignerPart::layoutGridLayout( )
+void KDevDesignerPart::tqlayoutGridLayout( )
 {
     m_widget->actionEditGridLayout->activate();
 }
 
-void KDevDesignerPart::layoutSplitHLayout( )
+void KDevDesignerPart::tqlayoutSplitHLayout( )
 {
     m_widget->actionEditSplitHorizontal->activate();
 }
 
-void KDevDesignerPart::layoutSplitVLayout( )
+void KDevDesignerPart::tqlayoutSplitVLayout( )
 {
     m_widget->actionEditSplitVertical->activate();
 }
 
-void KDevDesignerPart::layoutBreak( )
+void KDevDesignerPart::tqlayoutBreak( )
 {
     m_widget->actionEditBreakLayout->activate();
 }
@@ -509,7 +509,7 @@ void KDevDesignerPart::openProject( const TQString & // projectFile
 
 KInterfaceDesigner::DesignerType KDevDesignerPart::designerType( )
 {
-    return KInterfaceDesigner::QtDesigner;
+    return KInterfaceDesigner::TQtDesigner;
 }
 
 void KDevDesignerPart::emitAddedFunction( const TQString & form, KInterfaceDesigner::Function func )
@@ -552,9 +552,9 @@ void KDevDesignerPart::emitEditSource(const TQString &formName)
     emit editSource(designerType(), formName);
 }
 
-void KDevDesignerPart::emitNewStatus(const TQString &formName, int status)
+void KDevDesignerPart::emitNewtqStatus(const TQString &formName, int status)
 {
-    emit newStatus(formName, status);
+    emit newtqStatus(formName, status);
 }
 
 void KDevDesignerPart::toolsEditCustomWidgets( )