diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:21:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:21:02 -0600 |
| commit | 8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a (patch) | |
| tree | 19ff5ecf5e6b5168e5503677f18b85f3dfa91f95 /kio/kfile/kdiroperator.cpp | |
| parent | 5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 (diff) | |
| download | tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.tar.gz tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kio/kfile/kdiroperator.cpp')
| -rw-r--r-- | kio/kfile/kdiroperator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp index c5e339b1a..f9e2d237c 100644 --- a/kio/kfile/kdiroperator.cpp +++ b/kio/kfile/kdiroperator.cpp @@ -1383,11 +1383,11 @@ void KDirOperator::setupMenu(int whichActions) if (whichActions & FileActions) { actionMenu->insert( mkdirAction ); - if (currUrl.isLocalFile() && !(KApplication::keyboardMouseState() & TQt::ShiftButton)) + if (currUrl.isLocalFile() && !(TDEApplication::keyboardMouseState() & TQt::ShiftButton)) actionMenu->insert( myActionCollection->action( "trash" ) ); KConfig *globalconfig = KGlobal::config(); KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") ); - if (!currUrl.isLocalFile() || (KApplication::keyboardMouseState() & TQt::ShiftButton) || + if (!currUrl.isLocalFile() || (TDEApplication::keyboardMouseState() & TQt::ShiftButton) || globalconfig->readBoolEntry("ShowDeleteCommand", false)) actionMenu->insert( myActionCollection->action( "delete" ) ); actionMenu->insert( actionSeparator ); |