summaryrefslogtreecommitdiffstats
path: root/vcs/subversion/integrator
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-14 16:45:05 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-14 16:45:05 +0000
commit48d4a26399959121f33d2bc3bfe51c7827b654fc (patch)
tree5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /vcs/subversion/integrator
parent7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff)
downloadtdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz
tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip
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
Diffstat (limited to 'vcs/subversion/integrator')
-rw-r--r--vcs/subversion/integrator/subversionintegrator.cpp10
-rw-r--r--vcs/subversion/integrator/subversionintegrator.h7
-rw-r--r--vcs/subversion/integrator/svnintegratordlg.cpp4
-rw-r--r--vcs/subversion/integrator/svnintegratordlg.h3
-rw-r--r--vcs/subversion/integrator/svnintegratordlgbase.ui20
5 files changed, 23 insertions, 21 deletions
diff --git a/vcs/subversion/integrator/subversionintegrator.cpp b/vcs/subversion/integrator/subversionintegrator.cpp
index 32d28d27..8c0c4ef9 100644
--- a/vcs/subversion/integrator/subversionintegrator.cpp
+++ b/vcs/subversion/integrator/subversionintegrator.cpp
@@ -28,10 +28,10 @@ static const KDevPluginInfo data("kdevsubversionintegrator");
typedef KDevGenericFactory<SubversionIntegrator> SubversionIntegratorFactory;
K_EXPORT_COMPONENT_FACTORY( libsubversionintegrator, SubversionIntegratorFactory(data) )
-SubversionIntegrator::SubversionIntegrator(TQObject* parent, const char* name,
+SubversionIntegrator::SubversionIntegrator(TQObject* tqparent, const char* name,
const TQStringList // args
)
- :KDevVCSIntegrator(parent, name)
+ :KDevVCSIntegrator(tqparent, name)
{
}
@@ -39,15 +39,15 @@ SubversionIntegrator::~SubversionIntegrator()
{
}
-VCSDialog* SubversionIntegrator::fetcher(TQWidget* // parent
+VCSDialog* SubversionIntegrator::fetcher(TQWidget* // tqparent
)
{
return 0;
}
-VCSDialog* SubversionIntegrator::integrator(TQWidget* parent)
+VCSDialog* SubversionIntegrator::integrator(TQWidget* tqparent)
{
- SvnIntegratorDlg *dlg = new SvnIntegratorDlg(parent);
+ SvnIntegratorDlg *dlg = new SvnIntegratorDlg(tqparent);
return dlg;
}
diff --git a/vcs/subversion/integrator/subversionintegrator.h b/vcs/subversion/integrator/subversionintegrator.h
index e9b62d70..d5ae7fad 100644
--- a/vcs/subversion/integrator/subversionintegrator.h
+++ b/vcs/subversion/integrator/subversionintegrator.h
@@ -27,12 +27,13 @@
class SubversionIntegrator : public KDevVCSIntegrator
{
Q_OBJECT
+ TQ_OBJECT
public:
- SubversionIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+ SubversionIntegrator(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
~SubversionIntegrator();
- virtual VCSDialog* fetcher(TQWidget* parent);
- virtual VCSDialog* integrator(TQWidget* parent);
+ virtual VCSDialog* fetcher(TQWidget* tqparent);
+ virtual VCSDialog* integrator(TQWidget* tqparent);
};
diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp
index 05572278..cc074f8b 100644
--- a/vcs/subversion/integrator/svnintegratordlg.cpp
+++ b/vcs/subversion/integrator/svnintegratordlg.cpp
@@ -38,8 +38,8 @@
using namespace KIO;
-SvnIntegratorDlg::SvnIntegratorDlg( TQWidget *parent, const char *name )
- : SvnIntegratorDlgBase( parent, name )
+SvnIntegratorDlg::SvnIntegratorDlg( TQWidget *tqparent, const char *name )
+ : SvnIntegratorDlgBase( tqparent, name )
{
repos1->setMode( KFile::Directory );
}
diff --git a/vcs/subversion/integrator/svnintegratordlg.h b/vcs/subversion/integrator/svnintegratordlg.h
index f76cf95f..3e464f3e 100644
--- a/vcs/subversion/integrator/svnintegratordlg.h
+++ b/vcs/subversion/integrator/svnintegratordlg.h
@@ -25,8 +25,9 @@
class SvnIntegratorDlg: public SvnIntegratorDlgBase, public VCSDialog {
Q_OBJECT
+ TQ_OBJECT
public:
- SvnIntegratorDlg(TQWidget *parent = 0, const char *name = 0);
+ SvnIntegratorDlg(TQWidget *tqparent = 0, const char *name = 0);
virtual void accept();
virtual void init(const TQString &projectName, const TQString &projectLocation);
diff --git a/vcs/subversion/integrator/svnintegratordlgbase.ui b/vcs/subversion/integrator/svnintegratordlgbase.ui
index a2ec9982..27c1fc76 100644
--- a/vcs/subversion/integrator/svnintegratordlgbase.ui
+++ b/vcs/subversion/integrator/svnintegratordlgbase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>SvnIntegratorDlgBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>SvnIntegratorDlgBase</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QButtonGroup" row="0" column="0">
+ <widget class="TQButtonGroup" row="0" column="0">
<property name="name">
<cstring>buttonGroup1</cstring>
</property>
@@ -47,7 +47,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>doNothing</cstring>
</property>
@@ -72,7 +72,7 @@ out of kdevelop, you will not be able
to perform any subversion operations.</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>createProject</cstring>
</property>
@@ -94,7 +94,7 @@ NOTE: The repository has to exist.
e.g. has been created with 'svnadmin'</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -103,15 +103,15 @@ e.g. has been created with 'svnadmin'</string>
file:///home/user/subversion/mynewproject</string>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>repositoryLabel1</cstring>
</property>
@@ -156,7 +156,7 @@ http://localhost/svn/projectname/trunk</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>131</height>
@@ -181,7 +181,7 @@ http://localhost/svn/projectname/trunk</string>
<slot>setEnabled(bool)</slot>
</connection>
</connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>