summaryrefslogtreecommitdiffstats
path: root/kdialog/kdialog.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
commite4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch)
tree8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /kdialog/kdialog.cpp
parentd41050ea3f6904e5156d35f664346b816b9e4d12 (diff)
downloadtdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz
tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kdialog/kdialog.cpp')
-rw-r--r--kdialog/kdialog.cpp6
1 files changed, 3 insertions, 3 deletions
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();