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