diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:06:54 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:06:54 -0600 |
commit | 4946d97747eac03d3fbc7c624cd027990d85f0e4 (patch) | |
tree | 6879368be68593343f00b03e9ff8d590393df315 /katapult/common | |
parent | a935c1de6f952a489a96a27cb897144b5d225ebe (diff) | |
download | katapult-4946d97747eac03d3fbc7c624cd027990d85f0e4.tar.gz katapult-4946d97747eac03d3fbc7c624cd027990d85f0e4.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'katapult/common')
-rw-r--r-- | katapult/common/imagedisplay.cpp | 4 | ||||
-rw-r--r-- | katapult/common/imagedisplay.h | 4 | ||||
-rw-r--r-- | katapult/common/katapultcatalog.cpp | 4 | ||||
-rw-r--r-- | katapult/common/katapultcatalog.h | 6 | ||||
-rw-r--r-- | katapult/common/katapultdisplay.cpp | 4 | ||||
-rw-r--r-- | katapult/common/katapultdisplay.h | 6 |
6 files changed, 14 insertions, 14 deletions
diff --git a/katapult/common/imagedisplay.cpp b/katapult/common/imagedisplay.cpp index dbbc40d..a1ba512 100644 --- a/katapult/common/imagedisplay.cpp +++ b/katapult/common/imagedisplay.cpp @@ -384,7 +384,7 @@ void ImageDisplay::updateOffset() offset[3] = margin[3] + padding; } -void ImageDisplay::readSettings(KConfigBase *config) +void ImageDisplay::readSettings(TDEConfigBase *config) { fadeTime = config->readUnsignedNumEntry("FadeTime", 250); updateFadeStep(); @@ -395,7 +395,7 @@ void ImageDisplay::readSettings(KConfigBase *config) maxFontSize = config->readUnsignedNumEntry("MaxFontSize", 14); } -void ImageDisplay::writeSettings(KConfigBase *config) +void ImageDisplay::writeSettings(TDEConfigBase *config) { config->writeEntry("FadeTime", fadeTime); config->writeEntry("FontFace", fontFace); diff --git a/katapult/common/imagedisplay.h b/katapult/common/imagedisplay.h index 45edac0..a9de837 100644 --- a/katapult/common/imagedisplay.h +++ b/katapult/common/imagedisplay.h @@ -45,8 +45,8 @@ public slots: void continueFade(); virtual void hide(); - virtual void readSettings(KConfigBase *); - virtual void writeSettings(KConfigBase *); + virtual void readSettings(TDEConfigBase *); + virtual void writeSettings(TDEConfigBase *); virtual TQWidget * configure(); void setFont(const TQString &); diff --git a/katapult/common/katapultcatalog.cpp b/katapult/common/katapultcatalog.cpp index 65ff83d..7ffe8c8 100644 --- a/katapult/common/katapultcatalog.cpp +++ b/katapult/common/katapultcatalog.cpp @@ -75,11 +75,11 @@ Match KatapultCatalog::bestMatch() const return _bestMatch; } -void KatapultCatalog::readSettings(KConfigBase *) +void KatapultCatalog::readSettings(TDEConfigBase *) { } -void KatapultCatalog::writeSettings(KConfigBase *) +void KatapultCatalog::writeSettings(TDEConfigBase *) { } diff --git a/katapult/common/katapultcatalog.h b/katapult/common/katapultcatalog.h index 388b958..3ffef8d 100644 --- a/katapult/common/katapultcatalog.h +++ b/katapult/common/katapultcatalog.h @@ -27,7 +27,7 @@ #include "match.h" class TQWidget; -class KConfigBase; +class TDEConfigBase; /** @author Joe Ferris @@ -46,8 +46,8 @@ public: Match bestMatch() const; virtual void initialize(); - virtual void readSettings(KConfigBase *); - virtual void writeSettings(KConfigBase *); + virtual void readSettings(TDEConfigBase *); + virtual void writeSettings(TDEConfigBase *); virtual TQWidget * configure(); protected: diff --git a/katapult/common/katapultdisplay.cpp b/katapult/common/katapultdisplay.cpp index b6d3dc6..5102496 100644 --- a/katapult/common/katapultdisplay.cpp +++ b/katapult/common/katapultdisplay.cpp @@ -101,11 +101,11 @@ int KatapultDisplay::status() const return _status; } -void KatapultDisplay::readSettings(KConfigBase *) +void KatapultDisplay::readSettings(TDEConfigBase *) { } -void KatapultDisplay::writeSettings(KConfigBase *) +void KatapultDisplay::writeSettings(TDEConfigBase *) { } diff --git a/katapult/common/katapultdisplay.h b/katapult/common/katapultdisplay.h index b3f789c..4757d3e 100644 --- a/katapult/common/katapultdisplay.h +++ b/katapult/common/katapultdisplay.h @@ -28,7 +28,7 @@ #include "katapultaction.h" class Katapult; -class KConfigBase; +class TDEConfigBase; /** @author Joe Ferris @@ -48,8 +48,8 @@ public: void setAction(const KatapultAction *); void setStatus(int); - virtual void readSettings(KConfigBase *); - virtual void writeSettings(KConfigBase *); + virtual void readSettings(TDEConfigBase *); + virtual void writeSettings(TDEConfigBase *); virtual TQWidget * configure(); signals: |