Browse Source

Rename KLock and KTrader to avoid conflicts with KDE4

Timothy Pearson 6 years ago
parent
commit
0c9d97065a
51 changed files with 307 additions and 307 deletions
  1. 1
    1
      interfaces/kregexpeditor/kregexpeditorinterface.h
  2. 1
    1
      interfaces/kspeech/kspeech.h
  3. 3
    3
      interfaces/tdetexteditor/editorchooser.cpp
  4. 1
    1
      kabc/TODO
  5. 1
    1
      kate/part/katefactory.cpp
  6. 2
    2
      kate/part/katefactory.h
  7. 2
    2
      tdecore/kapplication.cpp
  8. 1
    1
      tdecore/kdebug.areas
  9. 36
    36
      tdecore/klockfile.cpp
  10. 7
    7
      tdecore/klockfile.h
  11. 1
    1
      tdecore/tdeconfig.cpp
  12. 1
    1
      tdecore/tdeconfig.h
  13. 9
    9
      tdecore/tdeconfigbackend.cpp
  14. 1
    1
      tdecore/tdeconfigbackend.h
  15. 3
    3
      tdehtml/ecma/kjs_navigator.cpp
  16. 1
    1
      tdehtml/rendering/render_frames.cpp
  17. 4
    4
      tdehtml/tdehtml_part.cpp
  18. 1
    1
      tdeio/Mainpage.dox
  19. 3
    3
      tdeio/tdefile/kpropertiesdialog.cpp
  20. 3
    3
      tdeio/tdeio/kdatatool.cpp
  21. 1
    1
      tdeio/tdeio/kdatatool.h
  22. 2
    2
      tdeio/tdeio/kdcopservicestarter.cpp
  23. 6
    6
      tdeio/tdeio/kdcopservicestarter.h
  24. 3
    3
      tdeio/tdeio/kfilterbase.cpp
  25. 2
    2
      tdeio/tdeio/kscan.cpp
  26. 1
    1
      tdeio/tdeio/kservicetype.h
  27. 20
    20
      tdeio/tdeio/ktrader.cpp
  28. 13
    13
      tdeio/tdeio/ktrader.h
  29. 20
    20
      tdeio/tdeio/ktraderparse.cpp
  30. 24
    24
      tdeio/tdeio/ktraderparse.h
  31. 3
    3
      tdeio/tdeio/kurifilter.cpp
  32. 5
    5
      tdeio/tdeio/kuserprofile.h
  33. 11
    11
      tdeio/tdeio/lex.c
  34. 11
    11
      tdeio/tdeio/lex.l
  35. 4
    4
      tdeio/tdeio/metainfojob.cpp
  36. 6
    6
      tdeio/tdeio/previewjob.cpp
  37. 5
    5
      tdeio/tdeio/renamedlg.cpp
  38. 3
    3
      tdeio/tdeio/tdefilemetainfo.cpp
  39. 30
    30
      tdeio/tdeio/yacc.c
  40. 30
    30
      tdeio/tdeio/yacc.y
  41. 2
    2
      tdeio/tests/tdesycocatest.cpp
  42. 4
    4
      tdeio/tests/tdetradertest.cpp
  43. 4
    4
      tdeparts/componentfactory.h
  44. 2
    2
      tdeparts/tests/ghostview.cpp
  45. 2
    2
      tdeprint/kprintpreview.cpp
  46. 5
    5
      tderesources/configpage.cpp
  47. 2
    2
      tderesources/factory.cpp
  48. 1
    1
      tdespell2/broker.cpp
  49. 1
    1
      tdeutils/Makefile.am
  50. 1
    1
      tdeutils/kplugininfo.cpp
  51. 1
    1
      tdeutils/ksettings/dialog.cpp

+ 1
- 1
interfaces/kregexpeditor/kregexpeditorinterface.h View File

@@ -15,7 +15,7 @@
15 15
  * To check if kregexpeditor in tdeutils is installed and available use this line:
16 16
  * 
17 17
  * \code
18
- * bool installed=!KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
18
+ * bool installed=!TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
19 19
  * \endcode
20 20
  *
21 21
  * The following is a template for what you need to do to create an instance of the

+ 1
- 1
interfaces/kspeech/kspeech.h View File

@@ -227,7 +227,7 @@
227 227
  * If you want to detect if KTTSD is installed without starting it, use this code.
228 228
  *
229 229
    @verbatim
230
-     KTrader::OfferList offers = KTrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'");
230
+     TDETrader::OfferList offers = TDETrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'");
231 231
      if (offers.count() > 0)
232 232
      {
233 233
        // KTTSD is installed.

+ 3
- 3
interfaces/tdetexteditor/editorchooser.cpp View File

@@ -46,14 +46,14 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) :
46 46
   grid->addWidget( d->chooser, 0, 0);
47 47
 
48 48
 
49
-	KTrader::OfferList offers = KTrader::self()->query("text/plain", "'KTextEditor/Document' in ServiceTypes");
49
+	TDETrader::OfferList offers = TDETrader::self()->query("text/plain", "'KTextEditor/Document' in ServiceTypes");
50 50
 	TDEConfig *config=new TDEConfig("default_components");
51 51
   	config->setGroup("KTextEditor");
52 52
   	TQString editor = config->readPathEntry("embeddedEditor");
53 53
 
54 54
         if (editor.isEmpty()) editor="katepart";
55 55
 
56
-	for (KTrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it)
56
+	for (TDETrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it)
57 57
 	{
58 58
     		if ((*it)->desktopEntryName().contains(editor))
59 59
 		{
@@ -62,7 +62,7 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) :
62 62
 		}
63 63
   	}
64 64
 
65
-  	for (KTrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it)
65
+  	for (TDETrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it)
66 66
   	{
67 67
     		d->chooser->editorCombo->insertItem((*it)->name());
68 68
 		d->elements.append((*it)->desktopEntryName());

+ 1
- 1
kabc/TODO View File

@@ -1 +1 @@
1
-Factor out KLockFile.
1
+Factor out TDELockFile.

+ 1
- 1
kate/part/katefactory.cpp View File

@@ -71,7 +71,7 @@ KateFactory::KateFactory ()
71 71
              I18N_NOOP( "Embeddable editor component" ), TDEAboutData::License_LGPL_V2,
72 72
              I18N_NOOP( "(c) 2000-2004 The Kate Authors" ), 0, "http://kate.kde.org")
73 73
  , m_instance (&m_aboutData)
74
- , m_plugins (KTrader::self()->query("KTextEditor/Plugin"))
74
+ , m_plugins (TDETrader::self()->query("KTextEditor/Plugin"))
75 75
  , m_jscript (0)
76 76
 {
77 77
   // set s_self

+ 2
- 2
kate/part/katefactory.h View File

@@ -150,7 +150,7 @@ class KateFactory
150 150
      * on start detected plugins
151 151
      * @return list of all at launch detected tdetexteditor::plugins
152 152
      */
153
-    inline const KTrader::OfferList &plugins () { return m_plugins; };
153
+    inline const TDETrader::OfferList &plugins () { return m_plugins; };
154 154
 
155 155
     /**
156 156
      * global dirwatch
@@ -261,7 +261,7 @@ class KateFactory
261 261
     /**
262 262
      * at start found plugins
263 263
      */
264
-    KTrader::OfferList m_plugins;
264
+    TDETrader::OfferList m_plugins;
265 265
 
266 266
     /**
267 267
      * fallback document config

+ 2
- 2
tdecore/kapplication.cpp View File

@@ -1443,8 +1443,8 @@ void TDEApplication::startKdeinit()
1443 1443
 {
1444 1444
 #ifndef Q_WS_WIN //TODO
1445 1445
   TDEInstance inst( "starttdeinitlock" );
1446
-  KLockFile lock( locateLocal( "tmp", "starttdeinitlock", &inst ));
1447
-  if( lock.lock( KLockFile::LockNoBlock ) != KLockFile::LockOK ) {
1446
+  TDELockFile lock( locateLocal( "tmp", "starttdeinitlock", &inst ));
1447
+  if( lock.lock( TDELockFile::LockNoBlock ) != TDELockFile::LockOK ) {
1448 1448
      lock.lock();
1449 1449
      DCOPClient cl;
1450 1450
      if( cl.attach())

+ 1
- 1
tdecore/kdebug.areas View File

@@ -234,7 +234,7 @@
234 234
 7011        kio (KSycoca)
235 235
 7012        kio (KService*)
236 236
 7013        kio (KPing)
237
-7014        kio (KTrader)
237
+7014        kio (TDETrader)
238 238
 7015        kio (KAutoMount)
239 239
 7016        kio (KLauncher)
240 240
 7017        kio (KIOConnection)

+ 36
- 36
tdecore/klockfile.cpp View File

@@ -45,7 +45,7 @@
45 45
 // TODO: http://www.spinnaker.de/linux/nfs-locking.html
46 46
 // TODO: Make regression test
47 47
 
48
-class KLockFile::KLockFilePrivate {
48
+class TDELockFile::TDELockFilePrivate {
49 49
 public:
50 50
    TQString file;
51 51
    int staleTime;
@@ -62,9 +62,9 @@ public:
62 62
 
63 63
 
64 64
 // 30 seconds
65
-KLockFile::KLockFile(const TQString &file)
65
+TDELockFile::TDELockFile(const TQString &file)
66 66
 {
67
-  d = new KLockFilePrivate();
67
+  d = new TDELockFilePrivate();
68 68
   d->file = file;
69 69
   d->staleTime = 30;
70 70
   d->isLocked = false;
@@ -72,21 +72,21 @@ KLockFile::KLockFile(const TQString &file)
72 72
   d->linkCountSupport = true;
73 73
 }
74 74
 
75
-KLockFile::~KLockFile()
75
+TDELockFile::~TDELockFile()
76 76
 {
77 77
   unlock();
78 78
   delete d;
79 79
 }
80 80
 
81 81
 int 
82
-KLockFile::staleTime() const
82
+TDELockFile::staleTime() const
83 83
 {
84 84
   return d->staleTime;
85 85
 }
86 86
 
87 87
 
88 88
 void
89
-KLockFile::setStaleTime(int _staleTime)
89
+TDELockFile::setStaleTime(int _staleTime)
90 90
 {
91 91
   d->staleTime = _staleTime;
92 92
 }
@@ -109,17 +109,17 @@ static bool testLinkCountSupport(const TQCString &fileName)
109 109
    return ((result == 0) && (st_buf.st_nlink == 2));
110 110
 }
111 111
 
112
-static KLockFile::LockResult lockFile(const TQString &lockFile, KDE_struct_stat &st_buf, bool &linkCountSupport)
112
+static TDELockFile::LockResult lockFile(const TQString &lockFile, KDE_struct_stat &st_buf, bool &linkCountSupport)
113 113
 {
114 114
   TQCString lockFileName = TQFile::encodeName( lockFile );
115 115
   int result = KDE_lstat( lockFileName, &st_buf );
116 116
   if (result == 0)
117
-     return KLockFile::LockFail;
117
+     return TDELockFile::LockFail;
118 118
   
119 119
   KTempFile uniqueFile(lockFile, TQString::null, 0644);
120 120
   uniqueFile.setAutoDelete(true);
121 121
   if (uniqueFile.status() != 0)
122
-     return KLockFile::LockError;
122
+     return TDELockFile::LockError;
123 123
 
124 124
   char hostname[256];
125 125
   hostname[0] = 0;
@@ -138,23 +138,23 @@ static KLockFile::LockResult lockFile(const TQString &lockFile, KDE_struct_stat
138 138
   // Create lock file
139 139
   result = ::link( uniqueName, lockFileName );
140 140
   if (result != 0)
141
-     return KLockFile::LockError;
141
+     return TDELockFile::LockError;
142 142
      
143 143
   if (!linkCountSupport)
144
-     return KLockFile::LockOK;
144
+     return TDELockFile::LockOK;
145 145
 #else
146 146
   //TODO for win32
147
-  return KLockFile::LockOK;
147
+  return TDELockFile::LockOK;
148 148
 #endif
149 149
 
150 150
   KDE_struct_stat st_buf2;
151 151
   result = KDE_lstat( uniqueName, &st_buf2 );
152 152
   if (result != 0)
153
-     return KLockFile::LockError;
153
+     return TDELockFile::LockError;
154 154
 
155 155
   result = KDE_lstat( lockFileName, &st_buf );
156 156
   if (result != 0)
157
-     return KLockFile::LockError;
157
+     return TDELockFile::LockError;
158 158
 
159 159
   if (!statResultIsEqual(st_buf, st_buf2) || S_ISLNK(st_buf.st_mode) || S_ISLNK(st_buf2.st_mode))
160 160
   {
@@ -163,15 +163,15 @@ static KLockFile::LockResult lockFile(const TQString &lockFile, KDE_struct_stat
163 163
      {
164 164
         linkCountSupport = testLinkCountSupport(uniqueName);
165 165
         if (!linkCountSupport)
166
-           return KLockFile::LockOK; // Link count support is missing... assume everything is OK.
166
+           return TDELockFile::LockOK; // Link count support is missing... assume everything is OK.
167 167
      }
168
-     return KLockFile::LockFail;
168
+     return TDELockFile::LockFail;
169 169
   }
170 170
 
171
-  return KLockFile::LockOK;
171
+  return TDELockFile::LockOK;
172 172
 }
173 173
 
174
-static KLockFile::LockResult deleteStaleLock(const TQString &lockFile, KDE_struct_stat &st_buf, bool &linkCountSupport)
174
+static TDELockFile::LockResult deleteStaleLock(const TQString &lockFile, KDE_struct_stat &st_buf, bool &linkCountSupport)
175 175
 {
176 176
    // This is dangerous, we could be deleting a new lock instead of
177 177
    // the old stale one, let's be very careful
@@ -179,7 +179,7 @@ static KLockFile::LockResult deleteStaleLock(const TQString &lockFile, KDE_struc
179 179
    // Create temp file
180 180
    KTempFile ktmpFile(lockFile);
181 181
    if (ktmpFile.status() != 0)
182
-      return KLockFile::LockError;
182
+      return TDELockFile::LockError;
183 183
               
184 184
    TQCString lckFile = TQFile::encodeName(lockFile);
185 185
    TQCString tmpFile = TQFile::encodeName(ktmpFile.name());
@@ -189,10 +189,10 @@ static KLockFile::LockResult deleteStaleLock(const TQString &lockFile, KDE_struc
189 189
 #ifdef Q_OS_UNIX
190 190
    // link to lock file
191 191
    if (::link(lckFile, tmpFile) != 0)
192
-      return KLockFile::LockFail; // Try again later
192
+      return TDELockFile::LockFail; // Try again later
193 193
 #else
194 194
    //TODO for win32
195
-   return KLockFile::LockOK;
195
+   return TDELockFile::LockOK;
196 196
 #endif
197 197
 
198 198
    // check if link count increased with exactly one
@@ -209,7 +209,7 @@ static KLockFile::LockResult deleteStaleLock(const TQString &lockFile, KDE_struc
209 209
          tqWarning("WARNING: deleting stale lockfile %s", lckFile.data());
210 210
          ::unlink(lckFile);
211 211
          ::unlink(tmpFile);
212
-         return KLockFile::LockOK;
212
+         return TDELockFile::LockOK;
213 213
       }
214 214
    }
215 215
    
@@ -227,34 +227,34 @@ static KLockFile::LockResult deleteStaleLock(const TQString &lockFile, KDE_struc
227 227
       tqWarning("WARNING: deleting stale lockfile %s", lckFile.data());
228 228
       ::unlink(lckFile);
229 229
       ::unlink(tmpFile);
230
-      return KLockFile::LockOK;
230
+      return TDELockFile::LockOK;
231 231
    }
232 232
    
233 233
    // Failed to delete stale lock file
234 234
    tqWarning("WARNING: Problem deleting stale lockfile %s", lckFile.data());
235 235
    ::unlink(tmpFile);
236
-   return KLockFile::LockFail;
236
+   return TDELockFile::LockFail;
237 237
 }
238 238
 
239 239
 
240
-KLockFile::LockResult KLockFile::lock(int options)
240
+TDELockFile::LockResult TDELockFile::lock(int options)
241 241
 {
242 242
   if (d->isLocked)
243
-     return KLockFile::LockOK;
243
+     return TDELockFile::LockOK;
244 244
 
245
-  KLockFile::LockResult result;     
245
+  TDELockFile::LockResult result;     
246 246
   int hardErrors = 5;
247 247
   int n = 5;
248 248
   while(true)
249 249
   {
250 250
      KDE_struct_stat st_buf;
251 251
      result = lockFile(d->file, st_buf, d->linkCountSupport);
252
-     if (result == KLockFile::LockOK)
252
+     if (result == TDELockFile::LockOK)
253 253
      {
254 254
         d->staleTimer = TQTime();
255 255
         break;
256 256
      }
257
-     else if (result == KLockFile::LockError)
257
+     else if (result == TDELockFile::LockError)
258 258
      {
259 259
         d->staleTimer = TQTime();
260 260
         if (--hardErrors == 0)
@@ -262,7 +262,7 @@ KLockFile::LockResult KLockFile::lock(int options)
262 262
            break;
263 263
         }
264 264
      }
265
-     else // KLockFile::Fail
265
+     else // TDELockFile::Fail
266 266
      {
267 267
         if (!d->staleTimer.isNull() && !statResultIsEqual(d->statBuf, st_buf))
268 268
            d->staleTimer = TQTime();
@@ -292,17 +292,17 @@ KLockFile::LockResult KLockFile::lock(int options)
292 292
            if (isStale)
293 293
            {
294 294
               if ((options & LockForce) == 0)
295
-                 return KLockFile::LockStale;
295
+                 return TDELockFile::LockStale;
296 296
                  
297 297
               result = deleteStaleLock(d->file, d->statBuf, d->linkCountSupport);
298 298
 
299
-              if (result == KLockFile::LockOK)
299
+              if (result == TDELockFile::LockOK)
300 300
               {
301 301
                  // Lock deletion successful
302 302
                  d->staleTimer = TQTime();
303 303
                  continue; // Now try to get the new lock
304 304
               }
305
-              else if (result != KLockFile::LockFail)
305
+              else if (result != TDELockFile::LockFail)
306 306
               {
307 307
                  return result;
308 308
               }
@@ -351,12 +351,12 @@ KLockFile::LockResult KLockFile::lock(int options)
351 351
   return result;
352 352
 }
353 353
    
354
-bool KLockFile::isLocked() const
354
+bool TDELockFile::isLocked() const
355 355
 {
356 356
   return d->isLocked;
357 357
 }
358 358
    
359
-void KLockFile::unlock()
359
+void TDELockFile::unlock()
360 360
 {
361 361
   if (d->isLocked)
362 362
   {
@@ -365,7 +365,7 @@ void KLockFile::unlock()
365 365
   }
366 366
 }
367 367
 
368
-bool KLockFile::getLockInfo(int &pid, TQString &hostname, TQString &appname)
368
+bool TDELockFile::getLockInfo(int &pid, TQString &hostname, TQString &appname)
369 369
 {
370 370
   if (d->pid == -1)
371 371
      return false;

+ 7
- 7
tdecore/klockfile.h View File

@@ -25,22 +25,22 @@
25 25
 
26 26
 #include <ksharedptr.h>
27 27
 /**
28
- * The KLockFile class provides NFS safe lockfiles.
28
+ * The TDELockFile class provides NFS safe lockfiles.
29 29
  *
30 30
  * @author Waldo Bastian <bastian@kde.org>
31 31
  * @since 3.3
32 32
  */
33
-class TDECORE_EXPORT KLockFile : public TDEShared
33
+class TDECORE_EXPORT TDELockFile : public TDEShared
34 34
 {
35 35
 public:
36
-   typedef TDESharedPtr<KLockFile> Ptr;
36
+   typedef TDESharedPtr<TDELockFile> Ptr;
37 37
 
38
-   KLockFile(const TQString &file);
38
+   TDELockFile(const TQString &file);
39 39
 
40 40
    /**
41 41
     * Destroys the object, releasing the lock if held
42 42
     **/
43
-   ~KLockFile();
43
+   ~TDELockFile();
44 44
 
45 45
    /**
46 46
     * Possible return values of the lock function.
@@ -116,8 +116,8 @@ public:
116 116
    bool getLockInfo(int &pid, TQString &hostname, TQString &appname);
117 117
 
118 118
 private:
119
-   class KLockFilePrivate;
120
-   KLockFilePrivate *d;
119
+   class TDELockFilePrivate;
120
+   TDELockFilePrivate *d;
121 121
 };
122 122
 
123 123
 #endif

+ 1
- 1
tdecore/tdeconfig.cpp View File

@@ -277,7 +277,7 @@ void TDEConfig::setFileWriteMode(int mode)
277 277
   backEnd->setFileWriteMode(mode);
278 278
 }
279 279
 
280
-KLockFile::Ptr TDEConfig::lockFile(bool bGlobal)
280
+TDELockFile::Ptr TDEConfig::lockFile(bool bGlobal)
281 281
 {
282 282
   TDEConfigINIBackEnd *aBackEnd = dynamic_cast<TDEConfigINIBackEnd*>(backEnd);
283 283
   if (!aBackEnd) return 0;

+ 1
- 1
tdecore/tdeconfig.h View File

@@ -176,7 +176,7 @@ public:
176 176
    * Otherwise there is a risk of deadlock.
177 177
    * @since 3.3
178 178
    */
179
-  KLockFile::Ptr lockFile( bool bGlobal=false );
179
+  TDELockFile::Ptr lockFile( bool bGlobal=false );
180 180
 
181 181
 protected:
182 182
 

+ 9
- 9
tdecore/tdeconfigbackend.cpp View File

@@ -236,8 +236,8 @@ class TDEConfigBackEnd::TDEConfigBackEndPrivate
236 236
 public:
237 237
    TQDateTime localLastModified;
238 238
    uint      localLastSize;
239
-   KLockFile::Ptr localLockFile;
240
-   KLockFile::Ptr globalLockFile;
239
+   TDELockFile::Ptr localLockFile;
240
+   TDELockFile::Ptr globalLockFile;
241 241
 };
242 242
 
243 243
 void TDEConfigBackEnd::changeFileName(const TQString &_fileName,
@@ -270,7 +270,7 @@ void TDEConfigBackEnd::changeFileName(const TQString &_fileName,
270 270
    d->globalLockFile = 0;
271 271
 }
272 272
 
273
-KLockFile::Ptr TDEConfigBackEnd::lockFile(bool bGlobal)
273
+TDELockFile::Ptr TDEConfigBackEnd::lockFile(bool bGlobal)
274 274
 {
275 275
    if (bGlobal)
276 276
    {
@@ -279,7 +279,7 @@ KLockFile::Ptr TDEConfigBackEnd::lockFile(bool bGlobal)
279 279
       
280 280
       if (!mGlobalFileName.isEmpty())
281 281
       {
282
-         d->globalLockFile = new KLockFile(mGlobalFileName+".lock");
282
+         d->globalLockFile = new TDELockFile(mGlobalFileName+".lock");
283 283
          return d->globalLockFile;
284 284
       }
285 285
    }
@@ -290,7 +290,7 @@ KLockFile::Ptr TDEConfigBackEnd::lockFile(bool bGlobal)
290 290
       
291 291
       if (!mLocalFileName.isEmpty())
292 292
       {
293
-         d->localLockFile = new KLockFile(mLocalFileName+".lock");
293
+         d->localLockFile = new TDELockFile(mLocalFileName+".lock");
294 294
          return d->localLockFile;
295 295
       }
296 296
    }
@@ -815,7 +815,7 @@ void TDEConfigINIBackEnd::sync(bool bMerge)
815 815
     // it wasn't SUID.
816 816
     if (checkAccess(mLocalFileName, W_OK)) {
817 817
       // File is writable
818
-      KLockFile::Ptr lf;
818
+      TDELockFile::Ptr lf;
819 819
 
820 820
       bool mergeLocalFile = bMerge;
821 821
       // Check if the file has been updated since.
@@ -827,7 +827,7 @@ void TDEConfigINIBackEnd::sync(bool bMerge)
827 827
 
828 828
          if (lf) 
829 829
          {
830
-            lf->lock( KLockFile::LockForce );
830
+            lf->lock( TDELockFile::LockForce );
831 831
             // But what if the locking failed? Ignore it for now...
832 832
          }
833 833
          
@@ -873,13 +873,13 @@ void TDEConfigINIBackEnd::sync(bool bMerge)
873 873
 
874 874
     // can we allow the write? (see above)
875 875
     if (checkAccess ( mGlobalFileName, W_OK )) {
876
-      KLockFile::Ptr lf = lockFile(true); // Lock file for global file
876
+      TDELockFile::Ptr lf = lockFile(true); // Lock file for global file
877 877
       if (lf && lf->isLocked())
878 878
          lf = 0; // Already locked, we don't need to lock/unlock again
879 879
 
880 880
       if (lf) 
881 881
       {
882
-         lf->lock( KLockFile::LockForce );
882
+         lf->lock( TDELockFile::LockForce );
883 883
          // But what if the locking failed? Ignore it for now...
884 884
       }
885 885
       writeConfigFile( mGlobalFileName, true, bMerge ); // Always merge

+ 1
- 1
tdecore/tdeconfigbackend.h View File

@@ -151,7 +151,7 @@ public:
151 151
    * @param bGlobal If true, returns a lock file object for kdeglobals
152 152
    * @since 3.3
153 153
    */
154
-  KLockFile::Ptr lockFile( bool bGlobal = false );
154
+  TDELockFile::Ptr lockFile( bool bGlobal = false );
155 155
 
156 156
 #ifdef KDE_NO_COMPAT
157 157
 private:

+ 3
- 3
tdehtml/ecma/kjs_navigator.cpp View File

@@ -291,9 +291,9 @@ PluginBase::PluginBase(ExecState *exec, bool loadPluginInfo)
291 291
         plugins->setAutoDelete( true );
292 292
         mimes->setAutoDelete( true );
293 293
 
294
-        // read in using KTrader
295
-        KTrader::OfferList offers = KTrader::self()->query("Browser/View");
296
-        KTrader::OfferList::iterator it;
294
+        // read in using TDETrader
295
+        TDETrader::OfferList offers = TDETrader::self()->query("Browser/View");
296
+        TDETrader::OfferList::iterator it;
297 297
         for ( it = offers.begin(); it != offers.end(); ++it ) {
298 298
 
299 299
             TQVariant pluginsinfo = (**it).property( "X-TDE-BrowserView-PluginsInfo" );

+ 1
- 1
tdehtml/rendering/render_frames.cpp View File

@@ -812,7 +812,7 @@ void RenderPartObject::updateWidget()
812 812
                   // It is ActiveX, but the nsplugin system handling
813 813
                   // should also work, that's why we don't override the
814 814
                   // serviceType with application/x-activex-handler
815
-                  // but let the KTrader in tdehtmlpart::createPart() detect
815
+                  // but let the TDETrader in tdehtmlpart::createPart() detect
816 816
                   // the user's preference: launch with activex viewer or
817 817
                   // with nspluginviewer (Niko)
818 818
                   serviceType = "application/x-shockwave-flash";

+ 4
- 4
tdehtml/tdehtml_part.cpp View File

@@ -4652,20 +4652,20 @@ KParts::ReadOnlyPart *TDEHTMLPart::createPart( TQWidget *parentWidget, const cha
4652 4652
   if ( !serviceName.isEmpty() )
4653 4653
     constr.append( TQString::fromLatin1( "Name == '%1'" ).arg( serviceName ) );
4654 4654
 
4655
-  KTrader::OfferList offers = KTrader::self()->query( mimetype, "KParts/ReadOnlyPart", constr, TQString() );
4655
+  TDETrader::OfferList offers = TDETrader::self()->query( mimetype, "KParts/ReadOnlyPart", constr, TQString() );
4656 4656
 
4657 4657
   if ( offers.isEmpty() ) {
4658 4658
     int pos = mimetype.find( "-plugin" );
4659 4659
     if (pos < 0)
4660 4660
         return 0L;
4661 4661
     TQString stripped_mime = mimetype.left( pos );
4662
-    offers = KTrader::self()->query( stripped_mime, "KParts/ReadOnlyPart", constr, TQString() );
4662
+    offers = TDETrader::self()->query( stripped_mime, "KParts/ReadOnlyPart", constr, TQString() );
4663 4663
     if ( offers.isEmpty() )
4664 4664
         return 0L;
4665 4665
   }
4666 4666
 
4667
-  KTrader::OfferList::ConstIterator it = offers.begin();
4668
-  const KTrader::OfferList::ConstIterator itEnd = offers.end();
4667
+  TDETrader::OfferList::ConstIterator it = offers.begin();
4668
+  const TDETrader::OfferList::ConstIterator itEnd = offers.end();
4669 4669
   for ( ; it != itEnd; ++it )
4670 4670
   {
4671 4671
     KService::Ptr service = (*it);

+ 1
- 1
tdeio/Mainpage.dox View File

@@ -28,7 +28,7 @@
28 28
  * KServiceTypeProfile:
29 29
  * Stores the user's preferences for services bound to mimetypes/servicetypes.
30 30
  *
31
- * KTrader:
31
+ * TDETrader:
32 32
  * Use it to query for which services implement a given mimetype/servicetype.
33 33
  * Has its own language, in order to allow complex queries.
34 34
  *

+ 3
- 3
tdeio/tdefile/kpropertiesdialog.cpp View File

@@ -522,9 +522,9 @@ void KPropertiesDialog::insertPages()
522 522
       " ([X-TDE-Protocol] == '%1'  )   )"          ).arg(item->url().protocol());
523 523
 
524 524
   kdDebug( 250 ) << "trader query: " << query << endl;
525
-  KTrader::OfferList offers = KTrader::self()->query( mimetype, query );
526
-  KTrader::OfferList::ConstIterator it = offers.begin();
527
-  KTrader::OfferList::ConstIterator end = offers.end();
525
+  TDETrader::OfferList offers = TDETrader::self()->query( mimetype, query );
526
+  TDETrader::OfferList::ConstIterator it = offers.begin();
527
+  TDETrader::OfferList::ConstIterator end = offers.end();
528 528
   for (; it != end; ++it )
529 529
   {
530 530
     KPropsDlgPlugin *plugin = KParts::ComponentFactory

+ 3
- 3
tdeio/tdeio/kdatatool.cpp View File

@@ -177,7 +177,7 @@ TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const
177 177
         else
178 178
             constr = constr + " and " + tmp;
179 179
     }
180
-/* Bug in KTrader ? Test with HEAD-tdelibs!
180
+/* Bug in TDETrader ? Test with HEAD-tdelibs!
181 181
     if ( instance )
182 182
     {
183 183
         TQString tmp = TQString::fromLatin1( "not ('%1' in ExcludeFrom)" ).arg( instance->instanceName() );
@@ -189,9 +189,9 @@ TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const
189 189
 
190 190
     // Query the trader
191 191
     //kdDebug() << "KDataToolInfo::query " << constr << endl;
192
-    KTrader::OfferList offers = KTrader::self()->query( "KDataTool", constr );
192
+    TDETrader::OfferList offers = TDETrader::self()->query( "KDataTool", constr );
193 193
 
194
-    KTrader::OfferList::ConstIterator it = offers.begin();
194
+    TDETrader::OfferList::ConstIterator it = offers.begin();
195 195
     for( ; it != offers.end(); ++it )
196 196
     {
197 197
         // Temporary replacement for the non-working trader query above

+ 1
- 1
tdeio/tdeio/kdatatool.h View File

@@ -164,7 +164,7 @@ public:
164 164
     bool isValid() const;
165 165
 
166 166
     /**
167
-     * Queries the KTrader about installed KDataTool implementations.
167
+     * Queries the TDETrader about installed KDataTool implementations.
168 168
      * @param datatype a type that the application can 'export' to the tools (e.g. TQString)
169 169
      * @param mimetype the mimetype of the data (e.g. text/plain)
170 170
      * @param instance the application (or the part)'s instance (to check if a tool is excluded from this part,

+ 2
- 2
tdeio/tdeio/kdcopservicestarter.cpp View File

@@ -58,7 +58,7 @@ int KDCOPServiceStarter::findServiceFor( const TQString& serviceType,
58 58
     if ( !constraint.isEmpty() )
59 59
         constraint += " and ";
60 60
     constraint += "exist [X-DCOP-ServiceName]";
61
-    KTrader::OfferList offers = KTrader::self()->query(serviceType, "Application", constraint, preferences);
61
+    TDETrader::OfferList offers = TDETrader::self()->query(serviceType, "Application", constraint, preferences);
62 62
     if ( offers.isEmpty() ) {
63 63
         if ( error )
64 64
             *error = i18n("No service implementing %1").arg( serviceType );
@@ -88,7 +88,7 @@ int KDCOPServiceStarter::startServiceFor( const TQString& serviceType,
88 88
                                           const TQString& preferences,
89 89
                                           TQString *error, TQCString* dcopService, int /*flags*/ )
90 90
 {
91
-    KTrader::OfferList offers = KTrader::self()->query(serviceType, "Application", constraint, preferences);
91
+    TDETrader::OfferList offers = TDETrader::self()->query(serviceType, "Application", constraint, preferences);
92 92
     if ( offers.isEmpty() )
93 93
         return -1;
94 94
     KService::Ptr ptr = offers.first();

+ 6
- 6
tdeio/tdeio/kdcopservicestarter.h View File

@@ -26,7 +26,7 @@ class KDCOPServiceStarter;
26 26
 class TQCString;
27 27
 
28 28
 /**
29
- * A generic DCOP service starter, using KTrader.
29
+ * A generic DCOP service starter, using TDETrader.
30 30
  * The default implementation starts new processes, but this interface can
31 31
  * also be reimplemented by specific applications to provide dlopened in-process DCOP objects.
32 32
  * @author David Faure <faure@kde.org>
@@ -46,8 +46,8 @@ public:
46 46
      * this method will call startServiceFor to start it.
47 47
      *
48 48
      * @param serviceType the type of service we're looking for
49
-     * @param constraint see KTrader
50
-     * @param preferences see KTrader
49
+     * @param constraint see TDETrader
50
+     * @param preferences see TDETrader
51 51
      * @param error On failure, @p error contains a description of the error
52 52
      *         that occurred. If the pointer is 0, the argument will be
53 53
      *         ignored
@@ -67,15 +67,15 @@ public:
67 67
     /**
68 68
      * Find an implementation of the given @p serviceType,
69 69
      * and start it, to use its DCOP interface.
70
-     * The default implementation uses KTrader to find the preferred Application,
70
+     * The default implementation uses TDETrader to find the preferred Application,
71 71
      * and then starts it using kapp->startService...
72 72
      *
73 73
      * However applications (like kontact) can reimplement this method, to provide
74 74
      * an in-process way of loading the implementation for this service type.
75 75
      *
76 76
      * @param serviceType the type of service we're looking for
77
-     * @param constraint see KTrader
78
-     * @param preferences see KTrader
77
+     * @param constraint see TDETrader
78
+     * @param preferences see TDETrader
79 79
      * @param error On failure, @p error contains a description of the error
80 80
      *         that occurred. If the pointer is 0, the argument will be
81 81
      *         ignored

+ 3
- 3
tdeio/tdeio/kfilterbase.cpp View File

@@ -48,10 +48,10 @@ KFilterBase * KFilterBase::findFilterByFileName( const TQString & fileName )
48 48
 
49 49
 KFilterBase * KFilterBase::findFilterByMimeType( const TQString & mimeType )
50 50
 {
51
-    KTrader::OfferList offers = KTrader::self()->query( "TDECompressionFilter",
51
+    TDETrader::OfferList offers = TDETrader::self()->query( "TDECompressionFilter",
52 52
                                                         TQString("'") + mimeType + "' in ServiceTypes" );
53
-    KTrader::OfferList::ConstIterator it = offers.begin();
54
-    KTrader::OfferList::ConstIterator end = offers.end();
53
+    TDETrader::OfferList::ConstIterator it = offers.begin();
54
+    TDETrader::OfferList::ConstIterator end = offers.end();
55 55
 
56 56
     kdDebug(7005) << "KFilterBase::findFilterByMimeType(" << mimeType << ") got " << offers.count() << " offers" << endl;
57 57
     for (; it != end; ++it )

+ 2
- 2
tdeio/tdeio/kscan.cpp View File

@@ -28,7 +28,7 @@
28 28
 KScanDialog * KScanDialog::getScanDialog( TQWidget *parent, const char *name,
29 29
 					  bool modal )
30 30
 {
31
-    KTrader::OfferList offers = KTrader::self()->query("KScan/KScanDialog");
31
+    TDETrader::OfferList offers = TDETrader::self()->query("KScan/KScanDialog");
32 32
     if ( offers.isEmpty() )
33 33
 	return 0L;
34 34
 	
@@ -71,7 +71,7 @@ bool KScanDialog::setup()
71 71
 KOCRDialog * KOCRDialog::getOCRDialog( TQWidget *parent, const char *name,
72 72
 					  bool modal )
73 73
 {
74
-    KTrader::OfferList offers = KTrader::self()->query("KScan/KOCRDialog");
74
+    TDETrader::OfferList offers = TDETrader::self()->query("KScan/KOCRDialog");
75 75
     if ( offers.isEmpty() )
76 76
 	return 0L;
77 77
 	

+ 1
- 1
tdeio/tdeio/kservicetype.h View File

@@ -210,7 +210,7 @@ public:
210 210
    * Returns all services supporting the given servicetype name.
211 211
    * This doesn't take care of the user profile.
212 212
    * In fact it is used by KServiceTypeProfile,
213
-   * which is used by KTrader, and that's the one you should use.
213
+   * which is used by TDETrader, and that's the one you should use.
214 214
    * @param _servicetype the name of the service type to search
215 215
    * @return the list of all services of the given type
216 216
    */

+ 20
- 20
tdeio/tdeio/ktrader.cpp View File

@@ -27,18 +27,18 @@
27 27
 #include <kstaticdeleter.h>
28 28
 #include <kdebug.h>
29 29
 
30
-template class KStaticDeleter<KTrader>;
30
+template class KStaticDeleter<TDETrader>;
31 31
 
32 32
 using namespace TDEIO;
33 33
 
34
-class KTraderSorter
34
+class TDETraderSorter
35 35
 {
36 36
 public:
37
-  KTraderSorter() { m_pService = 0; };
38
-  KTraderSorter( const KTraderSorter& s ) : m_userPreference( s.m_userPreference ),
37
+  TDETraderSorter() { m_pService = 0; };
38
+  TDETraderSorter( const TDETraderSorter& s ) : m_userPreference( s.m_userPreference ),
39 39
     m_bAllowAsDefault( s.m_bAllowAsDefault ),
40 40
     m_traderPreference( s.m_traderPreference ), m_pService( s.m_pService ) { }
41
-  KTraderSorter( const KService::Ptr &_service, double _pref1, int _pref2, bool _default )
41
+  TDETraderSorter( const KService::Ptr &_service, double _pref1, int _pref2, bool _default )
42 42
   { m_pService = _service;
43 43
     m_userPreference = _pref2;
44 44
     m_traderPreference = _pref1;
@@ -47,7 +47,7 @@ public:
47 47
 
48 48
   KService::Ptr service() const { return m_pService; }
49 49
 
50
-  bool operator< ( const KTraderSorter& ) const;
50
+  bool operator< ( const TDETraderSorter& ) const;
51 51
 
52 52
 private:
53 53
   /**
@@ -69,7 +69,7 @@ private:
69 69
   KService::Ptr m_pService;
70 70
 };
71 71
 
72
-bool KTraderSorter::operator< ( const KTraderSorter& _o ) const
72
+bool TDETraderSorter::operator< ( const TDETraderSorter& _o ) const
73 73
 {
74 74
   if ( _o.m_bAllowAsDefault && !m_bAllowAsDefault )
75 75
     return true;
@@ -84,32 +84,32 @@ bool KTraderSorter::operator< ( const KTraderSorter& _o ) const
84 84
 
85 85
 // --------------------------------------------------
86 86
 
87
-KTrader* KTrader::s_self = 0;
88
-static KStaticDeleter<KTrader> ktradersd;
87
+TDETrader* TDETrader::s_self = 0;
88
+static KStaticDeleter<TDETrader> ktradersd;
89 89
 
90
-KTrader* KTrader::self()
90
+TDETrader* TDETrader::self()
91 91
 {
92 92
     if ( !s_self )
93
-	ktradersd.setObject( s_self, new KTrader );
93
+	ktradersd.setObject( s_self, new TDETrader );
94 94
 
95 95
     return s_self;
96 96
 }
97 97
 
98
-KTrader::KTrader()
98
+TDETrader::TDETrader()
99 99
 {
100 100
 }
101 101
 
102
-KTrader::~KTrader()
102
+TDETrader::~TDETrader()
103 103
 {
104 104
 }
105 105
 
106
-KTrader::OfferList KTrader::query( const TQString& _servicetype, const TQString& _constraint,
106
+TDETrader::OfferList TDETrader::query( const TQString& _servicetype, const TQString& _constraint,
107 107
                                    const TQString& _preferences ) const
108 108
 {
109 109
     return query( _servicetype, TQString::null, _constraint, _preferences );
110 110
 }
111 111
 
112
-KTrader::OfferList KTrader::query( const TQString& _servicetype, const TQString& _genericServiceType,
112
+TDETrader::OfferList TDETrader::query( const TQString& _servicetype, const TQString& _genericServiceType,
113 113
                                    const TQString& _constraint,
114 114
                                    const TQString& _preferences ) const
115 115
 {
@@ -124,7 +124,7 @@ KTrader::OfferList KTrader::query( const TQString& _servicetype, const TQString&
124 124
     prefs = TDEIO::parsePreferences( _preferences );
125 125
 
126 126
   KServiceTypeProfile::OfferList lst;
127
-  KTrader::OfferList ret;
127
+  TDETrader::OfferList ret;
128 128
 
129 129
   // Get all services of this service type.
130 130
   lst = KServiceTypeProfile::offers( _servicetype, _genericServiceType );
@@ -147,17 +147,17 @@ KTrader::OfferList KTrader::query( const TQString& _servicetype, const TQString&
147 147
 
148 148
   if ( !!prefs )
149 149
   {
150
-    TQValueList<KTraderSorter> sorter;
150
+    TQValueList<TDETraderSorter> sorter;
151 151
     KServiceTypeProfile::OfferList::Iterator it = lst.begin();
152 152
     for( ; it != lst.end(); ++it )
153 153
     {
154 154
       PreferencesReturn p = matchPreferences( prefs, (*it).service(), lst );
155 155
       if ( p.type == PreferencesReturn::PRT_DOUBLE )
156
-	sorter.append( KTraderSorter( (*it).service(), p.f, (*it).preference(), (*it).allowAsDefault() ) );
156
+	sorter.append( TDETraderSorter( (*it).service(), p.f, (*it).preference(), (*it).allowAsDefault() ) );
157 157
     }
158 158
     qBubbleSort( sorter );
159 159
 
160
-    TQValueList<KTraderSorter>::Iterator it2 = sorter.begin();
160
+    TQValueList<TDETraderSorter>::Iterator it2 = sorter.begin();
161 161
     for( ; it2 != sorter.end(); ++it2 )
162 162
       ret.prepend( (*it2).service() );
163 163
   }
@@ -180,7 +180,7 @@ KTrader::OfferList KTrader::query( const TQString& _servicetype, const TQString&
180 180
   return ret;
181 181
 }
182 182
 
183
-void KTrader::virtual_hook( int, void* )
183
+void TDETrader::virtual_hook( int, void* )
184 184
 { /*BASE::virtual_hook( id, data );*/ }
185 185
 
186 186
 #include "ktrader.moc"

+ 13
- 13
tdeio/tdeio/ktrader.h View File

@@ -48,7 +48,7 @@
48 48
  * then will use KRun::run() to invoke the application.  In "trader-speak",
49 49
  * this looks like this:
50 50
  * \code
51
- * KTrader::OfferList offers = KTrader::self()->query("text/html", "Type == 'Application'");
51
+ * TDETrader::OfferList offers = TDETrader::self()->query("text/html", "Type == 'Application'");
52 52
  * KService::Ptr ptr = offers.first();
53 53
  * KURL::List lst;
54 54
  * lst.append("http://www.kde.org/index.html");
@@ -57,7 +57,7 @@
57 57
  *
58 58
  * Now, say that you want to list all KParts component that can handle HTML. 
59 59
  * \code
60
- * KTrader::OfferList offers = KTrader::self()->query("text/html", "KParts/ReadOnlyPart");
60
+ * TDETrader::OfferList offers = TDETrader::self()->query("text/html", "KParts/ReadOnlyPart");
61 61
  * \endcode
62 62
  *
63 63
  * If you want to get the preferred KParts component for text/html you could use
@@ -82,7 +82,7 @@
82 82
  *        applications or components.
83 83
  * @author Torben Weis <weis@kde.org>
84 84
  */
85
-class TDEIO_EXPORT KTrader : public TQObject
85
+class TDEIO_EXPORT TDETrader : public TQObject
86 86
 {
87 87
     Q_OBJECT
88 88
 public:
@@ -95,10 +95,10 @@ public:
95 95
     /**
96 96
      * Standard destructor
97 97
      */
98
-    virtual ~KTrader();
98
+    virtual ~TDETrader();
99 99
 
100 100
     /**
101
-     * The main function in the KTrader class.
101
+     * The main function in the TDETrader class.
102 102
      *
103 103
      * It will return a list of services that match your
104 104
      * specifications.  The only required parameter is the service
@@ -158,24 +158,24 @@ public:
158 158
                      const TQString& preferences /*= TQString::null*/) const;
159 159
 
160 160
     /**
161
-     * This is a static pointer to a KTrader instance.
161
+     * This is a static pointer to a TDETrader instance.
162 162
      *
163 163
      *  You will need
164
-     * to use this to access the KTrader functionality since the
164
+     * to use this to access the TDETrader functionality since the
165 165
      * constuctors are protected.
166 166
      *
167
-     * @return Static KTrader instance
167
+     * @return Static TDETrader instance
168 168
      */
169
-    static KTrader* self();
169
+    static TDETrader* self();
170 170
 
171 171
 protected:
172 172
     /**
173 173
      * @internal
174 174
      */
175
-    KTrader();
175
+    TDETrader();
176 176
 
177 177
 private:
178
-    static KTrader* s_self;
178
+    static TDETrader* s_self;
179 179
 protected:
180 180
     virtual void virtual_hook( int id, void* data );
181 181
 };
@@ -185,7 +185,7 @@ protected:
185 185
  *
186 186
  * @section Literals
187 187
  *
188
- * As elementary atoms of the constraint language, KTrader supports
188
+ * As elementary atoms of the constraint language, TDETrader supports
189 189
  * booleans, integers, floats and strings. Boolean literals are
190 190
  * @a TRUE and @a FALSE . Integers can be positive or negative,
191 191
  * i.e. @a 42 and @a -10 are legal values. Floating point
@@ -277,7 +277,7 @@ protected:
277 277
  *
278 278
  * The following examples show filters for .desktop files.
279 279
  * <tt>Type</tt>, <tt>ServiceTypes</tt> and <tt>MimeType</tt> are
280
- * properties in .desktop files. Be aware that within KTrader MimeType
280
+ * properties in .desktop files. Be aware that within TDETrader MimeType
281 281
  * properties are understood as ServiceTypes ones.
282 282
  *
283 283
  *

+ 20
- 20
tdeio/tdeio/ktraderparse.cpp View File

@@ -39,7 +39,7 @@ ParseTreeBase::Ptr TDEIO::parseConstraints( const TQString& _constr )
39 39
 {
40 40
   TQCString str = _constr.utf8();
41 41
   sCode = str.data();
42
-  KTraderParse_mainParse( sCode );
42
+  TDETraderParse_mainParse( sCode );
43 43
   sCode = 0;
44 44
   assert( pTree );
45 45
   return *pTree;
@@ -49,13 +49,13 @@ ParseTreeBase::Ptr TDEIO::parsePreferences( const TQString& _prefs )
49 49
 {
50 50
   TQCString str = _prefs.utf8();
51 51
   sCode = str.data();
52
-  KTraderParse_mainParse( sCode );
52
+  TDETraderParse_mainParse( sCode );
53 53
   sCode = 0;
54 54
   assert( pTree );
55 55
   return *pTree;
56 56
 }
57 57
 
58
-void KTraderParse_setParseTree( void *_ptr1 )
58
+void TDETraderParse_setParseTree( void *_ptr1 )
59 59
 {
60 60
   if ( !pTree )
61 61
     pTree = new ParseTreeBase::Ptr; // ### leak; should use KStaticDeleter
@@ -63,95 +63,95 @@ void KTraderParse_setParseTree( void *_ptr1 )
63 63
 }
64 64
 
65 65
 
66
-void KTraderParse_error( const char* err )
66
+void TDETraderParse_error( const char* err )
67 67
 {
68 68
   kdWarning(7014) << "Parsing '" << sCode << "' gave " << err << endl;
69 69
 }
70 70
 
71
-void* KTraderParse_newOR( void *_ptr1, void *_ptr2 )
71
+void* TDETraderParse_newOR( void *_ptr1, void *_ptr2 )
72 72
 {
73 73
   return new ParseTreeOR( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2 );
74 74
 }
75 75
 
76
-void* KTraderParse_newAND( void *_ptr1, void *_ptr2 )
76
+void* TDETraderParse_newAND( void *_ptr1, void *_ptr2 )
77 77
 {
78 78
   return new ParseTreeAND( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2 );
79 79
 }
80 80
 
81
-void* KTraderParse_newCMP( void *_ptr1, void *_ptr2, int _i )
81
+void* TDETraderParse_newCMP( void *_ptr1, void *_ptr2, int _i )
82 82
 {
83 83
   return new ParseTreeCMP( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2, _i );
84 84
 }
85 85
 
86
-void* KTraderParse_newIN( void *_ptr1, void *_ptr2 )
86
+void* TDETraderParse_newIN( void *_ptr1, void *_ptr2 )
87 87
 {
88 88
   return new ParseTreeIN( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2 );
89 89
 }
90 90
 
91
-void* KTraderParse_newMATCH( void *_ptr1, void *_ptr2 )
91
+void* TDETraderParse_newMATCH( void *_ptr1, void *_ptr2 )
92 92
 {
93 93
   return new ParseTreeMATCH( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2 );
94 94
 }
95 95
 
96
-void* KTraderParse_newCALC( void *_ptr1, void *_ptr2, int _i )
96
+void* TDETraderParse_newCALC( void *_ptr1, void *_ptr2, int _i )
97 97
 {
98 98
   return new ParseTreeCALC( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2, _i );
99 99
 }
100 100
 
101
-void* KTraderParse_newBRACKETS( void *_ptr1 )
101
+void* TDETraderParse_newBRACKETS( void *_ptr1 )
102 102
 {
103 103
   return new ParseTreeBRACKETS( (ParseTreeBase*)_ptr1 );
104 104
 }
105 105
 
106
-void* KTraderParse_newNOT( void *_ptr1 )
106
+void* TDETraderParse_newNOT( void *_ptr1 )
107 107
 {
108 108
   return new ParseTreeNOT( (ParseTreeBase*)_ptr1 );
109 109
 }
110 110
 
111
-void* KTraderParse_newEXIST( char *_ptr1 )
111
+void* TDETraderParse_newEXIST( char *_ptr1 )
112 112
 {
113 113
   ParseTreeEXIST *t = new ParseTreeEXIST( _ptr1 );
114 114
   free(_ptr1);
115 115
   return t;
116 116
 }
117 117
 
118
-void* KTraderParse_newID( char *_ptr1 )
118
+void* TDETraderParse_newID( char *_ptr1 )
119 119
 {
120 120
   ParseTreeID *t = new ParseTreeID( _ptr1 );
121 121
   free(_ptr1);
122 122
   return t;
123 123
 }
124 124
 
125
-void* KTraderParse_newSTRING( char *_ptr1 )
125
+void* TDETraderParse_newSTRING( char *_ptr1 )
126 126
 {
127 127
   ParseTreeSTRING *t = new ParseTreeSTRING( _ptr1 );
128 128
   free(_ptr1);
129 129
   return t;
130 130
 }
131 131
 
132
-void* KTraderParse_newNUM( int _i )
132
+void* TDETraderParse_newNUM( int _i )
133 133
 {
134 134
   return new ParseTreeNUM( _i );
135 135
 }
136 136
 
137
-void* KTraderParse_newFLOAT( float _f )
137
+void* TDETraderParse_newFLOAT( float _f )
138 138
 {
139 139
   return new ParseTreeDOUBLE( _f );
140 140
 }
141 141
 
142
-void* KTraderParse_newBOOL( char _b )
142
+void* TDETraderParse_newBOOL( char _b )
143 143
 {
144 144
   return new ParseTreeBOOL( (bool)_b );
145 145
 }
146 146
 
147
-void* KTraderParse_newMAX2( char *_id )
147
+void* TDETraderParse_newMAX2( char *_id )
148 148
 {
149 149
   ParseTreeMAX2 *t = new ParseTreeMAX2( _id );
150 150
   free(_id);
151 151
   return t;
152 152
 }
153 153
 
154
-void* KTraderParse_newMIN2( char *_id )
154
+void* TDETraderParse_newMIN2( char *_id )
155 155
 {
156 156
   ParseTreeMIN2 *t = new ParseTreeMIN2( _id );
157 157
   free(_id);

+ 24
- 24
tdeio/tdeio/ktraderparse.h View File

@@ -23,30 +23,30 @@
23 23
 /*
24 24
  * Functions definition for yacc
25 25
  */
26
-void KTraderParse_mainParse( const char *_code );
27
-void KTraderParse_setParseTree( void *_ptr1 );
28
-void KTraderParse_error( const char* err );
29
-void* KTraderParse_newOR( void *_ptr1, void *_ptr2 );
30
-void* KTraderParse_newAND( void *_ptr1, void *_ptr2 );
31
-void* KTraderParse_newCMP( void *_ptr1, void *_ptr2, int _i );
32
-void* KTraderParse_newIN( void *_ptr1, void *_ptr2 );
33
-void* KTraderParse_newMATCH( void *_ptr1, void *_ptr2 );
34
-void* KTraderParse_newCALC( void *_ptr1, void *_ptr2, int _i );
35
-void* KTraderParse_newBRACKETS( void *_ptr1 );
36
-void* KTraderParse_newNOT( void *_ptr1 );
37
-void* KTraderParse_newEXIST( char *_ptr1 );
38
-void* KTraderParse_newID( char *_ptr1 );
39
-void* KTraderParse_newSTRING( char *_ptr1 );
40
-void* KTraderParse_newNUM( int _i );
41
-void* KTraderParse_newFLOAT( float _f );
42
-void* KTraderParse_newBOOL( char _b );
26
+void TDETraderParse_mainParse( const char *_code );
27
+void TDETraderParse_setParseTree( void *_ptr1 );
28
+void TDETraderParse_error( const char* err );
29
+void* TDETraderParse_newOR( void *_ptr1, void *_ptr2 );
30
+void* TDETraderParse_newAND( void *_ptr1, void *_ptr2 );
31
+void* TDETraderParse_newCMP( void *_ptr1, void *_ptr2, int _i );
32
+void* TDETraderParse_newIN( void *_ptr1, void *_ptr2 );
33
+void* TDETraderParse_newMATCH( void *_ptr1, void *_ptr2 );
34
+void* TDETraderParse_newCALC( void *_ptr1, void *_ptr2, int _i );
35
+void* TDETraderParse_newBRACKETS( void *_ptr1 );
36
+void* TDETraderParse_newNOT( void *_ptr1 );
37
+void* TDETraderParse_newEXIST( char *_ptr1 );
38
+void* TDETraderParse_newID( char *_ptr1 );
39
+void* TDETraderParse_newSTRING( char *_ptr1 );
40
+void* TDETraderParse_newNUM( int _i );
41
+void* TDETraderParse_newFLOAT( float _f );
42
+void* TDETraderParse_newBOOL( char _b );
43 43
 
44
-void* KTraderParse_newWITH( void *_ptr1 );
45
-void* KTraderParse_newMAX( void *_ptr1 );
46
-void* KTraderParse_newMIN( void *_ptr1 );
47
-void* KTraderParse_newMAX2( char *_id );
48
-void* KTraderParse_newMIN2( char *_id );
49
-void* KTraderParse_newFIRST();
50
-void* KTraderParse_newRANDOM();
44
+void* TDETraderParse_newWITH( void *_ptr1 );
45
+void* TDETraderParse_newMAX( void *_ptr1 );
46
+void* TDETraderParse_newMIN( void *_ptr1 );
47
+void* TDETraderParse_newMAX2( char *_id );
48
+void* TDETraderParse_newMIN2( char *_id );
49
+void* TDETraderParse_newFIRST();
50
+void* TDETraderParse_newRANDOM();
51 51
 
52 52
 #endif

+ 3
- 3
tdeio/tdeio/kurifilter.cpp View File

@@ -426,10 +426,10 @@ TQStringList KURIFilter::pluginNames() const
426 426
 
427 427
 void KURIFilter::loadPlugins()
428 428
 {
429
-    KTrader::OfferList offers = KTrader::self()->query( "KURIFilter/Plugin" );
429
+    TDETrader::OfferList offers = TDETrader::self()->query( "KURIFilter/Plugin" );
430 430
 
431
-    KTrader::OfferList::ConstIterator it = offers.begin();
432
-    KTrader::OfferList::ConstIterator end = offers.end();
431
+    TDETrader::OfferList::ConstIterator it = offers.begin();
432
+    TDETrader::OfferList::ConstIterator end = offers.end();
433 433
 
434 434
     for (; it != end; ++it )
435 435
     {

+ 5
- 5
tdeio/tdeio/kuserprofile.h View File

@@ -105,13 +105,13 @@ private:
105 105
  * of a service type.
106 106
  * It consists of a list of services (service offers) for the service type
107 107
  * that is sorted by the user's preference.
108
- * KTrader uses KServiceTypeProfile to sort its results, so usually
109
- * you can just use KTrader to find the user's preferred service.
108
+ * TDETrader uses KServiceTypeProfile to sort its results, so usually
109
+ * you can just use TDETrader to find the user's preferred service.
110 110
  *
111 111
  * @see KService
112 112
  * @see KServiceType
113 113
  * @see KServiceOffer
114
- * @see KTrader
114
+ * @see TDETrader
115 115
  * @short Represents the user's preferences for services of a service type
116 116
  */
117 117
 class TDEIO_EXPORT KServiceTypeProfile
@@ -168,12 +168,12 @@ public:
168 168
 
169 169
   /**
170 170
    * Returns the offers associated with a given servicetype, sorted by preference.
171
-   * This is what KTrader uses to get the list of offers, before applying the
171
+   * This is what TDETrader uses to get the list of offers, before applying the
172 172
    * constraints and preferences.
173 173
    *
174 174
    * If @p genericServiceType is specified, a list is returned with
175 175
    * the offers associated with the combination of the two service types.
176
-   * This is almost like an "foo in ServiceTypes" constraint in the KTrader,
176
+   * This is almost like an "foo in ServiceTypes" constraint in the TDETrader,
177 177
    * but the difference is that to order the offers, we will look at entries
178 178
    * specifically for those two service types. Typically, this is used for
179 179
    * getting the list of embeddable components that can handle a given mimetype.

+ 11
- 11
tdeio/tdeio/lex.c View File

@@ -436,12 +436,12 @@ char *yytext;
436 436
 #include <stdlib.h>
437 437
 #define YY_NO_UNPUT
438 438
 
439
-char* KTraderParse_putSymbol( char *_name );
440
-char *KTraderParse_putSymbolInBrackets( char *_name );
441
-char* KTraderParse_putString( char *_name );
439
+char* TDETraderParse_putSymbol( char *_name );
440
+char *TDETraderParse_putSymbolInBrackets( char *_name );
441
+char* TDETraderParse_putString( char *_name );
442 442
 int yywrap();
443 443
 int kiotraderlex(void);
444
-void KTraderParse_initFlex( const char *_code );
444
+void TDETraderParse_initFlex( const char *_code );
445 445
 
446 446
 #line 447 "lex.c"
447 447
 
@@ -763,7 +763,7 @@ YY_RULE_SETUP
763 763
 case 17:
764 764
 YY_RULE_SETUP
765 765
 #line 42 "lex.l"
766
-{ yylval.name = KTraderParse_putString( yytext ); return VAL_STRING; }
766
+{ yylval.name = TDETraderParse_putString( yytext ); return VAL_STRING; }
767 767
 	YY_BREAK
768 768
 case 18:
769 769
 YY_RULE_SETUP
@@ -783,12 +783,12 @@ YY_RULE_SETUP
783 783
 case 21:
784 784
 YY_RULE_SETUP
785 785
 #line 49 "lex.l"
786
-{ yylval.name = KTraderParse_putSymbolInBrackets( yytext ); return VAL_ID; }
786
+{ yylval.name = TDETraderParse_putSymbolInBrackets( yytext ); return VAL_ID; }
787 787
 	YY_BREAK
788 788
 case 22:
789 789
 YY_RULE_SETUP
790 790
 #line 51 "lex.l"
791
-{ yylval.name = KTraderParse_putSymbol( yytext ); return VAL_ID; }
791
+{ yylval.name = TDETraderParse_putSymbol( yytext ); return VAL_ID; }
792 792
 	YY_BREAK
793 793
 case 23:
794 794
 YY_RULE_SETUP
@@ -1689,7 +1689,7 @@ int main()
1689 1689
 #line 57 "lex.l"
1690 1690
 
1691 1691
 
1692
-char* KTraderParse_putSymbolInBrackets( char *_name )
1692
+char* TDETraderParse_putSymbolInBrackets( char *_name )
1693 1693
 {
1694 1694
   int l = strlen( _name )-1;
1695 1695
   char *p = (char *)malloc( l );
@@ -1702,7 +1702,7 @@ char* KTraderParse_putSymbolInBrackets( char *_name )
1702 1702
   return p;
1703 1703
 }
1704 1704
 
1705
-char *KTraderParse_putSymbol( char *_name )
1705
+char *TDETraderParse_putSymbol( char *_name )
1706 1706
 {
1707 1707
   char *p = (char*)malloc( strlen( _name ) + 1 );
1708 1708
   if (p != NULL)
@@ -1712,7 +1712,7 @@ char *KTraderParse_putSymbol( char *_name )
1712 1712
   return p;
1713 1713
 }
1714 1714
 
1715
-char* KTraderParse_putString( char *_str )
1715
+char* TDETraderParse_putString( char *_str )
1716 1716
 {
1717 1717
   int l = strlen( _str );
1718 1718
   char *p = (char*)malloc( l );
@@ -1747,7 +1747,7 @@ char* KTraderParse_putString( char *_str )
1747 1747
   return p;
1748 1748
 }
1749 1749
 
1750
-void KTraderParse_initFlex( const char *_code )
1750
+void TDETraderParse_initFlex( const char *_code )
1751 1751
 {
1752 1752
   yy_switch_to_buffer( yy_scan_string( _code ) );
1753 1753
 }

+ 11
- 11
tdeio/tdeio/lex.l View File

@@ -7,12 +7,12 @@
7 7
 #include <stdlib.h>
8 8
 #define YY_NO_UNPUT
9 9
 
10
-char* KTraderParse_putSymbol( char *_name );
11
-char *KTraderParse_putSymbolInBrackets( char *_name );
12
-char* KTraderParse_putString( char *_name );
10
+char* TDETraderParse_putSymbol( char *_name );
11
+char *TDETraderParse_putSymbolInBrackets( char *_name );
12
+char* TDETraderParse_putString( char *_name );
13 13
 int yywrap();
14 14
 int kiotraderlex(void);
15
-void KTraderParse_initFlex( const char *_code );
15
+void TDETraderParse_initFlex( const char *_code );
16 16
 
17 17
 %}
18 18
 
@@ -39,16 +39,16 @@ DIGIT    [0-9]
39 39
 "TRUE" { yylval.valb = 1; return VAL_BOOL; }
40 40
 "FALSE" { yylval.valb = 0; return VAL_BOOL; }
41 41
 
42
-"'"[^']*"'" { yylval.name = KTraderParse_putString( yytext ); return VAL_STRING; }
42
+"'"[^']*"'" { yylval.name = TDETraderParse_putString( yytext ); return VAL_STRING; }
43 43
 
44 44
 "-"{DIGIT}+  { yylval.vali = atoi( yytext ); return VAL_NUM; }
45 45
 {DIGIT}+  { yylval.vali = atoi( yytext ); return VAL_NUM; }
46 46
 
47 47
 {DIGIT}*"\."{DIGIT}+ { yylval.vald = atof( yytext ); return VAL_FLOAT; }
48 48
 
49
-\[[a-zA-Z][a-zA-Z0-9\-]*\] { yylval.name = KTraderParse_putSymbolInBrackets( yytext ); return VAL_ID; }
49
+\[[a-zA-Z][a-zA-Z0-9\-]*\] { yylval.name = TDETraderParse_putSymbolInBrackets( yytext ); return VAL_ID; }
50 50
 
51
-[a-zA-Z][a-zA-Z0-9]* { yylval.name = KTraderParse_putSymbol( yytext ); return VAL_ID; }
51
+[a-zA-Z][a-zA-Z0-9]* { yylval.name = TDETraderParse_putSymbol( yytext ); return VAL_ID; }
52 52
 
53 53
 [ \t\n]+          /* eat up whitespace */
54 54
 
@@ -56,7 +56,7 @@ DIGIT    [0-9]
56 56
 
57 57
 %%
58 58
 
59
-char* KTraderParse_putSymbolInBrackets( char *_name )
59
+char* TDETraderParse_putSymbolInBrackets( char *_name )
60 60
 {
61 61
   int l = strlen( _name )-1;
62 62
   char *p = (char *)malloc( l );
@@ -69,7 +69,7 @@ char* KTraderParse_putSymbolInBrackets( char *_name )
69 69
   return p;
70 70
 }
71 71
 
72
-char *KTraderParse_putSymbol( char *_name )
72
+char *TDETraderParse_putSymbol( char *_name )
73 73
 {
74 74
   char *p = (char*)malloc( strlen( _name ) + 1 );
75 75
   if (p != NULL)
@@ -79,7 +79,7 @@ char *KTraderParse_putSymbol( char *_name )
79 79
   return p;
80 80
 }
81 81
 
82
-char* KTraderParse_putString( char *_str )
82
+char* TDETraderParse_putString( char *_str )
83 83
 {
84 84
   int l = strlen( _str );
85 85
   char *p = (char*)malloc( l );
@@ -114,7 +114,7 @@ char* KTraderParse_putString( char *_str )
114 114
   return p;
115 115
 }
116 116
 
117
-void KTraderParse_initFlex( const char *_code )
117
+void TDETraderParse_initFlex( const char *_code )
118 118
 {
119 119
   yy_switch_to_buffer( yy_scan_string( _code ) );
120 120
 }

+ 4
- 4
tdeio/tdeio/metainfojob.cpp View File

@@ -154,8 +154,8 @@ void MetaInfoJob::slotMetaInfo(TDEIO::Job*, const TQByteArray &data)
154 154
 TQStringList MetaInfoJob::availablePlugins()
155 155
 {
156 156
     TQStringList result;
157
-    KTrader::OfferList plugins = KTrader::self()->query("KFilePlugin");
158
-    for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
157
+    TDETrader::OfferList plugins = TDETrader::self()->query("KFilePlugin");
158
+    for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
159 159
         result.append((*it)->desktopEntryName());
160 160
     return result;
161 161
 }
@@ -163,8 +163,8 @@ TQStringList MetaInfoJob::availablePlugins()
163 163
 TQStringList MetaInfoJob::supportedMimeTypes()
164 164
 {
165 165
     TQStringList result;
166
-    KTrader::OfferList plugins = KTrader::self()->query("KFilePlugin");
167
-    for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
166
+    TDETrader::OfferList plugins = TDETrader::self()->query("KFilePlugin");
167
+    for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
168 168
         result += (*it)->property("MimeTypes").toStringList();
169 169
     return result;
170 170
 }

+ 6
- 6
tdeio/tdeio/previewjob.cpp View File

@@ -159,10 +159,10 @@ PreviewJob::~PreviewJob()
159 159
 void PreviewJob::startPreview()
160 160
 {
161 161
     // Load the list of plugins to determine which mimetypes are supported
162
-    KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
162
+    TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
163 163
     TQMap<TQString, KService::Ptr> mimeMap;
164 164
 
165
-    for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
165
+    for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
166 166
         if (!d->enabledPlugins || d->enabledPlugins->contains((*it)->desktopEntryName()))
167 167
     {
168 168
         TQStringList mimeTypes = (*it)->property("MimeTypes").toStringList();
@@ -551,8 +551,8 @@ void PreviewJob::emitFailed(const KFileItem *item)
551 551
 TQStringList PreviewJob::availablePlugins()
552 552
 {
553 553
     TQStringList result;
554
-    KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
555
-    for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
554
+    TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
555
+    for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
556 556
         if (!result.contains((*it)->desktopEntryName()))
557 557
             result.append((*it)->desktopEntryName());
558 558
     return result;
@@ -561,8 +561,8 @@ TQStringList PreviewJob::availablePlugins()
561 561
 TQStringList PreviewJob::supportedMimeTypes()
562 562
 {
563 563
     TQStringList result;
564
-    KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
565
-    for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
564
+    TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
565
+    for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
566 566
         result += (*it)->property("MimeTypes").toStringList();
567 567
     return result;
568 568
 }

+ 5
- 5
tdeio/tdeio/renamedlg.cpp View File

@@ -168,17 +168,17 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
168 168
         // Figure out the mimetype and load one plugin
169 169
         // (This is the only mode that is handled by plugins)
170 170
         pluginHandling();
171
-        KTrader::OfferList plugin_offers;
171
+        TDETrader::OfferList plugin_offers;
172 172
         if( d->mimeSrc != KMimeType::defaultMimeType()   ){
173
-            plugin_offers = KTrader::self()->query(d->mimeSrc, "'RenameDlg/Plugin' in ServiceTypes");
173
+            plugin_offers = TDETrader::self()->query(d->mimeSrc, "'RenameDlg/Plugin' in ServiceTypes");
174 174
 
175 175
         }else if(d->mimeDest != KMimeType::defaultMimeType() ) {
176
-            plugin_offers = KTrader::self()->query(d->mimeDest, "'RenameDlg/Plugin' in ServiceTypes");
176
+            plugin_offers = TDETrader::self()->query(d->mimeDest, "'RenameDlg/Plugin' in ServiceTypes");
177 177
         }
178 178
         if(!plugin_offers.isEmpty() ){
179 179
             kdDebug(7024) << "Offers" << endl;
180
-            KTrader::OfferList::ConstIterator it = plugin_offers.begin();
181
-            KTrader::OfferList::ConstIterator end = plugin_offers.end();
180
+            TDETrader::OfferList::ConstIterator it = plugin_offers.begin();
181
+            TDETrader::OfferList::ConstIterator end = plugin_offers.end();
182 182
             for( ; it != end; ++it ){
183 183
                 TQString libName = (*it)->library();
184 184
                 if( libName.isEmpty() ){

+ 3
- 3
tdeio/tdeio/tdefilemetainfo.cpp View File

@@ -942,7 +942,7 @@ KFilePlugin* KFileMetaInfoProvider::loadPlugin( const TQString& mimeType, const
942 942
         queryMimeType = "KFilePlugin";
943 943
         // hopefully using KFilePlugin as genericMimeType too isn't a problem
944 944
     }
945
-    const KTrader::OfferList offers = KTrader::self()->query( queryMimeType, "KFilePlugin", query, TQString::null );
945
+    const TDETrader::OfferList offers = TDETrader::self()->query( queryMimeType, "KFilePlugin", query, TQString::null );
946 946
     if ( offers.isEmpty() )
947 947
         return 0;
948 948
     KService::Ptr service = *(offers.begin());
@@ -1122,8 +1122,8 @@ TQStringList KFileMetaInfoProvider::supportedMimeTypes() const
1122 1122
     TQStringList allMimeTypes;
1123 1123
     TQString tdefilePlugin = "KFilePlugin";
1124 1124
 
1125
-    KTrader::OfferList offers = KTrader::self()->query( "KFilePlugin" );
1126
-    KTrader::OfferListIterator it = offers.begin();
1125
+    TDETrader::OfferList offers = TDETrader::self()->query( "KFilePlugin" );
1126
+    TDETrader::OfferListIterator it = offers.begin();
1127 1127
     for ( ; it != offers.end(); ++it )
1128 1128
     {
1129 1129
         const TQStringList mimeTypes = (*it)->serviceTypes();

+ 30
- 30
tdeio/tdeio/yacc.c View File

@@ -113,7 +113,7 @@
113 113
 
114 114
 void yyerror(const char *s);
115 115
 int yylex();
116
-void KTraderParse_initFlex( const char *s );
116
+void TDETraderParse_initFlex( const char *s );
117 117
 
118 118
 
119 119
 
@@ -1101,12 +1101,12 @@ yyreduce:
1101 1101
     {
1102 1102
         case 2:
1103 1103
 #line 56 "yacc.y"
1104
-    { KTraderParse_setParseTree( 0L ); ;}
1104
+    { TDETraderParse_setParseTree( 0L ); ;}
1105 1105
     break;
1106 1106
 
1107 1107
   case 3:
1108 1108
 #line 57 "yacc.y"
1109
-    { KTraderParse_setParseTree( (yyvsp[0].ptr) ); ;}
1109
+    { TDETraderParse_setParseTree( (yyvsp[0].ptr) ); ;}
1110 1110
     break;
1111 1111
 
1112 1112
   case 4:
@@ -1116,7 +1116,7 @@ yyreduce:
1116 1116
 
1117 1117
   case 5:
1118 1118
 #line 63 "yacc.y"
1119
-    { (yyval.ptr) = KTraderParse_newOR( (yyvsp[-2].ptr), (yyvsp[0].ptr) ); ;}
1119
+    { (yyval.ptr) = TDETraderParse_newOR( (yyvsp[-2].ptr), (yyvsp[0].ptr) ); ;}
1120 1120
     break;
1121 1121
 
1122 1122
   case 6:
@@ -1126,7 +1126,7 @@ yyreduce:
1126 1126
 
1127 1127
   case 7:
1128 1128
 #line 67 "yacc.y"
1129
-    { (yyval.ptr) = KTraderParse_newAND( (yyvsp[-2].ptr), (yyvsp[0].ptr) ); ;}
1129
+    { (yyval.ptr) = TDETraderParse_newAND( (yyvsp[-2].ptr), (yyvsp[0].ptr) ); ;}
1130 1130
     break;
1131 1131
 
1132 1132
   case 8:
@@ -1136,32 +1136,32 @@ yyreduce:
1136 1136
 
1137 1137
   case 9:
1138 1138
 #line 71 "yacc.y"
1139
-    { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 1 ); ;}
1139
+    { (yyval.ptr) = TDETraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 1 ); ;}
1140 1140
     break;
1141 1141
 
1142 1142
   case 10:
1143 1143
 #line 72 "yacc.y"
1144
-    { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 2 ); ;}
1144
+    { (yyval.ptr) = TDETraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 2 ); ;}
1145 1145
     break;
1146 1146
 
1147 1147
   case 11:
1148 1148
 #line 73 "yacc.y"
1149
-    { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 3 ); ;}
1149
+    { (yyval.ptr) = TDETraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 3 ); ;}
1150 1150
     break;
1151 1151
 
1152 1152
   case 12:
1153 1153
 #line 74 "yacc.y"
1154
-    { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 4 ); ;}
1154
+    { (yyval.ptr) = TDETraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 4 ); ;}
1155 1155
     break;
1156 1156
 
1157 1157
   case 13:
1158 1158
 #line 75 "yacc.y"
1159
-    { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 5 ); ;}
1159
+    { (yyval.ptr) = TDETraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 5 ); ;}
1160 1160
     break;
1161 1161
 
1162 1162
   case 14:
1163 1163
 #line 76 "yacc.y"
1164
-    { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 6 ); ;}
1164
+    { (yyval.ptr) = TDETraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 6 ); ;}
1165 1165
     break;
1166 1166
 
1167 1167
   case 15:
@@ -1171,7 +1171,7 @@ yyreduce:
1171 1171
 
1172 1172
   case 16:
1173 1173
 #line 80 "yacc.y"
1174
-    { (yyval.ptr) = KTraderParse_newIN( (yyvsp[-2].ptr), KTraderParse_newID( (yyvsp[0].name) ) ); ;}
1174
+    { (yyval.ptr) = TDETraderParse_newIN( (yyvsp[-2].ptr), TDETraderParse_newID( (yyvsp[0].name) ) ); ;}
1175 1175
     break;
1176 1176
 
1177 1177
   case 17:
@@ -1181,7 +1181,7 @@ yyreduce:
1181 1181
 
1182 1182
   case 18:
1183 1183
 #line 84 "yacc.y"
1184
-    { (yyval.ptr) = KTraderParse_newMATCH( (yyvsp[-2].ptr), (yyvsp[0].ptr) ); ;}
1184
+    { (yyval.ptr) = TDETraderParse_newMATCH( (yyvsp[-2].ptr), (yyvsp[0].ptr) ); ;}
1185 1185
     break;
1186 1186
 
1187 1187
   case 19:
@@ -1191,12 +1191,12 @@ yyreduce:
1191 1191
 
1192 1192
   case 20:
1193 1193
 #line 88 "yacc.y"
1194
-    { (yyval.ptr) = KTraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 1 ); ;}
1194
+    { (yyval.ptr) = TDETraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 1 ); ;}
1195 1195
     break;
1196 1196
 
1197 1197
   case 21:
1198 1198
 #line 89 "yacc.y"
1199
-    { (yyval.ptr) = KTraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 2 ); ;}
1199
+    { (yyval.ptr) = TDETraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 2 ); ;}
1200 1200
     break;
1201 1201
 
1202 1202
   case 22:
@@ -1206,12 +1206,12 @@ yyreduce:
1206 1206
 
1207 1207
   case 23:
1208 1208
 #line 93 "yacc.y"
1209
-    { (yyval.ptr) = KTraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 3 ); ;}
1209
+    { (yyval.ptr) = TDETraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 3 ); ;}
1210 1210
     break;
1211 1211
 
1212 1212
   case 24:
1213 1213
 #line 94 "yacc.y"
1214
-    { (yyval.ptr) = KTraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 4 ); ;}
1214
+    { (yyval.ptr) = TDETraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 4 ); ;}
1215 1215
     break;
1216 1216
 
1217 1217
   case 25:
@@ -1221,7 +1221,7 @@ yyreduce:
1221 1221
 
1222 1222
   case 26:
1223 1223
 #line 98 "yacc.y"
1224
-    { (yyval.ptr) = KTraderParse_newNOT( (yyvsp[0].ptr) ); ;}
1224
+    { (yyval.ptr) = TDETraderParse_newNOT( (yyvsp[0].ptr) ); ;}
1225 1225
     break;
1226 1226
 
1227 1227
   case 27:
@@ -1231,47 +1231,47 @@ yyreduce:
1231 1231
 
1232 1232
   case 28:
1233 1233
 #line 102 "yacc.y"
1234
-    { (yyval.ptr) = KTraderParse_newBRACKETS( (yyvsp[-1].ptr) ); ;}
1234
+    { (yyval.ptr) = TDETraderParse_newBRACKETS( (yyvsp[-1].ptr) ); ;}
1235 1235
     break;
1236 1236
 
1237 1237
   case 29:
1238 1238
 #line 103 "yacc.y"
1239
-    { (yyval.ptr) = KTraderParse_newEXIST( (yyvsp[0].name) ); ;}
1239
+    { (yyval.ptr) = TDETraderParse_newEXIST( (yyvsp[0].name) ); ;}
1240 1240
     break;
1241 1241
 
1242 1242
   case 30:
1243 1243
 #line 104 "yacc.y"
1244
-    { (yyval.ptr) = KTraderParse_newID( (yyvsp[0].name) ); ;}
1244
+    { (yyval.ptr) = TDETraderParse_newID( (yyvsp[0].name) ); ;}
1245 1245
     break;
1246 1246
 
1247 1247
   case 31:
1248 1248
 #line 105 "yacc.y"
1249
-    { (yyval.ptr) = KTraderParse_newNUM( (yyvsp[0].vali) ); ;}
1249
+    { (yyval.ptr) = TDETraderParse_newNUM( (yyvsp[0].vali) ); ;}
1250 1250
     break;
1251 1251
 
1252 1252
   case 32:
1253 1253
 #line 106 "yacc.y"
1254
-    { (yyval.ptr) = KTraderParse_newFLOAT( (yyvsp[0].vald) ); ;}
1254
+    { (yyval.ptr) = TDETraderParse_newFLOAT( (yyvsp[0].vald) ); ;}
1255 1255
     break;
1256 1256
 
1257 1257
   case 33:
1258 1258
 #line 107 "yacc.y"
1259
-    { (yyval.ptr) = KTraderParse_newSTRING( (yyvsp[0].name) ); ;}
1259
+    { (yyval.ptr) = TDETraderParse_newSTRING( (yyvsp[0].name) ); ;}
1260 1260
     break;
1261 1261
 
1262 1262
   case 34:
1263 1263
 #line 108 "yacc.y"
1264
-    { (yyval.ptr) = KTraderParse_newBOOL( (yyvsp[0].valb) ); ;}
1264
+    { (yyval.ptr) = TDETraderParse_newBOOL( (yyvsp[0].valb) ); ;}
1265 1265
     break;
1266 1266
 
1267 1267
   case 35:
1268 1268
 #line 109 "yacc.y"
1269
-    { (yyval.ptr) = KTraderParse_newMAX2( (yyvsp[0].name) ); ;}
1269
+    { (yyval.ptr) = TDETraderParse_newMAX2( (yyvsp[0].name) ); ;}
1270 1270
     break;
1271 1271
 
1272 1272
   case 36:
1273 1273
 #line 110 "yacc.y"
1274
-    { (yyval.ptr) = KTraderParse_newMIN2( (yyvsp[0].name) ); ;}
1274
+    { (yyval.ptr) = TDETraderParse_newMIN2( (yyvsp[0].name) ); ;}
1275 1275
     break;
1276 1276
 
1277 1277
 
@@ -1511,12 +1511,12 @@ yyreturn:
1511 1511
 
1512 1512
 void yyerror ( const char *s )  /* Called by yyparse on error */
1513 1513
 {
1514
-    KTraderParse_error( s );
1514
+    TDETraderParse_error( s );
1515 1515
 }
1516 1516
 
1517
-void KTraderParse_mainParse( const char *_code )
1517
+void TDETraderParse_mainParse( const char *_code )
1518 1518
 {
1519
-  KTraderParse_initFlex( _code );
1519
+  TDETraderParse_initFlex( _code );
1520 1520
   yyparse();
1521 1521
 }
1522 1522
 

+ 30
- 30
tdeio/tdeio/yacc.y View File

@@ -5,7 +5,7 @@
5 5
 
6 6
 void yyerror(const char *s);
7 7
 int yylex();
8
-void KTraderParse_initFlex( const char *s );
8
+void TDETraderParse_initFlex( const char *s );
9 9
 
10 10
 %}
11 11
 
@@ -53,61 +53,61 @@ void KTraderParse_initFlex( const char *s );
53 53
 
54 54
 %%
55 55
 
56
-constraint: /* empty */ { KTraderParse_setParseTree( 0L ); }
57
-          | bool { KTraderParse_setParseTree( $<ptr>1 ); }
56
+constraint: /* empty */ { TDETraderParse_setParseTree( 0L ); }
57
+          | bool { TDETraderParse_setParseTree( $<ptr>1 ); }
58 58
 ;
59 59
 
60 60
 bool: bool_or { $$ = $<ptr>1; }
61 61
 ;
62 62
 
63
-bool_or: bool_and OR bool_or { $$ = KTraderParse_newOR( $<ptr>1, $<ptr>3 ); }
63
+bool_or: bool_and OR bool_or { $$ = TDETraderParse_newOR( $<ptr>1, $<ptr>3 ); }
64 64
        | bool_and { $$ = $<ptr>1; }
65 65
 ;
66 66
 
67
-bool_and: bool_compare AND bool_and { $$ = KTraderParse_newAND( $<ptr>1, $<ptr>3 ); }
67
+bool_and: bool_compare AND bool_and { $$ = TDETraderParse_newAND( $<ptr>1, $<ptr>3 ); }
68 68
         | bool_compare { $$ = $<ptr>1; }
69 69
 ;
70 70
 
71
-bool_compare: expr_in EQ expr_in { $$ = KTraderParse_newCMP( $<ptr>1, $<ptr>3, 1 ); }
72
-            | expr_in NEQ expr_in { $$ = KTraderParse_newCMP( $<ptr>1, $<ptr>3, 2 ); }
73
-            | expr_in GEQ expr_in { $$ = KTraderParse_newCMP( $<ptr>1, $<ptr>3, 3 ); }
74
-            | expr_in LEQ expr_in { $$ = KTraderParse_newCMP( $<ptr>1, $<ptr>3, 4 ); }
75
-            | expr_in LE expr_in { $$ = KTraderParse_newCMP( $<ptr>1, $<ptr>3, 5 ); }
76
-            | expr_in GR expr_in { $$ = KTraderParse_newCMP( $<ptr>1, $<ptr>3, 6 ); }
71
+bool_compare: expr_in EQ expr_in { $$ = TDETraderParse_newCMP( $<ptr>1, $<ptr>3, 1 ); }
72
+            | expr_in NEQ expr_in { $$ = TDETraderParse_newCMP( $<ptr>1, $<ptr>3, 2 ); }
73
+            | expr_in GEQ expr_in { $$ = TDETraderParse_newCMP( $<ptr>1, $<ptr>3, 3 ); }
74
+            | expr_in LEQ expr_in { $$ = TDETraderParse_newCMP( $<ptr>1, $<ptr>3, 4 ); }
75
+            | expr_in LE expr_in { $$ = TDETraderParse_newCMP( $<ptr>1, $<ptr>3, 5 ); }
76
+            | expr_in GR expr_in { $$ = TDETraderParse_newCMP( $<ptr>1, $<ptr>3, 6 ); }
77 77
             | expr_in { $$ = $<ptr>1; }
78 78
 ;
79 79
 
80
-expr_in: expr_twiddle TOKEN_IN VAL_ID { $$ = KTraderParse_newIN( $<ptr>1, KTraderParse_newID( $<name>3 ) ); }
80
+expr_in: expr_twiddle TOKEN_IN VAL_ID { $$ = TDETraderParse_newIN( $<ptr>1, TDETraderParse_newID( $<name>3 ) ); }
81 81
        | expr_twiddle { $$ = $<ptr>1; }
82 82
 ;
83 83
 
84
-expr_twiddle: expr '~' expr { $$ = KTraderParse_newMATCH( $<ptr>1, $<ptr>3 ); }
84
+expr_twiddle: expr '~' expr { $$ = TDETraderParse_newMATCH( $<ptr>1, $<ptr>3 ); }
85 85
             | expr { $$ = $<ptr>1; }
86 86
 ;
87 87
 
88
-expr: expr '+' term { $$ = KTraderParse_newCALC( $<ptr>1, $<ptr>3, 1 ); }
89
-    | expr '-' term { $$ = KTraderParse_newCALC( $<ptr>1, $<ptr>3, 2 ); }
88
+expr: expr '+' term { $$ = TDETraderParse_newCALC( $<ptr>1, $<ptr>3, 1 ); }
89
+    | expr '-' term { $$ = TDETraderParse_newCALC( $<ptr>1, $<ptr>3, 2 ); }
90 90
     | term { $$ = $<ptr>1; }
91 91
 ;
92 92
 
93
-term: term '*' factor_non { $$ = KTraderParse_newCALC( $<ptr>1, $<ptr>3, 3 ); }
94
-    | term '/' factor_non { $$ = KTraderParse_newCALC( $<ptr>1, $<ptr>3, 4 ); }
93
+term: term '*' factor_non { $$ = TDETraderParse_newCALC( $<ptr>1, $<ptr>3, 3 ); }
94
+    | term '/' factor_non { $$ = TDETraderParse_newCALC( $<ptr>1, $<ptr>3, 4 ); }
95 95
     | factor_non { $$ = $<ptr>1; }
96 96
 ;
97 97
 
98
-factor_non: NOT factor { $$ = KTraderParse_newNOT( $<ptr>2 ); }
98
+factor_non: NOT factor { $$ = TDETraderParse_newNOT( $<ptr>2 ); }
99 99
           | factor { $$ = $<ptr>1; }
100 100
 ;
101 101
 
102
-factor: '(' bool_or ')' { $$ = KTraderParse_newBRACKETS( $<ptr>2 ); }
103
-      | EXIST VAL_ID { $$ = KTraderParse_newEXIST( $<name>2 ); }
104
-      | VAL_ID { $$ = KTraderParse_newID( $<name>1 ); }
105
-      | VAL_NUM { $$ = KTraderParse_newNUM( $<vali>1 ); }
106
-      | VAL_FLOAT { $$ = KTraderParse_newFLOAT( $<vald>1 ); }
107
-      | VAL_STRING { $$ = KTraderParse_newSTRING( $<name>1 ); }
108
-      | VAL_BOOL { $$ = KTraderParse_newBOOL( $<valb>1 ); }
109
-      | MAX VAL_ID { $$ = KTraderParse_newMAX2( $<name>2 ); }
110
-      | MIN VAL_ID { $$ = KTraderParse_newMIN2( $<name>2 ); }
102
+factor: '(' bool_or ')' { $$ = TDETraderParse_newBRACKETS( $<ptr>2 ); }
103
+      | EXIST VAL_ID { $$ = TDETraderParse_newEXIST( $<name>2 ); }
104
+      | VAL_ID { $$ = TDETraderParse_newID( $<name>1 ); }
105
+      | VAL_NUM { $$ = TDETraderParse_newNUM( $<vali>1 ); }
106
+      | VAL_FLOAT { $$ = TDETraderParse_newFLOAT( $<vald>1 ); }
107
+      | VAL_STRING { $$ = TDETraderParse_newSTRING( $<name>1 ); }
108
+      | VAL_BOOL { $$ = TDETraderParse_newBOOL( $<valb>1 ); }
109
+      | MAX VAL_ID { $$ = TDETraderParse_newMAX2( $<name>2 ); }
110
+      | MIN VAL_ID { $$ = TDETraderParse_newMIN2( $<name>2 ); }
111 111
 ;
112 112
 
113 113
 /* End of grammar */
@@ -116,11 +116,11 @@ factor: '(' bool_or ')' { $$ = KTraderParse_newBRACKETS( $<ptr>2 ); }
116 116
 
117 117
 void yyerror ( const char *s )  /* Called by yyparse on error */
118 118
 {
119
-    KTraderParse_error( s );
119
+    TDETraderParse_error( s );
120 120
 }
121 121
 
122
-void KTraderParse_mainParse( const char *_code )
122
+void TDETraderParse_mainParse( const char *_code )
123 123
 {
124
-  KTraderParse_initFlex( _code );
124
+  TDETraderParse_initFlex( _code );
125 125
   yyparse();
126 126
 }

+ 2
- 2
tdeio/tests/tdesycocatest.cpp View File

@@ -182,9 +182,9 @@ int main(int argc, char *argv[])
182 182
    }
183 183
 
184 184
    debug("Querying trader for Konqueror/Plugin");
185
-   KTrader::OfferList traderoffers = KTrader::self()->query("Konqueror/Plugin");
185
+   TDETrader::OfferList traderoffers = TDETrader::self()->query("Konqueror/Plugin");
186 186
    debug(TQString("got %1 offers").arg(traderoffers.count()));
187
-   KTrader::OfferList::Iterator trit = traderoffers.begin();
187
+   TDETrader::OfferList::Iterator trit = traderoffers.begin();
188 188
    for ( ; trit != traderoffers.end() ; trit++ )
189 189
    {
190 190
      debug((*trit)->name());

+ 4
- 4
tdeio/tests/tdetradertest.cpp View File

@@ -33,7 +33,7 @@ static KCmdLineOptions options[] =
33 33
 
34 34
 int main( int argc, char **argv )
35 35
 {
36
-  TDECmdLineArgs::init( argc, argv, "tdetradertest", "KTradertest", "A KTrader testing tool", "0.0" );
36
+  TDECmdLineArgs::init( argc, argv, "tdetradertest", "TDETradertest", "A TDETrader testing tool", "0.0" );
37 37
 
38 38
   TDECmdLineArgs::addCmdLineOptions( options );
39 39
 
@@ -62,13 +62,13 @@ int main( int argc, char **argv )
62 62
   printf( "constraint is : %s\n", constraint.local8Bit().data() );
63 63
   printf( "preference is : %s\n", preference.local8Bit().data() );
64 64
 
65
-  KTrader::OfferList offers = KTrader::self()->query( query, genericServiceType, constraint, preference );
65
+  TDETrader::OfferList offers = TDETrader::self()->query( query, genericServiceType, constraint, preference );
66 66
 
67 67
   printf("got %d offers.\n", offers.count());
68 68
 
69 69
   int i = 0;
70
-  KTrader::OfferList::ConstIterator it = offers.begin();
71
-  KTrader::OfferList::ConstIterator end = offers.end();
70
+  TDETrader::OfferList::ConstIterator it = offers.begin();
71
+  TDETrader::OfferList::ConstIterator end = offers.end();
72 72
   for (; it != end; ++it, ++i )
73 73
   {
74 74
     printf("---- Offer %d ----\n", i);

+ 4
- 4
tdeparts/componentfactory.h View File

@@ -307,7 +307,7 @@ namespace KParts
307 307
          * \endcode
308 308
          *
309 309
          * @param serviceType the type of service for which to find a plugin
310
-         * @param constraint an optional constraint to pass to the trader (see TDEIO::KTrader)
310
+         * @param constraint an optional constraint to pass to the trader (see TDEIO::TDETrader)
311 311
          * @param parent the parent object for the part itself
312 312
          * @param name the name that will be given to the part
313 313
          * @param args A list of string arguments, passed to the factory and possibly
@@ -325,7 +325,7 @@ namespace KParts
325 325
                                            const TQStringList &args = TQStringList(),
326 326
                                            int *error = 0 )
327 327
         {
328
-            KTrader::OfferList offers = KTrader::self()->query( serviceType, constraint );
328
+            TDETrader::OfferList offers = TDETrader::self()->query( serviceType, constraint );
329 329
             if ( offers.isEmpty() )
330 330
             {
331 331
                 if ( error )
@@ -354,7 +354,7 @@ namespace KParts
354 354
          * \endcode
355 355
          *
356 356
          * @param serviceType the type of service for which to find a part, e.g. a mimetype
357
-         * @param constraint an optional constraint to pass to the trader (see KTrader)
357
+         * @param constraint an optional constraint to pass to the trader (see TDETrader)
358 358
          * @param parentWidget the parent widget, will be set as the parent of the part's widget
359 359
          * @param widgetName the name that will be given to the part's widget
360 360
          * @param parent the parent object for the part itself
@@ -376,7 +376,7 @@ namespace KParts
376 376
                                                const TQStringList &args = TQStringList(),
377 377
                                                int *error = 0 )
378 378
         {
379
-            KTrader::OfferList offers = KTrader::self()->query( serviceType, TQString::fromLatin1("KParts/ReadOnlyPart"), constraint, TQString::null );
379
+            TDETrader::OfferList offers = TDETrader::self()->query( serviceType, TQString::fromLatin1("KParts/ReadOnlyPart"), constraint, TQString::null );
380 380
             if ( offers.isEmpty() )
381 381
             {
382 382
                 if ( error )

+ 2
- 2
tdeparts/tests/ghostview.cpp View File

@@ -26,11 +26,11 @@ Shell::Shell()
26 26
   KAction * paQuit = new KAction( "&Quit" , "exit", 0, this, TQT_SLOT( close() ), actionCollection(), "file_quit" );
27 27
 
28 28
   // Try to find a postscript component first
29
-  KTrader::OfferList offers = KTrader::self()->query("application/postscript", "('KParts/ReadOnlyPart' in ServiceTypes) or ('Browser/View' in ServiceTypes)");
29
+  TDETrader::OfferList offers = TDETrader::self()->query("application/postscript", "('KParts/ReadOnlyPart' in ServiceTypes) or ('Browser/View' in ServiceTypes)");
30 30
 
31 31
   KLibFactory *factory = 0;
32 32
   m_gvpart = 0;
33
-  KTrader::OfferList::Iterator it(offers.begin());
33
+  TDETrader::OfferList::Iterator it(offers.begin());
34 34
   for( ; it != offers.end(); ++it)
35 35
   {
36 36
     KService::Ptr ptr = (*it);

+ 2
- 2
tdeprint/kprintpreview.cpp View File

@@ -111,8 +111,8 @@ static KLibFactory* componentFactory()
111 111
 	factory = KLibLoader::self()->factory("libkghostviewpart");
112 112
         if( factory )
113 113
             return factory;
114
-	KTrader::OfferList	offers = KTrader::self()->query(TQString::fromLatin1("application/postscript"), TQString::fromLatin1("KParts/ReadOnlyPart"), TQString::null, TQString::null);
115
-	for (KTrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it)
114
+	TDETrader::OfferList	offers = TDETrader::self()->query(TQString::fromLatin1("application/postscript"), TQString::fromLatin1("KParts/ReadOnlyPart"), TQString::null, TQString::null);
115
+	for (TDETrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it)
116 116
 	{
117 117
 		KService::Ptr	service = *it;
118 118
 		factory = KLibLoader::self()->factory(TQFile::encodeName(service->library()));

+ 5
- 5
tderesources/configpage.cpp View File

@@ -174,17 +174,17 @@ void ConfigPage::load()
174 174
 
175 175
   // KDE-3.3 compatibility code: get families from the plugins
176 176
   TQStringList compatFamilyNames;
177
-  const KTrader::OfferList plugins = KTrader::self()->query( "KResources/Plugin" );
178
-  KTrader::OfferList::ConstIterator it = plugins.begin();
179
-  KTrader::OfferList::ConstIterator end = plugins.end();
177
+  const TDETrader::OfferList plugins = TDETrader::self()->query( "KResources/Plugin" );
178
+  TDETrader::OfferList::ConstIterator it = plugins.begin();
179
+  TDETrader::OfferList::ConstIterator end = plugins.end();
180 180
   for ( ; it != end; ++it ) {
181 181
     const TQString family = (*it)->property( "X-TDE-ResourceFamily" ).toString();
182 182
     if ( compatFamilyNames.find( family ) == compatFamilyNames.end() )
183 183
         compatFamilyNames.append( family );
184 184
   }
185 185
 
186
-  const KTrader::OfferList managers = KTrader::self()->query( "KResources/Manager" );
187
-  KTrader::OfferList::ConstIterator m_it;
186
+  const TDETrader::OfferList managers = TDETrader::self()->query( "KResources/Manager" );
187
+  TDETrader::OfferList::ConstIterator m_it;
188 188
   for( m_it = managers.begin(); m_it != managers.end(); ++m_it ) {
189 189
     TQString displayName = (*m_it)->property( "Name" ).toString();
190 190
     familyDisplayNames.append( displayName );

+ 2
- 2
tderesources/factory.cpp View File

@@ -58,9 +58,9 @@ Factory *Factory::self( const TQString& resourceFamily )
58 58
 Factory::Factory( const TQString& resourceFamily ) :
59 59
   mResourceFamily( resourceFamily )
60 60
 {
61
-  KTrader::OfferList plugins = KTrader::self()->query( "KResources/Plugin", TQString( "[X-TDE-ResourceFamily] == '%1'" )
61
+  TDETrader::OfferList plugins = TDETrader::self()->query( "KResources/Plugin", TQString( "[X-TDE-ResourceFamily] == '%1'" )
62 62
                                                 .arg( resourceFamily ) );
63
-  KTrader::OfferList::ConstIterator it;
63
+  TDETrader::OfferList::ConstIterator it;
64 64
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
65 65
     TQVariant type = (*it)->property( "X-TDE-ResourceType" );
66 66
     if ( !type.toString().isEmpty() )

+ 1
- 1
tdespell2/broker.cpp View File

@@ -174,7 +174,7 @@ Settings* Broker::settings() const
174 174
 void Broker::loadPlugins()
175 175
 {
176 176
     d->plugins = KPluginInfo::fromServices(
177
-        KTrader::self()->query( "KSpell/Client" ) );
177
+        TDETrader::self()->query( "KSpell/Client" ) );
178 178
 
179 179
     for ( KPluginInfo::List::Iterator itr = d->plugins.begin();
180 180
           itr != d->plugins.end(); ++itr ) {

+ 1
- 1
tdeutils/Makefile.am View File

@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/interfaces/kregexpeditor $(all_includes)
3 3
 
4 4
 lib_LTLIBRARIES   = libtdeutils.la
5 5
 libtdeutils_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
6
-# Needs KTrader
6
+# Needs TDETrader
7 7
 libtdeutils_la_LIBADD  = ../tdeio/libtdeio.la ksettings/libksettings.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_X11)
8 8
 
9 9
 libtdeutils_la_SOURCES = kfind.cpp kfinddialog.cpp kreplace.cpp \

+ 1
- 1
tdeutils/kplugininfo.cpp View File

@@ -276,7 +276,7 @@ const TQValueList<KService::Ptr> & KPluginInfo::kcmServices() const
276 276
 {
277 277
     if ( !d->kcmservicesCached )
278 278
     {
279
-        d->kcmservices = KTrader::self()->query( "TDECModule", "'" + d->pluginName +
279
+        d->kcmservices = TDETrader::self()->query( "TDECModule", "'" + d->pluginName +
280 280
             "' in [X-TDE-ParentComponents]" );
281 281
         kdDebug( 703 ) << "found " << d->kcmservices.count() << " offers for " <<
282 282
             d->pluginName << endl;

+ 1
- 1
tdeutils/ksettings/dialog.cpp View File

@@ -467,7 +467,7 @@ TQValueList<KService::Ptr> Dialog::parentComponentsServices(
467 467
 	constraint = "('" + constraint + "' in [X-TDE-ParentComponents])";
468 468
 
469 469
 	kdDebug( 700 ) << "constraint = " << constraint << endl;
470
-	return KTrader::self()->query( "TDECModule", constraint );
470
+	return TDETrader::self()->query( "TDECModule", constraint );
471 471
 }
472 472
 
473 473
 bool Dialog::isPluginForKCMEnabled( TDECModuleInfo * moduleinfo ) const

Loading…
Cancel
Save