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-ecb5cbfe19da
tags/v3.5.13
tpearson 8 years ago
parent
commit
b1960071ca

+ 60
- 60
common_texts.cpp View File

@@ -191,66 +191,66 @@ i18n( "Configure &Key Bindings...");
i18n( "&Preferences...");
i18n( "&Settings");
i18n( "Do not show this message again");
i18n("TQAccel", "Escape");
i18n("TQAccel", "Tab");
i18n("TQAccel", "Backtab");
i18n("TQAccel", "Backspace");
i18n("TQAccel", "Return");
i18n("TQAccel", "Enter");
i18n("TQAccel", "Insert");
i18n("TQAccel", "Delete");
i18n("TQAccel", "Pause");
i18n("TQAccel", "Print");
i18n("TQAccel", "SysReq");
i18n("TQAccel", "Home");
i18n("TQAccel", "End");
i18n("TQAccel", "Left");
i18n("TQAccel", "Up");
i18n("TQAccel", "Right");
i18n("TQAccel", "Down");
i18n("TQAccel", "Prior");
i18n("TQAccel", "Next");
i18n("TQAccel", "Shift");
i18n("TQAccel", "Control");
i18n("TQAccel", "Meta");
i18n("TQAccel", "Alt");
i18n("TQAccel", "CapsLock");
i18n("TQAccel", "NumLock");
i18n("TQAccel", "ScrollLock");
i18n("TQAccel", "Space");
i18n("TQAccel", "ParenLeft");
i18n("TQAccel", "ParenRight");
i18n("TQAccel", "Asterisk");
i18n("TQAccel", "Plus");
i18n("TQAccel", "Comma");
i18n("TQAccel", "Minus");
i18n("TQAccel", "Period");
i18n("TQAccel", "Slash");
i18n("TQAccel", "Colon");
i18n("TQAccel", "Semicolon");
i18n("TQAccel", "Less");
i18n("TQAccel", "Equal");
i18n("TQAccel", "Greater");
i18n("TQAccel", "Question");
i18n("TQAccel", "BracketLeft");
i18n("TQAccel", "Backslash");
i18n("TQAccel", "BracketRight");
i18n("TQAccel", "AsciiCircum");
i18n("TQAccel", "Underscore");
i18n("TQAccel", "QuoteLeft");
i18n("TQAccel", "BraceLeft");
i18n("TQAccel", "BraceRight");
i18n("TQAccel", "AsciiTilde");
i18n("TQAccel", "PgUp");
i18n("TQAccel", "PgDown");
i18n("TQAccel", "Apostrophe");
i18n("TQAccel", "Ampersand");
i18n("TQAccel", "Exclam");
i18n("TQAccel", "Dollar");
i18n("TQAccel", "Percent");
i18n("TQAccel", "Menu");
i18n("TQAccel", "Help");
i18n("TQAccel", "NumberSign");
i18n(TQACCEL_OBJECT_NAME_STRING, "Escape");
i18n(TQACCEL_OBJECT_NAME_STRING, "Tab");
i18n(TQACCEL_OBJECT_NAME_STRING, "Backtab");
i18n(TQACCEL_OBJECT_NAME_STRING, "Backspace");
i18n(TQACCEL_OBJECT_NAME_STRING, "Return");
i18n(TQACCEL_OBJECT_NAME_STRING, "Enter");
i18n(TQACCEL_OBJECT_NAME_STRING, "Insert");
i18n(TQACCEL_OBJECT_NAME_STRING, "Delete");
i18n(TQACCEL_OBJECT_NAME_STRING, "Pause");
i18n(TQACCEL_OBJECT_NAME_STRING, "Print");
i18n(TQACCEL_OBJECT_NAME_STRING, "SysReq");
i18n(TQACCEL_OBJECT_NAME_STRING, "Home");
i18n(TQACCEL_OBJECT_NAME_STRING, "End");
i18n(TQACCEL_OBJECT_NAME_STRING, "Left");
i18n(TQACCEL_OBJECT_NAME_STRING, "Up");
i18n(TQACCEL_OBJECT_NAME_STRING, "Right");
i18n(TQACCEL_OBJECT_NAME_STRING, "Down");
i18n(TQACCEL_OBJECT_NAME_STRING, "Prior");
i18n(TQACCEL_OBJECT_NAME_STRING, "Next");
i18n(TQACCEL_OBJECT_NAME_STRING, "Shift");
i18n(TQACCEL_OBJECT_NAME_STRING, "Control");
i18n(TQACCEL_OBJECT_NAME_STRING, "Meta");
i18n(TQACCEL_OBJECT_NAME_STRING, "Alt");
i18n(TQACCEL_OBJECT_NAME_STRING, "CapsLock");
i18n(TQACCEL_OBJECT_NAME_STRING, "NumLock");
i18n(TQACCEL_OBJECT_NAME_STRING, "ScrollLock");
i18n(TQACCEL_OBJECT_NAME_STRING, "Space");
i18n(TQACCEL_OBJECT_NAME_STRING, "ParenLeft");
i18n(TQACCEL_OBJECT_NAME_STRING, "ParenRight");
i18n(TQACCEL_OBJECT_NAME_STRING, "Asterisk");
i18n(TQACCEL_OBJECT_NAME_STRING, "Plus");
i18n(TQACCEL_OBJECT_NAME_STRING, "Comma");
i18n(TQACCEL_OBJECT_NAME_STRING, "Minus");
i18n(TQACCEL_OBJECT_NAME_STRING, "Period");
i18n(TQACCEL_OBJECT_NAME_STRING, "Slash");
i18n(TQACCEL_OBJECT_NAME_STRING, "Colon");
i18n(TQACCEL_OBJECT_NAME_STRING, "Semicolon");
i18n(TQACCEL_OBJECT_NAME_STRING, "Less");
i18n(TQACCEL_OBJECT_NAME_STRING, "Equal");
i18n(TQACCEL_OBJECT_NAME_STRING, "Greater");
i18n(TQACCEL_OBJECT_NAME_STRING, "Question");
i18n(TQACCEL_OBJECT_NAME_STRING, "BracketLeft");
i18n(TQACCEL_OBJECT_NAME_STRING, "Backslash");
i18n(TQACCEL_OBJECT_NAME_STRING, "BracketRight");
i18n(TQACCEL_OBJECT_NAME_STRING, "AsciiCircum");
i18n(TQACCEL_OBJECT_NAME_STRING, "Underscore");
i18n(TQACCEL_OBJECT_NAME_STRING, "QuoteLeft");
i18n(TQACCEL_OBJECT_NAME_STRING, "BraceLeft");
i18n(TQACCEL_OBJECT_NAME_STRING, "BraceRight");
i18n(TQACCEL_OBJECT_NAME_STRING, "AsciiTilde");
i18n(TQACCEL_OBJECT_NAME_STRING, "PgUp");
i18n(TQACCEL_OBJECT_NAME_STRING, "PgDown");
i18n(TQACCEL_OBJECT_NAME_STRING, "Apostrophe");
i18n(TQACCEL_OBJECT_NAME_STRING, "Ampersand");
i18n(TQACCEL_OBJECT_NAME_STRING, "Exclam");
i18n(TQACCEL_OBJECT_NAME_STRING, "Dollar");
i18n(TQACCEL_OBJECT_NAME_STRING, "Percent");
i18n(TQACCEL_OBJECT_NAME_STRING, "Menu");
i18n(TQACCEL_OBJECT_NAME_STRING, "Help");
i18n(TQACCEL_OBJECT_NAME_STRING, "NumberSign");
i18n("Main Toolbar");

//some font styles

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

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

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

@@ -17,7 +17,7 @@ Win::Win()
{
KLibFactory* factory = KLibLoader::self()->factory( "libkonsolepart" );
assert( factory );
KParts::Part* p = static_cast<KParts::Part*>( factory->create( this, "tralala", "TQObject", "KParts::ReadOnlyPart" ) );
KParts::Part* p = static_cast<KParts::Part*>( factory->create( this, "tralala", TQOBJECT_OBJECT_NAME_STRING, "KParts::ReadOnlyPart" ) );
setCentralWidget( p->widget() );

TerminalInterface* t = ::tqqt_cast<TerminalInterface*>( p );

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

@@ -160,9 +160,9 @@ void KDataToolPluginView::aboutToShow()
KInstance *inst=instance();

TQValueList<KDataToolInfo> tools;
tools += KDataToolInfo::query( "TQString", "text/plain", inst );
tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "text/plain", inst );
if( m_singleWord )
tools += KDataToolInfo::query( "TQString", "application/x-singleword", inst );
tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "application/x-singleword", inst );

m_actionList = KDataToolAction::dataToolActionList( tools, this,
TQT_SLOT( slotToolActivated( const KDataToolInfo &, const TQString & ) ) );
@@ -203,7 +203,7 @@ void KDataToolPluginView::slotToolActivated( const KDataToolInfo &info, const TQ
text = m_wordUnderCursor;

TQString mimetype = "text/plain";
TQString datatype = "TQString";
TQString datatype = TQSTRING_OBJECT_NAME_STRING;

// If unsupported (and if we have a single word indeed), try application/x-singleword
if ( !info.mimeTypes().tqcontains( mimetype ) && m_singleWord )

+ 4
- 4
kdecore/kapplication.cpp View File

@@ -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
}

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

@@ -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
}
}


+ 1
- 1
kdecore/kkeyserver_x11.cpp View File

@@ -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 ); }

+ 4
- 4
kdecore/klibloader.h View File

@@ -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;



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

@@ -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;

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

@@ -29,7 +29,7 @@ public:
virtual ~KLpdFactory();

protected:
TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char *className = "TQObject", const TQStringList& args = TQStringList());
TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char *className = TQOBJECT_OBJECT_NAME_STRING, const TQStringList& args = TQStringList());
};

#endif

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

@@ -39,7 +39,7 @@ class EscpFactory : public KLibFactory
public:
EscpFactory(TQObject *parent = 0, const char *name = 0) : KLibFactory(parent, name) {}
protected:
TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = "TQObject", const TQStringList& args = TQStringList())
TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = TQOBJECT_OBJECT_NAME_STRING, const TQStringList& args = TQStringList())
{
Q_UNUSED(className);
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
lay->addWidget( label );

// The multiline-edit
m_lineedit = new TQMultiLineEdit( parent, "TQMultiLineEdit" );
m_lineedit = new TQMultiLineEdit( parent, TQMULTILINEEDIT_OBJECT_NAME_STRING );
m_lineedit->setMinimumHeight( 180 ); // make it big
m_lineedit->setWordWrap(TQMultiLineEdit::WidgetWidth);
lay->addWidget( m_lineedit, 10 /*stretch*/ );

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

@@ -203,7 +203,7 @@ protected:
KScanDialogFactory( TQObject *parent=0, const char *name=0 );

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() );


@@ -339,7 +339,7 @@ protected:
KOCRDialogFactory( TQObject *parent=0, const char *name=0 );

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() );



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

@@ -286,7 +286,7 @@ TQStringList KSSLCertificateCache::getHostList(KSSLCertificate& cert) {
"cacheGetHostList(KSSLCertificate)",
data, rettype, retval);

if (rc && rettype == "TQStringList") {
if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) {
TQDataStream retStream(retval, IO_ReadOnly);
TQStringList drc;
retStream >> drc;
@@ -347,7 +347,7 @@ TQStringList KSSLCertificateCache::getKDEKeyByEmail(const TQString &email) {
"getKDEKeyByEmail(TQString)",
data, rettype, retval);

if (rc && rettype == "TQStringList") {
if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) {
TQDataStream retStream(retval, IO_ReadOnly);
TQStringList drc;
retStream >> drc;

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

@@ -199,7 +199,7 @@ TQStringList KSSLSigners::list() {
"caList()",
data, rettype, retval);

if (rc && rettype == "TQStringList") {
if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) {
TQDataStream retStream(retval, IO_ReadOnly);
retStream >> drc;
}
@@ -218,7 +218,7 @@ TQString KSSLSigners::getCert(TQString subject) {
"caGetCert(TQString)",
data, rettype, retval);

if (rc && rettype == "TQString") {
if (rc && rettype == TQSTRING_OBJECT_NAME_STRING) {
TQDataStream retStream(retval, IO_ReadOnly);
retStream >> drc;
}

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

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

+ 1
- 1
kparts/factory.h View File

@@ -119,7 +119,7 @@ protected:
/**
* Reimplemented from KLibFactory. Calls createPart()
*/
virtual TQObject *createObject( TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList() );
virtual TQObject *createObject( TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );

/** This 'enum' along with the structure below is NOT part of the public API.
* It's going to disappear in KDE 4.0 and is likely to change inbetween.

Loading…
Cancel
Save