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 --- kpdf/shell/main.cpp | 2 +- kpdf/ui/pageview.cpp | 2 +- kpdf/ui/presentationwidget.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kpdf') diff --git a/kpdf/shell/main.cpp b/kpdf/shell/main.cpp index 6c3a351c..5009ba12 100644 --- a/kpdf/shell/main.cpp +++ b/kpdf/shell/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char** argv) TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; // see if we are starting with session management if (app.isRestored()) diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp index 0029676e..9642f7a9 100644 --- a/kpdf/ui/pageview.cpp +++ b/kpdf/ui/pageview.cpp @@ -1192,7 +1192,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e ) if (!client->isApplicationRegistered("kttsd")) { TQString error; - if (KApplication::startServiceByDesktopName("kttsd", TQStringList(), &error)) + if (TDEApplication::startServiceByDesktopName("kttsd", TQStringList(), &error)) { d->messageWindow->display( i18n("Starting KTTSD Failed: %1").arg(error) ); KpdfSettings::setUseKTTSD(false); diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp index 74800e88..865d8e50 100644 --- a/kpdf/ui/presentationwidget.cpp +++ b/kpdf/ui/presentationwidget.cpp @@ -890,7 +890,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const } case KpdfSettings::EnumSlidesTransition::Random: { - return defaultTransition( KApplication::random() % 18 ); + return defaultTransition( TDEApplication::random() % 18 ); break; } case KpdfSettings::EnumSlidesTransition::SplitHorizontalIn: -- cgit v1.2.1