Browse Source

Convert remainder of kdelibs to use currently defined tqt object name defs

This might fix the kio ssl problem


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1226906 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tpearson 8 years ago
parent
commit
b1960071ca

+ 60
- 60
common_texts.cpp View File

@@ -191,66 +191,66 @@ i18n( "Configure &Key Bindings...");
191 191
 i18n( "&Preferences...");
192 192
 i18n( "&Settings");
193 193
 i18n( "Do not show this message again");
194
-i18n("TQAccel", "Escape");
195
-i18n("TQAccel", "Tab");
196
-i18n("TQAccel", "Backtab");
197
-i18n("TQAccel", "Backspace");
198
-i18n("TQAccel", "Return");
199
-i18n("TQAccel", "Enter");
200
-i18n("TQAccel", "Insert");
201
-i18n("TQAccel", "Delete");
202
-i18n("TQAccel", "Pause");
203
-i18n("TQAccel", "Print");
204
-i18n("TQAccel", "SysReq");
205
-i18n("TQAccel", "Home");
206
-i18n("TQAccel", "End");
207
-i18n("TQAccel", "Left");
208
-i18n("TQAccel", "Up");
209
-i18n("TQAccel", "Right");
210
-i18n("TQAccel", "Down");
211
-i18n("TQAccel", "Prior");
212
-i18n("TQAccel", "Next");
213
-i18n("TQAccel", "Shift");
214
-i18n("TQAccel", "Control");
215
-i18n("TQAccel", "Meta");
216
-i18n("TQAccel", "Alt");
217
-i18n("TQAccel", "CapsLock");
218
-i18n("TQAccel", "NumLock");
219
-i18n("TQAccel", "ScrollLock");
220
-i18n("TQAccel", "Space");
221
-i18n("TQAccel", "ParenLeft");
222
-i18n("TQAccel", "ParenRight");
223
-i18n("TQAccel", "Asterisk");
224
-i18n("TQAccel", "Plus");
225
-i18n("TQAccel", "Comma");
226
-i18n("TQAccel", "Minus");
227
-i18n("TQAccel", "Period");
228
-i18n("TQAccel", "Slash");
229
-i18n("TQAccel", "Colon");
230
-i18n("TQAccel", "Semicolon");
231
-i18n("TQAccel", "Less");
232
-i18n("TQAccel", "Equal");
233
-i18n("TQAccel", "Greater");
234
-i18n("TQAccel", "Question");
235
-i18n("TQAccel", "BracketLeft");
236
-i18n("TQAccel", "Backslash");
237
-i18n("TQAccel", "BracketRight");
238
-i18n("TQAccel", "AsciiCircum");
239
-i18n("TQAccel", "Underscore");
240
-i18n("TQAccel", "QuoteLeft");
241
-i18n("TQAccel", "BraceLeft");
242
-i18n("TQAccel", "BraceRight");
243
-i18n("TQAccel", "AsciiTilde");
244
-i18n("TQAccel", "PgUp");
245
-i18n("TQAccel", "PgDown");
246
-i18n("TQAccel", "Apostrophe");
247
-i18n("TQAccel", "Ampersand");
248
-i18n("TQAccel", "Exclam");
249
-i18n("TQAccel", "Dollar");
250
-i18n("TQAccel", "Percent");
251
-i18n("TQAccel", "Menu");
252
-i18n("TQAccel", "Help");
253
-i18n("TQAccel", "NumberSign");
194
+i18n(TQACCEL_OBJECT_NAME_STRING, "Escape");
195
+i18n(TQACCEL_OBJECT_NAME_STRING, "Tab");
196
+i18n(TQACCEL_OBJECT_NAME_STRING, "Backtab");
197
+i18n(TQACCEL_OBJECT_NAME_STRING, "Backspace");
198
+i18n(TQACCEL_OBJECT_NAME_STRING, "Return");
199
+i18n(TQACCEL_OBJECT_NAME_STRING, "Enter");
200
+i18n(TQACCEL_OBJECT_NAME_STRING, "Insert");
201
+i18n(TQACCEL_OBJECT_NAME_STRING, "Delete");
202
+i18n(TQACCEL_OBJECT_NAME_STRING, "Pause");
203
+i18n(TQACCEL_OBJECT_NAME_STRING, "Print");
204
+i18n(TQACCEL_OBJECT_NAME_STRING, "SysReq");
205
+i18n(TQACCEL_OBJECT_NAME_STRING, "Home");
206
+i18n(TQACCEL_OBJECT_NAME_STRING, "End");
207
+i18n(TQACCEL_OBJECT_NAME_STRING, "Left");
208
+i18n(TQACCEL_OBJECT_NAME_STRING, "Up");
209
+i18n(TQACCEL_OBJECT_NAME_STRING, "Right");
210
+i18n(TQACCEL_OBJECT_NAME_STRING, "Down");
211
+i18n(TQACCEL_OBJECT_NAME_STRING, "Prior");
212
+i18n(TQACCEL_OBJECT_NAME_STRING, "Next");
213
+i18n(TQACCEL_OBJECT_NAME_STRING, "Shift");
214
+i18n(TQACCEL_OBJECT_NAME_STRING, "Control");
215
+i18n(TQACCEL_OBJECT_NAME_STRING, "Meta");
216
+i18n(TQACCEL_OBJECT_NAME_STRING, "Alt");
217
+i18n(TQACCEL_OBJECT_NAME_STRING, "CapsLock");
218
+i18n(TQACCEL_OBJECT_NAME_STRING, "NumLock");
219
+i18n(TQACCEL_OBJECT_NAME_STRING, "ScrollLock");
220
+i18n(TQACCEL_OBJECT_NAME_STRING, "Space");
221
+i18n(TQACCEL_OBJECT_NAME_STRING, "ParenLeft");
222
+i18n(TQACCEL_OBJECT_NAME_STRING, "ParenRight");
223
+i18n(TQACCEL_OBJECT_NAME_STRING, "Asterisk");
224
+i18n(TQACCEL_OBJECT_NAME_STRING, "Plus");
225
+i18n(TQACCEL_OBJECT_NAME_STRING, "Comma");
226
+i18n(TQACCEL_OBJECT_NAME_STRING, "Minus");
227
+i18n(TQACCEL_OBJECT_NAME_STRING, "Period");
228
+i18n(TQACCEL_OBJECT_NAME_STRING, "Slash");
229
+i18n(TQACCEL_OBJECT_NAME_STRING, "Colon");
230
+i18n(TQACCEL_OBJECT_NAME_STRING, "Semicolon");
231
+i18n(TQACCEL_OBJECT_NAME_STRING, "Less");
232
+i18n(TQACCEL_OBJECT_NAME_STRING, "Equal");
233
+i18n(TQACCEL_OBJECT_NAME_STRING, "Greater");
234
+i18n(TQACCEL_OBJECT_NAME_STRING, "Question");
235
+i18n(TQACCEL_OBJECT_NAME_STRING, "BracketLeft");
236
+i18n(TQACCEL_OBJECT_NAME_STRING, "Backslash");
237
+i18n(TQACCEL_OBJECT_NAME_STRING, "BracketRight");
238
+i18n(TQACCEL_OBJECT_NAME_STRING, "AsciiCircum");
239
+i18n(TQACCEL_OBJECT_NAME_STRING, "Underscore");
240
+i18n(TQACCEL_OBJECT_NAME_STRING, "QuoteLeft");
241
+i18n(TQACCEL_OBJECT_NAME_STRING, "BraceLeft");
242
+i18n(TQACCEL_OBJECT_NAME_STRING, "BraceRight");
243
+i18n(TQACCEL_OBJECT_NAME_STRING, "AsciiTilde");
244
+i18n(TQACCEL_OBJECT_NAME_STRING, "PgUp");
245
+i18n(TQACCEL_OBJECT_NAME_STRING, "PgDown");
246
+i18n(TQACCEL_OBJECT_NAME_STRING, "Apostrophe");
247
+i18n(TQACCEL_OBJECT_NAME_STRING, "Ampersand");
248
+i18n(TQACCEL_OBJECT_NAME_STRING, "Exclam");
249
+i18n(TQACCEL_OBJECT_NAME_STRING, "Dollar");
250
+i18n(TQACCEL_OBJECT_NAME_STRING, "Percent");
251
+i18n(TQACCEL_OBJECT_NAME_STRING, "Menu");
252
+i18n(TQACCEL_OBJECT_NAME_STRING, "Help");
253
+i18n(TQACCEL_OBJECT_NAME_STRING, "NumberSign");
254 254
 i18n("Main Toolbar");
255 255
 
256 256
 //some font styles

+ 1
- 1
interfaces/terminal/kde_terminal_interface.h View File

@@ -54,7 +54,7 @@ class TQStrList;
54 54
  *  };
55 55
  *  // fetch the part..
56 56
  *  KParts::Part* p = static_cast<KParts::Part*>(
57
- *      factory->create( this, "tralala", "TQObject",
57
+ *      factory->create( this, "tralala", TQOBJECT_OBJECT_NAME_STRING,
58 58
  *                       "KParts::ReadOnlyPart" ) );
59 59
  *  assert( p );
60 60
  *  setCentralWidget( p->widget() );

+ 1
- 1
interfaces/terminal/test/main.cc View File

@@ -17,7 +17,7 @@ Win::Win()
17 17
 {
18 18
     KLibFactory* factory = KLibLoader::self()->factory( "libkonsolepart" );
19 19
     assert( factory );
20
-    KParts::Part* p = static_cast<KParts::Part*>( factory->create( this, "tralala", "TQObject", "KParts::ReadOnlyPart" ) );
20
+    KParts::Part* p = static_cast<KParts::Part*>( factory->create( this, "tralala", TQOBJECT_OBJECT_NAME_STRING, "KParts::ReadOnlyPart" ) );
21 21
     setCentralWidget( p->widget() );
22 22
 
23 23
     TerminalInterface* t = ::tqqt_cast<TerminalInterface*>( p );

+ 3
- 3
kate/plugins/kdatatool/kate_kdatatool.cpp View File

@@ -160,9 +160,9 @@ void KDataToolPluginView::aboutToShow()
160 160
 	KInstance *inst=instance();
161 161
 
162 162
 	TQValueList<KDataToolInfo> tools;
163
-	tools += KDataToolInfo::query( "TQString", "text/plain", inst );
163
+	tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "text/plain", inst );
164 164
 	if( m_singleWord )
165
-		tools += KDataToolInfo::query( "TQString", "application/x-singleword", inst );
165
+		tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "application/x-singleword", inst );
166 166
 
167 167
 	m_actionList = KDataToolAction::dataToolActionList( tools, this,
168 168
 		TQT_SLOT( slotToolActivated( const KDataToolInfo &, const TQString & ) ) );
@@ -203,7 +203,7 @@ void KDataToolPluginView::slotToolActivated( const KDataToolInfo &info, const TQ
203 203
 		text = m_wordUnderCursor;
204 204
 
205 205
 	TQString mimetype = "text/plain";
206
-	TQString datatype = "TQString";
206
+	TQString datatype = TQSTRING_OBJECT_NAME_STRING;
207 207
 
208 208
 	// If unsupported (and if we have a single word indeed), try application/x-singleword
209 209
 	if ( !info.mimeTypes().tqcontains( mimetype ) && m_singleWord )

+ 4
- 4
kdecore/kapplication.cpp View File

@@ -2136,8 +2136,8 @@ void KApplication::kdisplaySetPalette()
2136 2136
 void KApplication::kdisplaySetFont()
2137 2137
 {
2138 2138
     TQApplication::tqsetFont(KGlobalSettings::generalFont(), true);
2139
-    TQApplication::tqsetFont(KGlobalSettings::menuFont(), true, "TQMenuBar");
2140
-    TQApplication::tqsetFont(KGlobalSettings::menuFont(), true, "TQPopupMenu");
2139
+    TQApplication::tqsetFont(KGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING);
2140
+    TQApplication::tqsetFont(KGlobalSettings::menuFont(), true, TQPOPUPMENU_OBJECT_NAME_STRING);
2141 2141
     TQApplication::tqsetFont(KGlobalSettings::menuFont(), true, "KPopupTitle");
2142 2142
 
2143 2143
     // "patch" standard TQStyleSheet to follow our fonts
@@ -2240,8 +2240,8 @@ void KApplication::installKDEPropertyMap()
2240 2240
     kdeMap->insert( "KIntSpinBox", "value" );
2241 2241
     kdeMap->insert( "KDoubleNumInput", "value" );
2242 2242
     // Temp til fixed in QT then enable ifdef with the correct version num
2243
-    kdeMap->insert( "TQGroupBox", "checked" );
2244
-    kdeMap->insert( "TQTabWidget", "currentPage" );
2243
+    kdeMap->insert( TQGROUPBOX_OBJECT_NAME_STRING, "checked" );
2244
+    kdeMap->insert( TQTABWIDGET_OBJECT_NAME_STRING, "currentPage" );
2245 2245
     TQSqlPropertyMap::installDefaultMap( kdeMap );
2246 2246
 #endif
2247 2247
 }

+ 9
- 9
kdecore/kconfig_compiler/kconfig_compiler.cpp View File

@@ -628,7 +628,7 @@ TQString param( const TQString &type )
628 628
     else if ( type == "Password" )    return "const TQString &";
629 629
     else {
630 630
         kdError() <<"kconfig_compiler does not support type \""<< type <<"\""<<endl;
631
-        return "TQString"; //For now, but an assert would be better
631
+        return TQSTRING_OBJECT_NAME_STRING; //For now, but an assert would be better
632 632
     }
633 633
 }
634 634
 
@@ -637,13 +637,13 @@ TQString param( const TQString &type )
637 637
 */
638 638
 TQString cppType( const TQString &type )
639 639
 {
640
-    if ( type == "String" )           return "TQString";
641
-    else if ( type == "StringList" )  return "TQStringList";
640
+    if ( type == "String" )           return TQSTRING_OBJECT_NAME_STRING;
641
+    else if ( type == "StringList" )  return TQSTRINGLIST_OBJECT_NAME_STRING;
642 642
     else if ( type == "Font" )        return "TQFont";
643 643
     else if ( type == "Rect" )        return "TQRect";
644 644
     else if ( type == "Size" )        return "TQSize";
645 645
     else if ( type == "Color" )       return "TQColor";
646
-    else if ( type == "Point" )       return "TQPoint";
646
+    else if ( type == "Point" )       return TQPOINT_OBJECT_NAME_STRING;
647 647
     else if ( type == "Int" )         return "int";
648 648
     else if ( type == "UInt" )        return "uint";
649 649
     else if ( type == "Bool" )        return "bool";
@@ -653,12 +653,12 @@ TQString cppType( const TQString &type )
653 653
     else if ( type == "UInt64" )      return "TQ_UINT64";
654 654
     else if ( type == "IntList" )     return "TQValueList<int>";
655 655
     else if ( type == "Enum" )        return "int";
656
-    else if ( type == "Path" )        return "TQString";
657
-    else if ( type == "PathList" )    return "TQStringList";
658
-    else if ( type == "Password" )    return "TQString";
656
+    else if ( type == "Path" )        return TQSTRING_OBJECT_NAME_STRING;
657
+    else if ( type == "PathList" )    return TQSTRINGLIST_OBJECT_NAME_STRING;
658
+    else if ( type == "Password" )    return TQSTRING_OBJECT_NAME_STRING;
659 659
     else {
660 660
         kdError()<<"kconfig_compiler does not support type \""<< type <<"\""<<endl;
661
-        return "TQString"; //For now, but an assert would be better
661
+        return TQSTRING_OBJECT_NAME_STRING; //For now, but an assert would be better
662 662
     }
663 663
 }
664 664
 
@@ -685,7 +685,7 @@ TQString defaultValue( const TQString &type )
685 685
     else if ( type == "Password" )    return "\"\""; // Use empty string, not null string!
686 686
     else {
687 687
         kdWarning()<<"Error, kconfig_compiler doesn't support the \""<< type <<"\" type!"<<endl;
688
-        return "TQString"; //For now, but an assert would be better
688
+        return TQSTRING_OBJECT_NAME_STRING; //For now, but an assert would be better
689 689
     }
690 690
 }
691 691
 

+ 1
- 1
kdecore/kkeyserver_x11.cpp View File

@@ -526,7 +526,7 @@ TQString Sym::toString( bool bUserSpace ) const
526 526
 	s = XKeysymToString( m_sym );
527 527
 #endif
528 528
 	capitalizeKeyname( s );
529
-	return bUserSpace ? i18n("TQAccel", s.latin1()) : s;
529
+	return bUserSpace ? i18n(TQACCEL_OBJECT_NAME_STRING, s.latin1()) : s;
530 530
 }
531 531
 
532 532
 TQString Sym::toStringInternal() const { return toString( false ); }

+ 4
- 4
kdecore/klibloader.h View File

@@ -349,7 +349,7 @@ public:
349 349
      * It is valid behavior to create different kinds of objects
350 350
      * depending on the requested @p classname. For example a koffice
351 351
      * library may usually return a pointer to KoDocument.  But
352
-     * if asked for a "TQWidget", it could create a wrapper widget,
352
+     * if asked for a TQWIDGET_OBJECT_NAME_STRING, it could create a wrapper widget,
353 353
      * that encapsulates the Koffice specific features.
354 354
      *
355 355
      * create() automatically emits a signal objectCreated to tell
@@ -363,7 +363,7 @@ public:
363 363
      * @param args a list of arguments
364 364
      */
365 365
 
366
-     TQObject* create( TQObject* parent = 0, const char* name = 0, const char* classname = "TQObject", const TQStringList &args = TQStringList() );
366
+     TQObject* create( TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
367 367
 
368 368
 signals:
369 369
     /**
@@ -382,7 +382,7 @@ protected:
382 382
      * It is valid behavior to create different kinds of objects
383 383
      * depending on the requested @p className. For example a koffice
384 384
      * library may usually return a pointer to KoDocument.  But
385
-     * if asked for a "TQWidget", it could create a wrapper widget,
385
+     * if asked for a TQWIDGET_OBJECT_NAME_STRING, it could create a wrapper widget,
386 386
      * that encapsulates the Koffice specific features.
387 387
      *
388 388
      * This function is called by #create()
@@ -392,7 +392,7 @@ protected:
392 392
      * @param args a list of arguments
393 393
      */
394 394
     virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
395
-                                   const char* className = "TQObject",
395
+                                   const char* className = TQOBJECT_OBJECT_NAME_STRING,
396 396
                                    const TQStringList &args = TQStringList() ) = 0;
397 397
 
398 398
 

+ 2
- 2
kdecore/tests/klocaletest.cpp View File

@@ -182,11 +182,11 @@ int main( int argc, char ** argv )
182 182
 
183 183
   kdDebug() << "setLanguage C\n";
184 184
   KGlobal::locale()->setLanguage(TQString::tqfromLatin1("C"));
185
-  kdDebug() << "C: " << i18n("yes") << " " << i18n("TQAccel", "Space") << endl;
185
+  kdDebug() << "C: " << i18n("yes") << " " << i18n(TQACCEL_OBJECT_NAME_STRING, "Space") << endl;
186 186
 
187 187
   kdDebug() << "setLanguage de\n";
188 188
   KGlobal::locale()->setLanguage(TQString::tqfromLatin1("de"));
189
-  kdDebug() << "de: " << i18n("yes") << " " << i18n("TQAccel", "Space") << endl;
189
+  kdDebug() << "de: " << i18n("yes") << " " << i18n(TQACCEL_OBJECT_NAME_STRING, "Space") << endl;
190 190
 
191 191
 
192 192
   Test m;

+ 1
- 1
kdeprint/lpd/kmlpdfactory.h View File

@@ -29,7 +29,7 @@ public:
29 29
 	virtual ~KLpdFactory();
30 30
 
31 31
 protected:
32
-	TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char *className = "TQObject", const TQStringList& args = TQStringList());
32
+	TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char *className = TQOBJECT_OBJECT_NAME_STRING, const TQStringList& args = TQStringList());
33 33
 };
34 34
 
35 35
 #endif

+ 1
- 1
kdeprint/tools/escputil/escpwidget.cpp View File

@@ -39,7 +39,7 @@ class EscpFactory : public KLibFactory
39 39
 public:
40 40
 	EscpFactory(TQObject *parent = 0, const char *name = 0) : KLibFactory(parent, name) {}
41 41
 protected:
42
-	TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = "TQObject", const TQStringList& args = TQStringList())
42
+	TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = TQOBJECT_OBJECT_NAME_STRING, const TQStringList& args = TQStringList())
43 43
 	{
44 44
                Q_UNUSED(className);
45 45
 		KDialogBase	*dlg = new KDialogBase(TQT_TQWIDGET(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close);

+ 1
- 1
kdeui/kbugreport.cpp View File

@@ -240,7 +240,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD
240 240
     lay->addWidget( label );
241 241
 
242 242
     // The multiline-edit
243
-    m_lineedit = new TQMultiLineEdit( parent, "TQMultiLineEdit" );
243
+    m_lineedit = new TQMultiLineEdit( parent, TQMULTILINEEDIT_OBJECT_NAME_STRING );
244 244
     m_lineedit->setMinimumHeight( 180 ); // make it big
245 245
     m_lineedit->setWordWrap(TQMultiLineEdit::WidgetWidth);
246 246
     lay->addWidget( m_lineedit, 10 /*stretch*/ );

+ 2
- 2
kio/kio/kscan.h View File

@@ -203,7 +203,7 @@ protected:
203 203
     KScanDialogFactory( TQObject *parent=0, const char *name=0 );
204 204
 
205 205
     virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
206
-                                   const char* classname = "TQObject",
206
+                                   const char* classname = TQOBJECT_OBJECT_NAME_STRING,
207 207
                                    const TQStringList &args = TQStringList() );
208 208
 
209 209
 
@@ -339,7 +339,7 @@ protected:
339 339
     KOCRDialogFactory( TQObject *parent=0, const char *name=0 );
340 340
 
341 341
     virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
342
-                                   const char* className = "TQObject",
342
+                                   const char* className = TQOBJECT_OBJECT_NAME_STRING,
343 343
                                    const TQStringList &args = TQStringList() );
344 344
 
345 345
 

+ 2
- 2
kio/kssl/ksslcertificatecache.cc View File

@@ -286,7 +286,7 @@ TQStringList KSSLCertificateCache::getHostList(KSSLCertificate& cert) {
286 286
                             "cacheGetHostList(KSSLCertificate)",
287 287
                             data, rettype, retval);
288 288
 
289
-     if (rc && rettype == "TQStringList") {
289
+     if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) {
290 290
         TQDataStream retStream(retval, IO_ReadOnly);
291 291
         TQStringList drc;
292 292
         retStream >> drc;
@@ -347,7 +347,7 @@ TQStringList KSSLCertificateCache::getKDEKeyByEmail(const TQString &email) {
347 347
                             "getKDEKeyByEmail(TQString)",
348 348
                             data, rettype, retval);
349 349
 
350
-     if (rc && rettype == "TQStringList") {
350
+     if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) {
351 351
         TQDataStream retStream(retval, IO_ReadOnly);
352 352
         TQStringList drc;
353 353
         retStream >> drc;

+ 2
- 2
kio/kssl/ksslsigners.cc View File

@@ -199,7 +199,7 @@ TQStringList KSSLSigners::list() {
199 199
                          "caList()",
200 200
                          data, rettype, retval);
201 201
 
202
-     if (rc && rettype == "TQStringList") {
202
+     if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) {
203 203
         TQDataStream retStream(retval, IO_ReadOnly);
204 204
         retStream >> drc;
205 205
      }
@@ -218,7 +218,7 @@ TQString KSSLSigners::getCert(TQString subject) {
218 218
                          "caGetCert(TQString)",
219 219
                          data, rettype, retval);
220 220
 
221
-     if (rc && rettype == "TQString") {
221
+     if (rc && rettype == TQSTRING_OBJECT_NAME_STRING) {
222 222
         TQDataStream retStream(retval, IO_ReadOnly);
223 223
         retStream >> drc;
224 224
      }

+ 1
- 1
kio/misc/kpac/proxyscout.cpp View File

@@ -130,7 +130,7 @@ namespace KPAC
130 130
         for ( RequestQueue::ConstIterator it = m_requestQueue.begin();
131 131
               it != m_requestQueue.end(); ++it )
132 132
         {
133
-            TQCString type = "TQString";
133
+            TQCString type = TQSTRING_OBJECT_NAME_STRING;
134 134
             TQByteArray data;
135 135
             TQDataStream ds( data, IO_WriteOnly );
136 136
             if ( success ) ds << handleRequest( ( *it ).url );

+ 1
- 1
kparts/factory.h View File

@@ -119,7 +119,7 @@ protected:
119 119
     /**
120 120
      * Reimplemented from KLibFactory. Calls createPart()
121 121
      */
122
-    virtual TQObject *createObject( TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList() );
122
+    virtual TQObject *createObject( TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
123 123
 
124 124
     /** This 'enum' along with the structure below is NOT part of the public API.
125 125
       * It's going to disappear in KDE 4.0 and is likely to change inbetween.

Loading…
Cancel
Save