diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:36:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:36:20 -0600 |
| commit | f21aaec952493cb5688c73de6e82a569ddbd7fb2 (patch) | |
| tree | 78ccb5117063da3e08e3277e11054b912a9f2ae7 /kopete/plugins/motionautoaway | |
| 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 'kopete/plugins/motionautoaway')
4 files changed, 7 insertions, 7 deletions
diff --git a/kopete/plugins/motionautoaway/kopete_motionaway_config.desktop b/kopete/plugins/motionautoaway/kopete_motionaway_config.desktop index 85a0213c..2f1ae265 100644 --- a/kopete/plugins/motionautoaway/kopete_motionaway_config.desktop +++ b/kopete/plugins/motionautoaway/kopete_motionaway_config.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=KCModule +ServiceTypes=TDECModule X-TDE-ModuleType=Library X-TDE-Library=kopete_motionaway diff --git a/kopete/plugins/motionautoaway/motionawayplugin.cpp b/kopete/plugins/motionautoaway/motionawayplugin.cpp index 56958bec..ea4bf2bc 100644 --- a/kopete/plugins/motionautoaway/motionawayplugin.cpp +++ b/kopete/plugins/motionautoaway/motionawayplugin.cpp @@ -159,7 +159,7 @@ MotionAwayPlugin::~MotionAwayPlugin() } void MotionAwayPlugin::loadSettings(){ - KConfig *kconfig = TDEGlobal::config(); + TDEConfig *kconfig = TDEGlobal::config(); kconfig->setGroup("MotionAway Plugin"); awayTimeout = kconfig->readNumEntry("AwayTimeout", 1); diff --git a/kopete/plugins/motionautoaway/motionawaypreferences.cpp b/kopete/plugins/motionautoaway/motionawaypreferences.cpp index 889d4d30..01dc7771 100644 --- a/kopete/plugins/motionautoaway/motionawaypreferences.cpp +++ b/kopete/plugins/motionautoaway/motionawaypreferences.cpp @@ -31,7 +31,7 @@ typedef KGenericFactory<MotionAwayPreferences> MotionAwayPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_motionaway, MotionAwayPreferencesFactory("kcm_kopete_motionaway")) MotionAwayPreferences::MotionAwayPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args) - : KCModule(MotionAwayPreferencesFactory::instance(), parent, args) + : TDECModule(MotionAwayPreferencesFactory::instance(), parent, args) { // Add actuall widget generated from ui file. ( new TQVBoxLayout( this ) )->setAutoAdd( true ); @@ -48,12 +48,12 @@ void MotionAwayPreferences::load() preferencesDialog->AwayTimeout->setValue(MotionAwayConfig::self()->awayTimeout()); preferencesDialog->BecomeAvailableWithActivity->setChecked(MotionAwayConfig::self()->becomeAvailableWithActivity()); preferencesDialog->VideoDevice->setText(MotionAwayConfig::self()->videoDevice()); - emit KCModule::changed(false); + emit TDECModule::changed(false); } void MotionAwayPreferences::slotWidgetModified() { - emit KCModule::changed(true); + emit TDECModule::changed(true); } void MotionAwayPreferences::save() @@ -62,7 +62,7 @@ void MotionAwayPreferences::save() MotionAwayConfig::self()->setBecomeAvailableWithActivity(preferencesDialog->BecomeAvailableWithActivity->isChecked()); MotionAwayConfig::self()->setVideoDevice(preferencesDialog->VideoDevice->text()); MotionAwayConfig::self()->writeConfig(); - emit KCModule::changed(false); + emit TDECModule::changed(false); } #include "motionawaypreferences.moc" diff --git a/kopete/plugins/motionautoaway/motionawaypreferences.h b/kopete/plugins/motionautoaway/motionawaypreferences.h index 3574005b..78ac9104 100644 --- a/kopete/plugins/motionautoaway/motionawaypreferences.h +++ b/kopete/plugins/motionautoaway/motionawaypreferences.h @@ -26,7 +26,7 @@ class motionawayPrefsUI; * Preference widget for the Motion Away plugin * @author Duncan Mac-Vicar P. */ -class MotionAwayPreferences : public KCModule +class MotionAwayPreferences : public TDECModule { Q_OBJECT |