From de9a6aa007626eba4e333ac4080cbdfcb9f98386 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:35:36 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kmid/channel.cpp | 2 +- kmid/channelview.cpp | 4 ++-- kmid/history.txt | 2 +- kmid/kdisptext.cpp | 6 +++--- kmid/kmidclient.cpp | 14 +++++++------- kmid/kmidclient.h | 6 +++--- kmid/kmidframe.cpp | 28 ++++++++++++++-------------- kmid/kmidframe.h | 6 +++--- 8 files changed, 34 insertions(+), 34 deletions(-) (limited to 'kmid') diff --git a/kmid/channel.cpp b/kmid/channel.cpp index c8bdb48d..214dcc18 100644 --- a/kmid/channel.cpp +++ b/kmid/channel.cpp @@ -50,7 +50,7 @@ KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent) penW = new TQPen (white); penT = new TQPen (colorGroup().background()); - KConfig *kcfg=TDEGlobal::instance()->config(); + TDEConfig *kcfg=TDEGlobal::instance()->config(); kcfg->setGroup("KMid"); TQFont *qtextfontdefault=new TQFont("lucida",18,TQFont::Bold,TRUE); qcvfont=new TQFont(kcfg->readFontEntry("ChannelViewFont",qtextfontdefault)); diff --git a/kmid/channelview.cpp b/kmid/channelview.cpp index b810aa4e..fe9043f0 100644 --- a/kmid/channelview.cpp +++ b/kmid/channelview.cpp @@ -121,7 +121,7 @@ int ChannelView::lookmode=0; int ChannelView::lookMode(void) { - KConfig *kcfg=(TDEApplication::kApplication())->config(); + TDEConfig *kcfg=(TDEApplication::kApplication())->config(); kcfg->setGroup("KMid"); lookmode=kcfg->readNumEntry("ChannelViewLookMode",0); @@ -131,7 +131,7 @@ int ChannelView::lookMode(void) void ChannelView::lookMode(int i) { - KConfig *kcfg=(TDEApplication::kApplication())->config(); + TDEConfig *kcfg=(TDEApplication::kApplication())->config(); lookmode=i; diff --git a/kmid/history.txt b/kmid/history.txt index 568c4957..3723e854 100644 --- a/kmid/history.txt +++ b/kmid/history.txt @@ -550,7 +550,7 @@ Sunday 5-3-2000 QScrollView) Sunday 2-4-2000 -- Now Libkmid links with tdecore and qt in order to use a KConfig object to +- Now Libkmid links with tdecore and qt in order to use a TDEConfig object to read the default settings as saved by the user with the midi kcontrol module. - It creates a "dummy" TDEInstance in case of the application being a non-KDE application. diff --git a/kmid/kdisptext.cpp b/kmid/kdisptext.cpp index 073c7715..edaede4a 100644 --- a/kmid/kdisptext.cpp +++ b/kmid/kdisptext.cpp @@ -56,7 +56,7 @@ KDisplayText::KDisplayText(TQWidget *parent,const char *name) : TQScrollView(par viewport()->setBackgroundColor(TQColor (110,110,110)); // setBackgroundMode(NoBackground); - KConfig *kcfg=TDEGlobal::instance()->config(); + TDEConfig *kcfg=TDEGlobal::instance()->config(); kcfg->setGroup("KMid"); typeoftextevents=kcfg->readNumEntry("TypeOfTextEvents",1); TQFont *qtextfontdefault=new TQFont(TDEGlobalSettings::fixedFont().family(),22); @@ -333,7 +333,7 @@ void KDisplayText::resizeEvent(TQResizeEvent *e) void KDisplayText::CursorToHome(void) { -/* KConfig *kcfg=TDEGlobal::instance()->config(); +/* TDEConfig *kcfg=TDEGlobal::instance()->config(); kcfg->setGroup("KMid"); typeoftextevents=kcfg->readNumEntry("TypeOfTextEvents",1); */ @@ -499,7 +499,7 @@ TQFont *KDisplayText::getFont(void) void KDisplayText::fontChanged(void) { - KConfig *kcfg=TDEGlobal::instance()->config(); + TDEConfig *kcfg=TDEGlobal::instance()->config(); kcfg->setGroup("KMid"); TQFont *qtextfontdefault=new TQFont(*qtextfont); delete qtextfont; diff --git a/kmid/kmidclient.cpp b/kmid/kmidclient.cpp index cc89e36b..284aa40e 100644 --- a/kmid/kmidclient.cpp +++ b/kmid/kmidclient.cpp @@ -69,7 +69,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name : DCOPObject("KMidIface"), TQWidget(parent,name) { actionCollection=ac; - KConfig *cfg=kapp->config(); + TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); midifile_opened=0L; loopsong=cfg->readNumEntry("Loop",0); @@ -79,7 +79,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name noteArray=0L; shuttingdown=false; - KConfig *kconf=TDEGlobal::instance()->config(); + TDEConfig *kconf=TDEGlobal::instance()->config(); kconf->setGroup("KMid"); TQString tmp2 = locateLocal("appdata", "collections"); @@ -370,9 +370,9 @@ int kmidClient::openURL(const TQString _url) if (!u.isLocalFile()) { filename = TQString("/tmp/") + u.filename(); - KIO::Job *iojob = KIO::copy( u, KURL::fromPathOrURL( filename ) ); + TDEIO::Job *iojob = TDEIO::copy( u, KURL::fromPathOrURL( filename ) ); downloaded=false; - connect( iojob, TQT_SIGNAL( result( KIO::Job *) ), this, TQT_SLOT(downloadFinished( KIO::Job * ) ) ); + connect( iojob, TQT_SIGNAL( result( TDEIO::Job *) ), this, TQT_SLOT(downloadFinished( TDEIO::Job * ) ) ); if (!downloaded) kapp->enter_loop(); @@ -390,7 +390,7 @@ int kmidClient::openURL(const TQString _url) { r=openFile(filename_8bit.data()); - KConfig *cfg=TDEGlobal::instance()->config(); + TDEConfig *cfg=TDEGlobal::instance()->config(); if (cfg->readBoolEntry("deleteTmpNonLocalFiles",false)) { unlink(filename_8bit.data()); @@ -1208,7 +1208,7 @@ void kmidClient::setSLManager(SLManager *slm) void kmidClient::setActiveCollection(int i) { activecollection=i; - KConfig *kconf=TDEGlobal::instance()->config(); + TDEConfig *kconf=TDEGlobal::instance()->config(); kconf->setGroup("KMid"); kconf->writeEntry("ActiveCollection",activecollection); @@ -1516,7 +1516,7 @@ void kmidClient::slotSetTempo(double value) } -void kmidClient::downloadFinished(KIO::Job *) +void kmidClient::downloadFinished(TDEIO::Job *) { downloaded=true; kapp->exit_loop(); diff --git a/kmid/kmidclient.h b/kmid/kmidclient.h index cdb5d1fa..18bef039 100644 --- a/kmid/kmidclient.h +++ b/kmid/kmidclient.h @@ -44,7 +44,7 @@ class DeviceManager; class TDEApplication; -class KConfig; +class TDEConfig; class KLCDNumber; class TQLabel; class TQComboBox; @@ -123,7 +123,7 @@ public: int ChooseTypeOfTextEvents(void); TQFont *getFont(void); - void fontChanged(void); // The new font is already in KConfig + void fontChanged(void); // The new font is already in TDEConfig SLManager *getSLManager(void) {return slman;}; void setSLManager(SLManager *slm); @@ -172,7 +172,7 @@ public slots: void slotSelectSong(int i); void slotSelectEncoding(int i); - void downloadFinished( KIO::Job * ); + void downloadFinished( TDEIO::Job * ); void processSpecialEvent(); diff --git a/kmid/kmidframe.cpp b/kmid/kmidframe.cpp index df2e8320..44a7157d 100644 --- a/kmid/kmidframe.cpp +++ b/kmid/kmidframe.cpp @@ -175,7 +175,7 @@ kmidFrame::kmidFrame(const char *name) setupGUI((ToolBar | Keys | StatusBar | Save | Create ), "kmidui.rc" ); - KConfig *cfg=kapp->config(); + TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); KSelectAction *tmplistaction= ((KSelectAction*)actionCollection()->action("display_events")); @@ -304,7 +304,7 @@ void kmidFrame::song_stopPause() void kmidFrame::options_FileType(int i) { - KConfig *cfg=kapp->config(); + TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); cfg->writeEntry("TypeOfMidiFile",i); kmidclient->setSongType(1-i); @@ -312,7 +312,7 @@ void kmidFrame::options_FileType(int i) void kmidFrame::options_DisplayEvents(int i) { - KConfig *cfg=kapp->config(); + TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); cfg->writeEntry("TypeOfTextEvents",(i==0)?1:5); cfg->sync(); @@ -321,7 +321,7 @@ void kmidFrame::options_DisplayEvents(int i) void kmidFrame::options_AutomaticText() { - KConfig *cfg=kapp->config(); + TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); cfg->writeEntry("AutomaticTextEventChooser",1-cfg->readNumEntry("AutomaticTextEventChooser",1)); } @@ -333,7 +333,7 @@ void kmidFrame::options_FontChange() font=*kmidclient->getFont(); kfd->getFont(font); delete kfd; - KConfig *cfg=kapp->config(); + TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); cfg->writeEntry("KaraokeFont",font); cfg->sync(); @@ -345,7 +345,7 @@ int kmidFrame::autoAddSongToCollection(const TQString& filename,int setactive) int r; SLManager *slman; SongList *sl; - KConfig *cfg=kapp->config(); + TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); if (cfg->readNumEntry("AutoAddToCollection",0)==0) { @@ -429,7 +429,7 @@ void kmidFrame::shuttingDown() kmidclient->saveCollections(); } -void kmidFrame::saveProperties(KConfig *cfg) +void kmidFrame::saveProperties(TDEConfig *cfg) { kmidclient->saveCollections(); int play=kmidclient->isPlaying(); @@ -439,7 +439,7 @@ void kmidFrame::saveProperties(KConfig *cfg) cfg->writeEntry("Playing",play); } -void kmidFrame::readProperties(KConfig *cfg) +void kmidFrame::readProperties(TDEConfig *cfg) { int activecol=cfg->readNumEntry("ActiveCollection",0); int activesong=cfg->readNumEntry("ActiveSong",0); @@ -474,7 +474,7 @@ void kmidFrame::options_MidiSetup() dlg=new MidiConfigDialog(kmidclient->devman(),NULL,"MidiDialog"); if (dlg->exec() == TQDialog::Accepted) { - KConfig *cfg=kapp->config(); + TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); cfg->writeEntry("MidiPortNumber",MidiConfigDialog::selecteddevice); kmidclient->setMidiDevice(MidiConfigDialog::selecteddevice); @@ -509,7 +509,7 @@ delete dlg; void kmidFrame::rechooseTextEvent() { - KConfig *cfg=kapp->config(); + TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); if ((cfg->readNumEntry("AutomaticTextEventChooser",1))==1) { @@ -524,7 +524,7 @@ void kmidFrame::rechooseTextEvent() void kmidFrame::song_Loop() { - KConfig *cfg=kapp->config(); + TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); int i=1-cfg->readNumEntry("Loop",0); cfg->writeEntry("Loop",i); @@ -534,7 +534,7 @@ void kmidFrame::song_Loop() void kmidFrame::collect_PlayOrder(int i) { - KConfig *cfg=kapp->config(); + TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); cfg->writeEntry("CollectionPlayMode", i); cfg->sync(); @@ -543,7 +543,7 @@ void kmidFrame::collect_PlayOrder(int i) void kmidFrame::collect_AutoAdd() { - KConfig *cfg=kapp->config(); + TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); cfg->writeEntry("AutoAddToCollection",1-cfg->readNumEntry("AutoAddToCollection",0)); cfg->sync(); @@ -584,7 +584,7 @@ void kmidFrame::spacePressed() } void kmidFrame::options_ShowVolumeBar() { - KConfig *cfg=kapp->config(); + TDEConfig *cfg=kapp->config(); cfg->setGroup("KMid"); int i=1-cfg->readNumEntry("ShowVolumeBar",0); cfg->writeEntry("ShowVolumeBar",i); diff --git a/kmid/kmidframe.h b/kmid/kmidframe.h index 1e3e08c6..f028c749 100644 --- a/kmid/kmidframe.h +++ b/kmid/kmidframe.h @@ -33,7 +33,7 @@ #include class TDEApplication; -class KConfig; +class TDEConfig; class kmidClient; class KToolBar; class TQDragEvent; @@ -67,8 +67,8 @@ protected: int autoAddSongToCollection(const TQString& filename=TQString(),int setactive=1); - virtual void saveProperties(KConfig *kcfg); - virtual void readProperties(KConfig *kcfg); + virtual void saveProperties(TDEConfig *kcfg); + virtual void readProperties(TDEConfig *kcfg); // virtual void closeEvent(TQCloseEvent *e); -- cgit v1.2.1