Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

2 files changed, 19 insertions, 19 deletions

diff --git a/conduits/sysinfoconduit/sysinfo-conduit.cpp b/conduits/sysinfoconduit/sysinfo-conduit.cpp
index 68511b7..71e1310 100644
--- a/conduits/sysinfoconduit/sysinfo-conduit.cpp
+++ b/conduits/sysinfoconduit/sysinfo-conduit.cpp
@@ -196,7 +196,7 @@ void SysInfoConduit::readConfig()
 
 	readConfig();
 
-	TQTimer::singleShot(0, this, TQT_SLOT(hardwareInfo()));
+	TQTimer::singleShot(0, this, TQ_SLOT(hardwareInfo()));
 	return true;
 }
 
@@ -235,7 +235,7 @@ void SysInfoConduit::hardwareInfo()
 		KPILOT_DELETE(device);
 		keepParts.append(CSL1("hardware"));
 	} else removeParts.append(CSL1("hardware"));
-	TQTimer::singleShot(0, this, TQT_SLOT(userInfo()));
+	TQTimer::singleShot(0, this, TQ_SLOT(userInfo()));
 }
 
 void SysInfoConduit::userInfo()
@@ -265,7 +265,7 @@ void SysInfoConduit::userInfo()
 	{
 		removeParts.append(CSL1("user"));
 	}
-	TQTimer::singleShot(0, this, TQT_SLOT(memoryInfo()));
+	TQTimer::singleShot(0, this, TQ_SLOT(memoryInfo()));
 }
 
 void SysInfoConduit::memoryInfo()
@@ -286,7 +286,7 @@ void SysInfoConduit::memoryInfo()
 		}
 		keepParts.append(CSL1("memory"));
 	} else removeParts.append(CSL1("memory"));
-	TQTimer::singleShot(0, this, TQT_SLOT(storageInfo()));
+	TQTimer::singleShot(0, this, TQ_SLOT(storageInfo()));
 }
 
 void SysInfoConduit::storageInfo()
@@ -309,7 +309,7 @@ void SysInfoConduit::storageInfo()
 		}
 		keepParts.append(CSL1("storage"));
 	} else removeParts.append(CSL1("storage"));
-	TQTimer::singleShot(0, this, TQT_SLOT(dbListInfo()));
+	TQTimer::singleShot(0, this, TQ_SLOT(dbListInfo()));
 }
 
 void SysInfoConduit::dbListInfo()
@@ -322,7 +322,7 @@ void SysInfoConduit::dbListInfo()
 		dblist=deviceLink()->getDBList();
 		keepParts.append(CSL1("dblist"));
 	} else removeParts.append(CSL1("dblist"));
-	TQTimer::singleShot(0, this, TQT_SLOT(recNumberInfo()));
+	TQTimer::singleShot(0, this, TQ_SLOT(recNumberInfo()));
 }
 
 void SysInfoConduit::recNumberInfo()
@@ -363,7 +363,7 @@ void SysInfoConduit::recNumberInfo()
 		}
 		keepParts.append(CSL1("records"));
 	} else removeParts.append(CSL1("records"));
-	TQTimer::singleShot(0, this, TQT_SLOT(syncInfo()));
+	TQTimer::singleShot(0, this, TQ_SLOT(syncInfo()));
 }
 
 void SysInfoConduit::syncInfo()
@@ -386,7 +386,7 @@ void SysInfoConduit::syncInfo()
 		fValues[CSL1("lastsyncpc")] = TQString::number(user.getLastSyncPC());
 		keepParts.append(CSL1("sync"));
 	} else removeParts.append(CSL1("sync"));
-	TQTimer::singleShot(0, this, TQT_SLOT(pcVersionInfo()));
+	TQTimer::singleShot(0, this, TQ_SLOT(pcVersionInfo()));
 }
 
 void SysInfoConduit::pcVersionInfo()
@@ -430,7 +430,7 @@ void SysInfoConduit::pcVersionInfo()
 #endif
 		keepParts.append(CSL1("pcversion"));
 	} else removeParts.append(CSL1("pcversion"));
-	TQTimer::singleShot(0, this, TQT_SLOT(palmVersionInfo()));
+	TQTimer::singleShot(0, this, TQ_SLOT(palmVersionInfo()));
 }
 
 void SysInfoConduit::palmVersionInfo()
@@ -450,7 +450,7 @@ void SysInfoConduit::palmVersionInfo()
 
 		keepParts.append(CSL1("palmversion"));
 	} else removeParts.append(CSL1("palmversion"));
-	TQTimer::singleShot(0, this, TQT_SLOT(debugInfo()));
+	TQTimer::singleShot(0, this, TQ_SLOT(debugInfo()));
 }
 
 void SysInfoConduit::debugInfo()
@@ -463,7 +463,7 @@ void SysInfoConduit::debugInfo()
 		fValues[CSL1("debug")] = i18n("No debug data");
 		keepParts.append(CSL1("debug"));
 	} else removeParts.append(CSL1("debug"));
-	TQTimer::singleShot(0, this, TQT_SLOT(writeFile()));
+	TQTimer::singleShot(0, this, TQ_SLOT(writeFile()));
 }
 
 void SysInfoConduit::writeFile()
@@ -589,7 +589,7 @@ void SysInfoConduit::writeFile()
 		if (!outfile.open(IO_WriteOnly)) {
 			WARNINGKPILOT<< "Unable to open " << fOutputFile << endl;
 			emit logError(i18n("Unable to open %1").arg(fOutputFile));
-			TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
+			TQTimer::singleShot(0, this, TQ_SLOT(cleanup()));
 			return;
 		}
 	}
@@ -600,7 +600,7 @@ void SysInfoConduit::writeFile()
 	outfile.close();
 
 	emit logMessage(i18n("Handheld system information written to the file %1").arg(fOutputFile));
-	TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
+	TQTimer::singleShot(0, this, TQ_SLOT(cleanup()));
 }
 
 void SysInfoConduit::cleanup()
diff --git a/conduits/sysinfoconduit/sysinfo-setup.cpp b/conduits/sysinfoconduit/sysinfo-setup.cpp
index 70676e4..534c834 100644
--- a/conduits/sysinfoconduit/sysinfo-setup.cpp
+++ b/conduits/sysinfoconduit/sysinfo-setup.cpp
@@ -103,12 +103,12 @@ SysInfoWidgetConfig::SysInfoWidgetConfig(TQWidget *w, const char *n) :
 	ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,fAbout);
 	fWidget=fConfigWidget;
 
-	TQObject::connect(fConfigWidget->fOutputFile,TQT_SIGNAL(textChanged(const TQString&)),
-		this,TQT_SLOT(modified()));
-	TQObject::connect(fConfigWidget->fTemplateFile,TQT_SIGNAL(textChanged(const TQString&)),
-		this,TQT_SLOT(modified()));
-	TQObject::connect(fConfigWidget->fOutputType,TQT_SIGNAL(clicked(int)),
-		this,TQT_SLOT(modified()));
+	TQObject::connect(fConfigWidget->fOutputFile,TQ_SIGNAL(textChanged(const TQString&)),
+		this,TQ_SLOT(modified()));
+	TQObject::connect(fConfigWidget->fTemplateFile,TQ_SIGNAL(textChanged(const TQString&)),
+		this,TQ_SLOT(modified()));
+	TQObject::connect(fConfigWidget->fOutputType,TQ_SIGNAL(clicked(int)),
+		this,TQ_SLOT(modified()));
 	fConduitName=i18n("System Information");
 }