From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:37:21 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- certmanager/kwatchgnupg/kwatchgnupgconfig.cpp | 4 ++-- certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'certmanager/kwatchgnupg') diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp index 5a49f134d..200175b2d 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp @@ -157,7 +157,7 @@ void KWatchGnuPGConfig::slotSetHistorySizeUnlimited() { void KWatchGnuPGConfig::loadConfig() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("WatchGnuPG"); mExeED->setURL( config->readEntry( "Executable", "watchgnupg" ) ); mSocketED->setURL( config->readEntry( "Socket", TQDir::home().canonicalPath() @@ -175,7 +175,7 @@ void KWatchGnuPGConfig::loadConfig() void KWatchGnuPGConfig::saveConfig() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("WatchGnuPG"); config->writeEntry( "Executable", mExeED->url() ); config->writeEntry( "Socket", mSocketED->url() ); diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp index 242643196..9bcd0b390 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp @@ -138,7 +138,7 @@ void KWatchGnuPGMainWindow::startWatcher() .arg( TQDateTime::currentDateTime().toString(Qt::ISODate))); } mWatcher->clearArguments(); - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("WatchGnuPG"); *mWatcher << config->readEntry("Executable", WATCHGNUPGBINARY); *mWatcher << "--force"; @@ -162,7 +162,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig() if ( !cconfig ) return; //Q_ASSERT( cconfig ); - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("WatchGnuPG"); TQStringList comps = cconfig->componentList(); for( TQStringList::const_iterator it = comps.begin(); it != comps.end(); ++it ) { @@ -270,7 +270,7 @@ void KWatchGnuPGMainWindow::slotConfigure() void KWatchGnuPGMainWindow::slotReadConfig() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("LogWindow"); mCentralWidget->setWordWrap( config->readBoolEntry("WordWrap", false) ?TQTextEdit::WidgetWidth -- cgit v1.2.1