diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:46 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:46 -0600 |
commit | 27430f06c6cc2187c639f59f342f07f1fde91a8b (patch) | |
tree | 493c1095950b7f0a82690cedac1b749666be1b47 /kmid | |
parent | 794a886cbd6d6893d62026f3800b95051652fc5a (diff) | |
download | tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.tar.gz tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmid')
-rw-r--r-- | kmid/channel.cpp | 2 | ||||
-rw-r--r-- | kmid/kdisptext.cpp | 12 | ||||
-rw-r--r-- | kmid/kmidclient.cpp | 12 | ||||
-rw-r--r-- | kmid/midicfgdlg.cpp | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/kmid/channel.cpp b/kmid/channel.cpp index 7d077dd7..c8bdb48d 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=KGlobal::instance()->config(); + KConfig *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/kdisptext.cpp b/kmid/kdisptext.cpp index 3eabda50..073c7715 100644 --- a/kmid/kdisptext.cpp +++ b/kmid/kdisptext.cpp @@ -52,14 +52,14 @@ KDisplayText::KDisplayText(TQWidget *parent,const char *name) : TQScrollView(par first_line=NULL; cursor=NULL; nlines=0; - lyrics_codec=KGlobal::locale()->codecForEncoding(); + lyrics_codec=TDEGlobal::locale()->codecForEncoding(); viewport()->setBackgroundColor(TQColor (110,110,110)); // setBackgroundMode(NoBackground); - KConfig *kcfg=KGlobal::instance()->config(); + KConfig *kcfg=TDEGlobal::instance()->config(); kcfg->setGroup("KMid"); typeoftextevents=kcfg->readNumEntry("TypeOfTextEvents",1); - TQFont *qtextfontdefault=new TQFont(KGlobalSettings::fixedFont().family(),22); + TQFont *qtextfontdefault=new TQFont(TDEGlobalSettings::fixedFont().family(),22); qtextfont=new TQFont(kcfg->readFontEntry("KaraokeFont",qtextfontdefault)); delete qtextfontdefault; qfmetr=new TQFontMetrics(*qtextfont); @@ -333,7 +333,7 @@ void KDisplayText::resizeEvent(TQResizeEvent *e) void KDisplayText::CursorToHome(void) { -/* KConfig *kcfg=KGlobal::instance()->config(); +/* KConfig *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=KGlobal::instance()->config(); + KConfig *kcfg=TDEGlobal::instance()->config(); kcfg->setGroup("KMid"); TQFont *qtextfontdefault=new TQFont(*qtextfont); delete qtextfont; @@ -623,7 +623,7 @@ void KDisplayText::setLyricsEncoding(const TQString &enc) { TQTextCodec *newcodec; if (enc.isEmpty()) - newcodec=KGlobal::locale()->codecForEncoding(); + newcodec=TDEGlobal::locale()->codecForEncoding(); else newcodec=TQTextCodec::codecForName(enc.latin1()); diff --git a/kmid/kmidclient.cpp b/kmid/kmidclient.cpp index a83e002f..cc89e36b 100644 --- a/kmid/kmidclient.cpp +++ b/kmid/kmidclient.cpp @@ -79,7 +79,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name noteArray=0L; shuttingdown=false; - KConfig *kconf=KGlobal::instance()->config(); + KConfig *kconf=TDEGlobal::instance()->config(); kconf->setGroup("KMid"); TQString tmp2 = locateLocal("appdata", "collections"); @@ -118,7 +118,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name comboEncodings = new TQComboBox(FALSE, this, "Encodings"); connect (comboEncodings,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotSelectEncoding(int))); comboEncodings->insertItem(i18n("Default")); - comboEncodings->insertStringList( KGlobal::charsets()->descriptiveEncodingNames() ); + comboEncodings->insertStringList( TDEGlobal::charsets()->descriptiveEncodingNames() ); comboEncodings->setCurrentItem(0); rhythmview= new RhythmView( this, "RhythmView"); @@ -146,7 +146,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name connect (timer4events,TQT_SIGNAL(timeout()),this,TQT_SLOT(processSpecialEvent())); TQString samplefile = - KGlobal::dirs()->findAllResources("appdata", "fm/*.o3").last(); + TDEGlobal::dirs()->findAllResources("appdata", "fm/*.o3").last(); samplefile.truncate(samplefile.findRev('/')); FMOut::setFMPatchesDirectory(TQFile::encodeName(samplefile)); @@ -390,7 +390,7 @@ int kmidClient::openURL(const TQString _url) { r=openFile(filename_8bit.data()); - KConfig *cfg=KGlobal::instance()->config(); + KConfig *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=KGlobal::instance()->config(); + KConfig *kconf=TDEGlobal::instance()->config(); kconf->setGroup("KMid"); kconf->writeEntry("ActiveCollection",activecollection); @@ -1601,6 +1601,6 @@ void kmidClient::slotSelectEncoding(int i) if (i == 0) kdispt->setLyricsEncoding(TQString()); // Default else - kdispt->setLyricsEncoding(KGlobal::charsets()->encodingForName(comboEncodings->text(i))); + kdispt->setLyricsEncoding(TDEGlobal::charsets()->encodingForName(comboEncodings->text(i))); } #include "kmidclient.moc" diff --git a/kmid/midicfgdlg.cpp b/kmid/midicfgdlg.cpp index 855de04a..481c4922 100644 --- a/kmid/midicfgdlg.cpp +++ b/kmid/midicfgdlg.cpp @@ -104,7 +104,7 @@ void MidiConfigDialog::deviceselected(int idx) void MidiConfigDialog::browseMap() { - TQString path = KGlobal::dirs()->findAllResources("appdata", "maps/*.map").last(); + TQString path = TDEGlobal::dirs()->findAllResources("appdata", "maps/*.map").last(); path.truncate(path.findRev('/')); KURL url = KFileDialog::getOpenURL(path,"*.map",this); |