From e4e0479220e9e9616b68b2a11e42cff7a8af7b3d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:17:06 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- kdialog/kdialog.cpp | 6 +++--- kdialog/widgets.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'kdialog') diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index 9f7b70ebd..e15564eb4 100644 --- a/kdialog/kdialog.cpp +++ b/kdialog/kdialog.cpp @@ -311,9 +311,9 @@ static int directCommand(TDECmdLineArgs *args) int w, h; int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h); if ( (m & XNegative) ) - x = KApplication::desktop()->width() + x - w; + x = TDEApplication::desktop()->width() + x - w; if ( (m & YNegative) ) - y = KApplication::desktop()->height() + y - h; + y = TDEApplication::desktop()->height() + y - h; popup->setAnchor( TQPoint(x, y) ); } #endif @@ -691,7 +691,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KApplication app; + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp index d663d1bc3..536ffadce 100644 --- a/kdialog/widgets.cpp +++ b/kdialog/widgets.cpp @@ -47,9 +47,9 @@ void Widgets::handleXGeometry(TQWidget * dlg) int w, h; int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h); if ( (m & XNegative) ) - x = KApplication::desktop()->width() + x - w; + x = TDEApplication::desktop()->width() + x - w; if ( (m & YNegative) ) - y = KApplication::desktop()->height() + y - h; + y = TDEApplication::desktop()->height() + y - h; dlg->setGeometry(x, y, w, h); // kdDebug() << "x: " << x << " y: " << y << " w: " << w << " h: " << h << endl; } -- cgit v1.2.1