From 9976abe538e2c6476c7f7a3cc15dd03f663cc3ea Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:07:34 -0600 Subject: [PATCH] Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kerry/src/kcm/backends.cpp | 2 +- kerry/src/kcm/backends.h | 2 +- kerry/src/kcm/beagle.cpp | 6 +++--- kerry/src/kcm/beagle.h | 10 +++++----- kerry/src/kcm/indexing.cpp | 6 +++--- kerry/src/kcm/indexing.h | 2 +- kerry/src/kcm/kerry.cpp | 6 +++--- kerry/src/kcm/kerry.h | 12 ++++++------ kerry/src/kcm/main.cpp | 4 ++-- kerry/src/kcm/search.cpp | 8 ++++---- kerry/src/kcm/search.h | 2 +- kerry/src/kcm/status.cpp | 2 +- kerry/src/kcm/status.h | 2 +- kerry/src/kerryapp.cpp | 10 +++++----- kerry/src/main.cpp | 2 +- kerry/src/searchdlg.cpp | 8 ++++---- kerry/src/searchdlg.h | 2 +- 17 files changed, 43 insertions(+), 43 deletions(-) diff --git a/kerry/src/kcm/backends.cpp b/kerry/src/kcm/backends.cpp index f69a699..2e7ea3f 100644 --- a/kerry/src/kcm/backends.cpp +++ b/kerry/src/kcm/backends.cpp @@ -30,7 +30,7 @@ #include KCMBeagleBackends::KCMBeagleBackends(TQWidget *parent, const char * ) - : KCModule(parent, "kcmbeaglebackends") + : TDECModule(parent, "kcmbeaglebackends") { TQVBoxLayout* general_layout = new TQVBoxLayout( this, KDialog::spacingHint() ); diff --git a/kerry/src/kcm/backends.h b/kerry/src/kcm/backends.h index b1744de..b7b3a1f 100644 --- a/kerry/src/kcm/backends.h +++ b/kerry/src/kcm/backends.h @@ -27,7 +27,7 @@ #include #include -class KCMBeagleBackends : public KCModule +class KCMBeagleBackends : public TDECModule { Q_OBJECT diff --git a/kerry/src/kcm/beagle.cpp b/kerry/src/kcm/beagle.cpp index 6fdd506..9196044 100644 --- a/kerry/src/kcm/beagle.cpp +++ b/kerry/src/kcm/beagle.cpp @@ -32,7 +32,7 @@ #include "status.h" KCMBeagle::KCMBeagle(TQWidget *parent, const char *name) - : KCModule( parent, "kcmbeagle" ) + : TDECModule( parent, "kcmbeagle" ) { setButtons(Default+Apply); @@ -89,9 +89,9 @@ void KCMBeagle::save() TQString KCMBeagle::quickHelp() const { TQWidget *w = m_tab->currentPage(); - if (w->inherits("KCModule")) + if (w->inherits("TDECModule")) { - KCModule *m = static_cast(w); + TDECModule *m = static_cast(w); return m->quickHelp(); } return TQString(); diff --git a/kerry/src/kcm/beagle.h b/kerry/src/kcm/beagle.h index a960c74..7c840cf 100644 --- a/kerry/src/kcm/beagle.h +++ b/kerry/src/kcm/beagle.h @@ -24,10 +24,10 @@ #include -class KConfig; +class TDEConfig; class TQTabWidget; -class KCMBeagle : public KCModule +class KCMBeagle : public TDECModule { Q_OBJECT @@ -41,9 +41,9 @@ public: virtual TQString quickHelp() const; private: - KCModule *m_indexing; - KCModule *m_backends; - KCModule *m_status; + TDECModule *m_indexing; + TDECModule *m_backends; + TDECModule *m_status; TQTabWidget *m_tab; }; diff --git a/kerry/src/kcm/indexing.cpp b/kerry/src/kcm/indexing.cpp index 263261b..73f2cb6 100644 --- a/kerry/src/kcm/indexing.cpp +++ b/kerry/src/kcm/indexing.cpp @@ -39,7 +39,7 @@ #include KCMBeagleIndexing::KCMBeagleIndexing(TQWidget *parent, const char * ) - : KCModule(parent, "kcmbeagleindexing") + : TDECModule(parent, "kcmbeagleindexing") { TQVBoxLayout* top_layout = new TQVBoxLayout( this, KDialog::spacingHint() ); @@ -163,7 +163,7 @@ void KCMBeagleIndexing::load( bool useDefaults ) _startBeagle = true; } else { - KConfig *config = new KConfig("kerryrc"); + TDEConfig *config = new TDEConfig("kerryrc"); config->setGroup("Beagle"); _startBeagle = config->readBoolEntry("AutoStart",false); delete config; @@ -199,7 +199,7 @@ void KCMBeagleIndexing::defaults() void KCMBeagleIndexing::save() { - KConfig *config = new KConfig("kerryrc"); + TDEConfig *config = new TDEConfig("kerryrc"); config->setGroup("Beagle"); config->writeEntry("AutoStart",startBeagle->isChecked()); config->sync(); diff --git a/kerry/src/kcm/indexing.h b/kerry/src/kcm/indexing.h index 5895897..fa0f18c 100644 --- a/kerry/src/kcm/indexing.h +++ b/kerry/src/kcm/indexing.h @@ -27,7 +27,7 @@ #include #include -class KCMBeagleIndexing : public KCModule +class KCMBeagleIndexing : public TDECModule { Q_OBJECT diff --git a/kerry/src/kcm/kerry.cpp b/kerry/src/kcm/kerry.cpp index 94fef59..ebed671 100644 --- a/kerry/src/kcm/kerry.cpp +++ b/kerry/src/kcm/kerry.cpp @@ -35,7 +35,7 @@ #include "status.h" KCMKerry::KCMKerry(TQWidget *parent, const char *name) - : KCModule( parent, "kcmkerry" ) + : TDECModule( parent, "kcmkerry" ) { setButtons(Default+Apply); @@ -102,9 +102,9 @@ void KCMKerry::save() TQString KCMKerry::quickHelp() const { TQWidget *w = m_tab->currentPage(); - if (w->inherits("KCModule")) + if (w->inherits("TDECModule")) { - KCModule *m = static_cast(w); + TDECModule *m = static_cast(w); return m->quickHelp(); } return TQString(); diff --git a/kerry/src/kcm/kerry.h b/kerry/src/kcm/kerry.h index 67718b1..1ab2b0b 100644 --- a/kerry/src/kcm/kerry.h +++ b/kerry/src/kcm/kerry.h @@ -24,10 +24,10 @@ #include -class KConfig; +class TDEConfig; class TQTabWidget; -class KCMKerry : public KCModule +class KCMKerry : public TDECModule { Q_OBJECT @@ -41,10 +41,10 @@ public: virtual TQString quickHelp() const; private: - KCModule *m_search; - KCModule *m_indexing; - KCModule *m_backends; - KCModule *m_status; + TDECModule *m_search; + TDECModule *m_indexing; + TDECModule *m_backends; + TDECModule *m_status; TQTabWidget *m_tab; }; diff --git a/kerry/src/kcm/main.cpp b/kerry/src/kcm/main.cpp index b1990dc..acd7fff 100644 --- a/kerry/src/kcm/main.cpp +++ b/kerry/src/kcm/main.cpp @@ -27,13 +27,13 @@ extern "C" { - KDE_EXPORT KCModule *create_beagle(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_beagle(TQWidget *parent, const char *name) { TDEGlobal::locale()->insertCatalogue("kcmbeagle"); return new KCMBeagle(parent, name); } - KDE_EXPORT KCModule *create_kerry(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_kerry(TQWidget *parent, const char *name) { TDEGlobal::locale()->insertCatalogue("kcmbeagle"); return new KCMKerry(parent, name); diff --git a/kerry/src/kcm/search.cpp b/kerry/src/kcm/search.cpp index b65ea47..78342da 100644 --- a/kerry/src/kcm/search.cpp +++ b/kerry/src/kcm/search.cpp @@ -24,7 +24,7 @@ #include KCMKerrySearch::KCMKerrySearch(TQWidget *parent, const char * ) - : KCModule(parent, "kcmkerrysearch") + : TDECModule(parent, "kcmkerrysearch") { TQVBoxLayout* top_layout = new TQVBoxLayout( this, KDialog::spacingHint() ); @@ -72,7 +72,7 @@ KCMKerrySearch::KCMKerrySearch(TQWidget *parent, const char * ) globalKeys->insert( "Show Kerry Dialog", i18n("Show Search Dialog"), TQString(), showDialogShortcut, showDialogShortcut, 0, 0); globalKeys->insert( "Search Primary Selection with Kerry", i18n("Search Primary Selection"), TQString(), CTRL+ALT+Key_Space, CTRL+ALT+Key_Space, 0, 0); - KConfig *config = new KConfig("kerryrc"); + TDEConfig *config = new TDEConfig("kerryrc"); globalKeys->readSettings(config); delete config; @@ -115,7 +115,7 @@ void KCMKerrySearch::load( bool useDefaults ) showBigTiles->setChecked(false); } else { - KConfig *config = new KConfig("kerryrc"); + TDEConfig *config = new TDEConfig("kerryrc"); config->setGroup("General"); maxResultsDisplayed->setValue(config->readNumEntry("DisplayAmount", 20)); combo_order->setCurrentItem(config->readNumEntry("DefaultSortOrder",0)); @@ -133,7 +133,7 @@ void KCMKerrySearch::defaults() void KCMKerrySearch::save() { - KConfig *config = new KConfig("kerryrc"); + TDEConfig *config = new TDEConfig("kerryrc"); config->setGroup("General"); config->writeEntry("DisplayAmount", maxResultsDisplayed->value()); config->writeEntry("DefaultSortOrder", combo_order->currentItem()); diff --git a/kerry/src/kcm/search.h b/kerry/src/kcm/search.h index b8d6c1e..93adf9a 100644 --- a/kerry/src/kcm/search.h +++ b/kerry/src/kcm/search.h @@ -34,7 +34,7 @@ #include #include -class KCMKerrySearch : public KCModule +class KCMKerrySearch : public TDECModule { Q_OBJECT diff --git a/kerry/src/kcm/status.cpp b/kerry/src/kcm/status.cpp index 5a76dff..7e74a22 100644 --- a/kerry/src/kcm/status.cpp +++ b/kerry/src/kcm/status.cpp @@ -37,7 +37,7 @@ extern "C" { } KCMBeagleStatus::KCMBeagleStatus(TQWidget *parent, const char * ) - : KCModule(parent, "kcmbeaglestatus") + : TDECModule(parent, "kcmbeaglestatus") { TQVBoxLayout* general_layout = new TQVBoxLayout( this, KDialog::spacingHint() ); diff --git a/kerry/src/kcm/status.h b/kerry/src/kcm/status.h index 1e20f64..fd35116 100644 --- a/kerry/src/kcm/status.h +++ b/kerry/src/kcm/status.h @@ -29,7 +29,7 @@ #include #include -class KCMBeagleStatus : public KCModule +class KCMBeagleStatus : public TDECModule { Q_OBJECT diff --git a/kerry/src/kerryapp.cpp b/kerry/src/kerryapp.cpp index 3360148..655731b 100644 --- a/kerry/src/kerryapp.cpp +++ b/kerry/src/kerryapp.cpp @@ -56,7 +56,7 @@ KerryApplication::KerryApplication() : KUniqueApplication(), KerryApplication::~KerryApplication() { if (hitListWindow) { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->writeEntry("History",hitListWindow->editSearch->historyItems()); config->writeEntry("DialogSize",hitListWindow->size()); config->sync(); @@ -88,7 +88,7 @@ void KerryApplication::init(const TDEAboutData* /*about*/) if (hitListWindow) return; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); hitListWindow = new SearchDlg(); @@ -187,7 +187,7 @@ void KerryApplication::quitKerry() { int autoStart = KMessageBox::questionYesNoCancel( 0L, i18n("Should Kerry start automatically\nwhen you login?"), i18n("Automatically Start Kerry?"), i18n("&Start"), i18n("&Do Not Start") ); - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); if ( autoStart == KMessageBox::Yes ) { config->writeEntry("AutoStart", true); @@ -215,7 +215,7 @@ void KerryApplication::quitKerry() void KerryApplication::clearHistory() { hitListWindow->editSearch->clearHistory(); - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->writeEntry("History",TQString()); config->sync(); } @@ -230,7 +230,7 @@ void KerryApplication::configure() void KerryApplication::configChanged() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); globalKeys->readSettings(config); globalKeys->updateConnections(); } diff --git a/kerry/src/main.cpp b/kerry/src/main.cpp index 0929427..b1e20f9 100644 --- a/kerry/src/main.cpp +++ b/kerry/src/main.cpp @@ -48,7 +48,7 @@ static KCmdLineOptions options[] = bool KSessionManaged::saveState(TQSessionManager&) { -// KConfig* config = kapp->sessionConfig(); +// TDEConfig* config = kapp->sessionConfig(); // config->setGroup("General"); // config->writeEntry("LastSearches", "foobar"); diff --git a/kerry/src/searchdlg.cpp b/kerry/src/searchdlg.cpp index e9b5b40..2ad6460 100644 --- a/kerry/src/searchdlg.cpp +++ b/kerry/src/searchdlg.cpp @@ -1373,7 +1373,7 @@ void SearchDlg::slotStartBeagle() { beagleJustStarted = true; if (cb_beagleStart->isChecked()) { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Beagle"); config->writeEntry("AutoStart",true); config->sync(); @@ -1522,12 +1522,12 @@ void SearchDlg::startPreview( const KFileItemList& items ) stopPreview(); // just in case int iconSize = TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ); - pPreviewJob = KIO::filePreview( items, KIcon::SizeHuge, KIcon::SizeHuge, iconSize, + pPreviewJob = TDEIO::filePreview( items, KIcon::SizeHuge, KIcon::SizeHuge, iconSize, true /*m_pSettings->textPreviewIconTransparency()*/, true /* scale */, true /* save */, 0); //&(d->previewSettings) ); connect( pPreviewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ), this, TQT_SLOT( slotPreview( const KFileItem *, const TQPixmap & ) ) ); - connect( pPreviewJob, TQT_SIGNAL( result( KIO::Job * ) ), + connect( pPreviewJob, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotPreviewResult() ) ); } @@ -1630,7 +1630,7 @@ void SearchDlg::showSearchDialog() void SearchDlg::configChanged() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->reparseConfiguration(); config->setGroup("General"); diff --git a/kerry/src/searchdlg.h b/kerry/src/searchdlg.h index 6c603b1..61eb68c 100644 --- a/kerry/src/searchdlg.h +++ b/kerry/src/searchdlg.h @@ -145,7 +145,7 @@ class SearchDlg : public HitsLayout, virtual public dcopIface bool canPreview( KFileItem* item ); void updatePreviewMimeTypes(); TQStringList* pPreviewMimeTypes; - KIO::PreviewJob *pPreviewJob; + TDEIO::PreviewJob *pPreviewJob; void startPreview( const KFileItemList& items ); void stopPreview(); KFileItemList previewItems;