From cc74f360bb40da3d79f58048f8e8611804980aa6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:30:47 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kcontrol/info/info.cpp | 4 ++-- kcontrol/info/info.h | 2 +- kcontrol/info/info_netbsd.cpp | 6 +++--- kcontrol/info/main.cpp | 26 +++++++++++++------------- kcontrol/info/memory.cpp | 2 +- kcontrol/info/memory.h | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) (limited to 'kcontrol/info') diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp index 0837209d6..666b914ab 100644 --- a/kcontrol/info/info.cpp +++ b/kcontrol/info/info.cpp @@ -399,7 +399,7 @@ TQString KInfoListWidget::quickHelp() const KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const char *name, bool _getlistbox(TQListView *lbox)) - : KCModule(parent, name), + : TDECModule(parent, name), title(_title) { TDEAboutData *about = @@ -411,7 +411,7 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const about->addAuthor("Helge Deller", 0, "deller@kde.org"); setAboutData( about ); - setButtons(KCModule::Help); + setButtons(TDECModule::Help); getlistbox = _getlistbox; GetInfo_ErrorString = 0; TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); diff --git a/kcontrol/info/info.h b/kcontrol/info/info.h index 80f200d2a..d26c7ba1f 100644 --- a/kcontrol/info/info.h +++ b/kcontrol/info/info.h @@ -32,7 +32,7 @@ bool GetInfo_XServer_and_Video( TQListView *lBox ); bool GetInfo_CD_ROM( TQListView *lBox ); /* New CD-ROM Info */ extern bool GetInfo_OpenGL( TQListView *lBox ); -class KInfoListWidget : public KCModule +class KInfoListWidget : public TDECModule { public: KInfoListWidget(const TQString &_title, TQWidget *parent, const char *name=0, bool _getlistbox (TQListView *)=0); diff --git a/kcontrol/info/info_netbsd.cpp b/kcontrol/info/info_netbsd.cpp index 02fd98b1d..22efcd6d3 100644 --- a/kcontrol/info/info_netbsd.cpp +++ b/kcontrol/info/info_netbsd.cpp @@ -43,7 +43,7 @@ #include #include -#include /* for KIO::convertSize() */ +#include /* for TDEIO::convertSize() */ typedef struct { @@ -295,9 +295,9 @@ bool GetInfo_Partitions (TQListView *lbox) big[1] *= mnt->f_bavail; // FIXME: use f_bfree if root? // convert to strings - vv[0] = KIO::convertSize(big[0]); + vv[0] = TDEIO::convertSize(big[0]); vv[1] = TQString::fromLatin1("%1 (%2%%)") - .arg(KIO::convertSize(big[1])) + .arg(TDEIO::convertSize(big[1])) .arg(mnt->f_blocks ? mnt->f_bavail*100/mnt->f_blocks : 0); // FIXME: these two are large enough to punctuate diff --git a/kcontrol/info/main.cpp b/kcontrol/info/main.cpp index 689ac25b7..780b6532e 100644 --- a/kcontrol/info/main.cpp +++ b/kcontrol/info/main.cpp @@ -34,7 +34,7 @@ extern "C" { - KDE_EXPORT KCModule *create_cpu(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_cpu(TQWidget *parent, const char * /*name*/) { #ifdef INFO_CPU_AVAILABLE return new KInfoListWidget(i18n("Processor(s)"), parent, "kcminfo", GetInfo_CPU); @@ -43,7 +43,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_irq(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_irq(TQWidget *parent, const char * /*name*/) { #ifdef INFO_IRQ_AVAILABLE return new KInfoListWidget(i18n("Interrupt"), parent, "kcminfo", GetInfo_IRQ); @@ -52,7 +52,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_pci(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_pci(TQWidget *parent, const char * /*name*/) { #ifdef INFO_PCI_AVAILABLE return new KInfoListWidget(i18n("PCI"), parent, "kcminfo", GetInfo_PCI); @@ -61,7 +61,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_dma(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_dma(TQWidget *parent, const char * /*name*/) { #ifdef INFO_DMA_AVAILABLE return new KInfoListWidget(i18n("DMA-Channel"), parent, "kcminfo", GetInfo_DMA); @@ -70,7 +70,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_ioports(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_ioports(TQWidget *parent, const char * /*name*/) { #ifdef INFO_IOPORTS_AVAILABLE return new KInfoListWidget(i18n("I/O-Port"), parent, "kcminfo", GetInfo_IO_Ports); @@ -79,7 +79,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_sound(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_sound(TQWidget *parent, const char * /*name*/) { #ifdef INFO_SOUND_AVAILABLE return new KInfoListWidget(i18n("Soundcard"), parent, "kcminfo", GetInfo_Sound); @@ -88,7 +88,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_scsi(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_scsi(TQWidget *parent, const char * /*name*/) { #ifdef INFO_SCSI_AVAILABLE return new KInfoListWidget(i18n("SCSI"), parent, "kcminfo", GetInfo_SCSI); @@ -97,7 +97,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_devices(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_devices(TQWidget *parent, const char * /*name*/) { #ifdef INFO_DEVICES_AVAILABLE return new KInfoListWidget(i18n("Devices"), parent, "kcminfo", GetInfo_Devices); @@ -106,7 +106,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_partitions(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_partitions(TQWidget *parent, const char * /*name*/) { #ifdef INFO_PARTITIONS_AVAILABLE return new KInfoListWidget(i18n("Partitions"), parent, "kcminfo", GetInfo_Partitions); @@ -115,7 +115,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_xserver(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_xserver(TQWidget *parent, const char * /*name*/) { #ifdef INFO_XSERVER_AVAILABLE return new KInfoListWidget(i18n("X-Server"), parent, "kcminfo", GetInfo_XServer_and_Video); @@ -124,12 +124,12 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_memory(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_memory(TQWidget *parent, const char * /*name*/) { return new KMemoryWidget(parent, "kcminfo"); } - KDE_EXPORT KCModule *create_opengl(TQWidget *parent, const char * ) + KDE_EXPORT TDECModule *create_opengl(TQWidget *parent, const char * ) { #ifdef INFO_OPENGL_AVAILABLE return new KInfoListWidget(i18n("OpenGL"), parent, "kcminfo", GetInfo_OpenGL); @@ -139,7 +139,7 @@ extern "C" } /* create_cdinfo function for CD-ROM Info ~Jahshan */ - KDE_EXPORT KCModule *create_cdinfo(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_cdinfo(TQWidget *parent, const char * /*name*/) { #ifdef INFO_CD_ROM_AVAILABLE return new KInfoListWidget(i18n("CD-ROM Info"), parent, "kcminfo", GetInfo_CD_ROM); diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index 49cb03dde..d6cd750ec 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -88,7 +88,7 @@ static TQString formatted_unit(t_memsize value) } KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) -: KCModule(parent, name) +: TDECModule(parent, name) { TDEAboutData *about = diff --git a/kcontrol/info/memory.h b/kcontrol/info/memory.h index 1387f5ac3..aaeb56f86 100644 --- a/kcontrol/info/memory.h +++ b/kcontrol/info/memory.h @@ -27,7 +27,7 @@ typedef unsigned long t_memsize; #define COLOR_USED_RAM TQColor(220,200,88) #define COLOR_FREE_MEMORY TQColor(127,255,212) -class KMemoryWidget:public KCModule { +class KMemoryWidget:public TDECModule { Q_OBJECT public: -- cgit v1.2.3