summaryrefslogtreecommitdiffstats
path: root/vcs/clearcase
diff options
context:
space:
mode:
Diffstat (limited to 'vcs/clearcase')
-rw-r--r--vcs/clearcase/clearcasefileinfoprovider.cpp10
-rw-r--r--vcs/clearcase/clearcasefileinfoprovider.h5
-rw-r--r--vcs/clearcase/clearcasepart.cpp6
-rw-r--r--vcs/clearcase/clearcasepart.h3
-rw-r--r--vcs/clearcase/commentdlg.cpp18
-rw-r--r--vcs/clearcase/commentdlg.h3
-rw-r--r--vcs/clearcase/integrator/ccintegratordlg.cpp4
-rw-r--r--vcs/clearcase/integrator/ccintegratordlg.h3
-rw-r--r--vcs/clearcase/integrator/ccintegratordlgbase.ui8
-rw-r--r--vcs/clearcase/integrator/clearcaseintegrator.cpp10
-rw-r--r--vcs/clearcase/integrator/clearcaseintegrator.h7
11 files changed, 41 insertions, 36 deletions
diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp
index 1e18f8e1..200f7448 100644
--- a/vcs/clearcase/clearcasefileinfoprovider.cpp
+++ b/vcs/clearcase/clearcasefileinfoprovider.cpp
@@ -16,14 +16,14 @@
#include <kprocess.h>
#include <tqapplication.h>
-ClearcaseFileinfoProvider::ClearcaseFileinfoProvider(ClearcasePart *parent)
- : KDevVCSFileInfoProvider( (KDevVersionControl*) parent, "clearcasefileinfoprovider")
+ClearcaseFileinfoProvider::ClearcaseFileinfoProvider(ClearcasePart *tqparent)
+ : KDevVCSFileInfoProvider( (KDevVersionControl*) tqparent, "clearcasefileinfoprovider")
{
vcsInfo_ = NULL;
- connect(parent, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void*)), TQT_SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*)));
+ connect(tqparent, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void*)), TQT_SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*)));
- kdevVCS_ = parent;
+ kdevVCS_ = tqparent;
}
@@ -45,7 +45,7 @@ const VCSFileInfoMap* ClearcaseFileinfoProvider::status( const TQString &dirPath
return vcsInfo_;
}
-bool ClearcaseFileinfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) {
+bool ClearcaseFileinfoProvider::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) {
VCSFileInfoMap* vcsDirInfos = ccManipulator_.retreiveFilesInfos(dirPath);
diff --git a/vcs/clearcase/clearcasefileinfoprovider.h b/vcs/clearcase/clearcasefileinfoprovider.h
index 24d38c2a..f4ac08f2 100644
--- a/vcs/clearcase/clearcasefileinfoprovider.h
+++ b/vcs/clearcase/clearcasefileinfoprovider.h
@@ -22,8 +22,9 @@
class ClearcaseFileinfoProvider : public KDevVCSFileInfoProvider
{
Q_OBJECT
+ TQ_OBJECT
public:
- ClearcaseFileinfoProvider(ClearcasePart *parent);
+ ClearcaseFileinfoProvider(ClearcasePart *tqparent);
virtual ~ClearcaseFileinfoProvider();
@@ -31,7 +32,7 @@ public:
const VCSFileInfoMap *status( const TQString &dirPath ) ;
// -- Async interface for requesting data
- bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
+ bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
private:
diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp
index 198cc1db..69e25513 100644
--- a/vcs/clearcase/clearcasepart.cpp
+++ b/vcs/clearcase/clearcasepart.cpp
@@ -42,8 +42,8 @@ static const KDevPluginInfo data("kdevclearcase");
typedef KDevGenericFactory<ClearcasePart> ClearcaseFactory;
K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( data ) )
-ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQStringList & )
- : KDevVersionControl( &data, parent, name ? name : "ClearcasePart" ),
+ClearcasePart::ClearcasePart( TQObject *tqparent, const char *name, const TQStringList & )
+ : KDevVersionControl( &data, tqparent, name ? name : "ClearcasePart" ),
default_checkin(""),
default_checkout(""),
default_uncheckout("-rm"),
@@ -86,7 +86,7 @@ void ClearcasePart::contextMenu(TQPopupMenu *popup, const Context *context)
KPopupMenu *sub = new KPopupMenu(popup);
TQString name = fi.fileName();
- sub->insertTitle( i18n("Actions for %1").arg(name) );
+ sub->insertTitle( i18n("Actions for %1").tqarg(name) );
sub->insertItem( i18n("Checkin"),
this, TQT_SLOT(slotCheckin()) );
sub->insertItem( i18n("Checkout"),
diff --git a/vcs/clearcase/clearcasepart.h b/vcs/clearcase/clearcasepart.h
index cafd60cd..956fc214 100644
--- a/vcs/clearcase/clearcasepart.h
+++ b/vcs/clearcase/clearcasepart.h
@@ -19,9 +19,10 @@ class TQPopupMenu;
class ClearcasePart : public KDevVersionControl {
Q_OBJECT
+ TQ_OBJECT
public:
- ClearcasePart( TQObject *parent, const char *name, const TQStringList & );
+ ClearcasePart( TQObject *tqparent, const char *name, const TQStringList & );
~ClearcasePart();
const TQString default_checkin;
diff --git a/vcs/clearcase/commentdlg.cpp b/vcs/clearcase/commentdlg.cpp
index df9fc10b..5355b3f0 100644
--- a/vcs/clearcase/commentdlg.cpp
+++ b/vcs/clearcase/commentdlg.cpp
@@ -25,21 +25,21 @@ CcaseCommentDlg::CcaseCommentDlg(bool bCheckin)
{
setCaption( i18n("Clearcase Comment") );
- TQBoxLayout *layout = new TQVBoxLayout(this, 10);
+ TQBoxLayout *tqlayout = new TQVBoxLayout(this, 10);
TQLabel *messagelabel = new TQLabel(i18n("Enter log message:"), this);
- messagelabel->setMinimumSize(messagelabel->sizeHint());
- layout->addWidget(messagelabel, 0);
+ messagelabel->setMinimumSize(messagelabel->tqsizeHint());
+ tqlayout->addWidget(messagelabel, 0);
_edit = new TQMultiLineEdit(this);
TQFontMetrics fm(_edit->fontMetrics());
_edit->setMinimumSize(fm.width("0")*40, fm.lineSpacing()*3);
- layout->addWidget(_edit, 10);
+ tqlayout->addWidget(_edit, 10);
- TQBoxLayout *layout2 = new TQHBoxLayout(layout);
+ TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout);
if(bCheckin) {
_check = new TQCheckBox(i18n("Reserve"), this);
- layout2->addWidget(_check);
+ tqlayout2->addWidget(_check);
}
KButtonBox *buttonbox = new KButtonBox(this);
@@ -49,10 +49,10 @@ CcaseCommentDlg::CcaseCommentDlg(bool bCheckin)
connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
ok->setDefault(true);
- buttonbox->layout();
- layout2->addWidget(buttonbox, 0);
+ buttonbox->tqlayout();
+ tqlayout2->addWidget(buttonbox, 0);
- layout->activate();
+ tqlayout->activate();
adjustSize();
}
diff --git a/vcs/clearcase/commentdlg.h b/vcs/clearcase/commentdlg.h
index 953a9a4e..c88ba7bd 100644
--- a/vcs/clearcase/commentdlg.h
+++ b/vcs/clearcase/commentdlg.h
@@ -16,9 +16,10 @@
#include <tqdialog.h>
#include <tqmultilineedit.h>
-class CcaseCommentDlg : public QDialog
+class CcaseCommentDlg : public TQDialog
{
Q_OBJECT
+ TQ_OBJECT
public:
CcaseCommentDlg(bool = FALSE);
TQString logMessage() { return _edit->text(); };
diff --git a/vcs/clearcase/integrator/ccintegratordlg.cpp b/vcs/clearcase/integrator/ccintegratordlg.cpp
index 8e89cf94..3f6f8d0e 100644
--- a/vcs/clearcase/integrator/ccintegratordlg.cpp
+++ b/vcs/clearcase/integrator/ccintegratordlg.cpp
@@ -19,8 +19,8 @@
***************************************************************************/
#include "ccintegratordlg.h"
-CCIntegratorDlg::CCIntegratorDlg(TQWidget *parent, const char *name)
- :CCIntegratorDlgBase(parent, name)
+CCIntegratorDlg::CCIntegratorDlg(TQWidget *tqparent, const char *name)
+ :CCIntegratorDlgBase(tqparent, name)
{
}
diff --git a/vcs/clearcase/integrator/ccintegratordlg.h b/vcs/clearcase/integrator/ccintegratordlg.h
index bbb23955..37d73885 100644
--- a/vcs/clearcase/integrator/ccintegratordlg.h
+++ b/vcs/clearcase/integrator/ccintegratordlg.h
@@ -25,8 +25,9 @@
class CCIntegratorDlg: public CCIntegratorDlgBase, public VCSDialog {
Q_OBJECT
+ TQ_OBJECT
public:
- CCIntegratorDlg(TQWidget *parent = 0, const char *name = 0);
+ CCIntegratorDlg(TQWidget *tqparent = 0, const char *name = 0);
virtual void accept();
virtual void init(const TQString &projectName, const TQString &projectLocation);
diff --git a/vcs/clearcase/integrator/ccintegratordlgbase.ui b/vcs/clearcase/integrator/ccintegratordlgbase.ui
index ae961a9f..bafb8a96 100644
--- a/vcs/clearcase/integrator/ccintegratordlgbase.ui
+++ b/vcs/clearcase/integrator/ccintegratordlgbase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>CCIntegratorDlgBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>CCIntegratorDlgBase</cstring>
</property>
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -34,7 +34,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>437</height>
@@ -43,5 +43,5 @@
</spacer>
</vbox>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/vcs/clearcase/integrator/clearcaseintegrator.cpp b/vcs/clearcase/integrator/clearcaseintegrator.cpp
index 4e8c1a0b..d076abc9 100644
--- a/vcs/clearcase/integrator/clearcaseintegrator.cpp
+++ b/vcs/clearcase/integrator/clearcaseintegrator.cpp
@@ -28,10 +28,10 @@ static const KDevPluginInfo data("kdevclearcaseintegrator");
typedef KDevGenericFactory<ClearcaseIntegrator> ClearcaseIntegratorFactory;
K_EXPORT_COMPONENT_FACTORY( libclearcaseintegrator, ClearcaseIntegratorFactory(data) )
-ClearcaseIntegrator::ClearcaseIntegrator(TQObject* parent, const char* name,
+ClearcaseIntegrator::ClearcaseIntegrator(TQObject* tqparent, const char* name,
const TQStringList // args
)
- :KDevVCSIntegrator(parent, name)
+ :KDevVCSIntegrator(tqparent, name)
{
}
@@ -39,15 +39,15 @@ ClearcaseIntegrator::~ClearcaseIntegrator()
{
}
-VCSDialog* ClearcaseIntegrator::fetcher(TQWidget* // parent
+VCSDialog* ClearcaseIntegrator::fetcher(TQWidget* // tqparent
)
{
return 0;
}
-VCSDialog* ClearcaseIntegrator::integrator(TQWidget* parent)
+VCSDialog* ClearcaseIntegrator::integrator(TQWidget* tqparent)
{
- CCIntegratorDlg *dlg = new CCIntegratorDlg(parent);
+ CCIntegratorDlg *dlg = new CCIntegratorDlg(tqparent);
return dlg;
}
diff --git a/vcs/clearcase/integrator/clearcaseintegrator.h b/vcs/clearcase/integrator/clearcaseintegrator.h
index 385f1976..197638bf 100644
--- a/vcs/clearcase/integrator/clearcaseintegrator.h
+++ b/vcs/clearcase/integrator/clearcaseintegrator.h
@@ -27,12 +27,13 @@
class ClearcaseIntegrator : public KDevVCSIntegrator
{
Q_OBJECT
+ TQ_OBJECT
public:
- ClearcaseIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+ ClearcaseIntegrator(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
~ClearcaseIntegrator();
- virtual VCSDialog* fetcher(TQWidget* parent);
- virtual VCSDialog* integrator(TQWidget* parent);
+ virtual VCSDialog* fetcher(TQWidget* tqparent);
+ virtual VCSDialog* integrator(TQWidget* tqparent);
};