From 8856e75c203aa69be210b2fee1095ab9761aca7e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:23:08 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- ksim/monitors/cpu/ksimcpu.cpp | 4 ++-- ksim/monitors/disk/ksimdisk.cpp | 4 ++-- ksim/monitors/filesystem/ksimfsystem.cpp | 4 ++-- ksim/monitors/i8k/ksimi8k.cpp | 4 ++-- ksim/monitors/lm_sensors/ksimsensors.cpp | 4 ++-- ksim/monitors/lm_sensors/ksimsensors.h | 2 +- ksim/monitors/mail/ksimmail.cpp | 4 ++-- ksim/monitors/net/ksimnet.cpp | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) (limited to 'ksim/monitors') diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp index fc7ccca..aaed602 100644 --- a/ksim/monitors/cpu/ksimcpu.cpp +++ b/ksim/monitors/cpu/ksimcpu.cpp @@ -96,10 +96,10 @@ void CpuPlugin::showAbout() { TQString version = kapp->aboutData()->version(); - KAboutData aboutData(instanceName(), + TDEAboutData aboutData(instanceName(), I18N_NOOP("KSim CPU Plugin"), version.latin1(), I18N_NOOP("A cpu monitor plugin for KSim"), - KAboutData::License_GPL, "(C) 2001 Robbie Ward"); + TDEAboutData::License_GPL, "(C) 2001 Robbie Ward"); aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"), "linuxphreak@gmx.co.uk"); diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp index 7a778fd..cccf0a5 100644 --- a/ksim/monitors/disk/ksimdisk.cpp +++ b/ksim/monitors/disk/ksimdisk.cpp @@ -92,10 +92,10 @@ void DiskPlugin::showAbout() { TQString version = kapp->aboutData()->version(); - KAboutData aboutData(instanceName(), + TDEAboutData aboutData(instanceName(), I18N_NOOP("KSim Disk Plugin"), version.latin1(), I18N_NOOP("A disk monitor plugin for KSim"), - KAboutData::License_GPL, "(C) 2001 Robbie Ward"); + TDEAboutData::License_GPL, "(C) 2001 Robbie Ward"); aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"), "linuxphreak@gmx.co.uk"); diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp index 9b08da9..46edb3c 100644 --- a/ksim/monitors/filesystem/ksimfsystem.cpp +++ b/ksim/monitors/filesystem/ksimfsystem.cpp @@ -66,10 +66,10 @@ void PluginModule::showAbout() { TQString version = kapp->aboutData()->version(); - KAboutData aboutData(instanceName(), + TDEAboutData aboutData(instanceName(), I18N_NOOP("KSim FileSystem Plugin"), version.latin1(), I18N_NOOP("A filesystem plugin for KSim"), - KAboutData::License_GPL, "(C) 2001 Robbie Ward"); + TDEAboutData::License_GPL, "(C) 2001 Robbie Ward"); aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"), "linuxphreak@gmx.co.uk"); diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp index 46a96e0..211fd4d 100644 --- a/ksim/monitors/i8k/ksimi8k.cpp +++ b/ksim/monitors/i8k/ksimi8k.cpp @@ -61,10 +61,10 @@ void I8KPlugin::showAbout() { TQString version = kapp->aboutData()->version(); - KAboutData aboutData(instanceName(), + TDEAboutData aboutData(instanceName(), I18N_NOOP("KSim I8K Plugin"), version.latin1(), I18N_NOOP("Dell I8K Hardware Monitor plugin"), - KAboutData::License_GPL, "(C) 2003 Nadeem Hasan"); + TDEAboutData::License_GPL, "(C) 2003 Nadeem Hasan"); aboutData.addAuthor("Nadeem Hasan", I18N_NOOP("Author"), "nhasan@kde.org"); diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp index eb2614f..c3fcda3 100644 --- a/ksim/monitors/lm_sensors/ksimsensors.cpp +++ b/ksim/monitors/lm_sensors/ksimsensors.cpp @@ -60,10 +60,10 @@ void PluginModule::showAbout() { TQString version = kapp->aboutData()->version(); - KAboutData aboutData(instanceName(), + TDEAboutData aboutData(instanceName(), I18N_NOOP("KSim Sensors Plugin"), version.latin1(), I18N_NOOP("An lm_sensors plugin for KSim"), - KAboutData::License_GPL, "(C) 2001 Robbie Ward"); + TDEAboutData::License_GPL, "(C) 2001 Robbie Ward"); aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"), "linuxphreak@gmx.co.uk"); diff --git a/ksim/monitors/lm_sensors/ksimsensors.h b/ksim/monitors/lm_sensors/ksimsensors.h index a0c9455..4f66a8b 100644 --- a/ksim/monitors/lm_sensors/ksimsensors.h +++ b/ksim/monitors/lm_sensors/ksimsensors.h @@ -26,7 +26,7 @@ class KConfig; class SensorList; -class KInstance; +class TDEInstance; /** * This class is the lm_sensors monitor plugin diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp index fdda6bd..b2903b6 100644 --- a/ksim/monitors/mail/ksimmail.cpp +++ b/ksim/monitors/mail/ksimmail.cpp @@ -57,10 +57,10 @@ KSim::PluginPage* MailPlugin::createConfigPage( const char* name ) void MailPlugin::showAbout() { - KAboutData about( instanceName(), + TDEAboutData about( instanceName(), I18N_NOOP( "KSim Mail Plugin" ), "0.1", I18N_NOOP( "A mail monitor plugin for KSim" ), - KAboutData::License_GPL, "(c) 2002 Malte Starostik" ); + TDEAboutData::License_GPL, "(c) 2002 Malte Starostik" ); about.addAuthor( "Malte Starostik", I18N_NOOP( "Author" ), "malte@kde.org" ); KAboutApplication( &about ).exec(); diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp index 140d822..2d3bd9c 100644 --- a/ksim/monitors/net/ksimnet.cpp +++ b/ksim/monitors/net/ksimnet.cpp @@ -86,10 +86,10 @@ void NetPlugin::showAbout() { TQString version = kapp->aboutData()->version(); - KAboutData aboutData(instanceName(), + TDEAboutData aboutData(instanceName(), I18N_NOOP("KSim Net Plugin"), version.latin1(), I18N_NOOP("A net plugin for KSim"), - KAboutData::License_GPL, "(C) 2001 Robbie Ward"); + TDEAboutData::License_GPL, "(C) 2001 Robbie Ward"); aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"), "linuxphreak@gmx.co.uk"); -- cgit v1.2.1