summaryrefslogtreecommitdiffstats
path: root/kdecore
diff options
context:
space:
mode:
Diffstat (limited to 'kdecore')
-rw-r--r--kdecore/kapplication.cpp8
-rw-r--r--kdecore/kconfig_compiler/kconfig_compiler.cpp18
-rw-r--r--kdecore/kkeyserver_x11.cpp2
-rw-r--r--kdecore/klibloader.h8
-rw-r--r--kdecore/tests/klocaletest.cpp4
5 files changed, 20 insertions, 20 deletions
diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp
index de3a7028d..32091b863 100644
--- a/kdecore/kapplication.cpp
+++ b/kdecore/kapplication.cpp
@@ -2136,8 +2136,8 @@ void KApplication::kdisplaySetPalette()
void KApplication::kdisplaySetFont()
{
TQApplication::tqsetFont(KGlobalSettings::generalFont(), true);
- TQApplication::tqsetFont(KGlobalSettings::menuFont(), true, "TQMenuBar");
- TQApplication::tqsetFont(KGlobalSettings::menuFont(), true, "TQPopupMenu");
+ TQApplication::tqsetFont(KGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING);
+ TQApplication::tqsetFont(KGlobalSettings::menuFont(), true, TQPOPUPMENU_OBJECT_NAME_STRING);
TQApplication::tqsetFont(KGlobalSettings::menuFont(), true, "KPopupTitle");
// "patch" standard TQStyleSheet to follow our fonts
@@ -2240,8 +2240,8 @@ void KApplication::installKDEPropertyMap()
kdeMap->insert( "KIntSpinBox", "value" );
kdeMap->insert( "KDoubleNumInput", "value" );
// Temp til fixed in QT then enable ifdef with the correct version num
- kdeMap->insert( "TQGroupBox", "checked" );
- kdeMap->insert( "TQTabWidget", "currentPage" );
+ kdeMap->insert( TQGROUPBOX_OBJECT_NAME_STRING, "checked" );
+ kdeMap->insert( TQTABWIDGET_OBJECT_NAME_STRING, "currentPage" );
TQSqlPropertyMap::installDefaultMap( kdeMap );
#endif
}
diff --git a/kdecore/kconfig_compiler/kconfig_compiler.cpp b/kdecore/kconfig_compiler/kconfig_compiler.cpp
index 434208b70..fd2cbc405 100644
--- a/kdecore/kconfig_compiler/kconfig_compiler.cpp
+++ b/kdecore/kconfig_compiler/kconfig_compiler.cpp
@@ -628,7 +628,7 @@ TQString param( const TQString &type )
else if ( type == "Password" ) return "const TQString &";
else {
kdError() <<"kconfig_compiler does not support type \""<< type <<"\""<<endl;
- return "TQString"; //For now, but an assert would be better
+ return TQSTRING_OBJECT_NAME_STRING; //For now, but an assert would be better
}
}
@@ -637,13 +637,13 @@ TQString param( const TQString &type )
*/
TQString cppType( const TQString &type )
{
- if ( type == "String" ) return "TQString";
- else if ( type == "StringList" ) return "TQStringList";
+ if ( type == "String" ) return TQSTRING_OBJECT_NAME_STRING;
+ else if ( type == "StringList" ) return TQSTRINGLIST_OBJECT_NAME_STRING;
else if ( type == "Font" ) return "TQFont";
else if ( type == "Rect" ) return "TQRect";
else if ( type == "Size" ) return "TQSize";
else if ( type == "Color" ) return "TQColor";
- else if ( type == "Point" ) return "TQPoint";
+ else if ( type == "Point" ) return TQPOINT_OBJECT_NAME_STRING;
else if ( type == "Int" ) return "int";
else if ( type == "UInt" ) return "uint";
else if ( type == "Bool" ) return "bool";
@@ -653,12 +653,12 @@ TQString cppType( const TQString &type )
else if ( type == "UInt64" ) return "TQ_UINT64";
else if ( type == "IntList" ) return "TQValueList<int>";
else if ( type == "Enum" ) return "int";
- else if ( type == "Path" ) return "TQString";
- else if ( type == "PathList" ) return "TQStringList";
- else if ( type == "Password" ) return "TQString";
+ else if ( type == "Path" ) return TQSTRING_OBJECT_NAME_STRING;
+ else if ( type == "PathList" ) return TQSTRINGLIST_OBJECT_NAME_STRING;
+ else if ( type == "Password" ) return TQSTRING_OBJECT_NAME_STRING;
else {
kdError()<<"kconfig_compiler does not support type \""<< type <<"\""<<endl;
- return "TQString"; //For now, but an assert would be better
+ return TQSTRING_OBJECT_NAME_STRING; //For now, but an assert would be better
}
}
@@ -685,7 +685,7 @@ TQString defaultValue( const TQString &type )
else if ( type == "Password" ) return "\"\""; // Use empty string, not null string!
else {
kdWarning()<<"Error, kconfig_compiler doesn't support the \""<< type <<"\" type!"<<endl;
- return "TQString"; //For now, but an assert would be better
+ return TQSTRING_OBJECT_NAME_STRING; //For now, but an assert would be better
}
}
diff --git a/kdecore/kkeyserver_x11.cpp b/kdecore/kkeyserver_x11.cpp
index 65e0e7215..de7157210 100644
--- a/kdecore/kkeyserver_x11.cpp
+++ b/kdecore/kkeyserver_x11.cpp
@@ -526,7 +526,7 @@ TQString Sym::toString( bool bUserSpace ) const
s = XKeysymToString( m_sym );
#endif
capitalizeKeyname( s );
- return bUserSpace ? i18n("TQAccel", s.latin1()) : s;
+ return bUserSpace ? i18n(TQACCEL_OBJECT_NAME_STRING, s.latin1()) : s;
}
TQString Sym::toStringInternal() const { return toString( false ); }
diff --git a/kdecore/klibloader.h b/kdecore/klibloader.h
index c36e82f07..0d372237d 100644
--- a/kdecore/klibloader.h
+++ b/kdecore/klibloader.h
@@ -349,7 +349,7 @@ public:
* It is valid behavior to create different kinds of objects
* depending on the requested @p classname. For example a koffice
* library may usually return a pointer to KoDocument. But
- * if asked for a "TQWidget", it could create a wrapper widget,
+ * if asked for a TQWIDGET_OBJECT_NAME_STRING, it could create a wrapper widget,
* that encapsulates the Koffice specific features.
*
* create() automatically emits a signal objectCreated to tell
@@ -363,7 +363,7 @@ public:
* @param args a list of arguments
*/
- TQObject* create( TQObject* parent = 0, const char* name = 0, const char* classname = "TQObject", const TQStringList &args = TQStringList() );
+ TQObject* create( TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
signals:
/**
@@ -382,7 +382,7 @@ protected:
* It is valid behavior to create different kinds of objects
* depending on the requested @p className. For example a koffice
* library may usually return a pointer to KoDocument. But
- * if asked for a "TQWidget", it could create a wrapper widget,
+ * if asked for a TQWIDGET_OBJECT_NAME_STRING, it could create a wrapper widget,
* that encapsulates the Koffice specific features.
*
* This function is called by #create()
@@ -392,7 +392,7 @@ protected:
* @param args a list of arguments
*/
virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
- const char* className = "TQObject",
+ const char* className = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ) = 0;
diff --git a/kdecore/tests/klocaletest.cpp b/kdecore/tests/klocaletest.cpp
index a81d867b1..39bef8dde 100644
--- a/kdecore/tests/klocaletest.cpp
+++ b/kdecore/tests/klocaletest.cpp
@@ -182,11 +182,11 @@ int main( int argc, char ** argv )
kdDebug() << "setLanguage C\n";
KGlobal::locale()->setLanguage(TQString::tqfromLatin1("C"));
- kdDebug() << "C: " << i18n("yes") << " " << i18n("TQAccel", "Space") << endl;
+ kdDebug() << "C: " << i18n("yes") << " " << i18n(TQACCEL_OBJECT_NAME_STRING, "Space") << endl;
kdDebug() << "setLanguage de\n";
KGlobal::locale()->setLanguage(TQString::tqfromLatin1("de"));
- kdDebug() << "de: " << i18n("yes") << " " << i18n("TQAccel", "Space") << endl;
+ kdDebug() << "de: " << i18n("yes") << " " << i18n(TQACCEL_OBJECT_NAME_STRING, "Space") << endl;
Test m;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-12 03:34:32 +0000