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/kdisptext.cpp | |
| 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/kdisptext.cpp')
| -rw-r--r-- | kmid/kdisptext.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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()); |