diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:17:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:17:06 -0600 |
| commit | e4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch) | |
| tree | 8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /libkonq | |
| parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
| download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'libkonq')
| -rw-r--r-- | libkonq/konq_operations.cc | 4 | ||||
| -rw-r--r-- | libkonq/konq_popupmenu.cc | 2 | ||||
| -rw-r--r-- | libkonq/tests/konqdragtest.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc index 63a11af44..afed003dc 100644 --- a/libkonq/konq_operations.cc +++ b/libkonq/konq_operations.cc @@ -437,7 +437,7 @@ void KonqOperations::asyncDrop( const KFileItem * destItem ) { stringList.append((*it).url()); } - if ( KApplication::startServiceByDesktopPath( m_destURL.path(), stringList, &error ) > 0 ) + if ( TDEApplication::startServiceByDesktopPath( m_destURL.path(), stringList, &error ) > 0 ) KMessageBox::error( 0L, error ); } else @@ -645,7 +645,7 @@ void KonqOperations::rename( TQWidget * parent, const KURL & oldurl, const KURL& KConfigGroupSaver cgs( globalConfig, "Paths" ); globalConfig->writePathEntry("Desktop" , newurl.path(), true, true ); globalConfig->sync(); - KIPC::sendMessageAll(KIPC::SettingsChanged, KApplication::SETTINGS_PATHS); + KIPC::sendMessageAll(KIPC::SettingsChanged, TDEApplication::SETTINGS_PATHS); } } diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc index 6b51047b5..129542952 100644 --- a/libkonq/konq_popupmenu.cc +++ b/libkonq/konq_popupmenu.cc @@ -588,7 +588,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( sDeleting ) { if ( !isLocal ) addDel = true; - else if (KApplication::keyboardMouseState() & TQt::ShiftButton) { + else if (TDEApplication::keyboardMouseState() & TQt::ShiftButton) { addTrash = false; addDel = true; } diff --git a/libkonq/tests/konqdragtest.cpp b/libkonq/tests/konqdragtest.cpp index 347bee3ae..35932e850 100644 --- a/libkonq/tests/konqdragtest.cpp +++ b/libkonq/tests/konqdragtest.cpp @@ -53,9 +53,9 @@ void testKonqIconDrag2() int main(int argc, char *argv[]) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); TDECmdLineArgs::init( argc, argv, "kurltest", 0, 0, 0, 0 ); - KApplication app; // GUI needed for QPixmaps + TDEApplication app; // GUI needed for QPixmaps testKonqIconDrag2(); return 0; |