Rename old tq methods that no longer need a unique name

33 files changed, 138 insertions, 138 deletions

diff --git a/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui b/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui
index 4a1b81f..50a2b14 100644
--- a/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui
+++ b/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui
@@ -193,7 +193,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>41</width>
                             <height>20</height>
@@ -210,7 +210,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>31</width>
                             <height>20</height>
@@ -263,7 +263,7 @@ Do NOT change these values: doing so will almost certainly result in data loss w
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>210</height>
diff --git a/conduits/abbrowserconduit/kaddressbookConduit.ui b/conduits/abbrowserconduit/kaddressbookConduit.ui
index d2b42b7..7227cc7 100644
--- a/conduits/abbrowserconduit/kaddressbookConduit.ui
+++ b/conduits/abbrowserconduit/kaddressbookConduit.ui
@@ -51,7 +51,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>50</height>
@@ -241,7 +241,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>41</height>
@@ -402,7 +402,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>0</width>
                                 <height>20</height>
@@ -710,7 +710,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>31</width>
                                 <height>30</height>
diff --git a/conduits/docconduit/DOC-converter.cc b/conduits/docconduit/DOC-converter.cc
index cff8f19..d983b1c 100644
--- a/conduits/docconduit/DOC-converter.cc
+++ b/conduits/docconduit/DOC-converter.cc
@@ -570,7 +570,7 @@ bool DOCConverter::convertPDBtoTXT()
 		if (rec)
 		{
 			PilotDOCBookmark bookie(rec);
-			docBookmark*bmk=new docBookmark(TQString::tqfromLatin1(bookie.bookmarkName), bookie.pos);
+			docBookmark*bmk=new docBookmark(TQString::fromLatin1(bookie.bookmarkName), bookie.pos);
 			bmks.append(bmk);
 			KPILOT_DELETE(rec);
 		} else {
diff --git a/conduits/docconduit/doc-conduit.cc b/conduits/docconduit/doc-conduit.cc
index 0ac14f1..287b443 100644
--- a/conduits/docconduit/doc-conduit.cc
+++ b/conduits/docconduit/doc-conduit.cc
@@ -300,7 +300,7 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
 		}
 		if (!sinfo.pdbfilename.isEmpty() && DOCConduitSettings::keepPDBsLocally() ) {
 			PilotLocalDatabase*database=new PilotLocalDatabase(DOCConduitSettings::pDBDirectory(),
-				TQString::tqfromLatin1(sinfo.dbinfo.name), false);
+				TQString::fromLatin1(sinfo.dbinfo.name), false);
 			if (database) {
 				if ( database->deleteDatabase() !=0 ) {
 					WARNINGKPILOT << "Unable to delete database " << sinfo.dbinfo.name << " on the PC" << endl;
@@ -378,10 +378,10 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
 
 		if (!postSyncAction(database, sinfo, res))
 			emit logError(i18n("Unable to install the locally created PalmDOC %1 to the handheld.")
-				.tqarg(TQString::tqfromLatin1(sinfo.dbinfo.name)));
+				.tqarg(TQString::fromLatin1(sinfo.dbinfo.name)));
 		if (!res)
 			emit logError(i18n("Conversion of PalmDOC \"%1\" failed.")
-				.tqarg(TQString::tqfromLatin1(sinfo.dbinfo.name)));
+				.tqarg(TQString::fromLatin1(sinfo.dbinfo.name)));
 //		disconnect(&docconverter, TQT_SIGNAL(logError(const TQString &)), TQT_SIGNAL(logError(const TQString &)));
 //		disconnect(&docconverter, TQT_SIGNAL(logMessage(const TQString &)), TQT_SIGNAL(logMessage(const TQString &)));
 //		KPILOT_DELETE(database);
@@ -389,7 +389,7 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
 	else
 	{
 		emit logError(i18n("Unable to open or create the database %1.")
-			.tqarg(TQString::tqfromLatin1(sinfo.dbinfo.name)));
+			.tqarg(TQString::fromLatin1(sinfo.dbinfo.name)));
 	}
 	return res;
 }
@@ -414,21 +414,21 @@ void DOCConduit::syncNextDB() {
 
 	// if creator and/or type don't match, go to next db
 	if (!isCorrectDBTypeCreator(dbinfo) ||
-		fDBNames.contains(TQString::tqfromLatin1(dbinfo.name)))
+		fDBNames.contains(TQString::fromLatin1(dbinfo.name)))
 	{
 		TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB()));
 		return;
 	}
 
-	TQString txtfilename=constructTXTFileName(TQString::tqfromLatin1(dbinfo.name));
-	TQString pdbfilename=constructPDBFileName(TQString::tqfromLatin1(dbinfo.name));
+	TQString txtfilename=constructTXTFileName(TQString::fromLatin1(dbinfo.name));
+	TQString pdbfilename=constructPDBFileName(TQString::fromLatin1(dbinfo.name));
 
-	docSyncInfo syncInfo(TQString::tqfromLatin1(dbinfo.name),
+	docSyncInfo syncInfo(TQString::fromLatin1(dbinfo.name),
 		txtfilename, pdbfilename, eSyncNone);
 	syncInfo.dbinfo=dbinfo;
 	needsSync(syncInfo);
 	fSyncInfoList.append(syncInfo);
-	fDBNames.append(TQString::tqfromLatin1(dbinfo.name));
+	fDBNames.append(TQString::fromLatin1(dbinfo.name));
 
 	TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB()));
 	return;
@@ -476,12 +476,12 @@ void DOCConduit::syncNextTXT()
 
 	bool alreadySynced=fDBNames.contains(fl.baseName(TRUE));
 	if (!alreadySynced) {
-		docSyncInfo syncInfo(TQString::tqfromLatin1(dbinfo.name),
+		docSyncInfo syncInfo(TQString::fromLatin1(dbinfo.name),
 			txtfilename, pdbfilename, eSyncNone);
 		syncInfo.dbinfo=dbinfo;
 		needsSync(syncInfo);
 		fSyncInfoList.append(syncInfo);
-		fDBNames.append(TQString::tqfromLatin1(dbinfo.name));
+		fDBNames.append(TQString::fromLatin1(dbinfo.name));
 	} else {
 #ifdef DEBUG
 		DEBUGKPILOT<<txtfilename<<" has already been synced, skipping it."<<endl;
@@ -701,7 +701,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
 	FUNCTIONSETUP;
 	sinfo.direction = eSyncNone;
 
-	PilotDatabase*docdb=openDOCDatabase(TQString::tqfromLatin1(sinfo.dbinfo.name));
+	PilotDatabase*docdb=openDOCDatabase(TQString::fromLatin1(sinfo.dbinfo.name));
 	if (!fDBListSynced.contains(sinfo.handheldDB)) {
 		// the database wasn't included on last sync, so it has to be new.
 #ifdef DEBUG
@@ -716,29 +716,29 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
 			N   N   |     C          P           H
 		*/
 
-		if (TQFile::exists(sinfo.txtfilename)) sinfo.fPCtqStatus=eStatNew;
-		else sinfo.fPCtqStatus=eStatDoesntExist;
-		if (docdb && docdb->isOpen()) sinfo.fPalmtqStatus=eStatNew;
-		else sinfo.fPalmtqStatus=eStatDoesntExist;
+		if (TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatNew;
+		else sinfo.fPCStatus=eStatDoesntExist;
+		if (docdb && docdb->isOpen()) sinfo.fPalmStatus=eStatNew;
+		else sinfo.fPalmStatus=eStatDoesntExist;
 		KPILOT_DELETE(docdb);
 
 		switch (eSyncDirection) {
 			case eSyncPDAToPC:
-				if (sinfo.fPalmtqStatus==eStatDoesntExist)
+				if (sinfo.fPalmStatus==eStatDoesntExist)
 					sinfo.direction=eSyncDelete;
 				else sinfo.direction=eSyncPDAToPC;
 				break;
 			case eSyncPCToPDA:
-				if (sinfo.fPCtqStatus==eStatDoesntExist)
+				if (sinfo.fPCStatus==eStatDoesntExist)
 					sinfo.direction=eSyncDelete;
 				else sinfo.direction=eSyncPCToPDA;
 				break;
 			case eSyncNone: // means actually both directions!
-				if (sinfo.fPCtqStatus==eStatNew) {
-					if (sinfo.fPalmtqStatus==eStatNew) sinfo.direction=eSyncConflict;
+				if (sinfo.fPCStatus==eStatNew) {
+					if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncConflict;
 					else sinfo.direction=eSyncPCToPDA;
 				} else {
-					if (sinfo.fPalmtqStatus==eStatNew) sinfo.direction=eSyncPDAToPC;
+					if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncPDAToPC;
 					else {
 						sinfo.direction=eSyncNone;
 #ifdef DEBUG
@@ -756,9 +756,9 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
 	}
 
 	// Text was included in the last sync
-	if (!TQFile::exists(sinfo.txtfilename)) sinfo.fPCtqStatus=eStatDeleted;
+	if (!TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatDeleted;
 	else if(pcTextChanged(sinfo.txtfilename)) {
-		sinfo.fPCtqStatus=eStatChanged;
+		sinfo.fPCStatus=eStatChanged;
 #ifdef DEBUG
 		DEBUGKPILOT<<"PC side has changed!"<<endl;
 #endif
@@ -769,12 +769,12 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
 #endif
 	}
 
-	if (!docdb || !docdb->isOpen()) sinfo.fPalmtqStatus=eStatDeleted;
+	if (!docdb || !docdb->isOpen()) sinfo.fPalmStatus=eStatDeleted;
 	else if (hhTextChanged(docdb)) {
 #ifdef DEBUG
 		DEBUGKPILOT<<"Handheld side has changed!"<<endl;
 #endif
-		sinfo.fPalmtqStatus=eStatChanged;
+		sinfo.fPalmStatus=eStatChanged;
 #ifdef DEBUG
 	} else {
 		DEBUGKPILOT<<"Handheld side has NOT changed!"<<endl;
@@ -800,7 +800,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
 		*/
 
 
-	if (sinfo.fPCtqStatus == eStatNone && sinfo.fPalmtqStatus==eStatNone) {
+	if (sinfo.fPCStatus == eStatNone && sinfo.fPalmStatus==eStatNone) {
 #ifdef DEBUG
 		DEBUGKPILOT<<"Nothing has changed, not need for a sync."<<endl;
 #endif
@@ -813,12 +813,12 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
 	// to sync that direction
 
 	if (eSyncDirection==eSyncPCToPDA) {
-		if (sinfo.fPCtqStatus==eStatDeleted) sinfo.direction=eSyncDelete;
+		if (sinfo.fPCStatus==eStatDeleted) sinfo.direction=eSyncDelete;
 		else sinfo.direction=eSyncPCToPDA;
 		return true;
 	}
 	if (eSyncDirection==eSyncPDAToPC) {
-		if (sinfo.fPalmtqStatus==eStatDeleted) sinfo.direction=eSyncDelete;
+		if (sinfo.fPalmStatus==eStatDeleted) sinfo.direction=eSyncDelete;
 		else sinfo.direction=eSyncPDAToPC;
 		return true;
 	}
@@ -830,8 +830,8 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
 
 
 	// if either is deleted, and the other is not changed, delete
-	if ( ((sinfo.fPCtqStatus==eStatDeleted) && (sinfo.fPalmtqStatus!=eStatChanged)) ||
-	     ((sinfo.fPalmtqStatus==eStatDeleted) && (sinfo.fPCtqStatus!=eStatChanged)) )
+	if ( ((sinfo.fPCStatus==eStatDeleted) && (sinfo.fPalmStatus!=eStatChanged)) ||
+	     ((sinfo.fPalmStatus==eStatDeleted) && (sinfo.fPCStatus!=eStatChanged)) )
 	{
 #ifdef DEBUG
 		DEBUGKPILOT<<"DB was deleted on one side and not changed on "
@@ -843,7 +843,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
 
 	// eStatDeleted (and both not changed) have already been treated, for all
 	// other values in combination with eStatNone, just copy the texts.
-	if (sinfo.fPCtqStatus==eStatNone) {
+	if (sinfo.fPCStatus==eStatNone) {
 #ifdef DEBUG
 		DEBUGKPILOT<<"PC side has changed!"<<endl;
 #endif
@@ -851,7 +851,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
 		return true;
 	}
 
-	if (sinfo.fPalmtqStatus==eStatNone) {
+	if (sinfo.fPalmStatus==eStatNone) {
 		sinfo.direction=eSyncPCToPDA;
 		return true;
 	}
@@ -922,11 +922,11 @@ PilotDatabase *DOCConduit::preSyncAction(docSyncInfo &sinfo) const
 	if (DOCConduitSettings::keepPDBsLocally())
 	{
 		return new PilotLocalDatabase(DOCConduitSettings::pDBDirectory(),
-			TQString::tqfromLatin1(dbinfo.name), false);
+			TQString::fromLatin1(dbinfo.name), false);
 	}
 	else
 	{
-		return deviceLink()->database(TQString::tqfromLatin1(dbinfo.name));
+		return deviceLink()->database(TQString::fromLatin1(dbinfo.name));
 	}
 }
 
@@ -950,7 +950,7 @@ bool DOCConduit::postSyncAction(PilotDatabase * database,
 		if (DOCConduitSettings::keepPDBsLocally() && !DOCConduitSettings::localSync())
 		{
 			PilotDatabase*db=deviceLink()->database(
-				TQString::tqfromLatin1(sinfo.dbinfo.name));
+				TQString::fromLatin1(sinfo.dbinfo.name));
 #ifdef DEBUG
 			DEBUGKPILOT<<"Middle 1 Resetting sync flags for database "
 				<<sinfo.dbinfo.name<<endl;
diff --git a/conduits/docconduit/doc-conduit.h b/conduits/docconduit/doc-conduit.h
index 7b50adc..a7e7a44 100644
--- a/conduits/docconduit/doc-conduit.h
+++ b/conduits/docconduit/doc-conduit.h
@@ -41,7 +41,7 @@ typedef enum eSyncDirectionEnum {
 		eSyncDelete,
 		eSyncConflict
 	};
-typedef enum eTextqStatus {
+typedef enum eTexStatus {
 	eStatNone=0,
 	eStatNew=1,
 	eStatChanged=2,
@@ -139,14 +139,14 @@ public:
 		txtfilename=txtfn;
 		pdbfilename=pdbfn;
 		direction=dir;
-		fPCtqStatus=eStatNone;
-		fPalmtqStatus=eStatNone;
+		fPCStatus=eStatNone;
+		fPalmStatus=eStatNone;
 	};
 	~docSyncInfo(){};
 	TQString handheldDB, txtfilename, pdbfilename;
 	DBInfo dbinfo;
 	eSyncDirectionEnum direction;
-	eTextqStatus fPCtqStatus, fPalmtqStatus;
+	eTexStatus fPCStatus, fPalmStatus;
 };
 
 
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"));
 }
diff --git a/conduits/docconduit/doc-setupdialog.ui b/conduits/docconduit/doc-setupdialog.ui
index e59025e..e04be16 100644
--- a/conduits/docconduit/doc-setupdialog.ui
+++ b/conduits/docconduit/doc-setupdialog.ui
@@ -153,7 +153,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -222,7 +222,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -304,7 +304,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -492,7 +492,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
diff --git a/conduits/docconduit/kpalmdoc_dlg.cc b/conduits/docconduit/kpalmdoc_dlg.cc
index 58ca0aa..728c2c3 100644
--- a/conduits/docconduit/kpalmdoc_dlg.cc
+++ b/conduits/docconduit/kpalmdoc_dlg.cc
@@ -73,7 +73,7 @@ ConverterDlg::ConverterDlg( TQWidget *parent, const TQString& caption)
 	connect(dlg->fTextToPDB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToPDB()));
 	connect(dlg->fPDBToText, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToText()));
 
-	resize(tqminimumSize());
+	resize(minimumSize());
 }
 
 ConverterDlg::~ConverterDlg()
diff --git a/conduits/docconduit/kpalmdoc_dlgbase.ui b/conduits/docconduit/kpalmdoc_dlgbase.ui
index 9b92d8d..c693e90 100644
--- a/conduits/docconduit/kpalmdoc_dlgbase.ui
+++ b/conduits/docconduit/kpalmdoc_dlgbase.ui
@@ -127,7 +127,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -181,7 +181,7 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -198,7 +198,7 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -215,7 +215,7 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -299,7 +299,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>21</width>
                                 <height>200</height>
@@ -329,7 +329,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>21</width>
                                 <height>190</height>
diff --git a/conduits/docconduit/pilotDOCEntry.h b/conduits/docconduit/pilotDOCEntry.h
index 679f35a..4ecaf19 100644
--- a/conduits/docconduit/pilotDOCEntry.h
+++ b/conduits/docconduit/pilotDOCEntry.h
@@ -50,7 +50,7 @@ public:
 
 	TQString getText() {
 		fText.Decompress();
-		return TQString::tqfromLatin1((const char *) fText.text());
+		return TQString::fromLatin1((const char *) fText.text());
 	};
 	void setText(TQString newtext, bool compressed = false) {
 		fText.setText((const unsigned char *) newtext.latin1(),
diff --git a/conduits/knotes/knotes-action.cc b/conduits/knotes/knotes-action.cc
index 7664f46..08acbac 100644
--- a/conduits/knotes/knotes-action.cc
+++ b/conduits/knotes/knotes-action.cc
@@ -234,7 +234,7 @@ KNotesAction::KNotesAction(KPilotLink *o,
 	}
 
 	fP->fTimer = new TQTimer(this);
-	fActiontqStatus = Init;
+	fActionStatus = Init;
 	
 	// this is not needed. As it is done in the initstate in process();
 	// resetIndexes();
@@ -308,9 +308,9 @@ void KNotesAction::listNotes()
 {
 	FUNCTIONSETUP;
 
-	DEBUGKPILOT << fname << ": Now in state " << fActiontqStatus << endl;
+	DEBUGKPILOT << fname << ": Now in state " << fActionStatus << endl;
 
-	switch(fActiontqStatus)
+	switch(fActionStatus)
 	{
 	case Init:
 		resetIndexes();
@@ -321,16 +321,16 @@ void KNotesAction::listNotes()
 		case SyncAction::SyncMode::eBackup:
 		case SyncAction::SyncMode::eRestore:
 			// Impossible!
-			fActiontqStatus = Done;
+			fActionStatus = Done;
 			break;
 		case SyncAction::SyncMode::eCopyHHToPC :
 			listNotes(); // Debugging
-			fActiontqStatus = MemosToKNotes;
+			fActionStatus = MemosToKNotes;
 			break;
 		case SyncAction::SyncMode::eHotSync:
 		case SyncAction::SyncMode::eFullSync:
 		case SyncAction::SyncMode::eCopyPCToHH:
-			fActiontqStatus = ModifiedNotesToPilot;
+			fActionStatus = ModifiedNotesToPilot;
 			break;
 		}
 		break;
@@ -338,14 +338,14 @@ void KNotesAction::listNotes()
 		if (modifyNoteOnPilot())
 		{
 			resetIndexes();
-			fActiontqStatus = DeleteNotesOnPilot;
+			fActionStatus = DeleteNotesOnPilot;
 		}
 		break;
 	case DeleteNotesOnPilot:
 		if (deleteNoteOnPilot())
 		{
 			resetIndexes();
-			fActiontqStatus = NewNotesToPilot;
+			fActionStatus = NewNotesToPilot;
 		}
 		break;
 	case NewNotesToPilot :
@@ -359,14 +359,14 @@ void KNotesAction::listNotes()
 			case SyncAction::SyncMode::eRestore:
 			case SyncAction::SyncMode::eCopyHHToPC :
 				// Impossible!
-				fActiontqStatus = Done;
+				fActionStatus = Done;
 				break;
 			case SyncAction::SyncMode::eHotSync:
 			case SyncAction::SyncMode::eFullSync:
-				fActiontqStatus = MemosToKNotes;
+				fActionStatus = MemosToKNotes;
 				break;
 			case SyncAction::SyncMode::eCopyPCToHH:
-				fActiontqStatus = Cleanup;
+				fActionStatus = Cleanup;
 				break;
 			}
 		}
@@ -374,7 +374,7 @@ void KNotesAction::listNotes()
 	case MemosToKNotes :
 		if (syncMemoToKNotes())
 		{
-			fActiontqStatus=Cleanup;
+			fActionStatus=Cleanup;
 		}
 		break;
 	case Cleanup :
@@ -791,7 +791,7 @@ void KNotesAction::cleanupMemos()
 	KNotesConduitSettings::setMemoIds(memos);
 	KNotesConduitSettings::self()->writeConfig();
 
-	fActiontqStatus=Done;
+	fActionStatus=Done;
 	fDatabase->cleanup();
 	fDatabase->resetSyncFlags();
 	fLocalDatabase->cleanup();
@@ -848,7 +848,7 @@ void KNotesAction::cleanupMemos()
 
 /* virtual */ TQString KNotesAction::statusString() const
 {
-	switch(fActiontqStatus)
+	switch(fActionStatus)
 	{
 	case Init : return CSL1("Init");
 	case NewNotesToPilot :
@@ -864,7 +864,7 @@ void KNotesAction::cleanupMemos()
 	case Done :
 		return CSL1("Done");
 	default :
-		return CSL1("Unknown (%1)").tqarg(fActiontqStatus);
+		return CSL1("Unknown (%1)").tqarg(fActionStatus);
 	}
 }
 
diff --git a/conduits/knotes/knotes-action.h b/conduits/knotes/knotes-action.h
index 223dfe2..bd057b7 100644
--- a/conduits/knotes/knotes-action.h
+++ b/conduits/knotes/knotes-action.h
@@ -45,7 +45,7 @@ public:
 		const TQStringList &a = TQStringList() );
 	virtual ~KNotesAction();
 
-	enum tqStatus { Init,
+	enum Status { Init,
 		ModifiedNotesToPilot,
 		DeleteNotesOnPilot,
 		NewNotesToPilot,
diff --git a/conduits/knotes/setup_base.ui b/conduits/knotes/setup_base.ui
index 15d902f..1757b88 100644
--- a/conduits/knotes/setup_base.ui
+++ b/conduits/knotes/setup_base.ui
@@ -72,7 +72,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>101</height>
diff --git a/conduits/malconduit/mal-conduit.cc b/conduits/malconduit/mal-conduit.cc
index 69a3f19..a8d9dec 100644
--- a/conduits/malconduit/mal-conduit.cc
+++ b/conduits/malconduit/mal-conduit.cc
@@ -144,7 +144,7 @@ void MALConduit::readConfig()
 void MALConduit::saveConfig()
 {
 	FUNCTIONSETUP;
-	MALConduitSettings::setLastMALSync( TQDateTime::tqcurrentDateTime() );
+	MALConduitSettings::setLastMALSync( TQDateTime::currentDateTime() );
 	MALConduitSettings::self()->writeConfig();
 }
 
@@ -152,7 +152,7 @@ void MALConduit::saveConfig()
 
 bool MALConduit::skip() 
 {
-	TQDateTime now=TQDateTime::tqcurrentDateTime();
+	TQDateTime now=TQDateTime::currentDateTime();
 	TQDateTime lastSync=MALConduitSettings::lastMALSync();
 	
 	if (!lastSync.isValid() || !now.isValid()) return false;
diff --git a/conduits/malconduit/mal-setup_dialog.ui b/conduits/malconduit/mal-setup_dialog.ui
index ff78fd3..b6cf743 100644
--- a/conduits/malconduit/mal-setup_dialog.ui
+++ b/conduits/malconduit/mal-setup_dialog.ui
@@ -137,7 +137,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -245,7 +245,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -397,7 +397,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>70</height>
@@ -489,7 +489,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -559,7 +559,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
diff --git a/conduits/memofileconduit/memofile-conduit.cc b/conduits/memofileconduit/memofile-conduit.cc
index 42461f5..5a26ee7 100644
--- a/conduits/memofileconduit/memofile-conduit.cc
+++ b/conduits/memofileconduit/memofile-conduit.cc
@@ -368,7 +368,7 @@ void MemofileConduit::getModifiedFromPilot()
 {
 	FUNCTIONSETUP;
 
-	DEBUGKPILOT << fname << ": Now in state " << fActiontqStatus << endl;
+	DEBUGKPILOT << fname << ": Now in state " << fActionStatus << endl;
 }
 
 
diff --git a/conduits/memofileconduit/setup_base.ui b/conduits/memofileconduit/setup_base.ui
index d3bf795..fba82af 100644
--- a/conduits/memofileconduit/setup_base.ui
+++ b/conduits/memofileconduit/setup_base.ui
@@ -81,7 +81,7 @@ the Memofile-conduit settings.</comment>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>180</height>
diff --git a/conduits/notepadconduit/notepad-setup.ui b/conduits/notepadconduit/notepad-setup.ui
index 02aec75..ac74d9d 100644
--- a/conduits/notepadconduit/notepad-setup.ui
+++ b/conduits/notepadconduit/notepad-setup.ui
@@ -45,7 +45,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>250</height>
diff --git a/conduits/null/setup_base.ui b/conduits/null/setup_base.ui
index f64d05c..7cfcbe4 100644
--- a/conduits/null/setup_base.ui
+++ b/conduits/null/setup_base.ui
@@ -109,7 +109,7 @@ the Null-conduit settings.</comment>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
diff --git a/conduits/popmail/popmail-conduit.cc b/conduits/popmail/popmail-conduit.cc
index 15441e5..8f51545 100644
--- a/conduits/popmail/popmail-conduit.cc
+++ b/conduits/popmail/popmail-conduit.cc
@@ -319,7 +319,7 @@ void PopMailConduit::writeMessageToFile(FILE* sendf, struct Mail& theMail)
 	// if our struct indicates that it's dated, then use the date it
 	// holds.  otherwise, provide current date.  either way, we need to
 	// have a date...
-	TQDateTime date = TQDateTime::tqcurrentDateTime();
+	TQDateTime date = TQDateTime::currentDateTime();
 	if (theMail.dated)
 	{
 		date = readTm(theMail.date);
@@ -377,7 +377,7 @@ void PopMailConduit::writeMessageToFile(FILE* sendf, struct Mail& theMail)
 		<< outbox
 		<< endl;
 
-	TQDateTime date = TQDateTime::tqcurrentDateTime();
+	TQDateTime date = TQDateTime::currentDateTime();
 	TQString dateString = date.toString(DATE_FORMAT);
 
 	DEBUGKPILOT << fname << ": Date format example: [" << dateString
diff --git a/conduits/popmail/setup-dialog.ui b/conduits/popmail/setup-dialog.ui
index 38b0c27..5d0566d 100644
--- a/conduits/popmail/setup-dialog.ui
+++ b/conduits/popmail/setup-dialog.ui
@@ -47,7 +47,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
diff --git a/conduits/recordconduit/setup_base.ui b/conduits/recordconduit/setup_base.ui
index 3608371..448a099 100644
--- a/conduits/recordconduit/setup_base.ui
+++ b/conduits/recordconduit/setup_base.ui
@@ -128,7 +128,7 @@ the Record-conduit settings.</comment>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
diff --git a/conduits/sysinfoconduit/sysinfo-conduit.cc b/conduits/sysinfoconduit/sysinfo-conduit.cc
index 4d1a35f..372fbd2 100644
--- a/conduits/sysinfoconduit/sysinfo-conduit.cc
+++ b/conduits/sysinfoconduit/sysinfo-conduit.cc
@@ -214,14 +214,14 @@ void SysInfoConduit::hardwareInfo()
 		* - #devicetype#
 		*/
 		KPilotSysInfo sysinfo = fHandle->getSysInfo();
-		fValues[CSL1("deviceid")] = TQString::tqfromLatin1(sysinfo.getProductID());
+		fValues[CSL1("deviceid")] = TQString::fromLatin1(sysinfo.getProductID());
 
 		const KPilotCard *device = fHandle->getCardInfo();
 		if (device)
 		{
-			fValues[CSL1("devicename")] = TQString::tqfromLatin1(device->getCardName());
+			fValues[CSL1("devicename")] = TQString::fromLatin1(device->getCardName());
 			fValues[CSL1("devicemodel")] = unknown;  // TODO
-			fValues[CSL1("manufacturer")] = TQString::tqfromLatin1(device->getCardManufacturer());
+			fValues[CSL1("manufacturer")] = TQString::fromLatin1(device->getCardManufacturer());
 		}
 		else
 		{
@@ -299,8 +299,8 @@ void SysInfoConduit::storageInfo()
 		const KPilotCard *device = fHandle->getCardInfo(1);
 		if (device) {
 			fValues[CSL1("cards")] = CSL1("%1 (%2, %3 kB of %3 kB free)")
-				.tqarg(TQString::tqfromLatin1(device->getCardName()))
-				.tqarg(TQString::tqfromLatin1(device->getCardManufacturer()))
+				.tqarg(TQString::fromLatin1(device->getCardName()))
+				.tqarg(TQString::fromLatin1(device->getCardManufacturer()))
 				.tqarg(device->getRamFree()/1024)
 				.tqarg(device->getRamSize()/1024);
 			KPILOT_DELETE(device);
@@ -400,7 +400,7 @@ void SysInfoConduit::pcVersionInfo()
 		 * - #kpilot#
 		 * - #pilotlink#
 		 */
-		fValues[CSL1("kpilot")] = TQString::tqfromLatin1(KPILOT_VERSION);
+		fValues[CSL1("kpilot")] = TQString::fromLatin1(KPILOT_VERSION);
 		fValues[CSL1("kde")] = i18n("unknown");
 		fValues[CSL1("qt")] = i18n("unknown");
 		fValues[CSL1("os")] = i18n("unknown");
@@ -408,23 +408,23 @@ void SysInfoConduit::pcVersionInfo()
 		struct utsname name;
 		if (uname (&name) >= 0) {
 			fValues[CSL1("os")] = CSL1("%1 %3, %5")
-				.tqarg(TQString::tqfromLatin1(name.sysname))
-				.tqarg(TQString::tqfromLatin1(name.release))
-				.tqarg(TQString::tqfromLatin1(name.machine));
-			fValues[CSL1("hostname")] = CSL1("%2").tqarg(TQString::tqfromLatin1(name.nodename));
+				.tqarg(TQString::fromLatin1(name.sysname))
+				.tqarg(TQString::fromLatin1(name.release))
+				.tqarg(TQString::fromLatin1(name.machine));
+			fValues[CSL1("hostname")] = CSL1("%2").tqarg(TQString::fromLatin1(name.nodename));
 		}
 #ifdef TDE_VERSION_STRING
-		fValues[CSL1("kde")] = TQString::tqfromLatin1(TDE_VERSION_STRING);
+		fValues[CSL1("kde")] = TQString::fromLatin1(TDE_VERSION_STRING);
 #endif
 #ifdef TQT_VERSION_STR
-		fValues[CSL1("qt")] = TQString::tqfromLatin1(TQT_VERSION_STR);
+		fValues[CSL1("qt")] = TQString::fromLatin1(TQT_VERSION_STR);
 #endif
 		fValues[CSL1("pilotlink")] = CSL1("%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
@@ -470,7 +470,7 @@ void SysInfoConduit::writeFile()
 {
 	FUNCTIONSETUP;
 
-	fValues[CSL1("date")] = TQDateTime::tqcurrentDateTime().toString(Qt::LocalDate);
+	fValues[CSL1("date")] = TQDateTime::currentDateTime().toString(Qt::LocalDate);
 
 	TQString output;
 	// Open the template file
@@ -552,11 +552,11 @@ void SysInfoConduit::writeFile()
 			 * %8 .. modifyDate
 			 * %9 .. backupDate
 			 */
-			newpatt.replace(CSL1("%0"), TQString::tqfromLatin1(dbi.name));
+			newpatt.replace(CSL1("%0"), TQString::fromLatin1(dbi.name));
 			set_long(&tmpchr[0],dbi.type);
-			newpatt.replace(CSL1("%1"), TQString::tqfromLatin1(tmpchr));
+			newpatt.replace(CSL1("%1"), TQString::fromLatin1(tmpchr));
 			set_long(&tmpchr[0],dbi.creator);
-			newpatt.replace(CSL1("%2"), TQString::tqfromLatin1(tmpchr));
+			newpatt.replace(CSL1("%2"), TQString::fromLatin1(tmpchr));
 			newpatt.replace(CSL1("%3"), TQString::number(dbi.index));
 			newpatt.replace(CSL1("%4"), TQString::number(dbi.flags));
 			newpatt.replace(CSL1("%5"), TQString::number(dbi.miscFlags));
diff --git a/conduits/sysinfoconduit/sysinfo-setup_dialog.ui b/conduits/sysinfoconduit/sysinfo-setup_dialog.ui
index 7e5fbc1..d23be0e 100644
--- a/conduits/sysinfoconduit/sysinfo-setup_dialog.ui
+++ b/conduits/sysinfoconduit/sysinfo-setup_dialog.ui
@@ -48,7 +48,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>51</height>
@@ -160,7 +160,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>21</width>
                                 <height>20</height>
diff --git a/conduits/timeconduit/time-conduit.cc b/conduits/timeconduit/time-conduit.cc
index 20000e5..76798db 100644
--- a/conduits/timeconduit/time-conduit.cc
+++ b/conduits/timeconduit/time-conduit.cc
@@ -83,7 +83,7 @@ void TimeConduit::readConfig()
 	{
 #ifdef DEBUG
 		DEBUGKPILOT << fname << ": Would have set time to "
-			<< TQDateTime::tqcurrentDateTime().toString() << endl;
+			<< TQDateTime::currentDateTime().toString() << endl;
 #endif
 		return delayDone();
 	}
diff --git a/conduits/vcalconduit/hhtopcstate.cc b/conduits/vcalconduit/hhtopcstate.cc
index 4fa12af..82024f1 100644
--- a/conduits/vcalconduit/hhtopcstate.cc
+++ b/conduits/vcalconduit/hhtopcstate.cc
@@ -123,7 +123,7 @@ void HHToPCState::handleRecord( ConduitAction *ca )
 		{
 			KCal::Incidence *e = vccb->addRecord( r );
 			if ( vccb->config()->syncArchived() && archiveRecord )  {
-				e->setSynctqStatus( KCal::Incidence::SYNCDEL );
+				e->setSyncStatus( KCal::Incidence::SYNCDEL );
 			}
 		}
 	}
@@ -218,7 +218,7 @@ void VCalConduitBase::slotPalmRecToPC()
 		{
 			KCal::Incidence*e=addRecord(r);
 			if (config()->syncArchived() && archiveRecord)  {
-				e->setSynctqStatus(KCal::Incidence::SYNCDEL);
+				e->setSyncStatus(KCal::Incidence::SYNCDEL);
 			}
 		}
 	}
diff --git a/conduits/vcalconduit/korganizerConduit.ui b/conduits/vcalconduit/korganizerConduit.ui
index 52904b4..7fa4491 100644
--- a/conduits/vcalconduit/korganizerConduit.ui
+++ b/conduits/vcalconduit/korganizerConduit.ui
@@ -79,7 +79,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -243,7 +243,7 @@ be saved in the calendar on the PC.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>31</height>
diff --git a/conduits/vcalconduit/pctohhstate.cc b/conduits/vcalconduit/pctohhstate.cc
index 84d50ed..d2866fd 100644
--- a/conduits/vcalconduit/pctohhstate.cc
+++ b/conduits/vcalconduit/pctohhstate.cc
@@ -120,7 +120,7 @@ void PCToHHState::handleRecord( ConduitAction *ca )
 
 	if( id > 0 && ( s = vccb->database()->readRecordById( id ) ) )
 	{
-		if( e->synctqStatus() == KCal::Incidence::SYNCDEL )
+		if( e->syncStatus() == KCal::Incidence::SYNCDEL )
 		{
 			vccb->deletePalmRecord( e, s );
 		}
diff --git a/conduits/vcalconduit/todo-conduit.cc b/conduits/vcalconduit/todo-conduit.cc
index 8a04f15..4dee60e 100644
--- a/conduits/vcalconduit/todo-conduit.cc
+++ b/conduits/vcalconduit/todo-conduit.cc
@@ -154,13 +154,13 @@ KCal::Incidence *TodoConduitPrivate::getNextModifiedIncidence()
 	}
 	if ( fAllTodosIterator != fAllTodos.end() ) e=*fAllTodosIterator;
 	while (fAllTodosIterator != fAllTodos.end() &&
-		e && e->synctqStatus()!=KCal::Incidence::SYNCMOD && e->pilotId())
+		e && e->syncStatus()!=KCal::Incidence::SYNCMOD && e->pilotId())
 	{
 		e = (++fAllTodosIterator != fAllTodos.end()) ? *fAllTodosIterator : 0L;
 
 #ifdef DEBUG
 	if(e)
-		DEBUGKPILOT<< e->summary()<<" had SyncStatus="<<e->synctqStatus()<<endl;
+		DEBUGKPILOT<< e->summary()<<" had SyncStatus="<<e->syncStatus()<<endl;
 #endif
 
 	}
diff --git a/conduits/vcalconduit/todoRecord.cc b/conduits/vcalconduit/todoRecord.cc
index f3baaeb..7618df3 100644
--- a/conduits/vcalconduit/todoRecord.cc
+++ b/conduits/vcalconduit/todoRecord.cc
@@ -126,7 +126,7 @@ bool KCalSync::setTodo(KCal::Todo *e,
 	// COMPLETED? //
 	e->setCompleted(de->getComplete());
 	if ( de->getComplete() && !e->hasCompletedDate() ) {
-		e->setCompleted( TQDateTime::tqcurrentDateTime() );
+		e->setCompleted( TQDateTime::currentDateTime() );
 	}
 
 	e->setSummary(de->getDescription());
@@ -134,8 +134,8 @@ bool KCalSync::setTodo(KCal::Todo *e,
 
 	// NOTE: This MUST be done last, since every other set* call
 	// calls updated(), which will trigger an
-	// setSynctqStatus(SYNCMOD)!!!
-	e->setSynctqStatus(KCal::Incidence::SYNCNONE);
+	// setSyncStatus(SYNCMOD)!!!
+	e->setSyncStatus(KCal::Incidence::SYNCNONE);
 
 	return true;
 }
diff --git a/conduits/vcalconduit/vcal-conduit.cc b/conduits/vcalconduit/vcal-conduit.cc
index 52bd759..4b82f16 100644
--- a/conduits/vcalconduit/vcal-conduit.cc
+++ b/conduits/vcalconduit/vcal-conduit.cc
@@ -155,7 +155,7 @@ KCal::Incidence *VCalConduitPrivate::getNextModifiedIncidence()
 	if ( fAllEventsIterator != fAllEvents.end() ) e = *fAllEventsIterator;
 	// Then walk the list until we find an unsynced entry
 	while ( fAllEventsIterator != fAllEvents.end() &&
-		e && e->synctqStatus()!=KCal::Incidence::SYNCMOD && e->pilotId() > 0)
+		e && e->syncStatus()!=KCal::Incidence::SYNCMOD && e->pilotId() > 0)
 	{
 		e = (++fAllEventsIterator != fAllEvents.end()) ? *fAllEventsIterator : 0L;
 	}
diff --git a/conduits/vcalconduit/vcal-conduitbase.cc b/conduits/vcalconduit/vcal-conduitbase.cc
index 33ae4f1..59351ac 100644
--- a/conduits/vcalconduit/vcal-conduitbase.cc
+++ b/conduits/vcalconduit/vcal-conduitbase.cc
@@ -452,7 +452,7 @@ KCal::Incidence*VCalConduitBase::changeRecord(PilotRecord *r,PilotRecord *)
 	if ( e && de )
 	{
 		// TODO: check for conflict, and if there is one, ask for resolution
-		if ( ( e->synctqStatus() != KCal::Incidence::SYNCNONE )
+		if ( ( e->syncStatus() != KCal::Incidence::SYNCNONE )
 			&& r->isModified() )
 		{
 			// TODO: I have not yet found a way to complete ignore an item
@@ -468,8 +468,8 @@ KCal::Incidence*VCalConduitBase::changeRecord(PilotRecord *r,PilotRecord *)
 
 		// NOTE: This MUST be done last, since every other set* call
 		// calls updated(), which will trigger an
-		// setSynctqStatus(SYNCMOD)!!!
-		e->setSynctqStatus(KCal::Incidence::SYNCNONE);
+		// setSyncStatus(SYNCMOD)!!!
+		e->setSyncStatus(KCal::Incidence::SYNCNONE);
 		fLocalDatabase->writeRecord( r );
 	}
 	else
@@ -552,7 +552,7 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e,
 		return;
 	}
 
-	if ( e->synctqStatus() == KCal::Incidence::SYNCDEL )
+	if ( e->syncStatus() == KCal::Incidence::SYNCDEL )
 	{
 		DEBUGKPILOT << fname << ": don't write deleted incidence "
 			<< e->summary() << " to the palm" << endl;
@@ -573,8 +573,8 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e,
 
 		// NOTE: This MUST be done last, since every other set* call
 		// calls updated(), which will trigger an
-		// setSynctqStatus(SYNCMOD)!!!
-		e->setSynctqStatus(KCal::Incidence::SYNCNONE);
+		// setSyncStatus(SYNCMOD)!!!
+		e->setSyncStatus(KCal::Incidence::SYNCNONE);
 		KPILOT_DELETE( r );
 	}
 }
diff --git a/conduits/vcalconduit/vcalRecord.cc b/conduits/vcalconduit/vcalRecord.cc
index fc274b1..898bc79 100644
--- a/conduits/vcalconduit/vcalRecord.cc
+++ b/conduits/vcalconduit/vcalRecord.cc
@@ -512,8 +512,8 @@ bool KCalSync::setEvent(KCal::Event *e,
 
 	// NOTE: This MUST be done last, since every other set* call
 	// calls updated(), which will trigger an
-	// setSynctqStatus(SYNCMOD)!!!
-	e->setSynctqStatus(KCal::Incidence::SYNCNONE);
+	// setSyncStatus(SYNCMOD)!!!
+	e->setSyncStatus(KCal::Incidence::SYNCNONE);
 
 	return true;
 }