diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-28 18:03:09 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-28 18:03:09 +0000 |
commit | 98d15d90b6a83e2df32d678013847e18b8a8c7e8 (patch) | |
tree | 02a588c0979fe1a40ae6216d1f831bb24de91a9f /katapult/katapult/katapultsettings.cpp | |
parent | e0974f69b7603e3d8f2d936301e05535af25346e (diff) | |
download | katapult-98d15d90b6a83e2df32d678013847e18b8a8c7e8.tar.gz katapult-98d15d90b6a83e2df32d678013847e18b8a8c7e8.zip |
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
Diffstat (limited to 'katapult/katapult/katapultsettings.cpp')
-rw-r--r-- | katapult/katapult/katapultsettings.cpp | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/katapult/katapult/katapultsettings.cpp b/katapult/katapult/katapultsettings.cpp index ae316f5..aaa4172 100644 --- a/katapult/katapult/katapultsettings.cpp +++ b/katapult/katapult/katapultsettings.cpp @@ -26,8 +26,8 @@ #include <kparts/componentfactory.h> #include <klocale.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> #include "katapultsettings.h" #include "katapultcatalog.h" @@ -70,7 +70,7 @@ void KatapultSettings::readSettings() _autoExec = config->readBoolEntry("AutoExec", FALSE); _displayName = config->readEntry("Display", "Pure Display"); - QStringList defCatalogs; + TQStringList defCatalogs; defCatalogs << "Program Catalog" << "Bookmark Catalog" << "Document Catalog" << "Calculator Catalog" << "Amarok Catalog" << "Spell Catalog" << "Google Catalog" << "Execution Catalog"; _activeCatalogNames = config->readListEntry("Catalogs", defCatalogs); @@ -105,18 +105,18 @@ void KatapultSettings::writeSettings() config->writeEntry("Catalogs", _activeCatalogNames); config->writeEntry("Display", _displayName); - QDictIterator<KatapultCatalog> it(_activeCatalogs); + TQDictIterator<KatapultCatalog> it(_activeCatalogs); KatapultCatalog *catalog; while((catalog = it.current()) != 0) { - KConfigGroup group(config, QString("Catalogs/%1").arg(it.currentKey())); + KConfigGroup group(config, TQString("Catalogs/%1").tqarg(it.currentKey())); catalog->writeSettings(&group); ++it; } if(_display != 0) { - KConfigGroup group(config, QString("Displays/%1").arg(_displayName)); + KConfigGroup group(config, TQString("Displays/%1").tqarg(_displayName)); _display->writeSettings(&group); } @@ -130,7 +130,7 @@ void KatapultSettings::configure() _isConfiguring = TRUE; KatapultConfigDlg *dlg = new KatapultConfigDlg(this); - if(dlg->exec() == QDialog::Accepted) { + if(dlg->exec() == TQDialog::Accepted) { writeSettings(); emit systrayChanged(); loadCatalogPlugins(); @@ -215,24 +215,24 @@ int KatapultSettings::notificationTimeout() const return _notificationTimeout; } -QString KatapultSettings::displayName() const +TQString KatapultSettings::displayName() const { return _displayName; } -QStringList KatapultSettings::displayNames() const +TQStringList KatapultSettings::displayNames() const { return _displayNames; } -QStringList KatapultSettings::displayIds() const +TQStringList KatapultSettings::displayIds() const { return _displayIds; } int KatapultSettings::displayNumber() const { - return _displayIds.findIndex(_displayName); + return _displayIds.tqfindIndex(_displayName); } KatapultDisplay * KatapultSettings::display() const @@ -240,52 +240,52 @@ KatapultDisplay * KatapultSettings::display() const return _display; } -void KatapultSettings::setDisplayName(QString name) +void KatapultSettings::setDisplayName(TQString name) { _displayName = name; loadDisplayPlugins(); emit displayChanged(); } -QStringList KatapultSettings::catalogNames() const +TQStringList KatapultSettings::catalogNames() const { return _catalogNames; } -QStringList KatapultSettings::catalogIds() const +TQStringList KatapultSettings::catalogIds() const { return _catalogIds; } -QStringList KatapultSettings::activeCatalogNames() const +TQStringList KatapultSettings::activeCatalogNames() const { return _activeCatalogNames; } -QStringList KatapultSettings::inactiveCatalogNames() const +TQStringList KatapultSettings::inactiveCatalogNames() const { - QStringList inactiveCatalogs, catalogs = _catalogIds; - for(QStringList::Iterator it = catalogs.begin(); it != catalogs.end(); ++it) + TQStringList inactiveCatalogs, catalogs = _catalogIds; + for(TQStringList::Iterator it = catalogs.begin(); it != catalogs.end(); ++it) { - if(!_activeCatalogNames.contains(*it)) + if(!_activeCatalogNames.tqcontains(*it)) inactiveCatalogs.append(*it); } return inactiveCatalogs; } -QDict<KatapultCatalog> KatapultSettings::activeCatalogs() const +TQDict<KatapultCatalog> KatapultSettings::activeCatalogs() const { return _activeCatalogs; } -void KatapultSettings::activateCatalog(QString catalogName) +void KatapultSettings::activateCatalog(TQString catalogName) { _activeCatalogNames.append(catalogName); loadCatalogPlugins(); emit catalogsChanged(); } -void KatapultSettings::deactivateCatalog(QString catalogName) +void KatapultSettings::deactivateCatalog(TQString catalogName) { _activeCatalogNames.remove(catalogName); loadCatalogPlugins(); @@ -303,27 +303,27 @@ void KatapultSettings::loadCatalogPlugins() KTrader::OfferList::ConstIterator it; for(it = offers.begin(); it != offers.end(); ++it) { - QString id; + TQString id; KService::Ptr service = *it; KatapultCatalog *catalog; - if(!service->property("X-Katapult-ID", QVariant::String).toString().isEmpty()) - id = service->property("X-Katapult-ID", QVariant::String).toString(); + if(!service->property("X-Katapult-ID", TQVariant::String).toString().isEmpty()) + id = service->property("X-Katapult-ID", TQVariant::String).toString(); else id = service->name(); _catalogNames.append(service->name()); _catalogIds.append(id); - if(_activeCatalogNames.contains(id)) + if(_activeCatalogNames.tqcontains(id)) { int errCode = 0; catalog = KParts::ComponentFactory::createInstanceFromService<KatapultCatalog> - (service, 0, 0, QStringList(), &errCode); + (service, 0, 0, TQStringList(), &errCode); if(catalog != 0) { - KConfigGroup group(kapp->config(), QString("Catalogs/%1").arg(id)); + KConfigGroup group(kapp->config(), TQString("Catalogs/%1").tqarg(id)); catalog->readSettings(&group); catalog->initialize(); _activeCatalogs.insert(id, catalog); @@ -350,8 +350,8 @@ void KatapultSettings::loadDisplayPlugins() KService::Ptr service = *it; _displayNames.append(service->name()); - if(!service->property("X-Katapult-ID", QVariant::String).toString().isEmpty()) - _displayIds.append(service->property("X-Katapult-ID", QVariant::String).toString()); + if(!service->property("X-Katapult-ID", TQVariant::String).toString().isEmpty()) + _displayIds.append(service->property("X-Katapult-ID", TQVariant::String).toString()); else _displayIds.append(service->name()); @@ -359,19 +359,19 @@ void KatapultSettings::loadDisplayPlugins() { int errCode = 0; _display = KParts::ComponentFactory::createInstanceFromService<KatapultDisplay> - (service, 0, 0, QStringList(), &errCode); + (service, 0, 0, TQStringList(), &errCode); } } if(_display != 0) { - KConfigGroup group(kapp->config(), QString("Displays/%1").arg(_displayName)); + KConfigGroup group(kapp->config(), TQString("Displays/%1").tqarg(_displayName)); _display->readSettings(&group); } } -KatapultCatalog * KatapultSettings::catalog(QString catalogName) const +KatapultCatalog * KatapultSettings::catalog(TQString catalogName) const { - return _activeCatalogs.find(catalogName); + return _activeCatalogs.tqfind(catalogName); } #include "katapultsettings.moc" |