diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:17:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:17:06 -0600 |
| commit | e4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch) | |
| tree | 8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /kioslave/media/mounthelper | |
| parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
| download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/media/mounthelper')
| -rw-r--r-- | kioslave/media/mounthelper/kio_media_mounthelper.cpp | 6 | ||||
| -rw-r--r-- | kioslave/media/mounthelper/kio_media_mounthelper.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.cpp b/kioslave/media/mounthelper/kio_media_mounthelper.cpp index 6289a85fc..23a207fab 100644 --- a/kioslave/media/mounthelper/kio_media_mounthelper.cpp +++ b/kioslave/media/mounthelper/kio_media_mounthelper.cpp @@ -61,7 +61,7 @@ const Medium MountHelper::findMedium(const KURL &url) } } -MountHelper::MountHelper() : KApplication() +MountHelper::MountHelper() : TDEApplication() { TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); @@ -269,10 +269,10 @@ int main(int argc, char **argv) TDECmdLineArgs::addCmdLineOptions( options ); KGlobal::locale()->setMainCatalogue("kio_media"); - KApplication::addCmdLineOptions(); + TDEApplication::addCmdLineOptions(); if (TDECmdLineArgs::parsedArgs()->count()==0) TDECmdLineArgs::usage(); - KApplication *app = new MountHelper(); + TDEApplication *app = new MountHelper(); KStartupInfo::appStarted(); app->dcopClient()->attach(); diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.h b/kioslave/media/mounthelper/kio_media_mounthelper.h index 4779c75ec..ffb5d1dba 100644 --- a/kioslave/media/mounthelper/kio_media_mounthelper.h +++ b/kioslave/media/mounthelper/kio_media_mounthelper.h @@ -30,7 +30,7 @@ class Dialog; -class MountHelper : public KApplication +class MountHelper : public TDEApplication { Q_OBJECT public: |