From 74f47aebb77b4744bf18960b81c3744106cf56e0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:19:40 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- kview/kviewcanvas/test/main.cpp | 2 +- kview/kviewviewer/kviewviewer.cpp | 2 +- kview/kviewviewer/test/main.cpp | 2 +- kview/main.cpp | 2 +- kview/modules/presenter/kviewpresenter.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'kview') diff --git a/kview/kviewcanvas/test/main.cpp b/kview/kviewcanvas/test/main.cpp index 74e1046e..bd78c8fb 100644 --- a/kview/kviewcanvas/test/main.cpp +++ b/kview/kviewcanvas/test/main.cpp @@ -21,7 +21,7 @@ int main(int argc, char **argv) about.addAuthor( "Matthias Kretz", 0, "kretz@kde.org" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; if (app.isRestored()) RESTORE(KImageViewerTest) diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp index 12a2d4a7..b9e8af7d 100644 --- a/kview/kviewviewer/kviewviewer.cpp +++ b/kview/kviewviewer/kviewviewer.cpp @@ -861,7 +861,7 @@ void KViewViewer::switchBlendEffect() m_pCanvas->setBlendEffect( 0 ); else { - unsigned int num = KApplication::random() % m_vEffects.size(); + unsigned int num = TDEApplication::random() % m_vEffects.size(); m_pCanvas->setBlendEffect( m_vEffects[ num ] ); } } diff --git a/kview/kviewviewer/test/main.cpp b/kview/kviewviewer/test/main.cpp index 64beafee..499e75e5 100644 --- a/kview/kviewviewer/test/main.cpp +++ b/kview/kviewviewer/test/main.cpp @@ -21,7 +21,7 @@ int main(int argc, char **argv) about.addAuthor( "Matthias Kretz", 0, "kretz@kde.org" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; if (app.isRestored()) RESTORE(Test) diff --git a/kview/main.cpp b/kview/main.cpp index c43f0ca3..4f8266d2 100644 --- a/kview/main.cpp +++ b/kview/main.cpp @@ -42,7 +42,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) about.addAuthor( "Simon Hausmann", 0, "hausmann@kde.org" ); TDECmdLineArgs::init( argc, argv, &about ); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; if( app.isRestored() ) RESTORE( KView ) diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp index fcd2cf4f..0fc6bfe2 100644 --- a/kview/modules/presenter/kviewpresenter.cpp +++ b/kview/modules/presenter/kviewpresenter.cpp @@ -391,7 +391,7 @@ void KViewPresenter::shuffle() listview->takeItem( item ); } while( ! items.isEmpty() ) - listview->insertItem( items.take( KApplication::random() % items.count() ) ); + listview->insertItem( items.take( TDEApplication::random() % items.count() ) ); } void KViewPresenter::closeAll() -- cgit v1.2.3