summaryrefslogtreecommitdiffstats
path: root/kalarm/lib
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501 /kalarm/lib
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kalarm/lib')
-rw-r--r--kalarm/lib/messagebox.cpp6
-rw-r--r--kalarm/lib/messagebox.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/kalarm/lib/messagebox.cpp b/kalarm/lib/messagebox.cpp
index c58287be..721ee5ea 100644
--- a/kalarm/lib/messagebox.cpp
+++ b/kalarm/lib/messagebox.cpp
@@ -23,7 +23,7 @@
#include "messagebox.h"
-KConfig* MessageBox::mConfig = 0;
+TDEConfig* MessageBox::mConfig = 0;
TQMap<TQString, KMessageBox::ButtonCode> MessageBox::mContinueDefaults;
@@ -108,7 +108,7 @@ bool MessageBox::setDefaultShouldBeShownContinue(const TQString& dontShowAgainNa
if (dontShowAgainName.isEmpty())
return false;
// First check whether there is an existing setting
- KConfig* config = mConfig ? mConfig : TDEGlobal::config();
+ TDEConfig* config = mConfig ? mConfig : TDEGlobal::config();
config->setGroup(TQString::fromLatin1("Notification Messages"));
if (config->hasKey(dontShowAgainName))
return false;
@@ -167,7 +167,7 @@ void MessageBox::saveDontShowAgain(const TQString& dontShowAgainName, bool yesno
{
if (dontShowAgainName.isEmpty())
return;
- KConfig* config = mConfig ? mConfig : TDEGlobal::config();
+ TDEConfig* config = mConfig ? mConfig : TDEGlobal::config();
config->setGroup(TQString::fromLatin1("Notification Messages"));
bool global = (dontShowAgainName[0] == ':');
if (yesno)
diff --git a/kalarm/lib/messagebox.h b/kalarm/lib/messagebox.h
index 7a84cf20..b0cae293 100644
--- a/kalarm/lib/messagebox.h
+++ b/kalarm/lib/messagebox.h
@@ -113,12 +113,12 @@ class MessageBox : public KMessageBox
* @param dontShow If true, the message box will be suppressed and will return Continue.
*/
static void saveDontShowAgainContinue(const TQString& dontShowAgainName, bool dontShow = true);
- /** Sets the KConfig object to be used by the MessageBox class. */
- static void setDontShowAskAgainConfig(KConfig* cfg) { mConfig = cfg; }
+ /** Sets the TDEConfig object to be used by the MessageBox class. */
+ static void setDontShowAskAgainConfig(TDEConfig* cfg) { mConfig = cfg; }
private:
static void saveDontShowAgain(const TQString& dontShowAgainName, bool yesno, bool dontShow, const char* yesnoResult = 0);
- static KConfig* mConfig;
+ static TDEConfig* mConfig;
static TQMap<TQString, ButtonCode> mContinueDefaults;
};