diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:36:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:36:20 -0600 |
| commit | f21aaec952493cb5688c73de6e82a569ddbd7fb2 (patch) | |
| tree | 78ccb5117063da3e08e3277e11054b912a9f2ae7 /ksirc/KSTicker | |
| parent | c48e769eb275917717e2b55eb869f7e559293ac8 (diff) | |
| download | tdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.tar.gz tdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'ksirc/KSTicker')
| -rw-r--r-- | ksirc/KSTicker/ksticker.cpp | 6 | ||||
| -rw-r--r-- | ksirc/KSTicker/ksttest.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp index 84821e7d..5187489a 100644 --- a/ksirc/KSTicker/ksticker.cpp +++ b/ksirc/KSTicker/ksticker.cpp @@ -30,7 +30,7 @@ KSTicker::KSTicker(TQWidget * parent, const char * name, WFlags f) pic = new TQPixmap(); // create pic map here, resize it later though. // pic->setBackgroundMode(TransparentMode); - KConfig *conf = kapp->config(); + TDEConfig *conf = kapp->config(); conf->setGroup("KSTicker"); bScrollConstantly = conf->readNumEntry("ScollConst", FALSE); @@ -445,7 +445,7 @@ void KSTicker::scrollConstantly() popup->setItemChecked(iScrollItem, bScrollConstantly); if(bScrollConstantly == TRUE) startTicker(); - KConfig *conf = kapp->config(); + TDEConfig *conf = kapp->config(); conf->setGroup("KSTicker"); conf->writeEntry("ScollConst", bScrollConstantly); conf->sync(); @@ -456,7 +456,7 @@ void KSTicker::updateFont(const TQFont &font){ setFixedHeight((fontMetrics().height()+fontMetrics().descent()*2)*pHeight); resize(fontMetrics().width("X")*chars, (fontMetrics().height()+fontMetrics().descent())*pHeight); - KConfig *conf = kapp->config(); + TDEConfig *conf = kapp->config(); conf->setGroup("KSTicker"); conf->writeEntry("Font", font); conf->sync(); diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp index 880626b4..ad8c3864 100644 --- a/ksirc/KSTicker/ksttest.cpp +++ b/ksirc/KSTicker/ksttest.cpp @@ -13,7 +13,7 @@ #include "ksttest.h" #include "../ksopts.h" -KConfig *kConfig; +TDEConfig *kConfig; StdInTicker::StdInTicker() : KSTicker() |