From b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 15 Dec 2011 15:51:21 -0600
Subject: Rename a number of old tq methods that are no longer tq specific

---
 vcs/clearcase/clearcasefileinfoprovider.cpp     |  2 +-
 vcs/clearcase/clearcasefileinfoprovider.h       |  2 +-
 vcs/clearcase/clearcasepart.cpp                 |  2 +-
 vcs/clearcase/commentdlg.cpp                    | 20 ++++++++++----------
 vcs/clearcase/integrator/ccintegratordlgbase.ui |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'vcs/clearcase')

diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp
index 33fb5302..5fe6dbf3 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::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos  ) {
+bool ClearcaseFileinfoProvider::requestStatus( 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 292ada0f..85f60cc8 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 requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
+    bool requestStatus( 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 9b1cd67b..198cc1db 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").tqarg(name) );
+        sub->insertTitle( i18n("Actions for %1").arg(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 5355b3f0..dcfe5eea 100644
--- a/vcs/clearcase/commentdlg.cpp
+++ b/vcs/clearcase/commentdlg.cpp
@@ -11,7 +11,7 @@
 
 #include "commentdlg.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <kapplication.h>
@@ -25,21 +25,21 @@ CcaseCommentDlg::CcaseCommentDlg(bool bCheckin)
 {
   setCaption( i18n("Clearcase Comment") );
 
-  TQBoxLayout *tqlayout = new TQVBoxLayout(this, 10);
+  TQBoxLayout *layout = new TQVBoxLayout(this, 10);
 
   TQLabel *messagelabel = new TQLabel(i18n("Enter log message:"), this);
-  messagelabel->setMinimumSize(messagelabel->tqsizeHint());
-  tqlayout->addWidget(messagelabel, 0);
+  messagelabel->setMinimumSize(messagelabel->sizeHint());
+  layout->addWidget(messagelabel, 0);
 
   _edit = new TQMultiLineEdit(this);
   TQFontMetrics fm(_edit->fontMetrics());
   _edit->setMinimumSize(fm.width("0")*40, fm.lineSpacing()*3);
-  tqlayout->addWidget(_edit, 10);
+  layout->addWidget(_edit, 10);
 
-  TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout);
+  TQBoxLayout *layout2 = new TQHBoxLayout(layout);
   if(bCheckin) {
     _check = new TQCheckBox(i18n("Reserve"), this);
-    tqlayout2->addWidget(_check);
+    layout2->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->tqlayout();
-  tqlayout2->addWidget(buttonbox, 0);
+  buttonbox->layout();
+  layout2->addWidget(buttonbox, 0);
 
-  tqlayout->activate();
+  layout->activate();
   adjustSize();
 }
 
diff --git a/vcs/clearcase/integrator/ccintegratordlgbase.ui b/vcs/clearcase/integrator/ccintegratordlgbase.ui
index c8b7100c..35182376 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="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>437</height>
-- 
cgit v1.2.1