diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /libkmid | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libkmid')
| -rw-r--r-- | libkmid/deviceman.cc | 2 | ||||
| -rw-r--r-- | libkmid/midfile.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libkmid/deviceman.cc b/libkmid/deviceman.cc index f989f2beb..ad9fc54fb 100644 --- a/libkmid/deviceman.cc +++ b/libkmid/deviceman.cc @@ -109,7 +109,7 @@ DeviceManager::DeviceManager(int def) if (def==-1) { TDEInstance *tmp_instance=0L; - if (!KGlobal::_instance) tmp_instance=new TDEInstance("nonKDEapp"); + if (!TDEGlobal::_instance) tmp_instance=new TDEInstance("nonKDEapp"); KConfig *config = new KConfig("kcmmidirc", true); config->setGroup("Configuration"); diff --git a/libkmid/midfile.cc b/libkmid/midfile.cc index 0e804e4e3..4bf19f5b1 100644 --- a/libkmid/midfile.cc +++ b/libkmid/midfile.cc @@ -54,7 +54,7 @@ double metronomeTempoToTempo(ulong x) int uncompressFile(const char *gzname, char *tmpname) // Returns 0 if OK, 1 if error (tmpname not set) { - TQString cmd("gzip -dc " + KProcess::quote(gzname)); + TQString cmd("gzip -dc " + TDEProcess::quote(gzname)); FILE *infile = popen( TQFile::encodeName(cmd).data(), "r"); if (infile==NULL) { fprintf(stderr,"ERROR : popen failed : %s\n",TQFile::encodeName(cmd).data()); |