TQt4 port Katapult

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/katapult@1233929 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 32 insertions, 32 deletions

diff --git a/katapult/katapult/katapultconfigdlg.cpp b/katapult/katapult/katapultconfigdlg.cpp
index 26b275e..97a7d24 100644
--- a/katapult/katapult/katapultconfigdlg.cpp
+++ b/katapult/katapult/katapultconfigdlg.cpp
@@ -24,12 +24,12 @@
 #include <kcombobox.h>
 #include <klocale.h>
 
-#include <qframe.h>
-#include <qlayout.h>
-#include <qslider.h>
-#include <qcheckbox.h>
-#include <qstringlist.h>
-#include <qradiobutton.h>
+#include <tqframe.h>
+#include <tqlayout.h>
+#include <tqslider.h>
+#include <tqcheckbox.h>
+#include <tqstringlist.h>
+#include <tqradiobutton.h>
  
 #include "katapultconfigdlg.h"
 #include "katapultsettings.h"
@@ -47,9 +47,9 @@ KatapultConfigDlg::KatapultConfigDlg(KatapultSettings *settings)
 	setTreeListAutoResize(TRUE);
 
 	// general settings	
-	QFrame *fConfGeneral = addPage(QString("Katapult"), i18n("General Settings"));
+	TQFrame *fConfGeneral = addPage(TQString("Katapult"), i18n("General Settings"));
 	general = new ConfGeneral(fConfGeneral);
-	(new QVBoxLayout(fConfGeneral, 0, KDialog::spacingHint()))->addWidget(general);
+	(new TQVBoxLayout(fConfGeneral, 0, KDialog::spacingHint()))->addWidget(general);
 	
 	general->hideDelay->setValue(settings->hideDelay());
 	general->autoExec->setChecked(settings->isAutoExecute());
@@ -60,36 +60,36 @@ KatapultConfigDlg::KatapultConfigDlg(KatapultSettings *settings)
 		case KatapultSettings::NR_HideDisplay:	general->nrHideDisplay->setChecked(TRUE);	break;
 		default:				general->nrClearQuery->setChecked(TRUE);	break;
 	}
-	connect(general->nrDoNothing, SIGNAL(toggled(bool)), this, SLOT(nrDoNothingToggled(bool)));
+	connect(general->nrDoNothing, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(nrDoNothingToggled(bool)));
 	general->noResultsDelay->setEnabled(!general->nrDoNothing->isChecked());
 	
 	// catalog settings
-	QFrame *fConfCatalogs = addPage(i18n("Catalogs"), i18n("Enabled Catalogs"));
+	TQFrame *fConfCatalogs = addPage(i18n("Catalogs"), i18n("Enabled Catalogs"));
 	catalogConf = new ConfCatalogs(fConfCatalogs);
-	(new QVBoxLayout(fConfCatalogs, 0, KDialog::spacingHint()))->addWidget(catalogConf);
+	(new TQVBoxLayout(fConfCatalogs, 0, KDialog::spacingHint()))->addWidget(catalogConf);
 	
 	catalogConf->catalogs->selectedListBox()->insertStringList(settings->activeCatalogNames());
 	catalogConf->catalogs->availableListBox()->insertStringList(settings->inactiveCatalogNames());
 	
 	catalogPages.setAutoDelete(TRUE);
-	QDict<KatapultCatalog> catalogs;
+	TQDict<KatapultCatalog> catalogs;
 	catalogs = settings->activeCatalogs();
-	QDictIterator<KatapultCatalog> it(catalogs);
+	TQDictIterator<KatapultCatalog> it(catalogs);
 	KatapultCatalog *catalog;
 	while((catalog = it.current()) != 0)
 	{
-		QString catalogName = it.currentKey();
+		TQString catalogName = it.currentKey();
 		addCatalogPage(catalogName, catalog);
 		++it;
 	}
 	
 	// display settings
-	QFrame *fConfDisplay = addPage(i18n("Display"), i18n("Display"));
+	TQFrame *fConfDisplay = addPage(i18n("Display"), i18n("Display"));
 	display = new ConfDisplay(fConfDisplay);
-	(new QVBoxLayout(fConfDisplay, 0, KDialog::spacingHint()))->addWidget(display);
-	new QVBoxLayout((QWidget *) display->displaySettings, 0, KDialog::spacingHint());
+	(new TQVBoxLayout(fConfDisplay, 0, KDialog::spacingHint()))->addWidget(display);
+	new TQVBoxLayout((TQWidget *) display->displaySettings, 0, KDialog::spacingHint());
 	
-	QStringList displays = settings->displayNames();
+	TQStringList displays = settings->displayNames();
 	display->displayName->insertStringList(displays);
 	display->displayName->setCurrentItem(settings->displayNumber());
 	displayConfig = 0;
@@ -98,10 +98,10 @@ KatapultConfigDlg::KatapultConfigDlg(KatapultSettings *settings)
 	unfoldTreeList(TRUE);
 	
 	// connect signals	
-	connect(catalogConf->catalogs, SIGNAL(added(QListBoxItem *)), this, SLOT(activateCatalog(QListBoxItem* )));
-	connect(catalogConf->catalogs, SIGNAL(removed(QListBoxItem *)), this, SLOT(deactivateCatalog(QListBoxItem* )));
-	connect(display->displayName, SIGNAL(activated(int)), this, SLOT(activateDisplay(int)));
-	connect(this, SIGNAL(okClicked()), this, SLOT(saveSettings()));
+	connect(catalogConf->catalogs, TQT_SIGNAL(added(TQListBoxItem *)), this, TQT_SLOT(activateCatalog(TQListBoxItem* )));
+	connect(catalogConf->catalogs, TQT_SIGNAL(removed(TQListBoxItem *)), this, TQT_SLOT(deactivateCatalog(TQListBoxItem* )));
+	connect(display->displayName, TQT_SIGNAL(activated(int)), this, TQT_SLOT(activateDisplay(int)));
+	connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(saveSettings()));
 }
 
 KatapultConfigDlg::~KatapultConfigDlg()
@@ -128,7 +128,7 @@ void KatapultConfigDlg::saveSettings()
 	}
 }
 
-void KatapultConfigDlg::activateCatalog(QListBoxItem *i)
+void KatapultConfigDlg::activateCatalog(TQListBoxItem *i)
 {
 	settings->activateCatalog(i->text());
 	KatapultCatalog *catalog = settings->catalog(i->text());
@@ -136,7 +136,7 @@ void KatapultConfigDlg::activateCatalog(QListBoxItem *i)
 		addCatalogPage(i->text(), catalog);
 }
 
-void KatapultConfigDlg::deactivateCatalog(QListBoxItem *i)
+void KatapultConfigDlg::deactivateCatalog(TQListBoxItem *i)
 {
 	catalogPages.remove(i->text());
 	settings->deactivateCatalog(i->text());
@@ -148,16 +148,16 @@ void KatapultConfigDlg::activateDisplay(int index)
 	addDisplaySettings();
 }
 
-void KatapultConfigDlg::addCatalogPage(QString name, KatapultCatalog *catalog)
+void KatapultConfigDlg::addCatalogPage(TQString name, KatapultCatalog *catalog)
 {
-	QWidget *catalogConfig = catalog->configure();
+	TQWidget *catalogConfig = catalog->configure();
 	if(catalogConfig != 0)
 	{
-		QStringList path;
+		TQStringList path;
 		path << i18n("Catalogs") << name;
-		QFrame *fCatalog = addPage(path, name);
-		catalogConfig->reparent(fCatalog, QPoint(0, 0));
-		(new QVBoxLayout(fCatalog, 0, KDialog::spacingHint()))->addWidget(catalogConfig);
+		TQFrame *fCatalog = addPage(path, name);
+		catalogConfig->reparent(fCatalog, TQPoint(0, 0));
+		(new TQVBoxLayout(fCatalog, 0, KDialog::spacingHint()))->addWidget(catalogConfig);
 		catalogPages.insert(name, fCatalog);
 	}
 }
@@ -172,8 +172,8 @@ void KatapultConfigDlg::addDisplaySettings()
 	displayConfig = settings->display()->configure();
 	if(displayConfig != 0)
 	{
-		displayConfig->reparent((QWidget *) display->displaySettings, QPoint(0, 0));
-		display->displaySettings->layout()->add(displayConfig);
+		displayConfig->reparent((TQWidget *) display->displaySettings, TQPoint(0, 0));
+		display->displaySettings->tqlayout()->add(displayConfig);
 		displayConfig->show();
 	}
 }