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/netmeeting | |
| 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/netmeeting')
4 files changed, 9 insertions, 9 deletions
diff --git a/kopete/plugins/netmeeting/kopete_netmeeting_config.desktop b/kopete/plugins/netmeeting/kopete_netmeeting_config.desktop index 154dcf16..0d266c03 100644 --- a/kopete/plugins/netmeeting/kopete_netmeeting_config.desktop +++ b/kopete/plugins/netmeeting/kopete_netmeeting_config.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=highlight Type=Service -ServiceTypes=KCModule +ServiceTypes=TDECModule X-TDE-ModuleType=Library X-TDE-Library=kopete_netmeeting diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp index 8d310bc0..7581ac62 100644 --- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp +++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp @@ -160,7 +160,7 @@ void NetMeetingInvitation::startMeeting(const TQString & ip_address) { //TODO: use TDEProcess - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup("Netmeeting Plugin"); TQString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").arg(ip_address); diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp index a1801fbf..d5d7f01b 100644 --- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp +++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp @@ -40,7 +40,7 @@ typedef KGenericFactory<NetmeetingPreferences> NetmeetingPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_netmeeting, NetmeetingPreferencesFactory( "kcm_kopete_netmeeting" ) ) NetmeetingPreferences::NetmeetingPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args) - : KCModule(NetmeetingPreferencesFactory::instance(), parent, args) + : TDECModule(NetmeetingPreferencesFactory::instance(), parent, args) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); preferencesDialog = new NetmeetingPrefsUI(this); @@ -56,24 +56,24 @@ NetmeetingPreferences::~NetmeetingPreferences() void NetmeetingPreferences::load() { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup("Netmeeting Plugin"); preferencesDialog->m_app->setCurrentText(config->readEntry("NetmeetingApplication","ekiga -c callto://%1")); - emit KCModule::changed(false); + emit TDECModule::changed(false); } void NetmeetingPreferences::save() { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup("Netmeeting Plugin"); config->writeEntry("NetmeetingApplication",preferencesDialog->m_app->currentText()); - emit KCModule::changed(false); + emit TDECModule::changed(false); } void NetmeetingPreferences::slotChanged() { - emit KCModule::changed(true); + emit TDECModule::changed(true); } #include "netmeetingpreferences.moc" diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.h b/kopete/plugins/netmeeting/netmeetingpreferences.h index 2ed4d86b..2246e805 100644 --- a/kopete/plugins/netmeeting/netmeetingpreferences.h +++ b/kopete/plugins/netmeeting/netmeetingpreferences.h @@ -26,7 +26,7 @@ class NetmeetingPrefsUI; *@author Olivier Goffart */ -class NetmeetingPreferences : public KCModule { +class NetmeetingPreferences : public TDECModule { Q_OBJECT public: |