diff options
| author | Timothy Pearson <[email protected]> | 2013-01-20 00:21:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-20 00:21:27 -0600 |
| commit | 2f1044cf6325ef76548375b602a14f8eb56eeb3f (patch) | |
| tree | a5c4773d5bcb1e35ca3717dc96ba5cfcfac1b5f2 /kmid | |
| parent | 58646ccdcdc8ee08b081edba54e1460ff3295166 (diff) | |
| download | tdemultimedia-2f1044cf6325ef76548375b602a14f8eb56eeb3f.tar.gz tdemultimedia-2f1044cf6325ef76548375b602a14f8eb56eeb3f.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kmid')
| -rw-r--r-- | kmid/channelview.cpp | 4 | ||||
| -rw-r--r-- | kmid/kmidclient.h | 2 | ||||
| -rw-r--r-- | kmid/kmidframe.h | 2 | ||||
| -rw-r--r-- | kmid/main.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kmid/channelview.cpp b/kmid/channelview.cpp index 9a1f1e88..b810aa4e 100644 --- a/kmid/channelview.cpp +++ b/kmid/channelview.cpp @@ -121,7 +121,7 @@ int ChannelView::lookmode=0; int ChannelView::lookMode(void) { - KConfig *kcfg=(KApplication::kApplication())->config(); + KConfig *kcfg=(TDEApplication::kApplication())->config(); kcfg->setGroup("KMid"); lookmode=kcfg->readNumEntry("ChannelViewLookMode",0); @@ -131,7 +131,7 @@ int ChannelView::lookMode(void) void ChannelView::lookMode(int i) { - KConfig *kcfg=(KApplication::kApplication())->config(); + KConfig *kcfg=(TDEApplication::kApplication())->config(); lookmode=i; diff --git a/kmid/kmidclient.h b/kmid/kmidclient.h index 3f4bf7c7..cdb5d1fa 100644 --- a/kmid/kmidclient.h +++ b/kmid/kmidclient.h @@ -43,7 +43,7 @@ class DeviceManager; -class KApplication; +class TDEApplication; class KConfig; class KLCDNumber; class TQLabel; diff --git a/kmid/kmidframe.h b/kmid/kmidframe.h index 21a173fb..1e3e08c6 100644 --- a/kmid/kmidframe.h +++ b/kmid/kmidframe.h @@ -32,7 +32,7 @@ #include <tqtimer.h> #include <tdelibs_export.h> -class KApplication; +class TDEApplication; class KConfig; class kmidClient; class KToolBar; diff --git a/kmid/main.cpp b/kmid/main.cpp index 55596d3c..c368e523 100644 --- a/kmid/main.cpp +++ b/kmid/main.cpp @@ -65,7 +65,7 @@ int main(int argc, char **argv) }; TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; kmidFrame *kmidframe=new kmidFrame("KMid"); |