summaryrefslogtreecommitdiffstats
path: root/kontact/plugins/newsticker
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 /kontact/plugins/newsticker
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kontact/plugins/newsticker')
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.cpp12
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.desktop2
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.h2
-rw-r--r--kontact/plugins/newsticker/summarywidget.cpp2
4 files changed, 9 insertions, 9 deletions
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 0a059da3b..6e0efd0fc 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -49,7 +49,7 @@
extern "C"
{
- KDE_EXPORT KCModule *create_kontactknt( TQWidget *parent, const char * )
+ KDE_EXPORT TDECModule *create_kontactknt( TQWidget *parent, const char * )
{
return new KCMKontactKNT( parent, "kcmkontactknt" );
}
@@ -129,7 +129,7 @@ class NewsItem : public TQListViewItem
};
KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name )
- : KCModule( parent, name )
+ : TDECModule( parent, name )
{
initGUI();
@@ -175,7 +175,7 @@ void KCMKontactKNT::loadNews()
void KCMKontactKNT::loadCustomNews()
{
- KConfig config( "kcmkontactkntrc" );
+ TDEConfig config( "kcmkontactkntrc" );
TQMap<TQString, TQString> customFeeds = config.entryMap( "CustomFeeds" );
config.setGroup( "CustomFeeds" );
@@ -196,7 +196,7 @@ void KCMKontactKNT::loadCustomNews()
void KCMKontactKNT::storeCustomNews()
{
- KConfig config( "kcmkontactkntrc" );
+ TDEConfig config( "kcmkontactkntrc" );
config.deleteGroup( "CustomFeeds" );
config.setGroup( "CustomFeeds" );
@@ -409,7 +409,7 @@ void KCMKontactKNT::load()
loadCustomNews();
scanNews();
- KConfig config( "kcmkontactkntrc" );
+ TDEConfig config( "kcmkontactkntrc" );
config.setGroup( "General" );
mUpdateInterval->setValue( config.readNumEntry( "UpdateInterval", 600 ) );
@@ -422,7 +422,7 @@ void KCMKontactKNT::save()
{
storeCustomNews();
- KConfig config( "kcmkontactkntrc" );
+ TDEConfig config( "kcmkontactkntrc" );
config.setGroup( "General" );
config.writeEntry( "UpdateInterval", mUpdateInterval->value() );
diff --git a/kontact/plugins/newsticker/kcmkontactknt.desktop b/kontact/plugins/newsticker/kcmkontactknt.desktop
index b395d1313..5b4418c96 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.desktop
+++ b/kontact/plugins/newsticker/kcmkontactknt.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=knode
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kontactknt
diff --git a/kontact/plugins/newsticker/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h
index 0f9c15481..2eedb0a73 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.h
+++ b/kontact/plugins/newsticker/kcmkontactknt.h
@@ -35,7 +35,7 @@ class KPushButton;
class NewsItem;
-class KCMKontactKNT : public KCModule
+class KCMKontactKNT : public TDECModule
{
Q_OBJECT
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index 8e6719fce..52bb8b6e4 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -105,7 +105,7 @@ void SummaryWidget::configChanged()
void SummaryWidget::readConfig()
{
- KConfig config( "kcmkontactkntrc" );
+ TDEConfig config( "kcmkontactkntrc" );
config.setGroup( "General" );
mUpdateInterval = config.readNumEntry( "UpdateInterval", 600 );