diff options
Diffstat (limited to 'kcontrol/ebrowsing/plugins/ikws')
9 files changed, 50 insertions, 50 deletions
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp index eb96f682a..622cec32c 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp @@ -38,8 +38,8 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kservice.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <ktrader.h> #include "ikwsopts.h" @@ -147,35 +147,35 @@ void FilterOptions::load( bool useDefaults ) m_dlg->lvSearchProviders->setSelected(m_dlg->lvSearchProviders->firstChild(), true); // Connect all the signals/slots... - connect(m_dlg->cbEnableShortcuts, TQT_SIGNAL(clicked()), this, - TQT_SLOT(setWebShortcutState())); - connect(m_dlg->cbEnableShortcuts, TQT_SIGNAL(clicked()), this, - TQT_SLOT(configChanged())); - - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(updateSearchProvider())); - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - this, TQT_SLOT(changeSearchProvider())); - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT(changeSearchProvider())); - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(executed(TQListViewItem *)), - this, TQT_SLOT(checkFavoritesChanged())); - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(spacePressed(TQListViewItem *)), - this, TQT_SLOT(checkFavoritesChanged())); - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(pressed(TQListViewItem *)), - this, TQT_SLOT(checkFavoritesChanged())); - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(clicked(TQListViewItem *)), - this, TQT_SLOT(checkFavoritesChanged())); - - - connect(m_dlg->cmbDefaultEngine, TQT_SIGNAL(activated(const TQString &)), this, - TQT_SLOT(configChanged())); - connect(m_dlg->cmbDelimiter, TQT_SIGNAL(activated(const TQString &)), this, - TQT_SLOT(configChanged())); - - connect(m_dlg->pbNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(addSearchProvider())); - connect(m_dlg->pbChange, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeSearchProvider())); - connect(m_dlg->pbDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSearchProvider())); + connect(m_dlg->cbEnableShortcuts, TQ_SIGNAL(clicked()), this, + TQ_SLOT(setWebShortcutState())); + connect(m_dlg->cbEnableShortcuts, TQ_SIGNAL(clicked()), this, + TQ_SLOT(configChanged())); + + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(updateSearchProvider())); + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + this, TQ_SLOT(changeSearchProvider())); + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT(changeSearchProvider())); + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(executed(TQListViewItem *)), + this, TQ_SLOT(checkFavoritesChanged())); + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(spacePressed(TQListViewItem *)), + this, TQ_SLOT(checkFavoritesChanged())); + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(pressed(TQListViewItem *)), + this, TQ_SLOT(checkFavoritesChanged())); + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(clicked(TQListViewItem *)), + this, TQ_SLOT(checkFavoritesChanged())); + + + connect(m_dlg->cmbDefaultEngine, TQ_SIGNAL(activated(const TQString &)), this, + TQ_SLOT(configChanged())); + connect(m_dlg->cmbDelimiter, TQ_SIGNAL(activated(const TQString &)), this, + TQ_SLOT(configChanged())); + + connect(m_dlg->pbNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(addSearchProvider())); + connect(m_dlg->pbChange, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeSearchProvider())); + connect(m_dlg->pbDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSearchProvider())); emit changed( useDefaults ); } @@ -223,7 +223,7 @@ void FilterOptions::save() // kdDebug () << "Engine: " << m_defaultEngineMap[engine] << endl; int changedProviderCount = 0; - TQString path = kapp->dirs()->saveLocation("services", "searchproviders/"); + TQString path = tdeApp->dirs()->saveLocation("services", "searchproviders/"); m_favoriteEngines.clear(); @@ -274,7 +274,7 @@ void FilterOptions::save() } } - KSimpleConfig service(path + name + ".desktop"); + TDESimpleConfig service(path + name + ".desktop"); service.setGroup("Desktop Entry"); service.writeEntry("Type", "Service"); service.writeEntry("X-TDE-ServiceTypes", "SearchProvider"); @@ -291,7 +291,7 @@ void FilterOptions::save() for (TQStringList::ConstIterator it = m_deletedProviders.begin(); it != m_deletedProviders.end(); ++it) { - TQStringList matches = kapp->dirs()->findAllResources("services", "searchproviders/" + *it + ".desktop"); + TQStringList matches = tdeApp->dirs()->findAllResources("services", "searchproviders/" + *it + ".desktop"); // Shouldn't happen if (!matches.count()) @@ -304,7 +304,7 @@ void FilterOptions::save() TQFile::remove(matches[0]); continue; } - KSimpleConfig service(path + *it + ".desktop"); + TDESimpleConfig service(path + *it + ".desktop"); service.setGroup("Desktop Entry"); service.writeEntry("Type", "Service"); service.writeEntry("X-TDE-ServiceTypes", "SearchProvider"); @@ -332,7 +332,7 @@ void FilterOptions::defaults() void FilterOptions::configChanged() { - // kdDebug () << "FilterOptions::configChanged: TRUE" << endl; + // kdDebug () << "FilterOptions::configChanged: true" << endl; emit changed(true); } diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h index be82459b6..661a3abb0 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h @@ -32,7 +32,7 @@ class SearchProviderItem; class FilterOptions : public TDECModule { - Q_OBJECT + TQ_OBJECT public: FilterOptions(TDEInstance *instance, TQWidget *parent = 0, const char *name = 0); diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp index f6227b90f..f29678e15 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <kurl.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include "ikwsopts.h" diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h index abf3fe255..add958f41 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h @@ -32,7 +32,7 @@ class TDEInstance; class KAutoWebSearch : public KURIFilterPlugin, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT public: KAutoWebSearch(TQObject *parent = 0, const char *name = 0, const TQStringList &args = TQStringList() ); diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp index ae86c5836..a33f4e78b 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp @@ -33,9 +33,9 @@ #include <kdebug.h> #include <tdeconfig.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kprotocolinfo.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kstaticdeleter.h> #include "kuriikwsfiltereng.h" @@ -449,7 +449,7 @@ void KURISearchFilterEngine::loadConfig() // contains the sycoca based search provider configuration (malte). // TODO: Remove in KDE 4 !!! This has been here a sufficient amount of time... { - KSimpleConfig oldConfig(kapp->dirs()->saveLocation("config") + TQString(name()) + "rc"); + TDESimpleConfig oldConfig(tdeApp->dirs()->saveLocation("config") + TQString(name()) + "rc"); oldConfig.setGroup("General"); if (oldConfig.hasKey("SearchEngines")) @@ -498,7 +498,7 @@ void KURISearchFilterEngine::loadConfig() delete provider; } - KSimpleConfig desktop(kapp->dirs()->saveLocation("services", "searchproviders/") + name + ".desktop"); + TDESimpleConfig desktop(tdeApp->dirs()->saveLocation("services", "searchproviders/") + name + ".desktop"); desktop.setGroup("Desktop Entry"); desktop.writeEntry("Type", "Service"); desktop.writeEntry("X-TDE-ServiceTypes", "SearchProvider"); diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp index 78f84780c..fb816ef84 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include "ikwsopts.h" diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h index f72d38340..2f2284e5a 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h +++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h @@ -31,7 +31,7 @@ class TDEInstance; class KURISearchFilter : public KURIFilterPlugin, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: KURISearchFilter(TQObject *parent = 0, const char *name = 0, diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp index a1f6ca619..bf295462f 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp @@ -43,11 +43,11 @@ SearchProviderDialog::SearchProviderDialog(SearchProvider *provider, enableButtonSeparator(true); - m_dlg->leQuery->setMinimumWidth(kapp->fontMetrics().maxWidth() * 40); + m_dlg->leQuery->setMinimumWidth(tdeApp->fontMetrics().maxWidth() * 40); - connect(m_dlg->leName, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged())); - connect(m_dlg->leQuery, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged())); - connect(m_dlg->leShortcut, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged())); + connect(m_dlg->leName, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged())); + connect(m_dlg->leQuery, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged())); + connect(m_dlg->leShortcut, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged())); // Data init TQStringList charsets = TDEGlobal::charsets()->availableEncodingNames(); diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h index 2a23cbf05..a698ee626 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h +++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h @@ -27,7 +27,7 @@ class SearchProviderDlgUI; class SearchProviderDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: SearchProviderDialog(SearchProvider *provider, TQWidget *parent = 0, const char *name = 0); |