Rename old tq methods that no longer need a unique name

32 files changed, 150 insertions, 150 deletions

diff --git a/kpilot/conduitConfigDialog.cc b/kpilot/conduitConfigDialog.cc
index 8f47a8a..53cfbcd 100644
--- a/kpilot/conduitConfigDialog.cc
+++ b/kpilot/conduitConfigDialog.cc
@@ -139,7 +139,7 @@ ConduitTip::~ConduitTip()
 		s.append(CSL1("</qt>"));
 	}
 
-	tip(fListView->tqitemRect(l),s);
+	tip(fListView->itemRect(l),s);
 }
 
 // implement our own check list items so we can detect if a given item was checked/unchecked. We need
@@ -192,7 +192,7 @@ static void addDescriptionPage(TQWidgetStack *parent,
 
 	l = new TQLabel(v);
 	l->setText(text);
-	l->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak);
+	l->setAlignment(TQt::AlignLeft | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak);
 
 	if (label) { *label = l; }
 
@@ -227,7 +227,7 @@ ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *parent, const char *n
 	fConduitList = new TQListView(this ,"ConduitList");
 	fConduitList->addColumn(TQString());
 	fConduitList->header()->hide();
-	fConduitList->tqsetSizePolicy(
+	fConduitList->setSizePolicy(
 		TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
 	mainLayout->addWidget(fConduitList);
 
@@ -316,13 +316,13 @@ ConduitConfigWidget::ConduitConfigWidget(TQWidget *parent, const char *n,
 	// fConduitList->removeColumn(CONDUIT_COMMENT);
 	fillLists();
 
-	fConduitList->resize(fConduitList->tqsizeHint());
-	fConduitList->setMinimumSize(fConduitList->tqsizeHint());
-	fConduitList->setColumnWidth(0, fConduitList->tqsizeHint().width());
+	fConduitList->resize(fConduitList->sizeHint());
+	fConduitList->setMinimumSize(fConduitList->sizeHint());
+	fConduitList->setColumnWidth(0, fConduitList->sizeHint().width());
 	fConduitList->setResizeMode(TQListView::AllColumns);
 
-	fStack->resize(fStack->tqsizeHint()+TQSize(10,40));
-	fStack->setMinimumSize(fStack->tqsizeHint()+TQSize(10,40));
+	fStack->resize(fStack->sizeHint()+TQSize(10,40));
+	fStack->setMinimumSize(fStack->sizeHint()+TQSize(10,40));
 
 	TQObject::connect(fConduitList,
 		TQT_SIGNAL(selectionChanged(TQListViewItem *)),
diff --git a/kpilot/datebookWidget.cc b/kpilot/datebookWidget.cc
index 8b76942..bc2dff5 100644
--- a/kpilot/datebookWidget.cc
+++ b/kpilot/datebookWidget.cc
@@ -49,7 +49,7 @@ DatebookWidget::DatebookWidget(TQWidget *parent, const TQString &dbpath) :
 	TQGridLayout *g = new TQGridLayout(this,1,1,SPACING);
 
 	fDatePicker = new KDatePicker( this, "fDatePicker" );
-	fDatePicker->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, fDatePicker->sizePolicy().hasHeightForWidth() ) );
+	fDatePicker->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, fDatePicker->sizePolicy().hasHeightForWidth() ) );
 	g->addMultiCellWidget(fDatePicker,0,0,0,2);
 
 	TQSpacerItem* spacer = new TQSpacerItem( 20, 180, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
@@ -69,7 +69,7 @@ DatebookWidget::DatebookWidget(TQWidget *parent, const TQString &dbpath) :
 	fEventList->addColumn( i18n( "Al" ) );
 	fEventList->addColumn( i18n( "Rec" ) );
 	fEventList->addColumn( i18n( "Description" ) );
-//	fEventList->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, fEventList->sizePolicy().hasHeightForWidth() ) );
+//	fEventList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, fEventList->sizePolicy().hasHeightForWidth() ) );
 	fEventList->setAllColumnsShowFocus( TRUE );
 	fEventList->setShowSortIndicator( TRUE );
 	fEventList->setResizeMode( KListView::/*LastColumn*/AllColumns );
diff --git a/kpilot/dbAppInfoEditor.cc b/kpilot/dbAppInfoEditor.cc
index bfedb45..c1e65c5 100644
--- a/kpilot/dbAppInfoEditor.cc
+++ b/kpilot/dbAppInfoEditor.cc
@@ -67,7 +67,7 @@ DBAppInfoEditor::DBAppInfoEditor(char*appInfoData, int l, TQWidget *parent) :
 	{
 		TQLabel*tmpW = new TQLabel( i18n("To view the Application info block data, please install a hex editor (e.g. khexedit from tdeutils)."), this );
 		tmpW->setBackgroundMode( TQt::PaletteMid );
-		tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
+		tmpW->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
 		tmpW->setFrameShape( TQFrame::Panel );
 		tmpW->setFrameShadow( TQFrame::Sunken );
 		fAppInfoEdit = tmpW;
diff --git a/kpilot/dbFlagsEditor.cc b/kpilot/dbFlagsEditor.cc
index eafbe58..89f14d0 100644
--- a/kpilot/dbFlagsEditor.cc
+++ b/kpilot/dbFlagsEditor.cc
@@ -115,15 +115,15 @@ void DBFlagsEditor::fillWidgets()
 {
 	// FUNCTIONSETUP
 
-	widget->fDBName->setText(TQString::tqfromLatin1(dbi->name));
+	widget->fDBName->setText(TQString::fromLatin1(dbi->name));
 
 	char buff[5];
 	set_long(buff, dbi->type);
 	buff[4]='\0';
-	widget->fType->setText(TQString::tqfromLatin1(buff));
+	widget->fType->setText(TQString::fromLatin1(buff));
 	set_long(buff, dbi->creator);
 	buff[4]='\0';
-	widget->fCreator->setText(TQString::tqfromLatin1(buff));
+	widget->fCreator->setText(TQString::fromLatin1(buff));
 
 	widget->fRessourceDB->setChecked(dbi->flags & dlpDBFlagResource);
 	widget->fReadOnly->setChecked(dbi->flags & dlpDBFlagReadOnly);
diff --git a/kpilot/dbFlagsEditor_base.ui b/kpilot/dbFlagsEditor_base.ui
index 6ea18ca..a89aabd 100644
--- a/kpilot/dbFlagsEditor_base.ui
+++ b/kpilot/dbFlagsEditor_base.ui
@@ -142,7 +142,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -172,7 +172,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>21</width>
                             <height>60</height>
@@ -317,7 +317,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>180</width>
                     <height>21</height>
@@ -342,7 +342,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>31</width>
                     <height>70</height>
diff --git a/kpilot/dbRecordEditor.cc b/kpilot/dbRecordEditor.cc
index 16385a7..056dac6 100644
--- a/kpilot/dbRecordEditor.cc
+++ b/kpilot/dbRecordEditor.cc
@@ -138,13 +138,13 @@ void DBRecordEditor::initWidgets()
 	DBRecordEditorBaseLayout->addWidget( fRecordID, 0, 3 );
 
 	fFlagsGroup = new TQButtonGroup( fWidget, "fFlagsGroup" );
-	fFlagsGroup->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5,
+	fFlagsGroup->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5,
 		(TQSizePolicy::SizeType)4, 0, 0, fFlagsGroup->sizePolicy().hasHeightForWidth() ) );
 	fFlagsGroup->setColumnLayout(0, Qt::Vertical );
 	fFlagsGroup->tqlayout()->setSpacing( 6 );
 	fFlagsGroup->tqlayout()->setMargin( 11 );
 	fFlagsGroupLayout = new TQGridLayout( fFlagsGroup->tqlayout() );
-	fFlagsGroupLayout->tqsetAlignment( TQt::AlignTop );
+	fFlagsGroupLayout->setAlignment( TQt::AlignTop );
 
 	fDirty = new TQCheckBox( fFlagsGroup, "fDirty" );
 	fFlagsGroupLayout->addWidget( fDirty, 0, 0 );
@@ -192,7 +192,7 @@ void DBRecordEditor::initWidgets()
 	{
 		TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. kbytesedit from tdeutils)."), fWidget );
 		tmpW->setBackgroundMode( TQt::PaletteMid );
-		tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
+		tmpW->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
 		tmpW->setFrameShape( TQFrame::Panel );
 		tmpW->setFrameShadow( TQFrame::Sunken );
 		fRecordData = tmpW;
@@ -202,7 +202,7 @@ void DBRecordEditor::initWidgets()
 	DBRecordEditorBaseLayout->addMultiCellWidget( fRecordData, 2, 2, 0, 3 );
 
 	languageChange();
-	resize( TQSize(600, 561).expandedTo(tqminimumSizeHint()) );
+	resize( TQSize(600, 561).expandedTo(minimumSizeHint()) );
 }
 
 void DBRecordEditor::fillWidgets()
diff --git a/kpilot/dbviewerWidget.cc b/kpilot/dbviewerWidget.cc
index 6332760..afa658f 100644
--- a/kpilot/dbviewerWidget.cc
+++ b/kpilot/dbviewerWidget.cc
@@ -87,7 +87,7 @@ void GenericDBWidget::setupWidget()
 
 	TQGridLayout *g1 = new TQGridLayout( 0, 1, 1);
 	fDBInfo = new KTextEdit( this );
-	fDBInfo->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, 0, 0, fDBInfo->sizePolicy().hasHeightForWidth() ) );
+	fDBInfo->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, 0, 0, fDBInfo->sizePolicy().hasHeightForWidth() ) );
 	fDBInfo->setReadOnly( TRUE );
 	g1->addWidget( fDBInfo, 0, 0 );
 	fDBInfoButton = new KPushButton( i18n( "General Database &Information" ), this );
@@ -117,7 +117,7 @@ void GenericDBWidget::setupWidget()
 
 
 	g->addMultiCellLayout( g1, 0, 1, 1, 1 );
-	resize( TQSize(682, 661).expandedTo(tqminimumSizeHint()) );
+	resize( TQSize(682, 661).expandedTo(minimumSizeHint()) );
 
 	connect(fDBList, TQT_SIGNAL(highlighted(const TQString &)),
 		this, TQT_SLOT(slotSelected(const TQString &)));
@@ -192,14 +192,14 @@ void GenericDBWidget::slotSelected(const TQString &dbname)
 		}
 		dbinfo=fDB->getDBInfo();
 		display.append(i18n("<B>Database:</B> %1, %2 records<BR>")
-			.tqarg(TQString::tqfromLatin1(dbinfo.name)).tqarg(fDB->recordCount()));
+			.tqarg(TQString::fromLatin1(dbinfo.name)).tqarg(fDB->recordCount()));
 		char buff[5];
 		set_long(buff, dbinfo.type);
 		buff[4]='\0';
-		TQString tp = TQString::tqfromLatin1(buff);
+		TQString tp = TQString::fromLatin1(buff);
 		set_long(buff, dbinfo.creator);
 		buff[4]='\0';
-		TQString cr = TQString::tqfromLatin1(buff);
+		TQString cr = TQString::fromLatin1(buff);
 		display.append(i18n("<B>Type:</B> %1, <B>Creator:</B> %2<br><br>").tqarg(tp).tqarg(cr));
 
 		int currentRecord = 0;
diff --git a/kpilot/fileInstallWidget.cc b/kpilot/fileInstallWidget.cc
index 5e11c46..1789d68 100644
--- a/kpilot/fileInstallWidget.cc
+++ b/kpilot/fileInstallWidget.cc
@@ -116,7 +116,7 @@ FileInstallWidget::~FileInstallWidget()
 
 static inline bool pdbOrPrc(const TQString &s)
 {
-	return s.tqendsWith(CSL1(".pdb"),false) || s.tqendsWith(CSL1(".prc"),false) ;
+	return s.endsWith(CSL1(".pdb"),false) || s.endsWith(CSL1(".prc"),false) ;
 }
 
 void FileInstallWidget::dragEnterEvent(TQDragEnterEvent *event)
diff --git a/kpilot/fileInstaller.cc b/kpilot/fileInstaller.cc
index d02858e..7f659cf 100644
--- a/kpilot/fileInstaller.cc
+++ b/kpilot/fileInstaller.cc
@@ -105,7 +105,7 @@ void FileInstaller::deleteFiles(const TQStringList &files)
 {
 	FUNCTIONSETUP;
 
-	if(!(s.tqendsWith(CSL1(".pdb"), false) || s.tqendsWith(CSL1(".prc"), false))) {
+	if(!(s.endsWith(CSL1(".pdb"), false) || s.endsWith(CSL1(".prc"), false))) {
 		KMessageBox::detailedSorry(w, i18n("Cannot install %1").tqarg(s),
 			i18n("Only PalmOS database files (like *.pdb and *.prc) can be installed by the file installer."));
 		return false;
diff --git a/kpilot/hotSync.cc b/kpilot/hotSync.cc
index 7689f32..b7349e6 100644
--- a/kpilot/hotSync.cc
+++ b/kpilot/hotSync.cc
@@ -117,7 +117,7 @@ public:
 		set_long( &buff[1], info->creator );
 		buff[5] = ']';
 		buff[6] = '\0';
-		TQString creator = TQString::tqfromLatin1( buff );
+		TQString creator = TQString::fromLatin1( buff );
 
 		TQString dbname = Pilot::fromPilot( info->name, 32 );
 
@@ -349,18 +349,18 @@ static inline bool checkBackupDirectory( const TQString &backupDir )
 
 	if (fP->fFullBackup)
 	{
-		fActiontqStatus = FullBackup;
+		fActionStatus = FullBackup;
 		addSyncLogEntry(i18n("Full backup started."));
 	}
 	else
 	{
-		fActiontqStatus = FastBackup;
+		fActionStatus = FastBackup;
 		addSyncLogEntry(i18n("Fast backup started"));
 	}
 
 	if (!checkBackupDirectory(fP->fBackupDir))
 	{
-		fActiontqStatus=BackupIncomplete;
+		fActionStatus=BackupIncomplete;
 		// Don't issue an error message, checkBackupDirectory
 		// did this already...
 		return false;
@@ -386,7 +386,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir )
 	{
 		addSyncLogEntry(i18n("Exiting on cancel."));
 		endBackup();
-		fActiontqStatus = BackupIncomplete;
+		fActionStatus = BackupIncomplete;
 		return;
 	}
 
@@ -403,7 +403,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir )
 			addSyncLogEntry( i18n("Fast backup complete.") );
 		}
 		endBackup();
-		fActiontqStatus = BackupComplete;
+		fActionStatus = BackupComplete;
 		return;
 	}
 
@@ -557,7 +557,7 @@ void BackupAction::endBackup()
 	FUNCTIONSETUP;
 
 	fP->fDBIndex = (-1);
-	fActiontqStatus = BackupEnded;
+	fActionStatus = BackupEnded;
 	fP->fDeviceDBs.sort();
 	TQString old( TQString::null );
 	TQStringList::Iterator itr = fP->fDeviceDBs.begin();
@@ -993,7 +993,7 @@ void RestoreAction::setDirectory( const TQString &path )
 	{
 		WARNINGKPILOT << "Restore directory "
 			<< dirname << " does not exist." << endl;
-		fActiontqStatus = Error;
+		fActionStatus = Error;
 		addSyncLogEntry(i18n("Restore directory does not exist.") +
 			CSL1(" ") + i18n("Restore not performed."));
 		return false;
@@ -1047,7 +1047,7 @@ void RestoreAction::setDirectory( const TQString &path )
 
 	fP->fDBIndex = 0;
 	fP->fDBIterator = fP->fDBList.begin();
-	fActiontqStatus = InstallingFiles;
+	fActionStatus = InstallingFiles;
 
 	TQObject::connect(&(fP->fTimer), TQT_SIGNAL(timeout()),
 		this, TQT_SLOT(installNextFile()));
@@ -1060,14 +1060,14 @@ void RestoreAction::setDirectory( const TQString &path )
 {
 	FUNCTIONSETUP;
 
-	Q_ASSERT(fActiontqStatus == InstallingFiles);
+	Q_ASSERT(fActionStatus == InstallingFiles);
 
 
 	if (fP->fDBIterator == fP->fDBList.end())
 	{
 		fP->fTimer.stop();
 
-		fActiontqStatus = Done;
+		fActionStatus = Done;
 		addSyncLogEntry(i18n("OK."));
 		delayDone();
 		return;
@@ -1083,7 +1083,7 @@ void RestoreAction::setDirectory( const TQString &path )
 	{
 		WARNINGKPILOT << "Restore apparently canceled." << endl;
 		logMessage(i18n("Restore incomplete."));
-		fActiontqStatus = Done;
+		fActionStatus = Done;
 		emit syncDone(this);
 
 		return;
diff --git a/kpilot/hotSync.h b/kpilot/hotSync.h
index eb10e75..b81dbff 100644
--- a/kpilot/hotSync.h
+++ b/kpilot/hotSync.h
@@ -65,7 +65,7 @@ public:
 	*/
 	BackupAction(KPilotLink *, bool full);
 
-	enum tqStatus { Init,
+	enum Status { Init,
 		Error,
 		FastBackup,
 		FullBackup,
@@ -150,7 +150,7 @@ Q_OBJECT
 public:
 	RestoreAction(KPilotLink *,TQWidget *w=0L);
 
-	typedef enum { InstallingFiles, GettingFileInfo,Done } tqStatus;
+	typedef enum { InstallingFiles, GettingFileInfo,Done } Status;
 	virtual TQString statusString() const;
 
 	/** By default, a path based on the user name (either
diff --git a/kpilot/internalEditorAction.cc b/kpilot/internalEditorAction.cc
index a83d68f..222169c 100644
--- a/kpilot/internalEditorAction.cc
+++ b/kpilot/internalEditorAction.cc
@@ -60,7 +60,7 @@ bool InternalEditorAction::exec()
 {
 	FUNCTIONSETUP;
 	emit logMessage(i18n("[Internal Editors]"));
-	fInternalEditorSynctqStatus=eSyncStarted;
+	fInternalEditorSyncStatus=eSyncStarted;
 	TQTimer::singleShot(0, this, TQT_SLOT(syncDirtyDB()));
 	return true;
 }
@@ -69,9 +69,9 @@ void InternalEditorAction::syncDirtyDB()
 {
 	FUNCTIONSETUP;
 
-	if (fInternalEditorSynctqStatus!=eSyncDirtyDB)
+	if (fInternalEditorSyncStatus!=eSyncDirtyDB)
 	{
-		fInternalEditorSynctqStatus=eSyncDirtyDB;
+		fInternalEditorSyncStatus=eSyncDirtyDB;
 		dirtyDBs=KPilotSettings::dirtyDatabases();
 		emit logMessage(i18n("Databases with changed records: %1").tqarg(dirtyDBs.join(CSL1(", "))));
 		dbIter=dirtyDBs.begin();
@@ -217,7 +217,7 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
 	TQGridLayout*tqlayout = new TQGridLayout( page, 1, 1);
 
 	TQLabel *label=new TQLabel(dialogText, page);
-	label->tqsetAlignment( TQLabel::WordBreak );
+	label->setAlignment( TQLabel::WordBreak );
 	tqlayout->addMultiCellWidget( label,  0,0, 0,1 );
 
  	tqlayout->addItem( new TQSpacerItem( 20, 10, TQSizePolicy::Minimum,
@@ -262,7 +262,7 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
 		{
 			TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. khexedit from tdeutils)."), page );
 			tmpW->setBackgroundMode( TQt::PaletteMid );
-			tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
+			tmpW->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
 			tmpW->setFrameShape( TQFrame::Panel );
 			tmpW->setFrameShadow( TQFrame::Sunken );
 			hexEdit = tmpW;
@@ -290,7 +290,7 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
 		{
 			TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. khexedit from tdeutils)."), page );
 			tmpW->setBackgroundMode( TQt::PaletteMid );
-			tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
+			tmpW->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
 			tmpW->setFrameShape( TQFrame::Panel );
 			tmpW->setFrameShadow( TQFrame::Sunken );
 			hexEdit = tmpW;
@@ -308,9 +308,9 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
 void InternalEditorAction::syncFlagsChangedDB()
 {
 	FUNCTIONSETUP;
-	if (fInternalEditorSynctqStatus!=eSyncFlagsChangedDB)
+	if (fInternalEditorSyncStatus!=eSyncFlagsChangedDB)
 	{
-		fInternalEditorSynctqStatus=eSyncFlagsChangedDB;
+		fInternalEditorSyncStatus=eSyncFlagsChangedDB;
 		dirtyDBs=KPilotSettings::flagsChangedDatabases();
 		emit logMessage(i18n("Databases with changed flags: %1").tqarg(dirtyDBs.join(CSL1(", "))));
 		dbIter=dirtyDBs.begin();
@@ -349,9 +349,9 @@ return;
 void InternalEditorAction::syncAppBlockChangedDB()
 {
 	FUNCTIONSETUP;
-	if (fInternalEditorSynctqStatus!=eSyncAppBlockChangedDB)
+	if (fInternalEditorSyncStatus!=eSyncAppBlockChangedDB)
 	{
-		fInternalEditorSynctqStatus=eSyncAppBlockChangedDB;
+		fInternalEditorSyncStatus=eSyncAppBlockChangedDB;
 		dirtyDBs=KPilotSettings::appBlockChangedDatabases();
 		emit logMessage(i18n("Databases with changed AppBlock: %1").tqarg(dirtyDBs.join(CSL1(", "))));
 		dbIter=dirtyDBs.begin();
@@ -387,7 +387,7 @@ void InternalEditorAction::syncAppBlockChangedDB()
 void InternalEditorAction::cleanup()
 {
 	FUNCTIONSETUP;
-	fInternalEditorSynctqStatus=eSyncFinished;
+	fInternalEditorSyncStatus=eSyncFinished;
 	emit syncDone(this);
 }
 
diff --git a/kpilot/internalEditorAction.h b/kpilot/internalEditorAction.h
index db78eb2..b43f408 100644
--- a/kpilot/internalEditorAction.h
+++ b/kpilot/internalEditorAction.h
@@ -57,13 +57,13 @@ private:
 		PilotRecord*localrec, PilotRecord*serialrec, PilotDatabase*db);
 	TQStringList dirtyDBs;
 	TQStringList::Iterator dbIter;
-	enum eInternalEditorSynctqStatus {
+	enum eInternalEditorSyncStatus {
 		eSyncStarted,
 		eSyncDirtyDB,
 		eSyncFlagsChangedDB,
 		eSyncAppBlockChangedDB,
 		eSyncFinished
-	} fInternalEditorSynctqStatus;
+	} fInternalEditorSyncStatus;
 } ;
 
 #endif
diff --git a/kpilot/kpilot.cc b/kpilot/kpilot.cc
index f0618ea..fd477ad 100644
--- a/kpilot/kpilot.cc
+++ b/kpilot/kpilot.cc
@@ -104,7 +104,7 @@ KPilotInstaller::KPilotInstaller() :
 	fQuitAfterCopyComplete(false),
 	fManagingWidget(0L),
 	fDaemonWasRunning(true),
-	fApptqStatus(Startup),
+	fAppStatus(Startup),
 	fFileInstallWidget(0L),
 	fLogWidget(0L)
 {
@@ -143,7 +143,7 @@ void KPilotInstaller::startDaemonIfNeeded()
 {
 	FUNCTIONSETUP;
 
-	fApptqStatus=WaitingForDaemon;
+	fAppStatus=WaitingForDaemon;
 
 	TQString daemonError;
 	TQCString daemonDCOP;
@@ -180,7 +180,7 @@ void KPilotInstaller::startDaemonIfNeeded()
 				"KPilot daemon. The system error message "
 				"was: &quot;%1&quot;").tqarg(daemonError));
 		}
-		fApptqStatus=Error;
+		fAppStatus=Error;
 	}
 	else
 	{
@@ -196,7 +196,7 @@ void KPilotInstaller::startDaemonIfNeeded()
 				i18n("Daemon status is `%1'")
 				.tqarg(s.isEmpty() ? i18n("not running") : s ));
 		}
-		fApptqStatus=Normal;
+		fAppStatus=Normal;
 	}
 }
 
@@ -228,7 +228,7 @@ void KPilotInstaller::setupWidget()
 
 	fManagingWidget = new KJanusWidget(this,"mainWidget",
 		KJanusWidget::IconList);
-	fManagingWidget->setMinimumSize(fManagingWidget->tqsizeHint());
+	fManagingWidget->setMinimumSize(fManagingWidget->sizeHint());
 	fManagingWidget->show();
 	setCentralWidget(fManagingWidget);
 	connect( fManagingWidget, TQT_SIGNAL( aboutToShowPage ( TQWidget* ) ),
@@ -238,7 +238,7 @@ void KPilotInstaller::setupWidget()
 	initMenu();
 	initComponents();
 
-	setMinimumSize(tqsizeHint() + TQSize(10,60));
+	setMinimumSize(sizeHint() + TQSize(10,60));
 
 	createGUI(CSL1("kpilotui.rc"), false);
 	setAutoSaveSettings();
@@ -401,7 +401,7 @@ void KPilotInstaller::slotPCtoHHRequested()
 		i18n("Please press the HotSync button."));
 }
 
-/* virtual DCOP */ ASYNC KPilotInstaller::daemontqStatus(int i)
+/* virtual DCOP */ ASYNC KPilotInstaller::daemonStatus(int i)
 {
 	FUNCTIONSETUP;
 	DEBUGKPILOT << fname << ": Received daemon message " << i << endl;
@@ -409,17 +409,17 @@ void KPilotInstaller::slotPCtoHHRequested()
 	switch(i)
 	{
 	case KPilotDCOP::StartOfHotSync :
-		if (fApptqStatus==Normal)
+		if (fAppStatus==Normal)
 		{
-			fApptqStatus=WaitingForDaemon;
+			fAppStatus=WaitingForDaemon;
 			componentPreSync();
 		}
 		break;
 	case KPilotDCOP::EndOfHotSync :
-		if (fApptqStatus==WaitingForDaemon)
+		if (fAppStatus==WaitingForDaemon)
 		{
 			componentPostSync();
-			fApptqStatus=Normal;
+			fAppStatus=Normal;
 		}
 		break;
 	case KPilotDCOP::DaemonQuit :
@@ -429,7 +429,7 @@ void KPilotInstaller::slotPCtoHHRequested()
 			fLogWidget->logMessage(i18n("No further HotSyncs are possible."));
 			fLogWidget->logMessage(i18n("Restart the daemon to HotSync again."));
 		}
-		fApptqStatus=WaitingForDaemon;
+		fAppStatus=WaitingForDaemon;
 		break;
 	case KPilotDCOP::None :
 		WARNINGKPILOT << "Unhandled status message " << i << endl;
@@ -437,7 +437,7 @@ void KPilotInstaller::slotPCtoHHRequested()
 	}
 }
 
-/* virtual DCOP*/ int KPilotInstaller::kpilotqStatus()
+/* virtual DCOP*/ int KPilotInstaller::kpiloStatus()
 {
 	return status();
 }
@@ -920,7 +920,7 @@ void KPilotInstaller::componentUpdate()
 {
 	FUNCTIONSETUP;
 
-	if ( fApptqStatus!=Normal || fConfigureKPilotDialogInUse )
+	if ( fAppStatus!=Normal || fConfigureKPilotDialogInUse )
 	{
 		if (fLogWidget)
 		{
@@ -928,7 +928,7 @@ void KPilotInstaller::componentUpdate()
 		}
 		return;
 	}
-	fApptqStatus=UIBusy;
+	fAppStatus=UIBusy;
 	fConfigureKPilotDialogInUse = true;
 
 	if (runWizard(getDaemon(),this) == OK)
@@ -937,14 +937,14 @@ void KPilotInstaller::componentUpdate()
 	}
 
 	fConfigureKPilotDialogInUse = false;
-	fApptqStatus=Normal;
+	fAppStatus=Normal;
 }
 
 /* virtual DCOP */ ASYNC KPilotInstaller::configure()
 {
 	FUNCTIONSETUP;
 
-	if ( fApptqStatus!=Normal || fConfigureKPilotDialogInUse )
+	if ( fAppStatus!=Normal || fConfigureKPilotDialogInUse )
 	{
 		if (fLogWidget)
 		{
@@ -952,7 +952,7 @@ void KPilotInstaller::componentUpdate()
 		}
 		return;
 	}
-	fApptqStatus=UIBusy;
+	fAppStatus=UIBusy;
 	fConfigureKPilotDialogInUse = true;
 	if (runConfigure(getDaemon(),this))
 	{
@@ -960,7 +960,7 @@ void KPilotInstaller::componentUpdate()
 	}
 
 	fConfigureKPilotDialogInUse = false;
-	fApptqStatus=Normal;
+	fAppStatus=Normal;
 }
 
 
diff --git a/kpilot/kpilot.h b/kpilot/kpilot.h
index 0510322..e86f6e2 100644
--- a/kpilot/kpilot.h
+++ b/kpilot/kpilot.h
@@ -70,7 +70,7 @@ public:
 	void addComponentPage(PilotComponent *, const TQString &name);
 
 
-	KPilotqStatus status() const { return fApptqStatus; } ;
+	KPiloStatus status() const { return fAppStatus; } ;
 
 
 protected:
@@ -122,8 +122,8 @@ public:
 	/**
 	* This is the DCOP interface from the daemon to KPilot.
 	*/
-	virtual ASYNC daemontqStatus(int);
-	virtual int kpilotqStatus();
+	virtual ASYNC daemonStatus(int);
+	virtual int kpiloStatus();
 
 public slots:
 	/**
@@ -175,7 +175,7 @@ private:
 	KJanusWidget    *fManagingWidget;
 	bool fDaemonWasRunning;
 
-	KPilotqStatus fApptqStatus;
+	KPiloStatus fAppStatus;
 
 	FileInstallWidget *fFileInstallWidget;
 	LogWidget *fLogWidget;
diff --git a/kpilot/kpilotConfig.cc b/kpilot/kpilotConfig.cc
index 4c96258..3ca77a9 100644
--- a/kpilot/kpilotConfig.cc
+++ b/kpilot/kpilotConfig.cc
@@ -234,7 +234,7 @@ static void update440()
 	const char **s = oldconduits;
 	while (*s)
 	{
-		TQString libname = CSL1("trinity/lib%1conduit.so").tqarg(TQString::tqfromLatin1(*s));
+		TQString libname = CSL1("trinity/lib%1conduit.so").tqarg(TQString::fromLatin1(*s));
 		TQString foundlib = ::locate("lib",libname);
 		if (!foundlib.isEmpty())
 		{
diff --git a/kpilot/kpilotConfigDialog_backup.ui b/kpilot/kpilotConfigDialog_backup.ui
index 1a59aef..73f6262 100644
--- a/kpilot/kpilotConfigDialog_backup.ui
+++ b/kpilot/kpilotConfigDialog_backup.ui
@@ -44,7 +44,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>100</width>
                             <height>0</height>
@@ -97,7 +97,7 @@
                     <property name="name">
                         <cstring>TextLabel5</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>100</width>
                             <height>0</height>
@@ -117,7 +117,7 @@
                     <property name="name">
                         <cstring>TextLabel6</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>100</width>
                             <height>0</height>
@@ -194,7 +194,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
diff --git a/kpilot/kpilotConfigDialog_device.ui b/kpilot/kpilotConfigDialog_device.ui
index 29a4fe8..da3244f 100644
--- a/kpilot/kpilotConfigDialog_device.ui
+++ b/kpilot/kpilotConfigDialog_device.ui
@@ -75,7 +75,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>90</height>
diff --git a/kpilot/kpilotConfigDialog_startup.ui b/kpilot/kpilotConfigDialog_startup.ui
index 984689d..e505303 100644
--- a/kpilot/kpilotConfigDialog_startup.ui
+++ b/kpilot/kpilotConfigDialog_startup.ui
@@ -105,7 +105,7 @@ KPilot's settings.</comment>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>
diff --git a/kpilot/kpilotConfigDialog_sync.ui b/kpilot/kpilotConfigDialog_sync.ui
index 0afc66d..24193a4 100644
--- a/kpilot/kpilotConfigDialog_sync.ui
+++ b/kpilot/kpilotConfigDialog_sync.ui
@@ -87,7 +87,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>170</height>
diff --git a/kpilot/kpilotConfigDialog_viewers.ui b/kpilot/kpilotConfigDialog_viewers.ui
index 8f70950..fd73774 100644
--- a/kpilot/kpilotConfigDialog_viewers.ui
+++ b/kpilot/kpilotConfigDialog_viewers.ui
@@ -136,7 +136,7 @@ KPilot's settings.</comment>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
diff --git a/kpilot/kpilotConfigWizard_app.ui b/kpilot/kpilotConfigWizard_app.ui
index d774df1..c6d7870 100644
--- a/kpilot/kpilotConfigWizard_app.ui
+++ b/kpilot/kpilotConfigWizard_app.ui
@@ -79,7 +79,7 @@ Press "Finish" to setup KPilot according to the settings in this configuration W
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>120</height>
@@ -96,7 +96,7 @@ Press "Finish" to setup KPilot according to the settings in this configuration W
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>12</height>
diff --git a/kpilot/kpilotConfigWizard_user.ui b/kpilot/kpilotConfigWizard_user.ui
index 0bb6744..cb42fd0 100644
--- a/kpilot/kpilotConfigWizard_user.ui
+++ b/kpilot/kpilotConfigWizard_user.ui
@@ -149,7 +149,7 @@ Network: This has not been tested by any of the KPilot developers themselves (ha
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>70</height>
diff --git a/kpilot/kpilotDCOP.h b/kpilot/kpilotDCOP.h
index 045d9f9..fe4bc8b 100644
--- a/kpilot/kpilotDCOP.h
+++ b/kpilot/kpilotDCOP.h
@@ -43,7 +43,7 @@ public:
 		StartOfHotSync=1,
 		EndOfHotSync=2,
 		DaemonQuit=4 } ;
-	enum KPilotqStatus {
+	enum KPiloStatus {
 		Startup=1,
 		WaitingForDaemon=2,
 		Normal=10,
@@ -55,7 +55,7 @@ k_dcop:
 	* This is the method the daemon uses to report
 	* changes in its state.
 	*/
-	virtual ASYNC daemontqStatus(int) = 0;
+	virtual ASYNC daemonStatus(int) = 0;
 
 	/**
 	* This is the method the daemon uses to popup
@@ -67,7 +67,7 @@ k_dcop:
 	/**
 	* Report KPilot's state back to the daemon.
 	*/
-	virtual int kpilotqStatus() = 0;
+	virtual int kpiloStatus() = 0;
 } ;
 
 
diff --git a/kpilot/kpilotProbeDialog.cc b/kpilot/kpilotProbeDialog.cc
index bdec59e..3c163b1 100644
--- a/kpilot/kpilotProbeDialog.cc
+++ b/kpilot/kpilotProbeDialog.cc
@@ -95,15 +95,15 @@ ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) :
 	TQVBox *mainWidget = makeVBoxMainWidget();
 
 	fInfoText = new TQLabel( i18n( "KPilot is now trying to automatically detect the device of your handheld. Please press the hotsync button if you have not done so already." ), mainWidget, "fInfoText" );
-	fInfoText->tqsetAlignment( TQLabel::WordBreak );
+	fInfoText->setAlignment( TQLabel::WordBreak );
 
 	fStatusGroup = new TQGroupBox( i18n("Status"), mainWidget, "fStatusGroup" );
 	fStatusGroup->setColumnLayout(0, Qt::Vertical );
 	fStatusGroupLayout = new TQGridLayout( fStatusGroup->tqlayout() );
 
-	ftqStatus = new TQLabel( i18n("Autodetection not yet started..."), fStatusGroup, "fStatus" );
-	ftqStatus->tqsetAlignment( TQLabel::WordBreak );
-	fStatusGroupLayout->addWidget( ftqStatus, 0, 0 );
+	fStatus = new TQLabel( i18n("Autodetection not yet started..."), fStatusGroup, "fStatus" );
+	fStatus->setAlignment( TQLabel::WordBreak );
+	fStatusGroupLayout->addWidget( fStatus, 0, 0 );
 
 	fProgress = new KProgress( 100, fStatusGroup, "fProgress" );
 	fStatusGroupLayout->addWidget( fProgress, 1, 0 );
@@ -114,10 +114,10 @@ ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) :
 	fResultsGroup->setEnabled( FALSE );
 	fResultsGroup->setColumnLayout(0, Qt::Vertical );
 	fResultsGroupLayout = new TQGridLayout( fResultsGroup->tqlayout() );
-	fResultsGroupLayout->tqsetAlignment( TQt::AlignTop );
+	fResultsGroupLayout->setAlignment( TQt::AlignTop );
 
 	fUserLabel = new TQLabel( i18n( "Handheld user:" ), fResultsGroup, "fUserLabel" );
-	fUserLabel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, fUserLabel->sizePolicy().hasHeightForWidth() ) );
+	fUserLabel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, fUserLabel->sizePolicy().hasHeightForWidth() ) );
 	fResultsGroupLayout->addWidget( fUserLabel, 0, 0 );
 
 	fDeviceLabel = new TQLabel( i18n( "Device:" ), fResultsGroup, "fDeviceLabel" );
@@ -130,7 +130,7 @@ ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) :
 	fResultsGroupLayout->addWidget( fDevice, 1, 1 );
 
 
-	resize( TQSize(459, 298).expandedTo(tqminimumSizeHint()) );
+	resize( TQSize(459, 298).expandedTo(minimumSizeHint()) );
 	clearWState( WState_Polished );
 	enableButtonOK(false);
 
@@ -192,7 +192,7 @@ void ProbeDialog::startDetection()
 
 	disconnectDevices();
 	fProgress->setProgress(0);
-	ftqStatus->setText( i18n("Starting detection...") );
+	fStatus->setText( i18n("Starting detection...") );
 	TQTimer::singleShot(0, this, TQT_SLOT(processEvents()) );
 	processEvents();
 	PilotDaemonDCOP_stub *daemonStub = new PilotDaemonDCOP_stub("kpilotDaemon", "KPilotDaemonIface");
@@ -230,7 +230,7 @@ void ProbeDialog::startDetection()
 			processEvents();
 		}
 	}
-	ftqStatus->setText( i18n("Waiting for handheld to connect...") );
+	fStatus->setText( i18n("Waiting for handheld to connect...") );
 	mProbeDevicesIndex=0;
 
 	detect();
@@ -263,7 +263,7 @@ void ProbeDialog::timeout()
 {
 	disconnectDevices();
 	if (!mDetected) {
-		ftqStatus->setText( i18n("Timeout reached, could not detect a handheld.") );
+		fStatus->setText( i18n("Timeout reached, could not detect a handheld.") );
 		KMessageBox::information ( this, i18n("<qt>A handheld could not be detected. Possible check the following things:</p>"
 			"<ul><li> Have you pressed the hotsync button on the handheld?\n"
 			"<li> Make sure the device sits in the cradle correctly.\n"
@@ -285,7 +285,7 @@ void ProbeDialog::connection( KPilotDeviceLink*lnk)
 	mUserName = usr.name();
 	mDevice = mActiveLink->pilotPath();
 
-	ftqStatus->setText( i18n("Found a connected device on %1").tqarg(mDevice) );
+	fStatus->setText( i18n("Found a connected device on %1").tqarg(mDevice) );
 	fUser->setText( mUserName );
 	fDevice->setText( mDevice );
 	mDetected = true;
@@ -335,7 +335,7 @@ void ProbeDialog::disconnectDevices()
 {
 	FUNCTIONSETUP;
 
-	if (!mDetected) ftqStatus->setText( i18n("Disconnected from all devices") );
+	if (!mDetected) fStatus->setText( i18n("Disconnected from all devices") );
 	fProcessEventsTimer->stop( );
 	fTimeoutTimer->stop();
 	fProgressTimer->stop();
diff --git a/kpilot/kpilotProbeDialog.h b/kpilot/kpilotProbeDialog.h
index 997138a..c32e557 100644
--- a/kpilot/kpilotProbeDialog.h
+++ b/kpilot/kpilotProbeDialog.h
@@ -78,7 +78,7 @@ protected:
 	TQLabel* fUser;
 	TQLabel* fDevice;
 	TQGroupBox* fStatusGroup;
-	TQLabel* ftqStatus;
+	TQLabel* fStatus;
 	KProgress* fProgress;
 
 	TQTimer* fProcessEventsTimer;
diff --git a/kpilot/logFile.cc b/kpilot/logFile.cc
index b6fab0c..f066e7c 100644
--- a/kpilot/logFile.cc
+++ b/kpilot/logFile.cc
@@ -70,21 +70,21 @@ LogFile::LogFile() : DCOPObject("LogIface"), TQObject(), fOutfile(0L), fSyncing(
 	fSyncing = true;
 	fLogStream.setDevice(TQT_TQIODEVICE(fOutfile));
 
-	fLogStream<<(CSL1("KPilot HotSync log, %1").tqarg(TQDateTime::tqcurrentDateTime().toString()))<<endl<<endl<<endl;
-	fLogStream<<(CSL1("Version: KPilot %1").tqarg(TQString::tqfromLatin1(KPILOT_VERSION)))<<endl;
+	fLogStream<<(CSL1("KPilot HotSync log, %1").tqarg(TQDateTime::currentDateTime().toString()))<<endl<<endl<<endl;
+	fLogStream<<(CSL1("Version: KPilot %1").tqarg(TQString::fromLatin1(KPILOT_VERSION)))<<endl;
 	fLogStream<<(CSL1("Version: pilot-link %1.%2.%3%4" )
 		.tqarg(PILOT_LINK_VERSION).tqarg(PILOT_LINK_MAJOR).tqarg(PILOT_LINK_MINOR)
 #ifdef PILOT_LINK_PATCH
-		.tqarg(TQString::tqfromLatin1(PILOT_LINK_PATCH))
+		.tqarg(TQString::fromLatin1(PILOT_LINK_PATCH))
 #else
 		.tqarg(TQString())
 #endif
 		)<<endl;
 #ifdef TDE_VERSION_STRING
-	fLogStream<<(CSL1("Version: KDE %1" ).tqarg(TQString::tqfromLatin1(TDE_VERSION_STRING)) )<<endl;
+	fLogStream<<(CSL1("Version: KDE %1" ).tqarg(TQString::fromLatin1(TDE_VERSION_STRING)) )<<endl;
 #endif
 #ifdef TQT_VERSION_STR
-	fLogStream<<(CSL1("Version: TQt %1" ).tqarg(TQString::tqfromLatin1(TQT_VERSION_STR)) )<<endl;
+	fLogStream<<(CSL1("Version: TQt %1" ).tqarg(TQString::fromLatin1(TQT_VERSION_STR)) )<<endl;
 #endif
 	fLogStream<<endl<<endl;
 		
diff --git a/kpilot/logWidget.cc b/kpilot/logWidget.cc
index dbd9c5f..e84d62f 100644
--- a/kpilot/logWidget.cc
+++ b/kpilot/logWidget.cc
@@ -95,24 +95,24 @@ LogWidget::LogWidget(TQWidget * parent) :
 	TQString initialText ;
 
 	initialText.append(CSL1("<b>Version:</b> KPilot %1" TE_EOL)
-		.tqarg(TQString::tqfromLatin1(KPILOT_VERSION)));
+		.tqarg(TQString::fromLatin1(KPILOT_VERSION)));
 	initialText.append(CSL1("<b>Version:</b> pilot-link %1.%2.%3%4" TE_EOL)
 		.tqarg(PILOT_LINK_VERSION)
 		.tqarg(PILOT_LINK_MAJOR)
 		.tqarg(PILOT_LINK_MINOR)
 #ifdef PILOT_LINK_PATCH
-		.tqarg(TQString::tqfromLatin1(PILOT_LINK_PATCH))
+		.tqarg(TQString::fromLatin1(PILOT_LINK_PATCH))
 #else
 		.tqarg(TQString())
 #endif
 		);
 #ifdef TDE_VERSION_STRING
 	initialText.append(CSL1("<b>Version:</b> KDE %1" TE_EOL)
-		.tqarg(TQString::tqfromLatin1(TDE_VERSION_STRING)));
+		.tqarg(TQString::fromLatin1(TDE_VERSION_STRING)));
 #endif
 #ifdef TQT_VERSION_STR
 	initialText.append(CSL1("<b>Version:</b> TQt %1" TE_EOL)
-		.tqarg(TQString::tqfromLatin1(TQT_VERSION_STR)));
+		.tqarg(TQString::fromLatin1(TQT_VERSION_STR)));
 #endif
 
 	initialText.append(CSL1(TE_EOL));
@@ -172,7 +172,7 @@ LogWidget::LogWidget(TQWidget * parent) :
 		// This latin1() is ok; KPILOT_VERSION is a #define
 		// of a constant string.
 		int textWidth =fontMetrics().width(
-			TQString::tqfromLatin1(KPILOT_VERSION)) ;
+			TQString::fromLatin1(KPILOT_VERSION)) ;
 		int textHeight = fontMetrics().height();
 
 #ifdef DEBUG
@@ -189,10 +189,10 @@ LogWidget::LogWidget(TQWidget * parent) :
 			black);
 		painter.drawText(splash.width() -  25 - textWidth,
 			splash.height() - 8,
-			TQString::tqfromLatin1(KPILOT_VERSION));
+			TQString::fromLatin1(KPILOT_VERSION));
 		fSplash = new TQLabel(this);
 		fSplash->setPixmap(splash);
-		fSplash->tqsetAlignment(AlignCenter);
+		fSplash->setAlignment(AlignCenter);
 		TQTimer::singleShot(3000,this,TQT_SLOT(hideSplash()));
 		grid->addMultiCellWidget(fSplash,1,3,1,2);
 		grid->addColSpacing(0,10);
diff --git a/kpilot/memoWidget.cc b/kpilot/memoWidget.cc
index 53b220e..7675491 100644
--- a/kpilot/memoWidget.cc
+++ b/kpilot/memoWidget.cc
@@ -591,7 +591,7 @@ void MemoWidget::slotAddMemo()
 	FUNCTIONSETUP;
 	int currentCatID = findSelectedCategory(fCatList,
 		d->fMemoAppInfo->categoryInfo(), true);
-	addMemo(TQDateTime::tqcurrentDateTime().toString(), currentCatID);
+	addMemo(TQDateTime::currentDateTime().toString(), currentCatID);
 }
 
 void MemoWidget::slotImportMemo()
diff --git a/kpilot/pilotDaemon.cc b/kpilot/pilotDaemon.cc
index bbd8233..7ad7756 100644
--- a/kpilot/pilotDaemon.cc
+++ b/kpilot/pilotDaemon.cc
@@ -279,7 +279,7 @@ void PilotDaemonTray::endHotSync()
 
 PilotDaemon::PilotDaemon() :
 	DCOPObject("KPilotDaemonIface"),
-	fDaemontqStatus(INIT),
+	fDaemonStatus(INIT),
 	fPostSyncAction(None),
 	fPilotLink(0L),
 	fNextSyncType(SyncAction::SyncMode::eHotSync,true),
@@ -297,7 +297,7 @@ PilotDaemon::PilotDaemon() :
 	setupPilotLink();
 	reloadSettings();
 
-	if (fDaemontqStatus == ERROR)
+	if (fDaemonStatus == ERROR)
 	{
 		WARNINGKPILOT << "Connecting to device failed." << endl;
 		return;
@@ -403,7 +403,7 @@ void PilotDaemon::showTray()
 	DEBUGKPILOT << fname << ": Tray icon displayed." << endl;
 #endif
 
-	updateTraytqStatus();
+	updateTrayStatus();
 }
 
 /* DCOP ASYNC */ void PilotDaemon::setTempDevice(TQString d)
@@ -420,7 +420,7 @@ void PilotDaemon::showTray()
 {
 	FUNCTIONSETUP;
 
-	switch (fDaemontqStatus)
+	switch (fDaemonStatus)
 	{
 	case INIT:
 	case HOTSYNC_END:
@@ -508,7 +508,7 @@ void PilotDaemon::showTray()
 		}
 	}
 
-	updateTraytqStatus();
+	updateTrayStatus();
 	logProgress(TQString(),0);
 }
 
@@ -516,7 +516,7 @@ void PilotDaemon::showTray()
 {
 	fIsListening=false;
 	fTray->changeIcon(PilotDaemonTray::NotListening);
-	fDaemontqStatus=NOT_LISTENING;
+	fDaemonStatus=NOT_LISTENING;
 	fPilotLink->close();
 }
 
@@ -524,7 +524,7 @@ void PilotDaemon::showTray()
 {
 	fIsListening=true;
 	fTray->changeIcon(PilotDaemonTray::Normal);
-	fDaemontqStatus=INIT;
+	fDaemonStatus=INIT;
 	fPilotLink->reset();
 }
 
@@ -616,13 +616,13 @@ bool PilotDaemon::setupPilotLink()
 	// Using switch to make sure we cover all the cases.
 	//
 	//
-	switch (fDaemontqStatus)
+	switch (fDaemonStatus)
 	{
 	case INIT:
 	case HOTSYNC_END:
 	case ERROR:
 	case NOT_LISTENING:
-		getKPilot().daemontqStatus(KPilotDCOP::DaemonQuit);
+		getKPilot().daemonStatus(KPilotDCOP::DaemonQuit);
 		kapp->quit();
 		break;
 	case READY:
@@ -655,7 +655,7 @@ bool PilotDaemon::setupPilotLink()
 		return;
 	}
 
-	updateTraytqStatus();
+	updateTrayStatus();
 
 	if (fTray && (fTray->fSyncTypeMenu))
 	{
@@ -799,8 +799,8 @@ bool PilotDaemon::killDaemonOnExit()
 	return KPilotSettings::killDaemonAtExit();
 }
 
-typedef enum { NotLocked=0, Locked=1, DCOPError=2 } KDesktopLocktqStatus;
-static KDesktopLocktqStatus isKDesktopLockRunning()
+typedef enum { NotLocked=0, Locked=1, DCOPError=2 } KDesktopLockStatus;
+static KDesktopLockStatus isKDesktopLockRunning()
 {
 	if (!KPilotSettings::screenlockSecure()) return NotLocked;
 
@@ -847,7 +847,7 @@ static void informOthers(KPilotDCOP_stub &kpilot,
 	LoggerDCOP_stub &log,
 	LoggerDCOP_stub &filelog)
 {
-	kpilot.daemontqStatus(KPilotDCOP::StartOfHotSync);
+	kpilot.daemonStatus(KPilotDCOP::StartOfHotSync);
 	log.logStartSync();
 	filelog.logStartSync();
 }
@@ -864,7 +864,7 @@ static bool isSyncPossible(ActionQueue *fSyncStack,
 	* just tell the user that the sync couldn't run because
 	* of that.
 	*/
-	int kpilotstatus = kpilot.kpilotqStatus();
+	int kpilotstatus = kpilot.kpiloStatus();
 	DCOPStub::Status callstatus = kpilot.status();
 
 #ifdef DEBUG
@@ -1003,7 +1003,7 @@ bool PilotDaemon::shouldBackup()
 	(void) PilotDatabase::instanceCount();
 #endif
 
-	fDaemontqStatus = HOTSYNC_START ;
+	fDaemonStatus = HOTSYNC_START ;
 	if (fTray)
 	{
 		fTray->startHotSync();
@@ -1120,7 +1120,7 @@ launch:
 
 	TQTimer::singleShot(0,fSyncStack,TQT_SLOT(execConduit()));
 
-	updateTraytqStatus();
+	updateTrayStatus();
 }
 
 /* slot */ void PilotDaemon::logMessage(const TQString & s)
@@ -1129,7 +1129,7 @@ launch:
 
 	getLogger().logMessage(s);
 	getFileLogger().logMessage(s);
-	updateTraytqStatus(s);
+	updateTrayStatus(s);
 }
 
 /* slot */ void PilotDaemon::logError(const TQString & s)
@@ -1138,7 +1138,7 @@ launch:
 
 	getLogger().logError(s);
 	getFileLogger().logError(s);
-	updateTraytqStatus(s);
+	updateTrayStatus(s);
 }
 
 /* slot */ void PilotDaemon::logProgress(const TQString & s, int i)
@@ -1147,7 +1147,7 @@ launch:
 
 	getLogger().logProgress(s, i);
 	getFileLogger().logProgress(s, i);
-	if (!s.isEmpty()) updateTraytqStatus(s);
+	if (!s.isEmpty()) updateTrayStatus(s);
 }
 
 /* slot */ void PilotDaemon::endHotSync()
@@ -1166,15 +1166,15 @@ launch:
 	getFileLogger().logProgress(i18n("HotSync Completed.<br>"), 100);
 	getLogger().logEndSync();
 	getFileLogger().logEndSync();
-	getKPilot().daemontqStatus(KPilotDCOP::EndOfHotSync);
-	KPilotSettings::setLastSyncTime(TQDateTime::tqcurrentDateTime());
+	getKPilot().daemonStatus(KPilotDCOP::EndOfHotSync);
+	KPilotSettings::setLastSyncTime(TQDateTime::currentDateTime());
 	KPilotSettings::self()->writeConfig();
 
-	fDaemontqStatus = HOTSYNC_END;
+	fDaemonStatus = HOTSYNC_END;
 
 	if (fPostSyncAction & Quit)
 	{
-		getKPilot().daemontqStatus(KPilotDCOP::DaemonQuit);
+		getKPilot().daemonStatus(KPilotDCOP::DaemonQuit);
 		kapp->quit();
 	}
 	if (fPostSyncAction & ReloadSettings)
@@ -1191,7 +1191,7 @@ launch:
 
 	(void) PilotDatabase::instanceCount();
 
-	updateTraytqStatus();
+	updateTrayStatus();
 }
 
 
@@ -1264,7 +1264,7 @@ void PilotDaemon::slotRunConfig()
 	}
 }
 
-void PilotDaemon::updateTraytqStatus(const TQString &s)
+void PilotDaemon::updateTrayStatus(const TQString &s)
 {
 	if (!fTray) return;
 
diff --git a/kpilot/pilotDaemon.h b/kpilot/pilotDaemon.h
index bfae7bc..9e03360 100644
--- a/kpilot/pilotDaemon.h
+++ b/kpilot/pilotDaemon.h
@@ -138,7 +138,7 @@ public:
 	PilotDaemon();
 	~PilotDaemon();
 
-	enum DaemontqStatus
+	enum DaemonStatus
   	{
 		HOTSYNC_START,    // Hotsync is running
 		HOTSYNC_END,      // Hotsync is cleaning up
@@ -149,7 +149,7 @@ public:
 		NOT_LISTENING
 	};
 
-	DaemontqStatus status() const { return fDaemontqStatus; } ;
+	DaemonStatus status() const { return fDaemonStatus; } ;
 	/* DCOP */ virtual TQString statusString();
 	/* DCOP */ virtual TQString shorStatusString();
 
@@ -198,7 +198,7 @@ public:
 	virtual bool killDaemonOnExit();
 
 protected:
-	DaemontqStatus fDaemontqStatus;
+	DaemonStatus fDaemonStatus;
 
 	enum postSyncActions {
 		None=0,
@@ -244,7 +244,7 @@ private:
 	/**
 	* Set or change the tooltip displayed by the tray icon.
 	*/
-	void updateTraytqStatus(const TQString &s=TQString());
+	void updateTrayStatus(const TQString &s=TQString());
 
 	FileInstaller *fInstaller;
 
diff --git a/kpilot/todoEditor_base.ui b/kpilot/todoEditor_base.ui
index fbe6a1c..c6d7eab 100644
--- a/kpilot/todoEditor_base.ui
+++ b/kpilot/todoEditor_base.ui
@@ -127,7 +127,7 @@
             <property name="name">
                 <cstring>fDescription</cstring>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>80</height>