Browse Source

Rename KLock and KTrader to avoid conflicts with KDE4

Timothy Pearson 6 years ago
parent
commit
dc5f267664

+ 3
- 3
kate/app/katemainwindow.cpp View File

@@ -602,9 +602,9 @@ void KateMainWindow::mSlotFixOpenWithMenu()
602 602
   KMimeType::Ptr mime = KMimeType::findByURL( m_viewManager->activeView()->getDoc()->url() );
603 603
   //kdDebug(13001)<<"13000"<<"url: "<<m_viewManager->activeView()->getDoc()->url().prettyURL()<<"mime type: "<<mime->name()<<endl;
604 604
   // some checking goes here...
605
-  KTrader::OfferList offers = KTrader::self()->query(mime->name(), "Type == 'Application'");
605
+  TDETrader::OfferList offers = TDETrader::self()->query(mime->name(), "Type == 'Application'");
606 606
   // for each one, insert a menu item...
607
-  for(KTrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it) {
607
+  for(TDETrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it) {
608 608
     if ((*it)->name() == "Kate") continue;
609 609
     documentOpenWith->popupMenu()->insertItem( SmallIcon( (*it)->icon() ), (*it)->name() );
610 610
   }
@@ -629,7 +629,7 @@ void KateMainWindow::slotOpenWithMenuAction(int idx)
629 629
 
630 630
   TQString qry = TQString("((Type == 'Application') and (Name == '%1'))").arg( appname.latin1() );
631 631
   KMimeType::Ptr mime = KMimeType::findByURL( m_viewManager->activeView()->getDoc()->url() );
632
-  KTrader::OfferList offers = KTrader::self()->query(mime->name(), qry);
632
+  TDETrader::OfferList offers = TDETrader::self()->query(mime->name(), qry);
633 633
 
634 634
   if (!offers.isEmpty()) {
635 635
     KService::Ptr app = offers.first();

+ 2
- 2
kate/app/katepluginmanager.cpp View File

@@ -57,9 +57,9 @@ KatePluginManager *KatePluginManager::self()
57 57
 
58 58
 void KatePluginManager::setupPluginList ()
59 59
 {
60
-  TQValueList<KService::Ptr> traderList= KTrader::self()->query("Kate/Plugin", "(not ('Kate/ProjectPlugin' in ServiceTypes)) and (not ('Kate/InitPlugin' in ServiceTypes))");
60
+  TQValueList<KService::Ptr> traderList= TDETrader::self()->query("Kate/Plugin", "(not ('Kate/ProjectPlugin' in ServiceTypes)) and (not ('Kate/InitPlugin' in ServiceTypes))");
61 61
 
62
-  for(KTrader::OfferList::Iterator it(traderList.begin()); it != traderList.end(); ++it)
62
+  for(TDETrader::OfferList::Iterator it(traderList.begin()); it != traderList.end(); ++it)
63 63
   {
64 64
     KService::Ptr ptr = (*it);
65 65
 

+ 3
- 3
kcontrol/componentchooser/componentchooser.cpp View File

@@ -62,7 +62,7 @@ void CfgComponent::slotComponentChanged(const TQString&) {
62 62
 }
63 63
 
64 64
 void CfgComponent::save(TDEConfig *cfg) {
65
-		// yes, this can happen if there are NO KTrader offers for this component
65
+		// yes, this can happen if there are NO TDETrader offers for this component
66 66
 		if (!m_lookupDict[ComponentSelector->currentText()])
67 67
 			return;
68 68
 
@@ -84,9 +84,9 @@ void CfgComponent::load(TDEConfig *cfg) {
84 84
 	TQString ServiceTypeToConfigure=cfg->readEntry("ServiceTypeToConfigure");
85 85
 
86 86
 	TQString MimeTypeOfInterest=cfg->readEntry("MimeTypeOfInterest");
87
-	KTrader::OfferList offers = KTrader::self()->query(MimeTypeOfInterest, "'"+ServiceTypeToConfigure+"' in ServiceTypes");
87
+	TDETrader::OfferList offers = TDETrader::self()->query(MimeTypeOfInterest, "'"+ServiceTypeToConfigure+"' in ServiceTypes");
88 88
 
89
-	for (KTrader::OfferList::Iterator tit = offers.begin(); tit != offers.end(); ++tit)
89
+	for (TDETrader::OfferList::Iterator tit = offers.begin(); tit != offers.end(); ++tit)
90 90
         {
91 91
 		ComponentSelector->insertItem((*tit)->name());
92 92
 		m_lookupDict.insert((*tit)->name(),new TQString((*tit)->desktopEntryName()));

+ 2
- 2
kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp View File

@@ -126,9 +126,9 @@ void FilterOptions::load( bool useDefaults )
126 126
     m_favoriteEngines << "google" << "google_groups" << "google_news" << "webster" << "dmoz" << "wikipedia";
127 127
     m_favoriteEngines = config.readListEntry("FavoriteSearchEngines", m_favoriteEngines);
128 128
 
129
-    const KTrader::OfferList services = KTrader::self()->query("SearchProvider");
129
+    const TDETrader::OfferList services = TDETrader::self()->query("SearchProvider");
130 130
 
131
-    for (KTrader::OfferList::ConstIterator it = services.begin();
131
+    for (TDETrader::OfferList::ConstIterator it = services.begin();
132 132
          it != services.end(); ++it)
133 133
     {
134 134
       displaySearchProvider(new SearchProvider(*it),

+ 2
- 2
kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp View File

@@ -71,8 +71,8 @@ SearchProvider *SearchProvider::findByDesktopName(const TQString &name)
71 71
 
72 72
 SearchProvider *SearchProvider::findByKey(const TQString &key)
73 73
 {
74
-    KTrader::OfferList providers =
75
-        KTrader::self()->query("SearchProvider", TQString("'%1' in Keys").arg(key));
74
+    TDETrader::OfferList providers =
75
+        TDETrader::self()->query("SearchProvider", TQString("'%1' in Keys").arg(key));
76 76
     return providers.count() ? new SearchProvider(providers[0]) : 0;
77 77
 }
78 78
 

+ 1
- 1
kcontrol/filetypes/kserviceselectdlg.cpp View File

@@ -35,7 +35,7 @@ KServiceSelectDlg::KServiceSelectDlg( const TQString& /*serviceType*/, const TQS
35 35
     new TQLabel( i18n( "Select service:" ), vbox );
36 36
     m_listbox=new KListBox( vbox );
37 37
 
38
-    // Can't make a KTrader query since we don't have a servicetype to give,
38
+    // Can't make a TDETrader query since we don't have a servicetype to give,
39 39
     // we want all services that are not applications.......
40 40
     // So we have to do it the slow way
41 41
     // ### Why can't we query for KParts/ReadOnlyPart as the servicetype? Should work fine!

+ 2
- 2
kcontrol/konq/desktopbehavior_impl.cpp View File

@@ -305,10 +305,10 @@ void DesktopBehavior::load( bool useDefaults )
305 305
     bool bShowHidden = g_pConfig->readBoolEntry("ShowHidden", DEFAULT_SHOW_HIDDEN_ROOT_ICONS);
306 306
     showHiddenBox->setChecked(bShowHidden);
307 307
     //bool bVertAlign = g_pConfig->readBoolEntry("VertAlign", DEFAULT_VERT_ALIGN);
308
-    KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
308
+    TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
309 309
     previewListView->clear();
310 310
     TQStringList previews = g_pConfig->readListEntry("Preview");
311
-    for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
311
+    for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
312 312
         new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.contains((*it)->desktopEntryName()));
313 313
     new DesktopBehaviorPreviewItem(this, previewListView, previews.contains("audio/"));
314 314
     //

+ 3
- 3
kcontrol/tdeio/fakeuaprovider.cpp View File

@@ -71,15 +71,15 @@ FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const TQString
71 71
 void FakeUASProvider::loadFromDesktopFiles()
72 72
 {
73 73
   m_providers.clear();
74
-  m_providers = KTrader::self()->query("UserAgentStrings");
74
+  m_providers = TDETrader::self()->query("UserAgentStrings");
75 75
 }
76 76
 
77 77
 void FakeUASProvider::parseDescription()
78 78
 {
79 79
   TQString tmp;
80 80
 
81
-  KTrader::OfferList::ConstIterator it = m_providers.begin();
82
-  KTrader::OfferList::ConstIterator lastItem = m_providers.end();
81
+  TDETrader::OfferList::ConstIterator it = m_providers.begin();
82
+  TDETrader::OfferList::ConstIterator lastItem = m_providers.end();
83 83
 
84 84
   for ( ; it != lastItem; ++it )
85 85
   {

+ 1
- 1
kcontrol/tdeio/fakeuaprovider.h View File

@@ -49,7 +49,7 @@ protected:
49 49
   void parseDescription();
50 50
 
51 51
 private:
52
-  KTrader::OfferList m_providers;
52
+  TDETrader::OfferList m_providers;
53 53
   TQStringList m_lstIdentity;
54 54
   TQStringList m_lstAlias;
55 55
   bool m_bIsDirty;

+ 1
- 1
kfind/kftabdlg.cpp View File

@@ -272,7 +272,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
272 272
     TQToolTip::add(binaryContextCb,binaryTooltip);
273 273
 
274 274
     TQPushButton* editRegExp = 0;
275
-    if ( !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) {
275
+    if ( !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) {
276 276
       // The editor is available, so lets use it.
277 277
       editRegExp = new TQPushButton(i18n("&Edit..."), pages[2], "editRegExp");
278 278
     }

+ 1
- 1
kicker/kicker/ui/k_new_mnu.cpp View File

@@ -2122,7 +2122,7 @@ void KMenu::initSearch()
2122 2122
     if (!m_search_plugin) {
2123 2123
       m_search_plugin_interface = new TQObject( this, "m_search_plugin_interface" );
2124 2124
       new MyKickoffSearchInterface( this, m_search_plugin_interface, "kickoffsearch interface" );
2125
-      KTrader::OfferList offers = KTrader::self()->query("KickoffSearch/Plugin");
2125
+      TDETrader::OfferList offers = TDETrader::self()->query("KickoffSearch/Plugin");
2126 2126
 
2127 2127
       KService::Ptr service = *offers.begin();
2128 2128
       if (service) {

+ 1
- 1
klipper/configdialog.cpp View File

@@ -284,7 +284,7 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget,
284 284
     listView->setSorting( -1 ); // newly inserted items just append unsorted
285 285
 
286 286
     cbUseGUIRegExpEditor = new TQCheckBox( i18n("&Use graphical editor for editing regular expressions" ), this );
287
-    if ( KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() )
287
+    if ( TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() )
288 288
     {
289 289
 	cbUseGUIRegExpEditor->hide();
290 290
 	cbUseGUIRegExpEditor->setChecked( false );

+ 3
- 3
konqueror/client/kfmclient.cc View File

@@ -165,7 +165,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
165 165
  is configured to reuse always,
166 166
  or it's not configured to never reuse, and the URL to-be-opened is "safe".
167 167
  The URL is safe, if the view used to view it is listed in the allowed KPart's.
168
- In order to find out the part, mimetype is needed, and KTrader is needed.
168
+ In order to find out the part, mimetype is needed, and TDETrader is needed.
169 169
  If mimetype is not known, KMimeType is used (which doesn't work e.g. for remote
170 170
  URLs, but oh well). Since this function may be running without a TDEApplication
171 171
  instance, I'm actually quite surprised it works, and it may sooner or later break.
@@ -222,7 +222,7 @@ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString&
222 222
     }
223 223
     if( mimetype.isEmpty())
224 224
 	mimetype = KMimeType::findByURL( KURL( url ) )->name();
225
-    KTrader::OfferList offers = KTrader::self()->query( mimetype, TQString::fromLatin1( "KParts/ReadOnlyPart" ),
225
+    TDETrader::OfferList offers = TDETrader::self()->query( mimetype, TQString::fromLatin1( "KParts/ReadOnlyPart" ),
226 226
 	TQString::null, TQString::null );
227 227
     KService::Ptr serv;
228 228
     if( offers.count() > 0 )
@@ -529,7 +529,7 @@ bool clientApp::doIt()
529 529
     {
530 530
       KURL::List urls;
531 531
       urls.append( args->url(1) );
532
-      const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::fromLatin1( "Application" ), TQString::null, TQString::null );
532
+      const TDETrader::OfferList offers = TDETrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::fromLatin1( "Application" ), TQString::null, TQString::null );
533 533
       if (offers.isEmpty()) return 1;
534 534
       KService::Ptr serv = offers.first();
535 535
       return KRun::run( *serv, urls );

+ 2
- 2
konqueror/iconview/konq_iconview.cc View File

@@ -226,9 +226,9 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
226 226
     m_pamPreview->insert( m_paEnablePreviews );
227 227
     m_pamPreview->insert( new KActionSeparator(this) );
228 228
 
229
-    KTrader::OfferList plugins = KTrader::self()->query( "ThumbCreator" );
229
+    TDETrader::OfferList plugins = TDETrader::self()->query( "ThumbCreator" );
230 230
     TQMap< TQString, KToggleAction* > previewActions;
231
-    for ( KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it )
231
+    for ( TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it )
232 232
     {
233 233
         if ( KToggleAction*& preview = previewActions[ ( *it )->name() ] )
234 234
             preview->setName( TQCString( preview->name() ) + ',' + ( *it )->desktopEntryName().latin1() );

+ 9
- 9
konqueror/konq_factory.cc View File

@@ -86,14 +86,14 @@ KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const cha
86 86
 KonqViewFactory KonqFactory::createView( const TQString &serviceType,
87 87
                                          const TQString &serviceName,
88 88
                                          KService::Ptr *serviceImpl,
89
-                                         KTrader::OfferList *partServiceOffers,
90
-                                         KTrader::OfferList *appServiceOffers,
89
+                                         TDETrader::OfferList *partServiceOffers,
90
+                                         TDETrader::OfferList *appServiceOffers,
91 91
 					 bool forceAutoEmbed )
92 92
 {
93 93
   kdDebug(1202) << "Trying to create view for \"" << serviceType << "\"" << endl;
94 94
 
95 95
   // We need to get those in any case
96
-  KTrader::OfferList offers, appOffers;
96
+  TDETrader::OfferList offers, appOffers;
97 97
 
98 98
   // Query the trader
99 99
   getOffers( serviceType, &offers, &appOffers );
@@ -126,7 +126,7 @@ KonqViewFactory KonqFactory::createView( const TQString &serviceType,
126 126
   // Look for this service
127 127
   if ( !serviceName.isEmpty() )
128 128
   {
129
-      KTrader::OfferList::Iterator it = offers.begin();
129
+      TDETrader::OfferList::Iterator it = offers.begin();
130 130
       for ( ; it != offers.end() && !service ; ++it )
131 131
       {
132 132
           if ( (*it)->desktopEntryName() == serviceName )
@@ -149,7 +149,7 @@ KonqViewFactory KonqFactory::createView( const TQString &serviceType,
149 149
                            .arg(service->name()).arg(KLibLoader::self()->lastErrorMessage()));
150 150
   }
151 151
 
152
-  KTrader::OfferList::Iterator it = offers.begin();
152
+  TDETrader::OfferList::Iterator it = offers.begin();
153 153
   for ( ; !factory && it != offers.end() ; ++it )
154 154
   {
155 155
     service = (*it);
@@ -193,19 +193,19 @@ KonqViewFactory KonqFactory::createView( const TQString &serviceType,
193 193
 }
194 194
 
195 195
 void KonqFactory::getOffers( const TQString & serviceType,
196
-                             KTrader::OfferList *partServiceOffers,
197
-                             KTrader::OfferList *appServiceOffers )
196
+                             TDETrader::OfferList *partServiceOffers,
197
+                             TDETrader::OfferList *appServiceOffers )
198 198
 {
199 199
     if ( appServiceOffers )
200 200
     {
201
-        *appServiceOffers = KTrader::self()->query( serviceType, "Application",
201
+        *appServiceOffers = TDETrader::self()->query( serviceType, "Application",
202 202
 "DesktopEntryName != 'kfmclient' and DesktopEntryName != 'kfmclient_dir' and DesktopEntryName != 'kfmclient_html'",
203 203
                                                     TQString::null );
204 204
     }
205 205
 
206 206
     if ( partServiceOffers )
207 207
     {
208
-        *partServiceOffers = KTrader::self()->query( serviceType, "KParts/ReadOnlyPart",
208
+        *partServiceOffers = TDETrader::self()->query( serviceType, "KParts/ReadOnlyPart",
209 209
                                                      TQString::null, TQString::null );
210 210
     }
211 211
 }

+ 4
- 4
konqueror/konq_factory.h View File

@@ -69,13 +69,13 @@ public:
69 69
   static KonqViewFactory createView( const TQString &serviceType,
70 70
 				     const TQString &serviceName = TQString::null,
71 71
 				     KService::Ptr *serviceImpl = 0,
72
-				     KTrader::OfferList *partServiceOffers = 0,
73
-				     KTrader::OfferList *appServiceOffers = 0,
72
+				     TDETrader::OfferList *partServiceOffers = 0,
73
+				     TDETrader::OfferList *appServiceOffers = 0,
74 74
 				     bool forceAutoEmbed = false );
75 75
 
76 76
   static void getOffers( const TQString & serviceType,
77
-                         KTrader::OfferList *partServiceOffers = 0,
78
-                         KTrader::OfferList *appServiceOffers = 0);
77
+                         TDETrader::OfferList *partServiceOffers = 0,
78
+                         TDETrader::OfferList *appServiceOffers = 0);
79 79
 
80 80
   static const TDEAboutData* aboutData();
81 81
 

+ 7
- 7
konqueror/konq_guiclients.cc View File

@@ -28,7 +28,7 @@
28 28
 #include <kiconloader.h>
29 29
 
30 30
 PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow,
31
-                                        const KTrader::OfferList &embeddingServices,
31
+                                        const TDETrader::OfferList &embeddingServices,
32 32
                                         bool showEmbeddingServices, bool doTabHandling )
33 33
 {
34 34
     //giving a name to each guiclient: just for debugging
@@ -66,8 +66,8 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow,
66 66
 
67 67
     if ( showEmbeddingServices )
68 68
     {
69
-        KTrader::OfferList::ConstIterator it = embeddingServices.begin();
70
-        KTrader::OfferList::ConstIterator end = embeddingServices.end();
69
+        TDETrader::OfferList::ConstIterator it = embeddingServices.begin();
70
+        TDETrader::OfferList::ConstIterator end = embeddingServices.end();
71 71
 
72 72
         if ( embeddingServices.count() == 1 )
73 73
         {
@@ -166,8 +166,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
166 166
   m_mainWindow = mainWindow;
167 167
   m_actions.setAutoDelete( true );
168 168
 
169
-  KTrader::OfferList offers = KTrader::self()->query( "Browser/View" );
170
-  KTrader::OfferList::Iterator it = offers.begin();
169
+  TDETrader::OfferList offers = TDETrader::self()->query( "Browser/View" );
170
+  TDETrader::OfferList::Iterator it = offers.begin();
171 171
   while ( it != offers.end() )
172 172
   {
173 173
     TQVariant prop = (*it)->property( "X-TDE-BrowserView-Toggable" );
@@ -188,8 +188,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
188 188
   if ( m_empty )
189 189
     return;
190 190
 
191
-  KTrader::OfferList::ConstIterator cIt = offers.begin();
192
-  KTrader::OfferList::ConstIterator cEnd = offers.end();
191
+  TDETrader::OfferList::ConstIterator cIt = offers.begin();
192
+  TDETrader::OfferList::ConstIterator cEnd = offers.end();
193 193
   for (; cIt != cEnd; ++cIt )
194 194
   {
195 195
     TQString description = i18n( "Show %1" ).arg( (*cIt)->name() );

+ 1
- 1
konqueror/konq_guiclients.h View File

@@ -55,7 +55,7 @@ class KonqView;
55 55
 class PopupMenuGUIClient : public KXMLGUIClient
56 56
 {
57 57
 public:
58
-  PopupMenuGUIClient( KonqMainWindow *mainWindow, const KTrader::OfferList &embeddingServices,
58
+  PopupMenuGUIClient( KonqMainWindow *mainWindow, const TDETrader::OfferList &embeddingServices,
59 59
                       bool isIntoTrash, bool doTabHandling );
60 60
   virtual ~PopupMenuGUIClient();
61 61
 

+ 13
- 13
konqueror/konq_mainwindow.cc View File

@@ -1571,9 +1571,9 @@ void KonqMainWindow::slotOpenWith()
1571 1571
 
1572 1572
   TQString serviceName = TQT_TQOBJECT_CONST(sender())->name();
1573 1573
 
1574
-  KTrader::OfferList offers = m_currentView->appServiceOffers();
1575
-  KTrader::OfferList::ConstIterator it = offers.begin();
1576
-  KTrader::OfferList::ConstIterator end = offers.end();
1574
+  TDETrader::OfferList offers = m_currentView->appServiceOffers();
1575
+  TDETrader::OfferList::ConstIterator it = offers.begin();
1576
+  TDETrader::OfferList::ConstIterator end = offers.end();
1577 1577
   for (; it != end; ++it )
1578 1578
     if ( (*it)->desktopEntryName() == serviceName )
1579 1579
     {
@@ -1615,9 +1615,9 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
1615 1615
 
1616 1616
   // iterate over all services, update the toolbar service map
1617 1617
   // and check if we can do a quick property-based viewmode change
1618
-  const KTrader::OfferList offers = m_currentView->partServiceOffers();
1619
-  KTrader::OfferList::ConstIterator oIt = offers.begin();
1620
-  KTrader::OfferList::ConstIterator oEnd = offers.end();
1618
+  const TDETrader::OfferList offers = m_currentView->partServiceOffers();
1619
+  TDETrader::OfferList::ConstIterator oIt = offers.begin();
1620
+  TDETrader::OfferList::ConstIterator oEnd = offers.end();
1621 1621
   const TQString currentServiceKey = viewModeActionKey( m_currentView->service() );
1622 1622
   for (; oIt != oEnd; ++oIt )
1623 1623
   {
@@ -4725,7 +4725,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
4725 4725
       TQString currentServiceName = currentView->service()->desktopEntryName();
4726 4726
 
4727 4727
       // List of services for the "Preview In" submenu.
4728
-      m_popupEmbeddingServices = KTrader::self()->query(
4728
+      m_popupEmbeddingServices = TDETrader::self()->query(
4729 4729
           m_popupServiceType,
4730 4730
           "KParts/ReadOnlyPart",
4731 4731
           // Obey "HideFromMenus". It defaults to false so we want "absent or true"
@@ -5032,9 +5032,9 @@ void KonqMainWindow::updateOpenWithActions()
5032 5032
   if (!kapp->authorizeKAction("openwith"))
5033 5033
      return;
5034 5034
 
5035
-  const KTrader::OfferList & services = m_currentView->appServiceOffers();
5036
-  KTrader::OfferList::ConstIterator it = services.begin();
5037
-  KTrader::OfferList::ConstIterator end = services.end();
5035
+  const TDETrader::OfferList & services = m_currentView->appServiceOffers();
5036
+  TDETrader::OfferList::ConstIterator it = services.begin();
5037
+  TDETrader::OfferList::ConstIterator end = services.end();
5038 5038
   for (; it != end; ++it )
5039 5039
   {
5040 5040
     KAction *action = new KAction( i18n( "Open with %1" ).arg( (*it)->name() ), 0, 0, (*it)->desktopEntryName().latin1() );
@@ -5089,7 +5089,7 @@ void KonqMainWindow::updateViewModeActions()
5089 5089
       m_viewModeToolBarServices.clear();
5090 5090
   }
5091 5091
 
5092
-  KTrader::OfferList services = m_currentView->partServiceOffers();
5092
+  TDETrader::OfferList services = m_currentView->partServiceOffers();
5093 5093
 
5094 5094
   if ( services.count() <= 1 )
5095 5095
     return;
@@ -5110,8 +5110,8 @@ void KonqMainWindow::updateViewModeActions()
5110 5110
   TDEConfig * config = TDEGlobal::config();
5111 5111
   config->setGroup( "ModeToolBarServices" );
5112 5112
 
5113
-  KTrader::OfferList::ConstIterator it = services.begin();
5114
-  KTrader::OfferList::ConstIterator end = services.end();
5113
+  TDETrader::OfferList::ConstIterator it = services.begin();
5114
+  TDETrader::OfferList::ConstIterator end = services.end();
5115 5115
   for (; it != end; ++it )
5116 5116
   {
5117 5117
       TQVariant prop = (*it)->property( "X-TDE-BrowserView-Toggable" );

+ 1
- 1
konqueror/konq_mainwindow.h View File

@@ -734,7 +734,7 @@ private:
734 734
 
735 735
   ToggleViewGUIClient *m_toggleViewGUIClient;
736 736
 
737
-  KTrader::OfferList m_popupEmbeddingServices;
737
+  TDETrader::OfferList m_popupEmbeddingServices;
738 738
   TQString m_popupService;
739 739
   TQString m_popupServiceType;
740 740
   KURL m_popupURL;

+ 3
- 3
konqueror/konq_view.cc View File

@@ -59,8 +59,8 @@ KonqView::KonqView( KonqViewFactory &viewFactory,
59 59
                     KonqFrame* viewFrame,
60 60
                     KonqMainWindow *mainWindow,
61 61
                     const KService::Ptr &service,
62
-                    const KTrader::OfferList &partServiceOffers,
63
-                    const KTrader::OfferList &appServiceOffers,
62
+                    const TDETrader::OfferList &partServiceOffers,
63
+                    const TDETrader::OfferList &appServiceOffers,
64 64
                     const TQString &serviceType,
65 65
                     bool passiveMode
66 66
                     )
@@ -325,7 +325,7 @@ bool KonqView::changeViewMode( const TQString &serviceType,
325 325
   }
326 326
 
327 327
   kdDebug(1202) << "Switching view modes..." << endl;
328
-  KTrader::OfferList partServiceOffers, appServiceOffers;
328
+  TDETrader::OfferList partServiceOffers, appServiceOffers;
329 329
   KService::Ptr service = 0L;
330 330
   KonqViewFactory viewFactory = KonqFactory::createView( serviceType, serviceName, &service, &partServiceOffers, &appServiceOffers, forceAutoEmbed );
331 331
 

+ 6
- 6
konqueror/konq_view.h View File

@@ -82,8 +82,8 @@ public:
82 82
             KonqFrame* viewFrame,
83 83
             KonqMainWindow * mainWindow,
84 84
             const KService::Ptr &service,
85
-            const KTrader::OfferList &partServiceOffers,
86
-            const KTrader::OfferList &appServiceOffers,
85
+            const TDETrader::OfferList &partServiceOffers,
86
+            const TDETrader::OfferList &appServiceOffers,
87 87
             const TQString &serviceType,
88 88
             bool passiveMode);
89 89
 
@@ -281,8 +281,8 @@ public:
281 281
 
282 282
   TQString caption() const { return m_caption; }
283 283
 
284
-  KTrader::OfferList partServiceOffers() { return m_partServiceOffers; }
285
-  KTrader::OfferList appServiceOffers() { return m_appServiceOffers; }
284
+  TDETrader::OfferList partServiceOffers() { return m_partServiceOffers; }
285
+  TDETrader::OfferList appServiceOffers() { return m_appServiceOffers; }
286 286
 
287 287
   KonqMainWindow *mainWindow() const { return m_pMainWindow; }
288 288
 
@@ -465,8 +465,8 @@ private:
465 465
   uint m_bBackRightClick:1;
466 466
   uint m_bHierarchicalView:1;
467 467
   uint m_bDisableScrolling:1;
468
-  KTrader::OfferList m_partServiceOffers;
469
-  KTrader::OfferList m_appServiceOffers;
468
+  TDETrader::OfferList m_partServiceOffers;
469
+  TDETrader::OfferList m_appServiceOffers;
470 470
   KService::Ptr m_service;
471 471
   TQString m_serviceType;
472 472
   TQString m_caption;

+ 9
- 9
konqueror/konq_viewmgr.cc View File

@@ -65,7 +65,7 @@ KonqView* KonqViewManager::Initialize( const TQString &serviceType, const TQStri
65 65
 {
66 66
   //kdDebug(1202) << "KonqViewManager::Initialize()" << endl;
67 67
   KService::Ptr service;
68
-  KTrader::OfferList partServiceOffers, appServiceOffers;
68
+  TDETrader::OfferList partServiceOffers, appServiceOffers;
69 69
   KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers, true /*forceAutoEmbed*/ );
70 70
   if ( newViewFactory.isNull() )
71 71
   {
@@ -106,7 +106,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
106 106
   KonqFrame* splitFrame = m_pMainWindow->currentView()->frame();
107 107
 
108 108
   KService::Ptr service;
109
-  KTrader::OfferList partServiceOffers, appServiceOffers;
109
+  TDETrader::OfferList partServiceOffers, appServiceOffers;
110 110
 
111 111
   KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers, forceAutoEmbed );
112 112
 
@@ -217,7 +217,7 @@ KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation,
217 217
   TQString locationBarURL = m_pMainWindow->currentView()->locationBarURL();
218 218
 
219 219
   KService::Ptr service;
220
-  KTrader::OfferList partServiceOffers, appServiceOffers;
220
+  TDETrader::OfferList partServiceOffers, appServiceOffers;
221 221
 
222 222
   KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers );
223 223
 
@@ -328,7 +328,7 @@ KonqView* KonqViewManager::addTab(const TQString &serviceType, const TQString &s
328 328
   }
329 329
 
330 330
   KService::Ptr service;
331
-  KTrader::OfferList partServiceOffers, appServiceOffers;
331
+  TDETrader::OfferList partServiceOffers, appServiceOffers;
332 332
 
333 333
   KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers, true /*forceAutoEmbed*/ );
334 334
 
@@ -984,8 +984,8 @@ KonqView *KonqViewManager::chooseNextView( KonqView *view )
984 984
 KonqViewFactory KonqViewManager::createView( const TQString &serviceType,
985 985
                                           const TQString &serviceName,
986 986
                                           KService::Ptr &service,
987
-                                          KTrader::OfferList &partServiceOffers,
988
-                                          KTrader::OfferList &appServiceOffers,
987
+                                          TDETrader::OfferList &partServiceOffers,
988
+                                          TDETrader::OfferList &appServiceOffers,
989 989
                                           bool forceAutoEmbed )
990 990
 {
991 991
   kdDebug(1202) << "KonqViewManager::createView" << endl;
@@ -1018,8 +1018,8 @@ KonqViewFactory KonqViewManager::createView( const TQString &serviceType,
1018 1018
 KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer,
1019 1019
                                       KonqViewFactory &viewFactory,
1020 1020
                                       const KService::Ptr &service,
1021
-                                      const KTrader::OfferList &partServiceOffers,
1022
-                                      const KTrader::OfferList &appServiceOffers,
1021
+                                      const TDETrader::OfferList &partServiceOffers,
1022
+                                      const TDETrader::OfferList &appServiceOffers,
1023 1023
                                       const TQString &serviceType,
1024 1024
                                       bool passiveMode,
1025 1025
                                       bool openAfterCurrentPage )
@@ -1471,7 +1471,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
1471 1471
     //kdDebug(1202) << "KonqViewManager::loadItem: ServiceType " << serviceType << " " << serviceName << endl;
1472 1472
 
1473 1473
     KService::Ptr service;
1474
-    KTrader::OfferList partServiceOffers, appServiceOffers;
1474
+    TDETrader::OfferList partServiceOffers, appServiceOffers;
1475 1475
 
1476 1476
     KonqViewFactory viewFactory = KonqFactory::createView( serviceType, serviceName, &service, &partServiceOffers, &appServiceOffers, true /*forceAutoEmbed*/ );
1477 1477
     if ( viewFactory.isNull() )

+ 4
- 4
konqueror/konq_viewmgr.h View File

@@ -325,8 +325,8 @@ private:
325 325
   KonqViewFactory createView( const TQString &serviceType,
326 326
                               const TQString &serviceName,
327 327
                               KService::Ptr &service,
328
-                              KTrader::OfferList &partServiceOffers,
329
-                              KTrader::OfferList &appServiceOffers,
328
+                              TDETrader::OfferList &partServiceOffers,
329
+                              TDETrader::OfferList &appServiceOffers,
330 330
 			      bool forceAutoEmbed = false );
331 331
 
332 332
   /**
@@ -336,8 +336,8 @@ private:
336 336
   KonqView *setupView( KonqFrameContainerBase *parentContainer,
337 337
                        KonqViewFactory &viewFactory,
338 338
                        const KService::Ptr &service,
339
-                       const KTrader::OfferList &partServiceOffers,
340
-                       const KTrader::OfferList &appServiceOffers,
339
+                       const TDETrader::OfferList &partServiceOffers,
340
+                       const TDETrader::OfferList &appServiceOffers,
341 341
                        const TQString &serviceType,
342 342
                        bool passiveMode, bool openAfterCurrentPage = false);
343 343
 

+ 2
- 2
konqueror/kttsplugin/tdehtmlkttsd.cpp View File

@@ -37,7 +37,7 @@ TDEHTMLPluginKTTSD::TDEHTMLPluginKTTSD( TQObject* parent, const char* name, cons
37 37
     : Plugin( parent, name )
38 38
 {
39 39
     // If KTTSD is not installed, hide action.
40
-    KTrader::OfferList offers = KTrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'");
40
+    TDETrader::OfferList offers = TDETrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'");
41 41
     if (offers.count() > 0)
42 42
     {
43 43
         (void) new KAction( i18n("&Speak Text"),
@@ -46,7 +46,7 @@ TDEHTMLPluginKTTSD::TDEHTMLPluginKTTSD( TQObject* parent, const char* name, cons
46 46
             actionCollection(), "tools_kttsd" );
47 47
     }
48 48
     else
49
-        kdDebug() << "TDEHTMLPLuginKTTSD::TDEHTMLPluginKTTSD: KTrader did not find KTTSD." << endl;
49
+        kdDebug() << "TDEHTMLPLuginKTTSD::TDEHTMLPluginKTTSD: TDETrader did not find KTTSD." << endl;
50 50
 }
51 51
 
52 52
 TDEHTMLPluginKTTSD::~TDEHTMLPluginKTTSD()

+ 1
- 1
konqueror/sidebar/trees/konq_sidebartree.cpp View File

@@ -770,7 +770,7 @@ void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent,  const TQSt
770 770
     KonqSidebarTreeModule * module = 0L;
771 771
 
772 772
     // Here's where we need to create the right module...
773
-    // ### TODO: make this KTrader/KLibrary based.
773
+    // ### TODO: make this TDETrader/KLibrary based.
774 774
     TQString moduleName = cfg.readEntry( "X-TDE-TreeModule" );
775 775
     TQString showHidden=cfg.readEntry("X-TDE-TreeModule-ShowHidden");
776 776
 

+ 1
- 1
konsole/konsole/konsole.cpp View File

@@ -4263,7 +4263,7 @@ KonsoleFind::KonsoleFind( TQWidget *parent, const char *name, bool /*modal*/ )
4263 4263
   TQHBox* row = new TQHBox( (TQWidget*)group );
4264 4264
   m_asRegExp = new TQCheckBox( i18n("As &regular expression"), row, "asRegexp" );
4265 4265
 
4266
-  if (!KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty()) {
4266
+  if (!TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty()) {
4267 4267
     m_editRegExp = new TQPushButton( i18n("&Edit..."), row, "editRegExp" );
4268 4268
     connect( m_asRegExp, TQT_SIGNAL( toggled(bool) ), m_editRegExp, TQT_SLOT( setEnabled(bool) ) );
4269 4269
     connect( m_editRegExp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditRegExp() ) );

+ 2
- 2
kpersonalizer/keyecandypage.cpp View File

@@ -490,8 +490,8 @@ one holds the types, wich are NOT supposed to be shown. We need to take care of
490 490
 void KEyeCandyPage::enablePreview(bool currSettings){
491 491
 	TQStringList desktopPreviews;
492 492
 	TQStringList konquerorNoPreviews;
493
-	KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
494
-	for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) {
493
+	TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
494
+	for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) {
495 495
 		if(prevOther){
496 496
 			desktopPreviews.append((*it)->desktopEntryName());
497 497
 			kdDebug() << "Adding Preview:" << (*it)->desktopEntryName() << endl;

+ 1
- 1
ksplashml/kcmksplash/installer.cpp View File

@@ -373,7 +373,7 @@ void SplashInstaller::slotSetTheme(int id)
373 373
         infoTxt += "</qt>";
374 374
 
375 375
         TQString pluginName( cnf.readEntry( "Engine", "Default" ) ); // Perhaps no default is better?
376
-        if ((KTrader::self()->query("KSplash/Plugin", TQString("[X-KSplash-PluginName] == '%1'").arg(pluginName))).isEmpty())
376
+        if ((TDETrader::self()->query("KSplash/Plugin", TQString("[X-KSplash-PluginName] == '%1'").arg(pluginName))).isEmpty())
377 377
         {
378 378
           enabled = false;
379 379
           error = i18n("This theme requires the plugin %1 which is not installed.").arg(pluginName);

+ 2
- 2
ksplashml/wndmain.cpp View File

@@ -346,7 +346,7 @@ void KSplash::loadTheme( const TQString& theme )
346 346
 
347 347
 ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQString& theme )
348 348
 {
349
-  // Since we may be called before the DCOP server is active, we cannot use the KTrader framework for obtaining plugins. In its
349
+  // Since we may be called before the DCOP server is active, we cannot use the TDETrader framework for obtaining plugins. In its
350 350
   // place, we use the following naive heuristic to locate plugins. If we are not in managed mode, and we are not in testing mode
351 351
   // either, we assume that we have been called by starttde. In this case, we simply try to load the library whose name should
352 352
   // conform to the following specification:
@@ -369,7 +369,7 @@ ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQStri
369 369
   else
370 370
   {
371 371
     // Fancier way of locating plugins.
372
-    KService::List list= KTrader::self()->query("KSplash/Plugin", TQString("[X-KSplash-PluginName] == '%1'").arg(pluginName));
372
+    KService::List list= TDETrader::self()->query("KSplash/Plugin", TQString("[X-KSplash-PluginName] == '%1'").arg(pluginName));
373 373
     KService::Ptr ptr;
374 374
     if (!list.isEmpty())
375 375
     {

+ 2
- 2
libkonq/konq_iconviewwidget.cc View File

@@ -1912,8 +1912,8 @@ void KonqIconViewWidget::updatePreviewMimeTypes()
1912 1912
         d->pPreviewMimeTypes->clear();
1913 1913
 
1914 1914
     // Load the list of plugins to determine which mimetypes are supported
1915
-    KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
1916
-    KTrader::OfferList::ConstIterator it;
1915
+    TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
1916
+    TDETrader::OfferList::ConstIterator it;
1917 1917
 
1918 1918
     for ( it = plugins.begin(); it != plugins.end(); ++it ) {
1919 1919
         if ( d->previewSettings.contains((*it)->desktopEntryName()) ) {

+ 7
- 7
libkonq/konq_popupmenu.cc View File

@@ -847,7 +847,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
847 847
             }
848 848
         }
849 849
 
850
-        KTrader::OfferList offers;
850
+        TDETrader::OfferList offers;
851 851
 
852 852
         if (kapp->authorizeKAction("openwith"))
853 853
         {
@@ -864,7 +864,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
864 864
                 ++it;
865 865
             }
866 866
 
867
-            offers = KTrader::self()->query( first, constraint );
867
+            offers = TDETrader::self()->query( first, constraint );
868 868
         }
869 869
 
870 870
         //// Ok, we have everything, now insert
@@ -895,7 +895,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
895 895
                     text.appendChild( m_doc.createTextNode( i18n("&Open With") ) );
896 896
                 }
897 897
 
898
-                KTrader::OfferList::ConstIterator it = offers.begin();
898
+                TDETrader::OfferList::ConstIterator it = offers.begin();
899 899
                 for( ; it != offers.end(); it++ )
900 900
                 {
901 901
                     KService::Ptr service = (*it);
@@ -1179,14 +1179,14 @@ void KonqPopupMenu::addPlugins()
1179 1179
 {
1180 1180
     // search for Konq_PopupMenuPlugins inspired by simons kpropsdlg
1181 1181
     //search for a plugin with the right protocol
1182
-    KTrader::OfferList plugin_offers;
1182
+    TDETrader::OfferList plugin_offers;
1183 1183
     unsigned int pluginCount = 0;
1184
-    plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? TQString::fromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes");
1184
+    plugin_offers = TDETrader::self()->query( m_sMimeType.isNull() ? TQString::fromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes");
1185 1185
     if ( plugin_offers.isEmpty() )
1186 1186
         return; // no plugins installed do not bother about it
1187 1187
 
1188
-    KTrader::OfferList::ConstIterator iterator = plugin_offers.begin();
1189
-    KTrader::OfferList::ConstIterator end = plugin_offers.end();
1188
+    TDETrader::OfferList::ConstIterator iterator = plugin_offers.begin();
1189
+    TDETrader::OfferList::ConstIterator end = plugin_offers.end();
1190 1190
 
1191 1191
     addGroup( "plugins" );
1192 1192
     // travers the offerlist

+ 2
- 2
libkonq/konq_propsview.cc View File

@@ -563,8 +563,8 @@ const TQStringList& KonqPropsView::previewSettings()
563 563
         d->previewsToShow = new TQStringList;
564 564
 
565 565
         if (d->previewsEnabled) {
566
-            KTrader::OfferList plugins = KTrader::self()->query( "ThumbCreator" );
567
-            for ( KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it )
566
+            TDETrader::OfferList plugins = TDETrader::self()->query( "ThumbCreator" );
567
+            for ( TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it )
568 568
             {
569 569
             TQString name = (*it)->desktopEntryName();
570 570
             if ( ! m_dontPreview.contains(name) )

+ 3
- 3
tdeioslave/thumbnail/thumbnail.cpp View File

@@ -70,7 +70,7 @@
70 70
 // iconSize     - the size of the overlay icon to use if any
71 71
 // iconAlpha    - the transparency value used for icon overlays
72 72
 // plugin       - the name of the plugin library to be used for thumbnail creation.
73
-//                Provided by the application to save an addition KTrader
73
+//                Provided by the application to save an addition TDETrader
74 74
 //                query here.
75 75
 // shmid        - the shared memory segment id to write the image's data to.
76 76
 //                The segment is assumed to provide enough space for a 32-bit
@@ -240,10 +240,10 @@ void ThumbnailProtocol::get(const KURL &url)
240 240
 #ifdef THUMBNAIL_HACK
241 241
         if (plugin.isEmpty())
242 242
         {
243
-            KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
243
+            TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
244 244
             TQMap<TQString, KService::Ptr> mimeMap;
245 245
     
246
-            for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
246
+            for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
247 247
             {
248 248
                 TQStringList mimeTypes = (*it)->property("MimeTypes").toStringList();
249 249
                 for (TQStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt)

Loading…
Cancel
Save