summaryrefslogtreecommitdiffstats
path: root/vcs/perforce
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 10:00:25 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 10:00:25 -0600
commit1623fe64102c18ab098b79656b80f28cef840756 (patch)
tree78f35fef11ea3dbbca1ba4c99937736a1a0894cf /vcs/perforce
parentb6ba5d642f3fc7d320e3d6f4650eb259a3a52b04 (diff)
downloadtdevelop-1623fe64102c18ab098b79656b80f28cef840756.tar.gz
tdevelop-1623fe64102c18ab098b79656b80f28cef840756.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.
Diffstat (limited to 'vcs/perforce')
-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
4 files changed, 23 insertions, 23 deletions
diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp
index 8625ecd0..1f1f8290 100644
--- a/vcs/perforce/commitdlg.cpp
+++ b/vcs/perforce/commitdlg.cpp
@@ -12,9 +12,9 @@
#include "commitdlg.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
-#include <textedit.h>
+#include <tqtextedit.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 *layout = new TQVBoxLayout( w, 0, spacingHint() );
+ TQVBoxLayout *tqlayout = new TQVBoxLayout( w, 0, spacingHint() );
TQLabel *editLabel = new TQLabel(i18n("&Enter description:"), w);
editLabel->setBuddy(edit);
- layout->addWidget(editLabel);
- layout->addWidget(edit);
+ tqlayout->addWidget(editLabel);
+ tqlayout->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 );
- layout = new TQVBoxLayout( w, 0, spacingHint() );
+ tqlayout = new TQVBoxLayout( w, 0, spacingHint() );
TQLabel *clientLabel = new TQLabel(i18n("C&lient:"), w);
clientLabel->setBuddy(clientEdit);
- layout->addWidget(clientLabel);
- layout->addWidget( clientEdit );
+ tqlayout->addWidget(clientLabel);
+ tqlayout->addWidget( clientEdit );
TQLabel *userLabel = new TQLabel(i18n("&User:"), w);
userLabel->setBuddy(userEdit);
- layout->addWidget( userLabel );
- layout->addWidget( userEdit );
+ tqlayout->addWidget( userLabel );
+ tqlayout->addWidget( userEdit );
TQLabel *filesLabel = new TQLabel(i18n("&File(s):"), w);
filesLabel->setBuddy(filesBox);
- layout->addWidget( filesLabel );
- layout->addWidget( filesBox );
+ tqlayout->addWidget( filesLabel );
+ tqlayout->addWidget( filesBox );
setDetailsWidget( w );
autoGuess();
diff --git a/vcs/perforce/commitdlg.h b/vcs/perforce/commitdlg.h
index 56fd680e..83766914 100644
--- a/vcs/perforce/commitdlg.h
+++ b/vcs/perforce/commitdlg.h
@@ -14,7 +14,7 @@
#define _COMMITDIALOG_H_
#include <tqstringlist.h>
-#include <textedit.h>
+#include <tqtextedit.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 f798e42a..8d1c3530 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="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>435</height>
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index dd501e37..ca81a8d4 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").arg(name) );
+ sub->insertTitle( i18n("Actions for %1").tqarg(name) );
int id = sub->insertItem( i18n("Edit"),
this, TQT_SLOT(slotEdit()) );
- sub->setWhatsThis(id, i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit."));
+ sub->tqsetWhatsThis(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->setWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files."));
+ sub->tqsetWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files."));
id = sub->insertItem( i18n("Submit"),
this, TQT_SLOT(slotCommit()) );
- sub->setWhatsThis(id, i18n("<b>Submit</b><p>Sends changes made to open files to the depot."));
+ sub->tqsetWhatsThis(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->setWhatsThis(id, i18n("<b>Sync</b><p>Copies files from the depot into the workspace."));
+ sub->tqsetWhatsThis(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->setWhatsThis(id, i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot."));
+ sub->tqsetWhatsThis(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->setWhatsThis(id, i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot."));
+ sub->tqsetWhatsThis(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->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot."));
+ sub->tqsetWhatsThis(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?").arg( filename ), TQString(), i18n("Revert"), i18n("Do Not Revert") ) == KMessageBox::Yes ) {
+ "the file %1 and lose all your changes?").tqarg( filename ), TQString(), i18n("Revert"), i18n("Do Not Revert") ) == KMessageBox::Yes ) {
execCommand( "revert", filename );
}
}