diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:49:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:49:49 -0600 |
| commit | dc5f267664506a312203c26bfe9001a448b0bb0f (patch) | |
| tree | a78c7f15e87303d22b89619db42fc56ad8f4a046 /konqueror/konq_guiclients.cc | |
| parent | 98f4a055baf6eb7ea5c3d69d6a3f2162b491e253 (diff) | |
| download | tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.tar.gz tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/konq_guiclients.cc')
| -rw-r--r-- | konqueror/konq_guiclients.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc index a2be33e4e..94aaf8ba1 100644 --- a/konqueror/konq_guiclients.cc +++ b/konqueror/konq_guiclients.cc @@ -28,7 +28,7 @@ #include <kiconloader.h> PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow, - const KTrader::OfferList &embeddingServices, + const TDETrader::OfferList &embeddingServices, bool showEmbeddingServices, bool doTabHandling ) { //giving a name to each guiclient: just for debugging @@ -66,8 +66,8 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow, if ( showEmbeddingServices ) { - KTrader::OfferList::ConstIterator it = embeddingServices.begin(); - KTrader::OfferList::ConstIterator end = embeddingServices.end(); + TDETrader::OfferList::ConstIterator it = embeddingServices.begin(); + TDETrader::OfferList::ConstIterator end = embeddingServices.end(); if ( embeddingServices.count() == 1 ) { @@ -166,8 +166,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) m_mainWindow = mainWindow; m_actions.setAutoDelete( true ); - KTrader::OfferList offers = KTrader::self()->query( "Browser/View" ); - KTrader::OfferList::Iterator it = offers.begin(); + TDETrader::OfferList offers = TDETrader::self()->query( "Browser/View" ); + TDETrader::OfferList::Iterator it = offers.begin(); while ( it != offers.end() ) { TQVariant prop = (*it)->property( "X-TDE-BrowserView-Toggable" ); @@ -188,8 +188,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) if ( m_empty ) return; - KTrader::OfferList::ConstIterator cIt = offers.begin(); - KTrader::OfferList::ConstIterator cEnd = offers.end(); + TDETrader::OfferList::ConstIterator cIt = offers.begin(); + TDETrader::OfferList::ConstIterator cEnd = offers.end(); for (; cIt != cEnd; ++cIt ) { TQString description = i18n( "Show %1" ).arg( (*cIt)->name() ); |