summaryrefslogtreecommitdiffstats
path: root/vcs
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:51:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:51:21 -0600
commitb6ba5d642f3fc7d320e3d6f4650eb259a3a52b04 (patch)
tree76f49820693d443128d3720322ff1605e9bcd558 /vcs
parent247f828db1b8dcdc9346c1568d81cfa00db99c9e (diff)
downloadtdevelop-b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.tar.gz
tdevelop-b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'vcs')
-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
-rw-r--r--vcs/cvsservice/annotatepage.cpp4
-rw-r--r--vcs/cvsservice/annotateview.cpp4
-rw-r--r--vcs/cvsservice/annotateview.h2
-rw-r--r--vcs/cvsservice/changelog.cpp4
-rw-r--r--vcs/cvsservice/checkoutdialog.cpp2
-rw-r--r--vcs/cvsservice/checkoutdialogbase.ui10
-rw-r--r--vcs/cvsservice/commitdialogbase.ui6
-rw-r--r--vcs/cvsservice/commitdlg.cpp4
-rw-r--r--vcs/cvsservice/cvsdiffpage.cpp4
-rw-r--r--vcs/cvsservice/cvsdir.cpp14
-rw-r--r--vcs/cvsservice/cvsdir.h6
-rw-r--r--vcs/cvsservice/cvsentry.cpp2
-rw-r--r--vcs/cvsservice/cvsfileinfoprovider.cpp22
-rw-r--r--vcs/cvsservice/cvsfileinfoprovider.h2
-rw-r--r--vcs/cvsservice/cvsformbase.ui2
-rw-r--r--vcs/cvsservice/cvslogdialog.cpp2
-rw-r--r--vcs/cvsservice/cvslogpage.cpp6
-rw-r--r--vcs/cvsservice/cvsoptions.cpp8
-rw-r--r--vcs/cvsservice/cvspart.cpp32
-rw-r--r--vcs/cvsservice/cvspartimpl.cpp4
-rw-r--r--vcs/cvsservice/cvsprocesswidget.cpp4
-rw-r--r--vcs/cvsservice/cvsprocesswidget.h2
-rw-r--r--vcs/cvsservice/diffdialog.cpp2
-rw-r--r--vcs/cvsservice/diffdialogbase.ui8
-rw-r--r--vcs/cvsservice/diffwidget.cpp12
-rw-r--r--vcs/cvsservice/diffwidget.h2
-rw-r--r--vcs/cvsservice/editorsdialog.cpp4
-rw-r--r--vcs/cvsservice/editorsdialogbase.ui2
-rw-r--r--vcs/cvsservice/integrator/fetcherdlgbase.ui2
-rw-r--r--vcs/cvsservice/integrator/initdlg.ui2
-rw-r--r--vcs/cvsservice/integrator/integratordlg.cpp14
-rw-r--r--vcs/cvsservice/integrator/integratordlgbase.ui8
-rw-r--r--vcs/cvsservice/releaseinputdialogbase.ui10
-rw-r--r--vcs/cvsservice/tagdialogbase.ui6
-rw-r--r--vcs/perforce/commitdlg.cpp24
-rw-r--r--vcs/perforce/commitdlg.h2
-rw-r--r--vcs/perforce/integrator/pfintegratordlgbase.ui2
-rw-r--r--vcs/perforce/perforcepart.cpp18
-rw-r--r--vcs/subversion/commitdlgbase.ui6
-rw-r--r--vcs/subversion/integrator/svnintegratordlgbase.ui4
-rw-r--r--vcs/subversion/kdevsvnd.cpp30
-rw-r--r--vcs/subversion/subversion_core.cpp8
-rw-r--r--vcs/subversion/subversion_fileinfo.cpp8
-rw-r--r--vcs/subversion/subversion_fileinfo.h4
-rw-r--r--vcs/subversion/subversion_part.cpp30
-rw-r--r--vcs/subversion/subversiondiff.ui2
-rw-r--r--vcs/subversion/subversionprojectwidget.ui2
-rw-r--r--vcs/subversion/svn_blamewidget.cpp2
-rw-r--r--vcs/subversion/svn_co.ui16
-rw-r--r--vcs/subversion/svn_commitdlgbase.ui4
-rw-r--r--vcs/subversion/svn_copydlgwidget.ui2
-rw-r--r--vcs/subversion/svn_fileselectdlg_commit.cpp10
-rw-r--r--vcs/subversion/svn_kio.cpp68
-rw-r--r--vcs/subversion/svn_logviewwidget.cpp8
-rw-r--r--vcs/subversion/svn_mergeoptiondlgbase.ui2
-rw-r--r--vcs/subversion/svn_switchdlgbase.ui6
-rw-r--r--vcs/subversion/svnssltrustpromptbase.ui2
62 files changed, 253 insertions, 253 deletions
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>
diff --git a/vcs/cvsservice/annotatepage.cpp b/vcs/cvsservice/annotatepage.cpp
index 4c838cf9..cdcd0fdc 100644
--- a/vcs/cvsservice/annotatepage.cpp
+++ b/vcs/cvsservice/annotatepage.cpp
@@ -9,7 +9,7 @@
* *
***************************************************************************/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqregexp.h>
#include <tqstringlist.h>
#include <tqdatetime.h>
@@ -106,7 +106,7 @@ void AnnotatePage::slotJobExited( bool normalExit, int exitStatus )
if (!normalExit)
{
- KMessageBox::sorry( this, i18n("Annotate failed with exitStatus == %1").tqarg( exitStatus), i18n("Annotate Failed") );
+ KMessageBox::sorry( this, i18n("Annotate failed with exitStatus == %1").arg( exitStatus), i18n("Annotate Failed") );
return;
}
diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp
index 597415f1..bd8014d8 100644
--- a/vcs/cvsservice/annotateview.cpp
+++ b/vcs/cvsservice/annotateview.cpp
@@ -170,7 +170,7 @@ void AnnotateView::addLine(TQString rev, TQString author, TQDateTime date,
}
-TQSize AnnotateView::tqsizeHint() const
+TQSize AnnotateView::sizeHint() const
{
TQFontMetrics fm(fontMetrics());
return TQSize(100 * fm.width("0"), 20 * fm.lineSpacing());
@@ -189,7 +189,7 @@ void AnnotateView::maybeTip( const TQPoint & p )
return;
}
- TQRect r = tqitemRect( item );
+ TQRect r = itemRect( item );
//get the dimension of the author + the date column
TQRect headerRect = header()->sectionRect(AnnotateViewItem::AuthorColumn);
headerRect = headerRect.unite(header()->sectionRect(AnnotateViewItem::DateColumn));
diff --git a/vcs/cvsservice/annotateview.h b/vcs/cvsservice/annotateview.h
index 956c0251..7586616e 100644
--- a/vcs/cvsservice/annotateview.h
+++ b/vcs/cvsservice/annotateview.h
@@ -42,7 +42,7 @@ public:
void addLine(TQString rev, TQString author, TQDateTime date, TQString content,
TQString comment, bool odd);
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
void maybeTip( const TQPoint & p );
private:
diff --git a/vcs/cvsservice/changelog.cpp b/vcs/cvsservice/changelog.cpp
index 18deee0f..93aec07d 100644
--- a/vcs/cvsservice/changelog.cpp
+++ b/vcs/cvsservice/changelog.cpp
@@ -11,7 +11,7 @@
#include <tqdatetime.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kemailsettings.h>
@@ -24,7 +24,7 @@ ChangeLogEntry::ChangeLogEntry()
authorEmail = emailConfig.getSetting( KEMailSettings::EmailAddress );
authorName = emailConfig.getSetting( KEMailSettings::RealName );
- TQDate currDate = TQDate::tqcurrentDate();
+ TQDate currDate = TQDate::currentDate();
date = currDate.toString( "yyyy-MM-dd" );
}
diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp
index be20d977..87c9cd15 100644
--- a/vcs/cvsservice/checkoutdialog.cpp
+++ b/vcs/cvsservice/checkoutdialog.cpp
@@ -13,7 +13,7 @@
#include <tqpushbutton.h>
#include <tqcombobox.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <klistview.h>
#include <kurlrequester.h>
diff --git a/vcs/cvsservice/checkoutdialogbase.ui b/vcs/cvsservice/checkoutdialogbase.ui
index 0639364d..38f1e7f0 100644
--- a/vcs/cvsservice/checkoutdialogbase.ui
+++ b/vcs/cvsservice/checkoutdialogbase.ui
@@ -56,7 +56,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<grid>
<property name="name">
@@ -106,7 +106,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<grid>
<property name="name">
@@ -122,7 +122,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>156</width>
<height>20</height>
@@ -238,7 +238,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -254,7 +254,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>421</width>
<height>20</height>
diff --git a/vcs/cvsservice/commitdialogbase.ui b/vcs/cvsservice/commitdialogbase.ui
index eabd9c57..61805f99 100644
--- a/vcs/cvsservice/commitdialogbase.ui
+++ b/vcs/cvsservice/commitdialogbase.ui
@@ -42,7 +42,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -88,7 +88,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -104,7 +104,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>350</width>
<height>20</height>
diff --git a/vcs/cvsservice/commitdlg.cpp b/vcs/cvsservice/commitdlg.cpp
index 18850643..35dbb391 100644
--- a/vcs/cvsservice/commitdlg.cpp
+++ b/vcs/cvsservice/commitdlg.cpp
@@ -11,10 +11,10 @@
* *
***************************************************************************/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqcheckbox.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqpushbutton.h>
#include <kapplication.h>
diff --git a/vcs/cvsservice/cvsdiffpage.cpp b/vcs/cvsservice/cvsdiffpage.cpp
index 04a37607..fcdb8b27 100644
--- a/vcs/cvsservice/cvsdiffpage.cpp
+++ b/vcs/cvsservice/cvsdiffpage.cpp
@@ -9,8 +9,8 @@
* *
***************************************************************************/
-#include <tqtextedit.h>
-#include <tqlayout.h>
+#include <textedit.h>
+#include <layout.h>
#include <tqregexp.h>
#include <tqdir.h>
#include <tqstringlist.h>
diff --git a/vcs/cvsservice/cvsdir.cpp b/vcs/cvsservice/cvsdir.cpp
index c9e9ab51..c1d90973 100644
--- a/vcs/cvsservice/cvsdir.cpp
+++ b/vcs/cvsservice/cvsdir.cpp
@@ -10,7 +10,7 @@
***************************************************************************/
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include "cvsdir.h"
@@ -173,7 +173,7 @@ TQStringList CVSDir::registeredEntryList() const
bool CVSDir::isRegistered( const TQString fileName ) const
{
- CVSEntry entry = filetqStatus( fileName );
+ CVSEntry entry = fileStatus( fileName );
return entry.isValid() && entry.fileName() == fileName;
}
@@ -197,7 +197,7 @@ void CVSDir::refreshEntriesCache() const
///////////////////////////////////////////////////////////////////////////////
-CVSEntry CVSDir::filetqStatus( const TQString &fileName, bool refreshCache ) const
+CVSEntry CVSDir::fileStatus( const TQString &fileName, bool refreshCache ) const
{
if (refreshCache)
refreshEntriesCache();
@@ -284,7 +284,7 @@ void CVSDir::doNotIgnoreFile( const TQString &fileName )
///////////////////////////////////////////////////////////////////////////////
-VCSFileInfoMap CVSDir::dirtqStatus() const
+VCSFileInfoMap CVSDir::dirStatus() const
{
VCSFileInfoMap vcsInfo;
/// Convert to VCSFileInfoMap: \FIXME : any speed improvement here?
@@ -293,7 +293,7 @@ VCSFileInfoMap CVSDir::dirtqStatus() const
for ( ; it != end; ++it)
{
const TQString &fileName = (*it);
- const CVSEntry entry = filetqStatus( fileName );
+ const CVSEntry entry = fileStatus( fileName );
vcsInfo.insert( fileName, entry.toVCSFileInfo() );
}
@@ -303,7 +303,7 @@ VCSFileInfoMap CVSDir::dirtqStatus() const
///////////////////////////////////////////////////////////////////////////////
-VCSFileInfoMap *CVSDir::cacheableDirtqStatus() const
+VCSFileInfoMap *CVSDir::cacheableDirStatus() const
{
VCSFileInfoMap *vcsInfo = new VCSFileInfoMap;
/// Convert to VCSFileInfoMap: \FIXME : any speed improvement here?
@@ -312,7 +312,7 @@ VCSFileInfoMap *CVSDir::cacheableDirtqStatus() const
for ( ; it != end; ++it)
{
const TQString &fileName = (*it);
- const CVSEntry entry = filetqStatus( fileName );
+ const CVSEntry entry = fileStatus( fileName );
vcsInfo->insert( fileName, entry.toVCSFileInfo() );
}
diff --git a/vcs/cvsservice/cvsdir.h b/vcs/cvsservice/cvsdir.h
index dc7cb53a..1d3f7d85 100644
--- a/vcs/cvsservice/cvsdir.h
+++ b/vcs/cvsservice/cvsdir.h
@@ -46,11 +46,11 @@ public:
* @param refreshCache update internal cache re-parsing "<dirPath>/CVS/Entries"
* @return an empty CVSEntry if the file is not present
*/
- CVSEntry filetqStatus( const TQString &fileName, bool refreshCache = false ) const;
+ CVSEntry fileStatus( const TQString &fileName, bool refreshCache = false ) const;
/**
*/
- VCSFileInfoMap dirtqStatus() const;
- VCSFileInfoMap *cacheableDirtqStatus() const;
+ VCSFileInfoMap dirStatus() const;
+ VCSFileInfoMap *cacheableDirStatus() const;
/**
* @return true if the file is registered into repository, false otherwise
*/
diff --git a/vcs/cvsservice/cvsentry.cpp b/vcs/cvsservice/cvsentry.cpp
index bf478f7c..e9d7b676 100644
--- a/vcs/cvsservice/cvsentry.cpp
+++ b/vcs/cvsservice/cvsentry.cpp
@@ -10,7 +10,7 @@
***************************************************************************/
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include "cvsentry.h"
#include "cvsdir.h"
diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp
index 2ed764f4..cbfc726f 100644
--- a/vcs/cvsservice/cvsfileinfoprovider.cpp
+++ b/vcs/cvsservice/cvsfileinfoprovider.cpp
@@ -59,14 +59,14 @@ const VCSFileInfoMap *CVSFileInfoProvider::status( const TQString &dirPath )
delete m_cachedDirEntries;
CVSDir cvsdir( projectDirectory() + TQDir::separator() + dirPath );
m_previousDirPath = dirPath;
- m_cachedDirEntries = cvsdir.cacheableDirtqStatus();
+ m_cachedDirEntries = cvsdir.cacheableDirStatus();
}
return m_cachedDirEntries;
}
///////////////////////////////////////////////////////////////////////////////
-bool CVSFileInfoProvider::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos )
+bool CVSFileInfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos )
{
m_savedCallerData = callerData;
if (m_requestStatusJob)
@@ -131,11 +131,11 @@ void CVSFileInfoProvider::propagateUpdate()
void CVSFileInfoProvider::updateStatusFor(const CVSDir& dir)
{
- m_cachedDirEntries = dir.cacheableDirtqStatus();
+ m_cachedDirEntries = dir.cacheableDirStatus();
printOutFileInfoMap( *m_cachedDirEntries );
- /* FileTree will call requesttqStatus() everytime the user expands a directory
- * Unfortunatly requesttqStatus() will be called before the
+ /* FileTree will call requestStatus() everytime the user expands a directory
+ * Unfortunatly requestStatus() will be called before the
* VCSFileTreeViewItem of the directory will be filled with the files
* it contains. Meaning, m_savedCallerData contains no childs at that
* time. When a dcop call is made to run "cvs status" this is no problem.
@@ -196,7 +196,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
{
TQRegExp rx_recordStart( "^=+$" );
TQRegExp rx_fileName( "^File: (\\.|\\-|\\w)+" );
- TQRegExp rx_filetqStatus( "Status: (\\.|-|\\s|\\w)+" );
+ TQRegExp rx_fileStatus( "Status: (\\.|-|\\s|\\w)+" );
TQRegExp rx_fileWorkRev( "\\bWorking revision:" );
TQRegExp rx_fileRepoRev( "\\bRepository revision:" );
//TQRegExp rx_stickyTag( "\\s+(Sticky Tag:\\W+(w+|\\(none\\)))" );
@@ -204,7 +204,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
//TQRegExp rx_stickyOptions( "" ); //@todo
TQString fileName,
- filetqStatus,
+ fileStatus,
workingRevision,
repositoryRevision,
stickyTag,
@@ -224,12 +224,12 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
if (rx_recordStart.exactMatch( s ))
state = 1;
- else if (state == 1 && rx_fileName.search( s ) >= 0 && rx_filetqStatus.search( s ) >= 0) // FileName
+ else if (state == 1 && rx_fileName.search( s ) >= 0 && rx_fileStatus.search( s ) >= 0) // FileName
{
fileName = rx_fileName.cap().replace( "File:", "" ).stripWhiteSpace();
- filetqStatus = rx_filetqStatus.cap().replace( "Status:", "" ).stripWhiteSpace();
+ fileStatus = rx_fileStatus.cap().replace( "Status:", "" ).stripWhiteSpace();
++state; // Next state
- kdDebug(9006) << ">> " << fileName << ", " << filetqStatus << endl;
+ kdDebug(9006) << ">> " << fileName << ", " << fileStatus << endl;
}
else if (state == 2 && rx_fileWorkRev.search( s ) >= 0)
{
@@ -266,7 +266,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
{
// Package stuff, put into map and get ready for a new record
VCSFileInfo vcsInfo( fileName, workingRevision, repositoryRevision,
- String2EnumState( filetqStatus ) );
+ String2EnumState( fileStatus ) );
kdDebug(9006) << "== Inserting: " << vcsInfo.toString() << endl;
vcsStates->insert( fileName, vcsInfo );
}
diff --git a/vcs/cvsservice/cvsfileinfoprovider.h b/vcs/cvsservice/cvsfileinfoprovider.h
index ead2d113..0a3d8887 100644
--- a/vcs/cvsservice/cvsfileinfoprovider.h
+++ b/vcs/cvsservice/cvsfileinfoprovider.h
@@ -40,7 +40,7 @@ public:
virtual const VCSFileInfoMap *status( const TQString &dirPath ) ;
// -- Async interface for requesting data
- virtual bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
+ virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
public slots:
void updateStatusFor( const CVSDir& );
diff --git a/vcs/cvsservice/cvsformbase.ui b/vcs/cvsservice/cvsformbase.ui
index 62abbfd5..875bac49 100644
--- a/vcs/cvsservice/cvsformbase.ui
+++ b/vcs/cvsservice/cvsformbase.ui
@@ -197,7 +197,7 @@ Most of the thime you'll just reuse the project name</string>
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
diff --git a/vcs/cvsservice/cvslogdialog.cpp b/vcs/cvsservice/cvslogdialog.cpp
index df00d8a5..6d192f38 100644
--- a/vcs/cvsservice/cvslogdialog.cpp
+++ b/vcs/cvsservice/cvslogdialog.cpp
@@ -79,7 +79,7 @@ void CVSLogDialog::slotDiffRequested( const TQString &pathName, const TQString &
kdDebug(9006) << "CVSLogDialog::slotDiffRequested()" << endl;
// Create a new CVSDiffPage and start diffing process
- TQString diffTitle = i18n("Diff between %1 and %2").tqarg( revA ).tqarg( revB );
+ TQString diffTitle = i18n("Diff between %1 and %2").arg( revA ).arg( revB );
TQVBox *vbox = addVBoxPage( diffTitle );
CVSDiffPage *diffPage = new CVSDiffPage( m_cvsService, vbox );
diffPage->startDiff( pathName, revA, revB );
diff --git a/vcs/cvsservice/cvslogpage.cpp b/vcs/cvsservice/cvslogpage.cpp
index c9659e0c..226b9689 100644
--- a/vcs/cvsservice/cvslogpage.cpp
+++ b/vcs/cvsservice/cvslogpage.cpp
@@ -9,8 +9,8 @@
* *
***************************************************************************/
-#include <tqtextbrowser.h>
-#include <tqlayout.h>
+#include <textbrowser.h>
+#include <layout.h>
#include <tqregexp.h>
#include <tqdir.h>
#include <tqstringlist.h>
@@ -113,7 +113,7 @@ void CVSLogPage::slotJobExited( bool normalExit, int exitStatus )
// m_part->core()->running( m_part, false );
if (!normalExit)
{
- KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").tqarg( exitStatus), i18n("Log Failed") );
+ KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").arg( exitStatus), i18n("Log Failed") );
return;
}
diff --git a/vcs/cvsservice/cvsoptions.cpp b/vcs/cvsservice/cvsoptions.cpp
index 6f2894e6..20cc198e 100644
--- a/vcs/cvsservice/cvsoptions.cpp
+++ b/vcs/cvsservice/cvsoptions.cpp
@@ -10,7 +10,7 @@
***************************************************************************/
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kdebug.h>
#include <kconfig.h>
@@ -24,9 +24,9 @@
// Macros
///////////////////////////////////////////////////////////////////////////////
-#define default_revert TQString::tqfromLatin1("-C")
-#define default_diff TQString::tqfromLatin1("-p")
-#define default_rsh TQString::tqfromLatin1("")
+#define default_revert TQString::fromLatin1("-C")
+#define default_diff TQString::fromLatin1("-p")
+#define default_rsh TQString::fromLatin1("")
#define default_contextLines 3
#define default_compression 0
diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp
index bca0d2f2..9df91a9b 100644
--- a/vcs/cvsservice/cvspart.cpp
+++ b/vcs/cvsservice/cvspart.cpp
@@ -321,45 +321,45 @@ void CvsServicePart::contextMenu( TQPopupMenu *popup, const Context *context )
popup->insertSeparator();
int id = subMenu->insertItem( actionCommit->text(), this, TQT_SLOT(slotCommit()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified."));
+ subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified."));
// CvsService let to do log and diff operations only on one file (or directory) at time
if (m_urls.count() == 1)
{
id = subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Build difference</b><p>Builds difference between releases."));
+ subMenu->setWhatsThis(id, i18n("<b>Build difference</b><p>Builds difference between releases."));
id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Generate log</b><p>Produces log for this file."));
+ subMenu->setWhatsThis(id, i18n("<b>Generate log</b><p>Produces log for this file."));
id = subMenu->insertItem( actionAnnotate->text(), this, TQT_SLOT(slotAnnotate()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Generate Annotate</b><p>Produces annotation output for this file."));
+ subMenu->setWhatsThis(id, i18n("<b>Generate Annotate</b><p>Produces annotation output for this file."));
}
id = subMenu->insertItem( actionEditors->text(), this, TQT_SLOT(slotEditors()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Show editors</b><p>Shows the list of users who are editing files."));
+ subMenu->setWhatsThis(id, i18n("<b>Show editors</b><p>Shows the list of users who are editing files."));
id = subMenu->insertItem( actionEdit->text(), this, TQT_SLOT(slotEdit()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Mark as beeing edited</b><p>Mark the files as beeing edited."));
+ subMenu->setWhatsThis(id, i18n("<b>Mark as beeing edited</b><p>Mark the files as beeing edited."));
id = subMenu->insertItem( actionUnEdit->text(), this, TQT_SLOT(slotUnEdit()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files."));
+ subMenu->setWhatsThis(id, i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files."));
id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Add to repository</b><p>Adds file to repository."));
+ subMenu->setWhatsThis(id, i18n("<b>Add to repository</b><p>Adds file to repository."));
id = subMenu->insertItem( actionAddBinary->text(), this, TQT_SLOT(slotAddBinary()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option)."));
+ subMenu->setWhatsThis(id, i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option)."));
id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotRemove()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository."));
+ subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository."));
subMenu->insertSeparator();
id = subMenu->insertItem( actionTag->text(), this, TQT_SLOT(slotTag()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s)."));
+ subMenu->setWhatsThis(id, i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s)."));
id = subMenu->insertItem( actionUnTag->text(), this, TQT_SLOT(slotUnTag()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Delete tag</b><p>Delete tag from selected file(s)."));
+ subMenu->setWhatsThis(id, i18n("<b>Delete tag</b><p>Delete tag from selected file(s)."));
id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release."));
+ subMenu->setWhatsThis(id, i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release."));
id = subMenu->insertItem( actionRemoveSticky->text(), this, TQT_SLOT(slotRemoveSticky()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s)."));
+ subMenu->setWhatsThis(id, i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s)."));
subMenu->insertSeparator();
id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file."));
+ subMenu->setWhatsThis(id, i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file."));
id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file."));
+ subMenu->setWhatsThis(id, i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file."));
// Now insert in parent menu
popup->insertItem( i18n("CvsService"), subMenu );
diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp
index b8b1685d..7556f7bc 100644
--- a/vcs/cvsservice/cvspartimpl.cpp
+++ b/vcs/cvsservice/cvspartimpl.cpp
@@ -211,7 +211,7 @@ bool CvsServicePartImpl::isRegisteredInRepository( const TQString &projectDirect
kdDebug(9006) << k_funcinfo << " Error: " << cvsdir.path() << " is not a valid CVS directory " << endl;
return false;
}
- CVSEntry entry = cvsdir.filetqStatus( url.fileName() );
+ CVSEntry entry = cvsdir.fileStatus( url.fileName() );
return entry.isValid();
}
}
@@ -639,7 +639,7 @@ void CvsServicePartImpl::diff( const KURL::List& urlList )
return;
CVSDir cvsdir = CVSDir( urlList[0].directory() );
- CVSEntry entry = cvsdir.filetqStatus( urlList[0].fileName() );
+ CVSEntry entry = cvsdir.fileStatus( urlList[0].fileName() );
DiffDialog dlg(entry);
if (dlg.exec() != TQDialog::Accepted)
diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp
index ed7f3da2..b1e888ff 100644
--- a/vcs/cvsservice/cvsprocesswidget.cpp
+++ b/vcs/cvsservice/cvsprocesswidget.cpp
@@ -142,7 +142,7 @@ bool CvsProcessWidget::startJob( const DCOPRef &aJob )
// disconnect 3rd party slots from our signals
disconnect( TQT_SIGNAL(jobFinished(bool, int)) );
- showInfo( i18n("Started job: %1").tqarg( cmdLine ) );
+ showInfo( i18n("Started job: %1").arg( cmdLine ) );
#ifdef MYDCOPDEBUG
g_dcopExitCounter = 0;
@@ -187,7 +187,7 @@ void CvsProcessWidget::slotJobExited( bool normalExit, int exitStatus )
m_job = 0;
}
TQString exitMsg = i18n("Job finished with exitCode == %1");
- showInfo( exitMsg.tqarg( exitStatus) );
+ showInfo( exitMsg.arg( exitStatus) );
m_part->core()->running( m_part, false );
m_part->mainWindow()->statusBar()->message( i18n("Done CVS command ..."), 2000 );
diff --git a/vcs/cvsservice/cvsprocesswidget.h b/vcs/cvsservice/cvsprocesswidget.h
index ad2ec45a..fa302a4b 100644
--- a/vcs/cvsservice/cvsprocesswidget.h
+++ b/vcs/cvsservice/cvsprocesswidget.h
@@ -12,7 +12,7 @@
#ifndef _CVSPROCESSWIDGET_H_
#define _CVSPROCESSWIDGET_H_
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqstringlist.h>
#include "cvsservicedcopIface.h"
diff --git a/vcs/cvsservice/diffdialog.cpp b/vcs/cvsservice/diffdialog.cpp
index a141d2a8..c86ae0ce 100644
--- a/vcs/cvsservice/diffdialog.cpp
+++ b/vcs/cvsservice/diffdialog.cpp
@@ -83,7 +83,7 @@ void DiffDialog::languageChange() {
//FIXME: We need a function in CVSEntry to return the latest revision there is in cvs
// if(!m_entry.revision().isNull())
-// diffLocalHeadRadio->setText( tr2i18n( "Local copy and &HEAD (%1)" ).tqarg( m_entry.revision()) );
+// diffLocalHeadRadio->setText( tr2i18n( "Local copy and &HEAD (%1)" ).arg( m_entry.revision()) );
}
#include "diffdialog.moc"
diff --git a/vcs/cvsservice/diffdialogbase.ui b/vcs/cvsservice/diffdialogbase.ui
index b4995cb4..a5e07812 100644
--- a/vcs/cvsservice/diffdialogbase.ui
+++ b/vcs/cvsservice/diffdialogbase.ui
@@ -35,7 +35,7 @@
</property>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -69,7 +69,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@@ -171,7 +171,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -187,7 +187,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>130</width>
<height>20</height>
diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp
index b0f60a20..b1891a20 100644
--- a/vcs/cvsservice/diffwidget.cpp
+++ b/vcs/cvsservice/diffwidget.cpp
@@ -9,8 +9,8 @@
* *
***************************************************************************/
-#include <tqlayout.h>
-#include <tqtextedit.h>
+#include <layout.h>
+#include <textedit.h>
#include <tqpopupmenu.h>
#include <tqcursor.h>
#include <tqfile.h>
@@ -70,7 +70,7 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p )
int i = 0;
for ( TQStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) {
- popup->insertItem( i18n( "Show in %1" ).tqarg( *it ), i + POPUP_BASE, i );
+ popup->insertItem( i18n( "Show in %1" ).arg( *it ), i + POPUP_BASE, i );
i++;
}
if ( !extPartsTranslated.isEmpty() )
@@ -186,8 +186,8 @@ DiffWidget::DiffWidget( TQWidget *parent, const char *name, WFlags f ):
// te->setMinimumSize( 300, 200 );
connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) );
- TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
- tqlayout->addWidget( te );
+ TQVBoxLayout* layout = new TQVBoxLayout( this );
+ layout->addWidget( te );
}
DiffWidget::~DiffWidget()
@@ -226,7 +226,7 @@ void DiffWidget::loadExtPart( const TQString& partName )
if ( !extPart || !extPart->widget() )
return;
- tqlayout()->add( extPart->widget() );
+ layout()->add( extPart->widget() );
setExtPartVisible( true );
diff --git a/vcs/cvsservice/diffwidget.h b/vcs/cvsservice/diffwidget.h
index c220e4f0..c4828096 100644
--- a/vcs/cvsservice/diffwidget.h
+++ b/vcs/cvsservice/diffwidget.h
@@ -13,7 +13,7 @@
#define _DIFFWIDGET_H_
#include <tqwidget.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqstringlist.h>
#include <kurl.h>
diff --git a/vcs/cvsservice/editorsdialog.cpp b/vcs/cvsservice/editorsdialog.cpp
index 79695840..bbd8443f 100644
--- a/vcs/cvsservice/editorsdialog.cpp
+++ b/vcs/cvsservice/editorsdialog.cpp
@@ -15,7 +15,7 @@
#include <kdebug.h>
#include <dcopref.h>
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
#include <tqregexp.h>
#include "editorsdialog.h"
@@ -61,7 +61,7 @@ void EditorsDialog::slotJobExited( bool normalExit, int exitStatus )
{
if (!normalExit)
{
- KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").tqarg( exitStatus), i18n("Log Failed") );
+ KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").arg( exitStatus), i18n("Log Failed") );
return;
}
diff --git a/vcs/cvsservice/editorsdialogbase.ui b/vcs/cvsservice/editorsdialogbase.ui
index 933d477f..37af7c1b 100644
--- a/vcs/cvsservice/editorsdialogbase.ui
+++ b/vcs/cvsservice/editorsdialogbase.ui
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/vcs/cvsservice/integrator/fetcherdlgbase.ui b/vcs/cvsservice/integrator/fetcherdlgbase.ui
index 398af4cf..9028b325 100644
--- a/vcs/cvsservice/integrator/fetcherdlgbase.ui
+++ b/vcs/cvsservice/integrator/fetcherdlgbase.ui
@@ -134,7 +134,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/vcs/cvsservice/integrator/initdlg.ui b/vcs/cvsservice/integrator/initdlg.ui
index 6e5b76f1..82e26c55 100644
--- a/vcs/cvsservice/integrator/initdlg.ui
+++ b/vcs/cvsservice/integrator/initdlg.ui
@@ -53,7 +53,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/vcs/cvsservice/integrator/integratordlg.cpp b/vcs/cvsservice/integrator/integratordlg.cpp
index 961094fc..5ae31ed1 100644
--- a/vcs/cvsservice/integrator/integratordlg.cpp
+++ b/vcs/cvsservice/integrator/integratordlg.cpp
@@ -21,10 +21,10 @@
#include <tqfile.h>
#include <tqdir.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcombobox.h>
#include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqcheckbox.h>
#include <kapplication.h>
@@ -81,11 +81,11 @@ void IntegratorDlg::init_clicked()
if (!proc->normalExit())
KMessageBox::error(this, i18n("cvs init did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository"));
else if (proc->exitStatus() != 0)
- KMessageBox::error(this, i18n("cvs init exited with status %1. Please check if the cvs location is correct.").tqarg(proc->exitStatus()), i18n("Init CVS Repository"));
+ KMessageBox::error(this, i18n("cvs init exited with status %1. Please check if the cvs location is correct.").arg(proc->exitStatus()), i18n("Init CVS Repository"));
else
{
- repository->insertItem(TQString(":local:%1").tqarg(url));
- repository->setCurrentText(TQString(":local:%1").tqarg(url));
+ repository->insertItem(TQString(":local:%1").arg(url));
+ repository->setCurrentText(TQString(":local:%1").arg(url));
}
}
}
@@ -122,13 +122,13 @@ void IntegratorDlg::accept()
proc->setWorkingDirectory(m_projectLocation);
*proc << "cvs";
*proc << "-d" << repository->currentText() << "import"
- << "-m" << TQString("\"%1\"").tqarg(comment->text()) << module->text()
+ << "-m" << TQString("\"%1\"").arg(comment->text()) << module->text()
<< vendorTag->text() << releaseTag->text();
proc->start(KProcess::Block);
if (!proc->normalExit())
KMessageBox::error(this, i18n("cvs import did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository"));
else if (proc->exitStatus() != 0)
- KMessageBox::error(this, i18n("cvs import exited with status %1. Please check if the cvs location is correct.").tqarg(proc->exitStatus()), i18n("Init CVS Repository"));
+ KMessageBox::error(this, i18n("cvs import exited with status %1. Please check if the cvs location is correct.").arg(proc->exitStatus()), i18n("Init CVS Repository"));
else
{
kdDebug() << "Project is in: " << m_projectLocation << endl;
diff --git a/vcs/cvsservice/integrator/integratordlgbase.ui b/vcs/cvsservice/integrator/integratordlgbase.ui
index 8e7cc979..6b53c738 100644
--- a/vcs/cvsservice/integrator/integratordlgbase.ui
+++ b/vcs/cvsservice/integrator/integratordlgbase.ui
@@ -29,7 +29,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<grid>
<property name="name">
@@ -103,7 +103,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -120,7 +120,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -279,7 +279,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
diff --git a/vcs/cvsservice/releaseinputdialogbase.ui b/vcs/cvsservice/releaseinputdialogbase.ui
index dbc59f7e..e6e65b15 100644
--- a/vcs/cvsservice/releaseinputdialogbase.ui
+++ b/vcs/cvsservice/releaseinputdialogbase.ui
@@ -37,7 +37,7 @@
<property name="title">
<string>Revision</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<vbox>
@@ -57,7 +57,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -92,7 +92,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -158,7 +158,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -174,7 +174,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>140</width>
<height>20</height>
diff --git a/vcs/cvsservice/tagdialogbase.ui b/vcs/cvsservice/tagdialogbase.ui
index 2ac067b3..86390490 100644
--- a/vcs/cvsservice/tagdialogbase.ui
+++ b/vcs/cvsservice/tagdialogbase.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -83,7 +83,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -99,7 +99,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>200</width>
<height>20</height>
diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp
index 1f1f8290..8625ecd0 100644
--- a/vcs/perforce/commitdlg.cpp
+++ b/vcs/perforce/commitdlg.cpp
@@ -12,9 +12,9 @@
#include "commitdlg.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqpushbutton.h>
#include <tqregexp.h>
#include <kprocess.h>
@@ -38,11 +38,11 @@ CommitDialog::CommitDialog( TQWidget *parent, const char *name )
TQFontMetrics fm(edit->fontMetrics());
edit->setMinimumSize(fm.width("0")*40, fm.lineSpacing()*3);
- TQVBoxLayout *tqlayout = new TQVBoxLayout( w, 0, spacingHint() );
+ TQVBoxLayout *layout = new TQVBoxLayout( w, 0, spacingHint() );
TQLabel *editLabel = new TQLabel(i18n("&Enter description:"), w);
editLabel->setBuddy(edit);
- tqlayout->addWidget(editLabel);
- tqlayout->addWidget(edit);
+ layout->addWidget(editLabel);
+ layout->addWidget(edit);
w = new TQWidget( this, "details widget" );
@@ -50,19 +50,19 @@ CommitDialog::CommitDialog( TQWidget *parent, const char *name )
userEdit = new KLineEdit( w );
filesBox = new KListBox( w );
- tqlayout = new TQVBoxLayout( w, 0, spacingHint() );
+ layout = new TQVBoxLayout( w, 0, spacingHint() );
TQLabel *clientLabel = new TQLabel(i18n("C&lient:"), w);
clientLabel->setBuddy(clientEdit);
- tqlayout->addWidget(clientLabel);
- tqlayout->addWidget( clientEdit );
+ layout->addWidget(clientLabel);
+ layout->addWidget( clientEdit );
TQLabel *userLabel = new TQLabel(i18n("&User:"), w);
userLabel->setBuddy(userEdit);
- tqlayout->addWidget( userLabel );
- tqlayout->addWidget( userEdit );
+ layout->addWidget( userLabel );
+ layout->addWidget( userEdit );
TQLabel *filesLabel = new TQLabel(i18n("&File(s):"), w);
filesLabel->setBuddy(filesBox);
- tqlayout->addWidget( filesLabel );
- tqlayout->addWidget( filesBox );
+ layout->addWidget( filesLabel );
+ layout->addWidget( filesBox );
setDetailsWidget( w );
autoGuess();
diff --git a/vcs/perforce/commitdlg.h b/vcs/perforce/commitdlg.h
index 83766914..56fd680e 100644
--- a/vcs/perforce/commitdlg.h
+++ b/vcs/perforce/commitdlg.h
@@ -14,7 +14,7 @@
#define _COMMITDIALOG_H_
#include <tqstringlist.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <klineedit.h>
#include <klistbox.h>
#include <kdialogbase.h>
diff --git a/vcs/perforce/integrator/pfintegratordlgbase.ui b/vcs/perforce/integrator/pfintegratordlgbase.ui
index 8d1c3530..f798e42a 100644
--- a/vcs/perforce/integrator/pfintegratordlgbase.ui
+++ b/vcs/perforce/integrator/pfintegratordlgbase.ui
@@ -34,7 +34,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>435</height>
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index ca81a8d4..dd501e37 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -94,30 +94,30 @@ void PerforcePart::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) );
int id = sub->insertItem( i18n("Edit"),
this, TQT_SLOT(slotEdit()) );
- sub->tqsetWhatsThis(id, i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit."));
+ sub->setWhatsThis(id, i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit."));
id = sub->insertItem( i18n("Revert"),
this, TQT_SLOT(slotRevert()) );
- sub->tqsetWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files."));
+ sub->setWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files."));
id = sub->insertItem( i18n("Submit"),
this, TQT_SLOT(slotCommit()) );
- sub->tqsetWhatsThis(id, i18n("<b>Submit</b><p>Sends changes made to open files to the depot."));
+ sub->setWhatsThis(id, i18n("<b>Submit</b><p>Sends changes made to open files to the depot."));
id = sub->insertItem( i18n("Sync"),
this, TQT_SLOT(slotUpdate()) );
- sub->tqsetWhatsThis(id, i18n("<b>Sync</b><p>Copies files from the depot into the workspace."));
+ sub->setWhatsThis(id, i18n("<b>Sync</b><p>Copies files from the depot into the workspace."));
sub->insertSeparator();
id = sub->insertItem( i18n("Diff Against Repository"),
this, TQT_SLOT(slotDiff()) );
- sub->tqsetWhatsThis(id, i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot."));
+ sub->setWhatsThis(id, i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot."));
id = sub->insertItem( i18n("Add to Repository"),
this, TQT_SLOT(slotAdd()) );
- sub->tqsetWhatsThis(id, i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot."));
+ sub->setWhatsThis(id, i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot."));
id = sub->insertItem( i18n("Remove From Repository"),
this, TQT_SLOT(slotRemove()) );
- sub->tqsetWhatsThis(id, i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot."));
+ sub->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot."));
id = popup->insertItem(i18n("Perforce"), sub);
}
}
@@ -153,7 +153,7 @@ void PerforcePart::revert( const TQString& filename )
{
if ( KMessageBox::questionYesNo( 0,
i18n("Do you really want to revert "
- "the file %1 and lose all your changes?").tqarg( filename ), TQString(), i18n("Revert"), i18n("Do Not Revert") ) == KMessageBox::Yes ) {
+ "the file %1 and lose all your changes?").arg( filename ), TQString(), i18n("Revert"), i18n("Do Not Revert") ) == KMessageBox::Yes ) {
execCommand( "revert", filename );
}
}
diff --git a/vcs/subversion/commitdlgbase.ui b/vcs/subversion/commitdlgbase.ui
index d557aa91..d58bd745 100644
--- a/vcs/subversion/commitdlgbase.ui
+++ b/vcs/subversion/commitdlgbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
@@ -42,7 +42,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -58,7 +58,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>220</width>
<height>20</height>
diff --git a/vcs/subversion/integrator/svnintegratordlgbase.ui b/vcs/subversion/integrator/svnintegratordlgbase.ui
index 52ce91a5..76b68321 100644
--- a/vcs/subversion/integrator/svnintegratordlgbase.ui
+++ b/vcs/subversion/integrator/svnintegratordlgbase.ui
@@ -105,7 +105,7 @@ file:///home/user/subversion/mynewproject</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -156,7 +156,7 @@ http://localhost/svn/projectname/trunk</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>131</height>
diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp
index c5c341a5..5e2ec8d9 100644
--- a/vcs/subversion/kdevsvnd.cpp
+++ b/vcs/subversion/kdevsvnd.cpp
@@ -239,7 +239,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
// return false;
// }
//
-// int KSvnd::gettqStatus( const KURL::List& list ) {
+// int KSvnd::getStatus( const KURL::List& list ) {
// int result = 0;
// uint files = 0, folders = 0, parentsentries = 0, parentshavesvn = 0, subdirhavesvn = 0, external = 0;
// for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) {
@@ -299,18 +299,18 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
//
// TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
// TQStringList result;
-// int listtqStatus = gettqStatus( list );
+// int listStatus = getStatus( list );
//
-// if ( !(listtqStatus & SomeAreInParentsEntries) &&
-// !(listtqStatus & SomeAreExternalToParent) &&
-// !(listtqStatus & SomeHaveSvn)) {
-// if( list.size() == 1 && listtqStatus & SomeAreFolders) {
+// if ( !(listStatus & SomeAreInParentsEntries) &&
+// !(listStatus & SomeAreExternalToParent) &&
+// !(listStatus & SomeHaveSvn)) {
+// if( list.size() == 1 && listStatus & SomeAreFolders) {
// result << "Checkout";
// result << "Export";
// // result << "CreateRepository";
// result << "Import";
// }
-// } else if ( (listtqStatus & AllAreInParentsEntries) ) {
+// } else if ( (listStatus & AllAreInParentsEntries) ) {
// result << "Diff";
// //In SVN
// // result << "ShowLog";
@@ -320,7 +320,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
// // result << "Update to revision..."
// result << "Rename";
// result << "Delete";
-// if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) {
+// if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) {
// result << "Revert";
// // result << "Cleanup";
// }
@@ -328,19 +328,19 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
// // result << "BranchTag";
// result << "Switch";
// result << "Merge";
-// if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) {
+// if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) {
// // result << "Export";
// // result << "Relocate";
// result << "_SEPARATOR_";
// result << "Add";
// }
// result << "_SEPARATOR_";
-// if( listtqStatus & SomeAreFiles && !(listtqStatus & SomeAreFolders)) {
+// if( listStatus & SomeAreFiles && !(listStatus & SomeAreFolders)) {
// result << "Blame";
// }
// result << "CreatePatch";
//
-// if( list.size() == 1 && listtqStatus & SomeAreFolders) {
+// if( list.size() == 1 && listStatus & SomeAreFolders) {
// // result << "ApplyPatchToFolder";
// }
// }
@@ -349,12 +349,12 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
//
// TQStringList KSvnd::getTopLevelActionMenu ( const KURL::List &list ) {
// TQStringList result;
-// int listtqStatus = gettqStatus( list );
+// int listStatus = getStatus( list );
//
//
-// if ( ( listtqStatus & AllParentsHaveSvn &&
-// ( ( listtqStatus & SomeAreExternalToParent ) || ( listtqStatus & SomeAreInParentsEntries ) )
-// || ( listtqStatus & SomeHaveSvn ) )
+// if ( ( listStatus & AllParentsHaveSvn &&
+// ( ( listStatus & SomeAreExternalToParent ) || ( listStatus & SomeAreInParentsEntries ) )
+// || ( listStatus & SomeHaveSvn ) )
// ) {
// result << "Update";
// result << "Commit";
diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp
index f49ac302..75546d11 100644
--- a/vcs/subversion/subversion_core.cpp
+++ b/vcs/subversion/subversion_core.cpp
@@ -40,9 +40,9 @@
#include <ktempfile.h>
#include <kprocess.h>
#include <kstandarddirs.h>
-#include <tqtextcodec.h>
-#include <tqtextstream.h>
-#include <tqtextbrowser.h>
+#include <textcodec.h>
+#include <textstream.h>
+#include <textbrowser.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <tqregexp.h>
@@ -223,7 +223,7 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){
if ( where=="HEAD"){
diffTo=i18n("the current svn HEAD version.");
}
- KMessageBox::information( 0, i18n("No differences between the file and %1").tqarg(diffTo), i18n("No difference") );
+ KMessageBox::information( 0, i18n("No differences between the file and %1").arg(diffTo), i18n("No difference") );
}
diffresult.clear();
}
diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp
index 8ea4e4d5..be0a4411 100644
--- a/vcs/subversion/subversion_fileinfo.cpp
+++ b/vcs/subversion/subversion_fileinfo.cpp
@@ -123,14 +123,14 @@ const VCSFileInfoMap *SVNFileInfoProvider::status( const TQString &dirPath ) {
if ( rx.search( *it ) == -1 ) break; // something is wrong ! :)
curIdx = rx.cap( 1 ).toInt();
}
- slottqStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
+ slotStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
}
}
kdDebug(9036) << " Returning VcsFileInfoMap. provider::status() finished " << endl;
return m_cachedDirEntries;
}
-bool SVNFileInfoProvider::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) {
+bool SVNFileInfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) {
kdDebug(9036) << "##################################################################################### svn provider : request status" << endl;
m_savedCallerData = callerData;
// Flush old cache
@@ -210,14 +210,14 @@ void SVNFileInfoProvider::slotResult( KIO::Job *j ) {
if ( rx.search( *it ) == -1 ) break; // something is wrong ! :)
curIdx = rx.cap( 1 ).toInt();
}
- slottqStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
+ slotStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
}
if ( m_cachedDirEntries )
emit statusReady(*m_cachedDirEntries, m_savedCallerData);
}
-void SVNFileInfoProvider::slottqStatus( const TQString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) {
+void SVNFileInfoProvider::slotStatus( const TQString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) {
// kdDebug(9036) << "##################################################################################### svn provider : slotstatus"
// << " path " << path << " text_status " << text_status << " prop_status " << prop_status << " repos_text_status " << repos_text_status
// << " repos_prop_status " << repos_prop_status << " rev " << rev
diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h
index dc1bfe1e..4729c35b 100644
--- a/vcs/subversion/subversion_fileinfo.h
+++ b/vcs/subversion/subversion_fileinfo.h
@@ -51,12 +51,12 @@ public:
void slotStatusExt( const TQString&, const TQString& , int, int, int, int, long int ) ;
// -- Async interface for requesting data
- virtual bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
+ virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
TQString projectDirectory() const;
k_dcop:
- void slottqStatus( const TQString& , int, int, int, int, long int ) ;
+ void slotStatus( const TQString& , int, int, int, int, long int ) ;
public slots:
void slotResult( KIO::Job * );
diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp
index a98f2298..af58f7c8 100644
--- a/vcs/subversion/subversion_part.cpp
+++ b/vcs/subversion/subversion_part.cpp
@@ -220,42 +220,42 @@ if(!project())
subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) );
subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) );
}*/
- subMenu->tqsetWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified."));
+ subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified."));
id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository."));
+ subMenu->setWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository."));
id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotDel()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository."));
+ subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository."));
id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs"));
+ subMenu->setWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs"));
id = subMenu->insertItem( actionBlame->text(), this, TQT_SLOT(slotBlame()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate"));
+ subMenu->setWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate"));
subMenu->insertSeparator();
id = subMenu->insertItem( actionDiffLocal->text(), this, TQT_SLOT(slotDiffLocal()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk."));
+ subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk."));
id = subMenu->insertItem( actionDiffHead->text(), this, TQT_SLOT(slotDiffHead()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository."));
+ subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository."));
id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository."));
+ subMenu->setWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository."));
id = subMenu->insertItem( actionRevert->text(), this, TQT_SLOT(slotRevert()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") );
+ subMenu->setWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") );
id = subMenu->insertItem( actionResolve->text(), this, TQT_SLOT(slotResolve()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") );
+ subMenu->setWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") );
id = subMenu->insertItem( actionSwitch->text(), this, TQT_SLOT(slotSwitch()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") );
+ subMenu->setWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") );
id = subMenu->insertItem( actionCopy->text(), this, TQT_SLOT(slotCopy()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") );
+ subMenu->setWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") );
id = subMenu->insertItem( actionMerge->text(), this, TQT_SLOT(slotMerge()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") );
+ subMenu->setWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") );
/*
subMenu->insertSeparator();
id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s)."));
+ subMenu->setWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s)."));
id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s)."));
+ subMenu->setWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s)."));
*/
// Now insert in parent menu
popup->insertItem( i18n("Subversion"), subMenu );
diff --git a/vcs/subversion/subversiondiff.ui b/vcs/subversion/subversiondiff.ui
index e647f6b6..a624e6bb 100644
--- a/vcs/subversion/subversiondiff.ui
+++ b/vcs/subversion/subversiondiff.ui
@@ -60,7 +60,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/vcs/subversion/subversionprojectwidget.ui b/vcs/subversion/subversionprojectwidget.ui
index 19529991..22f43ba9 100644
--- a/vcs/subversion/subversionprojectwidget.ui
+++ b/vcs/subversion/subversionprojectwidget.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
diff --git a/vcs/subversion/svn_blamewidget.cpp b/vcs/subversion/svn_blamewidget.cpp
index b4095389..49afb744 100644
--- a/vcs/subversion/svn_blamewidget.cpp
+++ b/vcs/subversion/svn_blamewidget.cpp
@@ -16,7 +16,7 @@
#include "subversion_widget.h"
#include <tqmap.h>
#include <tqlistview.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqstringlist.h>
#include <tqfont.h>
diff --git a/vcs/subversion/svn_co.ui b/vcs/subversion/svn_co.ui
index 73bc66b5..db9d8f31 100644
--- a/vcs/subversion/svn_co.ui
+++ b/vcs/subversion/svn_co.ui
@@ -48,7 +48,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -82,7 +82,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -139,7 +139,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<vbox>
<property name="name">
@@ -191,7 +191,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -225,7 +225,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -253,7 +253,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -269,7 +269,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>191</width>
<height>20</height>
@@ -278,7 +278,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
diff --git a/vcs/subversion/svn_commitdlgbase.ui b/vcs/subversion/svn_commitdlgbase.ui
index d6ebee02..75937324 100644
--- a/vcs/subversion/svn_commitdlgbase.ui
+++ b/vcs/subversion/svn_commitdlgbase.ui
@@ -56,7 +56,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>335</width>
<height>30</height>
@@ -76,7 +76,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="2">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
diff --git a/vcs/subversion/svn_copydlgwidget.ui b/vcs/subversion/svn_copydlgwidget.ui
index 4361afe2..e874206a 100644
--- a/vcs/subversion/svn_copydlgwidget.ui
+++ b/vcs/subversion/svn_copydlgwidget.ui
@@ -45,7 +45,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>31</height>
diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp
index 25149483..0c014a9d 100644
--- a/vcs/subversion/svn_fileselectdlg_commit.cpp
+++ b/vcs/subversion/svn_fileselectdlg_commit.cpp
@@ -86,17 +86,17 @@ SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart
vcsInfo = it.data();
// TQString absPathStr( fileInfo.absFilePath() + "/" + it.key() );
TQString absPathStr( fileInfo.filePath() + "/" + it.key() );
- KURL urlFromtqStatus( absPathStr );
+ KURL urlFromStatus( absPathStr );
if( vcsInfo.state == VCSFileInfo::Added || vcsInfo.state == VCSFileInfo::Modified ||
vcsInfo.state == VCSFileInfo::Deleted || vcsInfo.state == VCSFileInfo::Replaced){
- this->insertItem( VCSFileInfo::state2String( vcsInfo.state ), urlFromtqStatus );
+ this->insertItem( VCSFileInfo::state2String( vcsInfo.state ), urlFromStatus );
-// tobeCommittedUrls.push_back( urlFromtqStatus );
-// kdDebug(9036) << "slotCommit() @ DirCase adding " << urlFromtqStatus.prettyURL() << endl;
+// tobeCommittedUrls.push_back( urlFromStatus );
+// kdDebug(9036) << "slotCommit() @ DirCase adding " << urlFromStatus.prettyURL() << endl;
}
else{
- kdDebug(9036) << "slotCommit() @ DirCase ignoring " << urlFromtqStatus.prettyURL() << endl;
+ kdDebug(9036) << "slotCommit() @ DirCase ignoring " << urlFromStatus.prettyURL() << endl;
}
}
diff --git a/vcs/subversion/svn_kio.cpp b/vcs/subversion/svn_kio.cpp
index 8b97d3f2..7646e727 100644
--- a/vcs/subversion/svn_kio.cpp
+++ b/vcs/subversion/svn_kio.cpp
@@ -223,7 +223,7 @@ svn_error_t* kio_svnProtocol::checkAuth(svn_auth_cred_simple_t **cred, void *bat
p->info.url = p->myURL;
p->info.username = username; //( const char* )svn_auth_get_parameter( p->ctx->auth_baton, SVN_AUTH_PARAM_DEFAULT_USERNAME );
if (realm) {
- p->info.prompt = i18n("Username and Password for %1.").tqarg(realm);
+ p->info.prompt = i18n("Username and Password for %1.").arg(realm);
}
// if ( !p->checkCachedAuthentication( p->info ) ){
@@ -246,7 +246,7 @@ void kio_svnProtocol::get(const KURL& url ){
kdDebug(9036) << "kio_svn::get(const KURL& url)" << endl ;
TQString remoteServer = url.host();
- infoMessage(i18n("Looking for %1...").tqarg( remoteServer ) );
+ infoMessage(i18n("Looking for %1...").arg( remoteServer ) );
apr_pool_t *subpool = svn_pool_create (pool);
kbaton *bt = (kbaton*)apr_pcalloc(subpool, sizeof(*bt));
@@ -1261,7 +1261,7 @@ void kio_svnProtocol::svn_switch_relocate( const KURL &wc, const KURL &origUrl,
}
m_counter = 0L;
setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string",
- TQString("switched to %1").tqarg( toUrl ) );
+ TQString("switched to %1").arg( toUrl ) );
finished();
svn_pool_destroy( subpool );
}
@@ -1384,7 +1384,7 @@ void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc
TQString userstring = i18n ( "Nothing to commit." );
if ( SVN_IS_VALID_REVNUM( commit_info->revision ) )
- userstring = i18n( "Committed revision %1." ).tqarg(commit_info->revision);
+ userstring = i18n( "Committed revision %1." ).arg(commit_info->revision);
setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "path", nurl.path() );
setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "action", "0" );
setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "kind", "0" );
@@ -1584,7 +1584,7 @@ void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const TQString &
if( commit_info ){
setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string",
- i18n("Copied Revision %1").tqarg( commit_info->revision) );
+ i18n("Copied Revision %1").arg( commit_info->revision) );
} else {
setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string",
i18n("Copied") );
@@ -1900,42 +1900,42 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
switch ( action ) {
case svn_wc_notify_add : //add
if (mime_type && (svn_mime_type_is_binary (mime_type)))
- userstring = i18n( "A (bin) %1" ).tqarg( path );
+ userstring = i18n( "A (bin) %1" ).arg( path );
else
- userstring = i18n( "A %1" ).tqarg( path );
+ userstring = i18n( "A %1" ).arg( path );
break;
case svn_wc_notify_copy: //copy
- userstring = i18n( "Copied %1 " ).tqarg( path );
+ userstring = i18n( "Copied %1 " ).arg( path );
break;
case svn_wc_notify_delete: //delete
nb->received_some_change = TRUE;
- userstring = i18n( "D %1" ).tqarg( path );
+ userstring = i18n( "D %1" ).arg( path );
break;
case svn_wc_notify_restore : //restore
- userstring=i18n( "Restored %1." ).tqarg( path );
+ userstring=i18n( "Restored %1." ).arg( path );
break;
case svn_wc_notify_revert : //revert
- userstring=i18n( "Reverted %1." ).tqarg( path );
+ userstring=i18n( "Reverted %1." ).arg( path );
break;
case svn_wc_notify_failed_revert: //failed revert
- userstring=i18n( "Failed to revert %1.\nTry updating instead." ).tqarg( path );
+ userstring=i18n( "Failed to revert %1.\nTry updating instead." ).arg( path );
break;
case svn_wc_notify_resolved: //resolved
- userstring=i18n( "Resolved conflicted state of %1." ).tqarg( path );
+ userstring=i18n( "Resolved conflicted state of %1." ).arg( path );
break;
case svn_wc_notify_skip: //skip
if ( content_state == svn_wc_notify_state_missing )
- userstring=i18n("Skipped missing target %1.").tqarg( path );
+ userstring=i18n("Skipped missing target %1.").arg( path );
else
- userstring=i18n("Skipped %1.").tqarg( path );
+ userstring=i18n("Skipped %1.").arg( path );
break;
case svn_wc_notify_update_delete: //update_delete
nb->received_some_change = TRUE;
- userstring=i18n( "D %1" ).tqarg( path );
+ userstring=i18n( "D %1" ).arg( path );
break;
case svn_wc_notify_update_add: //update_add
nb->received_some_change = TRUE;
- userstring=i18n( "A %1" ).tqarg( path );
+ userstring=i18n( "A %1" ).arg( path );
break;
case svn_wc_notify_update_update: //update_update
{
@@ -1980,25 +1980,25 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
if (SVN_IS_VALID_REVNUM (revision)) {
if (nb->is_export) {
if ( nb->in_external )
- userstring = i18n("Exported external at revision %1.").tqarg( revision );
+ userstring = i18n("Exported external at revision %1.").arg( revision );
else
- userstring = i18n("Exported revision %1.").tqarg( revision );
+ userstring = i18n("Exported revision %1.").arg( revision );
} else if (nb->is_checkout) {
if ( nb->in_external )
- userstring = i18n("Checked out external at revision %1.").tqarg( revision );
+ userstring = i18n("Checked out external at revision %1.").arg( revision );
else
- userstring = i18n("Checked out revision %1.").tqarg( revision);
+ userstring = i18n("Checked out revision %1.").arg( revision);
} else {
if (nb->received_some_change) {
if ( nb->in_external )
- userstring=i18n("Updated external to revision %1.").tqarg( revision );
+ userstring=i18n("Updated external to revision %1.").arg( revision );
else
- userstring = i18n("Updated to revision %1.").tqarg( revision);
+ userstring = i18n("Updated to revision %1.").arg( revision);
} else {
if ( nb->in_external )
- userstring = i18n("External at revision %1.").tqarg( revision );
+ userstring = i18n("External at revision %1.").arg( revision );
else
- userstring = i18n("At revision %1.").tqarg( revision);
+ userstring = i18n("At revision %1.").arg( revision);
}
}
} else /* no revision */ {
@@ -2026,30 +2026,30 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
break;
case svn_wc_notify_update_external: //update_external
nb->in_external = TRUE;
- userstring = i18n("Fetching external item into %1." ).tqarg( path );
+ userstring = i18n("Fetching external item into %1." ).arg( path );
break;
case svn_wc_notify_status_completed: //status_completed
if (SVN_IS_VALID_REVNUM (revision))
- userstring = i18n( "Status against revision: %1.").tqarg( revision );
+ userstring = i18n( "Status against revision: %1.").arg( revision );
break;
case svn_wc_notify_status_external: //status_external
- userstring = i18n("Performing status on external item at %1.").tqarg( path );
+ userstring = i18n("Performing status on external item at %1.").arg( path );
break;
case svn_wc_notify_commit_modified: //commit_modified
- userstring = i18n( "Sending %1").tqarg( path );
+ userstring = i18n( "Sending %1").arg( path );
break;
case svn_wc_notify_commit_added: //commit_added
if (mime_type && svn_mime_type_is_binary (mime_type)) {
- userstring = i18n( "Adding (bin) %1.").tqarg( path );
+ userstring = i18n( "Adding (bin) %1.").arg( path );
} else {
- userstring = i18n( "Adding %1.").tqarg( path );
+ userstring = i18n( "Adding %1.").arg( path );
}
break;
case svn_wc_notify_commit_deleted: //commit_deleted
- userstring = i18n( "Deleting %1.").tqarg( path );
+ userstring = i18n( "Deleting %1.").arg( path );
break;
case svn_wc_notify_commit_replaced: //commit_replaced
- userstring = i18n( "Replacing %1.").tqarg( path );
+ userstring = i18n( "Replacing %1.").arg( path );
break;
case svn_wc_notify_commit_postfix_txdelta: //commit_postfix_txdelta
if (! nb->sent_first_txdelta) {
@@ -2062,7 +2062,7 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
break;
case svn_wc_notify_blame_revision: //blame_revision
- userstring = i18n("Blame %1.").tqarg(path);
+ userstring = i18n("Blame %1.").arg(path);
break;
default:
break;
diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp
index 541d1674..7a1346d1 100644
--- a/vcs/subversion/svn_logviewwidget.cpp
+++ b/vcs/subversion/svn_logviewwidget.cpp
@@ -35,7 +35,7 @@
#include <tqsplitter.h>
#include <tqheader.h>
#include <tqlistview.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqstringlist.h>
SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent)
@@ -52,7 +52,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent)
listView1->addColumn( i18n( "Date" ) );
listView1->addColumn( i18n( "Author" ) );
listView1->addColumn( i18n( "Comment" ) );
- listView1->resize( TQSize(1, 1).expandedTo(tqminimumSizeHint()) );
+ listView1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) );
TQFont listView1_font( listView1->font() );
listView1_font.setPointSize( 9 );
listView1->setFont( listView1_font );
@@ -60,7 +60,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent)
listView1->setShowSortIndicator( TRUE );
textEdit1 = new KTextEdit( splitter1, "textEdit1" );
- textEdit1->resize( TQSize(1, 1).expandedTo(tqminimumSizeHint()) );
+ textEdit1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) );
TQFont textEdit1_font( textEdit1->font() );
textEdit1_font.setPointSize( 9 );
textEdit1->setFont( textEdit1_font );
@@ -70,7 +70,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent)
m_layout->addWidget( splitter1, 0, 0 );
m_layout->setMargin(1);
- resize( TQSize(692, 343).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(692, 343).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished );
connect( listView1, TQT_SIGNAL(clicked( TQListViewItem *)), this, TQT_SLOT(slotClicked(TQListViewItem*)) );
diff --git a/vcs/subversion/svn_mergeoptiondlgbase.ui b/vcs/subversion/svn_mergeoptiondlgbase.ui
index d42a2707..b54ead45 100644
--- a/vcs/subversion/svn_mergeoptiondlgbase.ui
+++ b/vcs/subversion/svn_mergeoptiondlgbase.ui
@@ -279,7 +279,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>171</width>
<height>31</height>
diff --git a/vcs/subversion/svn_switchdlgbase.ui b/vcs/subversion/svn_switchdlgbase.ui
index 3c640661..87533197 100644
--- a/vcs/subversion/svn_switchdlgbase.ui
+++ b/vcs/subversion/svn_switchdlgbase.ui
@@ -24,7 +24,7 @@
<cstring>nonRecurseCheck</cstring>
</property>
<property name="text">
- <string>Non-recursive. (Switch its immediate tqchildren only)</string>
+ <string>Non-recursive. (Switch its immediate children only)</string>
</property>
</widget>
<widget class="Line" row="5" column="0" rowspan="1" colspan="2">
@@ -43,7 +43,7 @@
</widget>
<widget class="TQLayoutWidget" row="6" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
@@ -75,7 +75,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>150</width>
<height>30</height>
diff --git a/vcs/subversion/svnssltrustpromptbase.ui b/vcs/subversion/svnssltrustpromptbase.ui
index a4c5d0c9..fc72c0d5 100644
--- a/vcs/subversion/svnssltrustpromptbase.ui
+++ b/vcs/subversion/svnssltrustpromptbase.ui
@@ -86,7 +86,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>