1 files changed, 56 insertions, 56 deletions

diff --git a/kpilot/kpilot/kpilot.cc b/kpilot/kpilot/kpilot.cc
index 9207db02a..4b38c509a 100644
--- a/kpilot/kpilot/kpilot.cc
+++ b/kpilot/kpilot/kpilot.cc
@@ -31,11 +31,11 @@
 
 #include "options.h"
 
-#include <qfile.h>
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qvbox.h>
-#include <qtimer.h>
+#include <tqfile.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
+#include <tqvbox.h>
+#include <tqtimer.h>
 
 #include <kjanuswidget.h>
 #include <kurl.h>
@@ -86,7 +86,7 @@
 class KPilotInstaller::KPilotPrivate
 {
 public:
-	typedef QPtrList<PilotComponent> ComponentList;
+	typedef TQPtrList<PilotComponent> ComponentList;
 
 private:
 	ComponentList  fPilotComponentList;
@@ -145,11 +145,11 @@ void KPilotInstaller::startDaemonIfNeeded()
 
 	fAppStatus=WaitingForDaemon;
 
-	QString daemonError;
-	QCString daemonDCOP;
+	TQString daemonError;
+	TQCString daemonDCOP;
 	int daemonPID;
 
-	QString s = getDaemon().statusString();
+	TQString s = getDaemon().statusString();
 
 	DEBUGKPILOT << fname << ": Daemon status is "
 		<< ( s.isEmpty() ? CSL1("<none>") : s ) << endl;
@@ -169,7 +169,7 @@ void KPilotInstaller::startDaemonIfNeeded()
 
 	if (!fDaemonWasRunning && KApplication::startServiceByDesktopName(
 		CSL1("kpilotdaemon"),
-		QString::null, &daemonError, &daemonDCOP, &daemonPID
+		TQString::null, &daemonError, &daemonDCOP, &daemonPID
 			, "0" /* no notify */
 		))
 	{
@@ -231,14 +231,14 @@ void KPilotInstaller::setupWidget()
 	fManagingWidget->setMinimumSize(fManagingWidget->sizeHint());
 	fManagingWidget->show();
 	setCentralWidget(fManagingWidget);
-	connect( fManagingWidget, SIGNAL( aboutToShowPage ( QWidget* ) ),
-			this, SLOT( slotAboutToShowComponent( QWidget* ) ) );
+	connect( fManagingWidget, TQT_SIGNAL( aboutToShowPage ( TQWidget* ) ),
+			this, TQT_SLOT( slotAboutToShowComponent( TQWidget* ) ) );
 
 	initIcons();
 	initMenu();
 	initComponents();
 
-	setMinimumSize(sizeHint() + QSize(10,60));
+	setMinimumSize(sizeHint() + TQSize(10,60));
 
 	createGUI(CSL1("kpilotui.rc"), false);
 	setAutoSaveSettings();
@@ -248,15 +248,15 @@ void KPilotInstaller::initComponents()
 {
 	FUNCTIONSETUP;
 
-	QString defaultDBPath = KPilotConfig::getDefaultDBPath();
+	TQString defaultDBPath = KPilotConfig::getDefaultDBPath();
 
-	QPixmap pixmap;
-	QString pixfile;
-	QWidget *w;
+	TQPixmap pixmap;
+	TQString pixfile;
+	TQWidget *w;
 
 #define ADDICONPAGE(a,b) \
 	pixmap = KGlobal::iconLoader()->loadIcon(b, KIcon::Desktop, 64); \
-	w = getManagingWidget()->addVBoxPage(a,QString::null, pixmap) ;
+	w = getManagingWidget()->addVBoxPage(a,TQString::null, pixmap) ;
 
 	ADDICONPAGE(i18n("HotSync"),CSL1("kpilotbhotsync"));
 	fLogWidget = new LogWidget(w);
@@ -286,7 +286,7 @@ void KPilotInstaller::initComponents()
 
 #undef ADDICONPAGE
 
-	QTimer::singleShot(500,this,SLOT(initializeComponents()));
+	TQTimer::singleShot(500,this,TQT_SLOT(initializeComponents()));
 }
 
 
@@ -299,7 +299,7 @@ void KPilotInstaller::initIcons()
 
 
 
-void KPilotInstaller::slotAboutToShowComponent( QWidget *c )
+void KPilotInstaller::slotAboutToShowComponent( TQWidget *c )
 {
 	FUNCTIONSETUP;
 	int ix = fManagingWidget->pageIndex( c );
@@ -320,14 +320,14 @@ void KPilotInstaller::slotSelectComponent(PilotComponent *c)
 		return;
 	}
 
-	QObject *o = c->parent();
+	TQObject *o = c->parent();
 	if (!o)
 	{
 		WARNINGKPILOT << "Widget has no parent." << endl;
 		return;
 	}
 
-	QWidget *parent = dynamic_cast<QWidget *>(o);
+	TQWidget *parent = dynamic_cast<TQWidget *>(o);
 	if (!parent)
 	{
 		WARNINGKPILOT << "Widget's parent is not a widget." << endl;
@@ -446,8 +446,8 @@ bool KPilotInstaller::componentPreSync()
 {
 	FUNCTIONSETUP;
 
-	QString reason;
-	QString rprefix(i18n("Cannot start a Sync now. %1"));
+	TQString reason;
+	TQString rprefix(i18n("Cannot start a Sync now. %1"));
 
 	for (fP->list().first();
 		fP->list().current(); fP->list().next())
@@ -477,7 +477,7 @@ void KPilotInstaller::componentPostSync()
 	}
 }
 
-void KPilotInstaller::setupSync(int kind, const QString & message)
+void KPilotInstaller::setupSync(int kind, const TQString & message)
 {
 	FUNCTIONSETUP;
 
@@ -487,7 +487,7 @@ void KPilotInstaller::setupSync(int kind, const QString & message)
 	}
 	if (!message.isEmpty())
 	{
-		QString m(message);
+		TQString m(message);
 		if (fLogWidget)
 		{
 			fLogWidget->logMessage(m);
@@ -496,7 +496,7 @@ void KPilotInstaller::setupSync(int kind, const QString & message)
 	getDaemon().requestSync(kind);
 }
 
-void KPilotInstaller::closeEvent(QCloseEvent * e)
+void KPilotInstaller::closeEvent(TQCloseEvent * e)
 {
 	FUNCTIONSETUP;
 
@@ -518,12 +518,12 @@ void KPilotInstaller::initMenu()
 	syncPopup->setWhatsThis(i18n("Select the kind of HotSync to perform next. "
 		"This applies only to the next HotSync; to change the default, use "
 		"the configuration dialog."));
-	connect(syncPopup, SIGNAL(activated()),
-		this, SLOT(slotHotSyncRequested()));
+	connect(syncPopup, TQT_SIGNAL(activated()),
+		this, TQT_SLOT(slotHotSyncRequested()));
 
 	// File actions, keep this list synced with kpilotui.rc and pilotDaemon.cc
 	a = new KAction(i18n("&HotSync"), CSL1("hotsync"), 0,
-		this, SLOT(slotHotSyncRequested()),
+		this, TQT_SLOT(slotHotSyncRequested()),
 		actionCollection(), "file_hotsync");
 	a->setToolTip(i18n("Next HotSync will be normal HotSync."));
 	a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
@@ -531,7 +531,7 @@ void KPilotInstaller::initMenu()
 	syncPopup->insert(a);
 
 	a = new KAction(i18n("Full&Sync"), CSL1("fullsync"), 0,
-		this, SLOT(slotFullSyncRequested()),
+		this, TQT_SLOT(slotFullSyncRequested()),
 		actionCollection(), "file_fullsync");
 	a->setToolTip(i18n("Next HotSync will be a FullSync."));
 	a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
@@ -539,7 +539,7 @@ void KPilotInstaller::initMenu()
 	syncPopup->insert(a);
 
 	a = new KAction(i18n("&Backup"), CSL1("backup"), 0,
-		this, SLOT(slotBackupRequested()),
+		this, TQT_SLOT(slotBackupRequested()),
 		actionCollection(), "file_backup");
 	a->setToolTip(i18n("Next HotSync will be backup."));
 	a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
@@ -547,15 +547,15 @@ void KPilotInstaller::initMenu()
 	syncPopup->insert(a);
 
 	a = new KAction(i18n("&Restore"), CSL1("restore"), 0,
-		this, SLOT(slotRestoreRequested()),
+		this, TQT_SLOT(slotRestoreRequested()),
 		actionCollection(), "file_restore");
 	a->setToolTip(i18n("Next HotSync will be restore."));
 	a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
 		"should restore the Handheld from data on the PC."));
 	syncPopup->insert(a);
 
-	a = new KAction(i18n("Copy Handheld to PC"), QString::null, 0,
-		this, SLOT(slotHHtoPCRequested()),
+	a = new KAction(i18n("Copy Handheld to PC"), TQString::null, 0,
+		this, TQT_SLOT(slotHHtoPCRequested()),
 		actionCollection(), "file_HHtoPC");
 	a->setToolTip(i18n("Next HotSync will be backup."));
 	a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
@@ -563,8 +563,8 @@ void KPilotInstaller::initMenu()
 		"overwriting entries on the PC."));
 	syncPopup->insert(a);
 
-	a = new KAction(i18n("Copy PC to Handheld"), QString::null, 0,
-		this, SLOT(slotPCtoHHRequested()),
+	a = new KAction(i18n("Copy PC to Handheld"), TQString::null, 0,
+		this, TQT_SLOT(slotPCtoHHRequested()),
 		actionCollection(), "file_PCtoHH");
 	a->setToolTip(i18n("Next HotSync will copy PC to Handheld."));
 	a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
@@ -575,7 +575,7 @@ void KPilotInstaller::initMenu()
 
 #if 0
 	a = new KAction(i18n("&List Only"),CSL1("listsync"),0,
-		this,SLOT(slotTestSyncRequested()),
+		this,TQT_SLOT(slotTestSyncRequested()),
 		actionCollection(), "file_list");
 	a->setToolTip(i18n("Next HotSync will list databases."));
 	a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
@@ -586,14 +586,14 @@ void KPilotInstaller::initMenu()
 
 
 	a = new KAction(i18n("Rese&t Link"),CSL1("reload"), 0,
-		this, SLOT(slotResetLink()),
+		this, TQT_SLOT(slotResetLink()),
 		actionCollection(),"file_reload");
 	a->setToolTip(i18n("Reset the device connection."));
 	a->setWhatsThis(i18n("Try to reset the daemon and its connection "
 		"to the Handheld."));
 
 
-	a = KStdAction::quit(this, SLOT(quit()), actionCollection());
+	a = KStdAction::quit(this, TQT_SLOT(quit()), actionCollection());
 	a->setWhatsThis(i18n("Quit KPilot, (and stop the daemon "
 		"if configured that way)."));
 
@@ -603,15 +603,15 @@ void KPilotInstaller::initMenu()
 	createStandardStatusBarAction();
 	setStandardToolBarMenuEnabled(true);
 
-	(void) KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()),
+	(void) KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()),
 		actionCollection());
-	(void) KStdAction::configureToolbars(this, SLOT(optionsConfigureToolbars()),
+	(void) KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()),
 		actionCollection());
-	(void) KStdAction::preferences(this, SLOT(configure()),
+	(void) KStdAction::preferences(this, TQT_SLOT(configure()),
 		actionCollection());
 
 	a = new KAction(i18n("Configuration &Wizard..."), CSL1("wizard"), 0,
-		this, SLOT(configureWizard()),
+		this, TQT_SLOT(configureWizard()),
 		actionCollection(), "options_configure_wizard");
 	a->setWhatsThis(i18n("Configure KPilot using the configuration wizard."));
 
@@ -629,7 +629,7 @@ void KPilotInstaller::quit()
 	for (fP->list().first();
 		fP->list().current(); fP->list().next())
 	{
-		QString reason;
+		TQString reason;
 		if (!fP->list().current()->preHotSync(reason))
 		{
 			WARNINGKPILOT
@@ -644,7 +644,7 @@ void KPilotInstaller::quit()
 }
 
 void KPilotInstaller::addComponentPage(PilotComponent * p,
-	const QString & name)
+	const TQString & name)
 {
 	FUNCTIONSETUP;
 
@@ -685,13 +685,13 @@ void KPilotInstaller::addComponentPage(PilotComponent * p,
 
 	KToggleAction *pt =
 		new KToggleAction(name, /* "kpilot" -- component icon, */ 0,
-		p, SLOT(slotShowComponent()),
+		p, TQT_SLOT(slotShowComponent()),
 		actionCollection(), actionname);
 
 	pt->setExclusiveGroup(CSL1("view_menu"));
 
-	connect(p, SIGNAL(showComponent(PilotComponent *)),
-		this, SLOT(slotSelectComponent(PilotComponent *)));
+	connect(p, TQT_SIGNAL(showComponent(PilotComponent *)),
+		this, TQT_SLOT(slotSelectComponent(PilotComponent *)));
 }
 
 /* slot */ void KPilotInstaller::initializeComponents()
@@ -719,7 +719,7 @@ void KPilotInstaller::optionsConfigureToolbars()
 	// This was added in KDE 3.1
 	saveMainWindowSettings( KGlobal::config(), autoSaveGroup() );
 	KEditToolbar dlg(actionCollection());
-	connect(&dlg, SIGNAL(newToolbarConfig()), this, SLOT(slotNewToolbarConfig()));
+	connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig()));
 	dlg.exec();
 }
 
@@ -741,7 +741,7 @@ void KPilotInstaller::slotResetLink()
 /*
 ** Can't be a member function because it needs to be called even with no KPilotInstaller.
 */
-static bool runConfigure(PilotDaemonDCOP_stub &daemon,QWidget *parent)
+static bool runConfigure(PilotDaemonDCOP_stub &daemon,TQWidget *parent)
 {
 	FUNCTIONSETUP;
 	bool ret = false;
@@ -796,7 +796,7 @@ static bool runConfigure(PilotDaemonDCOP_stub &daemon,QWidget *parent)
  * canceled, though).
  */
 typedef enum { Failed, OK, Cancel } WizardResult;
-static WizardResult runWizard(PilotDaemonDCOP_stub &daemon,QWidget *parent)
+static WizardResult runWizard(PilotDaemonDCOP_stub &daemon,TQWidget *parent)
 {
 	FUNCTIONSETUP;
 	WizardResult ret = Failed ;
@@ -805,7 +805,7 @@ static WizardResult runWizard(PilotDaemonDCOP_stub &daemon,QWidget *parent)
 
 	KPilotSettings::self()->readConfig();
 	// Declarations at top because of goto's in this function
-	ConfigWizard *(* f) (QWidget *, int) = 0L ;
+	ConfigWizard *(* f) (TQWidget *, int) = 0L ;
 	ConfigWizard *w = 0L;
 	KLibrary *l = KLibLoader::self()->library("kcm_kpilot");
 
@@ -817,7 +817,7 @@ static WizardResult runWizard(PilotDaemonDCOP_stub &daemon,QWidget *parent)
 
 	if (l->hasSymbol("create_wizard"))
 	{
-		f = ( ConfigWizard * (*) (QWidget *, int) ) (l->symbol("create_wizard")) ;
+		f = ( ConfigWizard * (*) (TQWidget *, int) ) (l->symbol("create_wizard")) ;
 	}
 
 	if (!f)
@@ -869,7 +869,7 @@ void KPilotInstaller::componentUpdate()
 {
 	FUNCTIONSETUP;
 
-	QString defaultDBPath = KPilotConfig::getDefaultDBPath();
+	TQString defaultDBPath = KPilotConfig::getDefaultDBPath();
 	bool dbPathChanged = false;
 
 	for (fP->list().first();
@@ -1124,7 +1124,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	QTimer::singleShot(0,tp,SLOT(startDaemonIfNeeded()));
+	TQTimer::singleShot(0,tp,TQT_SLOT(startDaemonIfNeeded()));
 
 	KGlobal::dirs()->addResourceType("pilotdbs",
 		CSL1("share/apps/kpilot/DBBackup"));