diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /libkmid/deviceman.cc | |
parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'libkmid/deviceman.cc')
-rw-r--r-- | libkmid/deviceman.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libkmid/deviceman.cc b/libkmid/deviceman.cc index c8030f44e..f989f2beb 100644 --- a/libkmid/deviceman.cc +++ b/libkmid/deviceman.cc @@ -108,8 +108,8 @@ DeviceManager::DeviceManager(int def) #if 1 if (def==-1) { - KInstance *tmp_instance=0L; - if (!KGlobal::_instance) tmp_instance=new KInstance("nonKDEapp"); + TDEInstance *tmp_instance=0L; + if (!KGlobal::_instance) tmp_instance=new TDEInstance("nonKDEapp"); KConfig *config = new KConfig("kcmmidirc", true); config->setGroup("Configuration"); |