summaryrefslogtreecommitdiffstats
path: root/vcs/clearcase
diff options
context:
space:
mode:
Diffstat (limited to 'vcs/clearcase')
-rw-r--r--vcs/clearcase/clearcasefileinfoprovider.cpp2
-rw-r--r--vcs/clearcase/clearcasefileinfoprovider.h2
-rw-r--r--vcs/clearcase/clearcasepart.cpp2
-rw-r--r--vcs/clearcase/commentdlg.cpp20
-rw-r--r--vcs/clearcase/integrator/ccintegratordlgbase.ui2
5 files changed, 14 insertions, 14 deletions
diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp
index 5fe6dbf3..33fb5302 100644
--- a/vcs/clearcase/clearcasefileinfoprovider.cpp
+++ b/vcs/clearcase/clearcasefileinfoprovider.cpp
@@ -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 85f60cc8..292ada0f 100644
--- a/vcs/clearcase/clearcasefileinfoprovider.h
+++ b/vcs/clearcase/clearcasefileinfoprovider.h
@@ -32,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..9b1cd67b 100644
--- a/vcs/clearcase/clearcasepart.cpp
+++ b/vcs/clearcase/clearcasepart.cpp
@@ -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/commentdlg.cpp b/vcs/clearcase/commentdlg.cpp
index dcfe5eea..5355b3f0 100644
--- a/vcs/clearcase/commentdlg.cpp
+++ b/vcs/clearcase/commentdlg.cpp
@@ -11,7 +11,7 @@
#include "commentdlg.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
#include <kapplication.h>
@@ -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/integrator/ccintegratordlgbase.ui b/vcs/clearcase/integrator/ccintegratordlgbase.ui
index 35182376..c8b7100c 100644
--- a/vcs/clearcase/integrator/ccintegratordlgbase.ui
+++ b/vcs/clearcase/integrator/ccintegratordlgbase.ui
@@ -34,7 +34,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>437</height>