summaryrefslogtreecommitdiffstats
path: root/amor
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:58 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:58 -0600
commit9ea931fb1bda0802797c1d38fd903b5451b91a5a (patch)
tree52871b68f40404504f789e2abefc24080510e51e /amor
parent2178da111f72dc574457d5242d120b4d10ea5edd (diff)
downloadtdetoys-9ea931fb1bda0802797c1d38fd903b5451b91a5a.tar.gz
tdetoys-9ea931fb1bda0802797c1d38fd903b5451b91a5a.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'amor')
-rw-r--r--amor/amor.h2
-rw-r--r--amor/amoranim.cpp4
-rw-r--r--amor/amoranim.h4
-rw-r--r--amor/amorconfig.cpp8
-rw-r--r--amor/amordialog.cpp4
5 files changed, 11 insertions, 11 deletions
diff --git a/amor/amor.h b/amor/amor.h
index 96cb8c1..9991bbb 100644
--- a/amor/amor.h
+++ b/amor/amor.h
@@ -111,7 +111,7 @@ protected:
enum State { Focus, Blur, Normal, Sleeping, Waking, Destroy };
bool readConfig();
- void readGroupConfig(KConfigBase &config, TQPtrList<AmorAnim> &animList,
+ void readGroupConfig(TDEConfigBase &config, TQPtrList<AmorAnim> &animList,
const char *seq);
void showBubble();
AmorAnim *randomAnimation(TQPtrList<AmorAnim> &animList);
diff --git a/amor/amoranim.cpp b/amor/amoranim.cpp
index b4e595b..a87bdf1 100644
--- a/amor/amoranim.cpp
+++ b/amor/amoranim.cpp
@@ -34,7 +34,7 @@
//
// Constructor
//
-AmorAnim::AmorAnim(KConfigBase &config)
+AmorAnim::AmorAnim(TDEConfigBase &config)
: mMaximumSize(0, 0)
{
mCurrent = 0;
@@ -69,7 +69,7 @@ const TQPixmap *AmorAnim::frame()
// Read a single animation's parameters. The config class should already
// have its group set to the animation that is to be read.
//
-void AmorAnim::readConfig(KConfigBase &config)
+void AmorAnim::readConfig(TDEConfigBase &config)
{
// Read the list of frames to display and load them into the pixmap
// manager.
diff --git a/amor/amoranim.h b/amor/amoranim.h
index acc4fba..bb59d8a 100644
--- a/amor/amoranim.h
+++ b/amor/amoranim.h
@@ -46,7 +46,7 @@
class AmorAnim
{
public:
- AmorAnim(KConfigBase &config);
+ AmorAnim(TDEConfigBase &config);
virtual ~AmorAnim();
void reset()
@@ -71,7 +71,7 @@ public:
const TQPixmap *frame();
protected:
- void readConfig(KConfigBase &config);
+ void readConfig(TDEConfigBase &config);
protected:
unsigned int mCurrent; // current frame in sequence
diff --git a/amor/amorconfig.cpp b/amor/amorconfig.cpp
index 3a0c209..2285bc7 100644
--- a/amor/amorconfig.cpp
+++ b/amor/amorconfig.cpp
@@ -48,8 +48,8 @@ AmorConfig::AmorConfig()
//
void AmorConfig::read()
{
- KConfig *config = kapp->config();
- KConfigGroupSaver cs(config, "General");
+ TDEConfig *config = kapp->config();
+ TDEConfigGroupSaver cs(config, "General");
mOnTop = config->readBoolEntry("OnTop", false);
mOffset = config->readNumEntry("Offset", 0);
@@ -66,8 +66,8 @@ void AmorConfig::read()
//
void AmorConfig::write()
{
- KConfig *config = kapp->config();
- KConfigGroupSaver cs(config, "General");
+ TDEConfig *config = kapp->config();
+ TDEConfigGroupSaver cs(config, "General");
config->writeEntry("OnTop", mOnTop);
config->writeEntry("Offset", mOffset);
diff --git a/amor/amordialog.cpp b/amor/amordialog.cpp
index 56f035d..36cc629 100644
--- a/amor/amordialog.cpp
+++ b/amor/amordialog.cpp
@@ -251,8 +251,8 @@ void AmorDialog::slotApply()
void AmorDialog::slotCancel()
{
// restore offset
- KConfig *config = kapp->config();
- KConfigGroupSaver cs(config, "General");
+ TDEConfig *config = kapp->config();
+ TDEConfigGroupSaver cs(config, "General");
emit offsetChanged(config->readNumEntry("Offset"));
reject();
}