Rename old tq methods that no longer need a unique name

1 files changed, 8 insertions, 8 deletions

diff --git a/conduits/docconduit/doc-conflictdialog.cc b/conduits/docconduit/doc-conflictdialog.cc
index 32af25f..beb6749 100644
--- a/conduits/docconduit/doc-conflictdialog.cc
+++ b/conduits/docconduit/doc-conflictdialog.cc
@@ -51,11 +51,11 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s
 
 	// First, insert the texts on top:
 	textLabel1 = new TQLabel(i18n("Here is a list of all text files and DOC databases the conduit found. The conduit tried to determine the correct sync direction, but for databases in bold red letters a conflict occurred (i.e. the text was changed both on the desktop and on the handheld). For these databases please specify which version is the current one."), page);
-	textLabel1->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+	textLabel1->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
 	topLayout->addWidget(textLabel1);
 
 	textLabel2 = new TQLabel(i18n("You can also change the sync direction for databases without a conflict." ),  page );
-	textLabel2->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+	textLabel2->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
 	topLayout->addWidget(textLabel2);
 
 	resolutionGroupBox = new TQGroupBox(i18n("DOC Databases"), page );
@@ -70,7 +70,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s
 
 
 	resolutionGroupBoxLayout = new TQGridLayout( big_box, syncInfo->size(), 3 );
-	resolutionGroupBoxLayout->tqsetAlignment( TQt::AlignTop );
+	resolutionGroupBoxLayout->setAlignment( TQt::AlignTop );
 
 	// Invisible button group for the information buttons to use the same slot for all of them (see Dallheimer's book, page 309f)
 	TQButtonGroup *bgroup = new TQButtonGroup( this );
@@ -99,7 +99,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s
 			resolutionGroupBoxLayout->addWidget( cE.dbname, cE.index, 0 );
 
 			cE.resolution=new TQComboBox( FALSE, big_box);
-			cE.resolution->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7,
+			cE.resolution->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7,
 				(TQSizePolicy::SizeType)0, 0, 0,
 				cE.resolution->sizePolicy().hasHeightForWidth() ) );
 			cE.resolution->clear();
@@ -123,7 +123,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s
 
 
 	topLayout->addWidget( resolutionGroupBox );
-	resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) );
+	resize( TQSize(600, 480).expandedTo(minimumSizeHint()) );
 
 	if (fHandle) tickleTimer=new TQTimer(this, "TickleTimer");
 	if (tickleTimer) {
@@ -150,7 +150,7 @@ ResolutionDialog::~ResolutionDialog()
 	KDialogBase::slotOk();
 }
 
-TQString eTexStatusToString(eTextqStatus stat) {
+TQString eTexStatusToString(eTexStatus stat) {
 	switch(stat) {
 		case eStatNone: return i18n("unchanged");
 		case eStatNew: return i18n("new");
@@ -169,8 +169,8 @@ void ResolutionDialog::slotInfo(int index) {
 	if (!syncInfo) return;
 	docSyncInfo si=(*syncInfo)[ix];
 	TQString text=i18n("Status of the database %1:\n\n").tqarg(si.handheldDB);
-	text+=i18n("Handheld: %1\n").tqarg(eTexStatusToString(si.fPalmtqStatus));
-	text+=i18n("Desktop: %1\n").tqarg(eTexStatusToString(si.fPCtqStatus));
+	text+=i18n("Handheld: %1\n").tqarg(eTexStatusToString(si.fPalmStatus));
+	text+=i18n("Desktop: %1\n").tqarg(eTexStatusToString(si.fPCStatus));
 
 	KMessageBox::information(this, text, i18n("Database information"));
 }