TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 36c049e135)
pull/232/head
Michele Calgaro 1 year ago
parent 08eacf589a
commit 7073100361
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
54 changed files with 271 additions and 271 deletions
Show Stats Download Patch File Download Diff File

68
dcop/client/marshall.cpp
Unescape View File

@ -145,34 +145,34 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
bool b;
stream >> b;
result = b ? "true" : "false";
} else if ( type == TQSTRING_OBJECT_NAME_STRING )
} else if ( type == "TQString" )
{
TQString s;
stream >> s;
result = s.local8Bit();
} else if ( type == TQCSTRING_OBJECT_NAME_STRING )
} else if ( type == "TQCString" )
{
stream >> result;
} else if ( type == "QCStringList" )
{
return demarshal( stream, TQVALUELIST_OBJECT_NAME_STRING "<" TQCSTRING_OBJECT_NAME_STRING ">" );
} else if ( type == TQSTRINGLIST_OBJECT_NAME_STRING )
return demarshal( stream, "TQValueList" "<" "TQCString" ">" );
} else if ( type == "TQStringList" )
{
return demarshal( stream, TQVALUELIST_OBJECT_NAME_STRING "<" TQSTRING_OBJECT_NAME_STRING ">" );
return demarshal( stream, "TQValueList" "<" "TQString" ">" );
} else if ( type == "TQStringVariantMap" )
{
return demarshal(stream, TQMAP_OBJECT_NAME_STRING "<" TQSTRING_OBJECT_NAME_STRING "," TQVARIANT_OBJECT_NAME_STRING ">");
} else if ( type == TQCOLOR_OBJECT_NAME_STRING )
return demarshal(stream, "TQMap" "<" "TQString" "," "TQVariant" ">");
} else if ( type == "TQColor" )
{
TQColor c;
stream >> c;
result = TQString(c.name()).local8Bit();
} else if ( type == TQSIZE_OBJECT_NAME_STRING )
} else if ( type == "TQSize" )
{
TQSize s;
stream >> s;
result.sprintf( "%dx%d", s.width(), s.height() );
} else if ( type == TQPIXMAP_OBJECT_NAME_STRING || type == TQIMAGE_OBJECT_NAME_STRING )
} else if ( type == "TQPixmap" || type == "TQImage" )
{
TQImage i;
stream >> i;
@ -181,17 +181,17 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
buf.open( IO_WriteOnly );
i.save( &buf, "XPM" );
result = buf.buffer();
} else if ( type == TQPOINT_OBJECT_NAME_STRING )
} else if ( type == "TQPoint" )
{
TQPoint p;
stream >> p;
result.sprintf( "+%d+%d", p.x(), p.y() );
} else if ( type == TQRECT_OBJECT_NAME_STRING )
} else if ( type == "TQRect" )
{
TQRect r;
stream >> r;
result.sprintf( "%dx%d+%d+%d", r.width(), r.height(), r.x(), r.y() );
} else if ( type == TQVARIANT_OBJECT_NAME_STRING )
} else if ( type == "TQVariant" )
{
TQ_INT32 type;
stream >> type;
@ -206,7 +206,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
KURL r;
stream >> r;
result = r.url().local8Bit();
} else if ( type.left( 12 ) == TQVALUELIST_OBJECT_NAME_STRING "<" )
} else if ( type.left( 12 ) == "TQValueList" "<" )
{
if ( (uint)type.find( '>', 12 ) != type.length() - 1 )
return result;
@ -228,7 +228,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
if ( i < count - 1 )
result += '\n';
}
} else if ( type.left( 6 ) == TQMAP_OBJECT_NAME_STRING "<" )
} else if ( type.left( 6 ) == "TQMap" "<" )
{
int commaPos = type.find( ',', 6 );
@ -281,11 +281,11 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type )
}
TQString s = TQString::fromLocal8Bit( args[ i ] );
if (type == TQSTRINGLIST_OBJECT_NAME_STRING) {
type = TQVALUELIST_OBJECT_NAME_STRING "<" TQSTRING_OBJECT_NAME_STRING ">";
if (type == "TQStringList") {
type = "TQValueList" "<" "TQString" ">";
}
if (type == "QCStringList") {
type = TQVALUELIST_OBJECT_NAME_STRING "<" TQSTRING_OBJECT_NAME_STRING ">";
type = "TQValueList" "<" "TQString" ">";
}
if ( type == "int" )
@ -322,52 +322,52 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type )
arg << s.toDouble();
else if ( type == "bool" )
arg << mkBool( s );
else if ( type == TQSTRING_OBJECT_NAME_STRING )
else if ( type == "TQString" )
arg << s;
else if ( type == TQCSTRING_OBJECT_NAME_STRING )
else if ( type == "TQCString" )
arg << TQCString( args[ i ] );
else if ( type == TQCOLOR_OBJECT_NAME_STRING )
else if ( type == "TQColor" )
arg << mkColor( s );
else if ( type == TQPOINT_OBJECT_NAME_STRING )
else if ( type == "TQPoint" )
arg << mkPoint( s );
else if ( type == TQSIZE_OBJECT_NAME_STRING )
else if ( type == "TQSize" )
arg << mkSize( s );
else if ( type == TQRECT_OBJECT_NAME_STRING )
else if ( type == "TQRect" )
arg << mkRect( s );
else if ( type == "KURL" )
arg << KURL( s );
else if ( type == TQVARIANT_OBJECT_NAME_STRING ) {
int tqPointKeywordLength = strlen(TQPOINT_OBJECT_NAME_STRING);
int tqSizeKeywordLength = strlen(TQSIZE_OBJECT_NAME_STRING);
int tqRectKeywordLength = strlen(TQRECT_OBJECT_NAME_STRING);
int tqColorKeywordLength = strlen(TQCOLOR_OBJECT_NAME_STRING);
else if ( type == "TQVariant" ) {
int tqPointKeywordLength = strlen("TQPoint");
int tqSizeKeywordLength = strlen("TQSize");
int tqRectKeywordLength = strlen("TQRect");
int tqColorKeywordLength = strlen("TQColor");
if ( s == "true" || s == "false" ) {
arg << TQVariant( mkBool( s ) );
}
else if ( s.left( 4 ) == "int(" ) {
arg << TQVariant( s.mid(4, s.length()-5).toInt() );
}
else if ( s.left( (tqPointKeywordLength+1) ) == TQPOINT_OBJECT_NAME_STRING "(" ) {
else if ( s.left( (tqPointKeywordLength+1) ) == "TQPoint" "(" ) {
arg << TQVariant( mkPoint( s.mid((tqPointKeywordLength+1), s.length()-(tqPointKeywordLength+2)) ) );
}
else if ( s.left( (tqSizeKeywordLength+1) ) == TQSIZE_OBJECT_NAME_STRING "(" ) {
else if ( s.left( (tqSizeKeywordLength+1) ) == "TQSize" "(" ) {
arg << TQVariant( mkSize( s.mid((tqSizeKeywordLength+1), s.length()-(tqSizeKeywordLength+2)) ) );
}
else if ( s.left( (tqRectKeywordLength+1) ) == TQRECT_OBJECT_NAME_STRING "(" ) {
else if ( s.left( (tqRectKeywordLength+1) ) == "TQRect" "(" ) {
arg << TQVariant( mkRect( s.mid((tqRectKeywordLength+1), s.length()-(tqRectKeywordLength+2)) ) );
}
else if ( s.left( (tqColorKeywordLength+1) ) == TQCOLOR_OBJECT_NAME_STRING "(" ) {
else if ( s.left( (tqColorKeywordLength+1) ) == "TQColor" "(" ) {
arg << TQVariant( mkColor( s.mid((tqColorKeywordLength+1), s.length()-(tqColorKeywordLength+2)) ) );
}
else {
arg << TQVariant( s );
}
} else if ( type.startsWith(TQVALUELIST_OBJECT_NAME_STRING "<") || type == "KURL::List" ) {
} else if ( type.startsWith("TQValueList" "<") || type == "KURL::List" ) {
if ( type == "KURL::List" ) {
type = "KURL";
}
else {
int tqValueListKeywordLength = strlen(TQVALUELIST_OBJECT_NAME_STRING);
int tqValueListKeywordLength = strlen("TQValueList");
type = type.mid((tqValueListKeywordLength+1), type.length() - (tqValueListKeywordLength+2));
}
TQStringList list;

2
dcop/dcop_deadlock_test.cpp
Unescape View File

@ -47,7 +47,7 @@ TQCString& replyType, TQByteArray &replyData)
gettimeofday(&tv, 0);
tqWarning("%s: function('%s') %d:%06d", name(), m_remoteName.data(), tv.tv_sec % 100, tv.tv_usec);
replyType = TQSTRING_OBJECT_NAME_STRING;
replyType = "TQString";
TQDataStream reply( replyData, IO_WriteOnly );
reply << TQString("Hey");
m_timer.start(1000, true);

2
dcop/dcopref.h
Unescape View File

@ -238,7 +238,7 @@ inline TQDataStream & operator << (TQDataStream & str, const DCOPArg& arg )
* dcopTypeName function, for example
*
* \code
* inline const char* dcopTypeName( const TQString& ) { return TQSTRING_OBJECT_NAME_STRING; }
* inline const char* dcopTypeName( const TQString& ) { return "TQString"; }
* \endcode
*
* If you use custom data types that do support TQDataStream but have

54
dcop/dcoptypes.h
Unescape View File

@ -37,38 +37,38 @@ inline const char* dcopTypeName( long ) { return "long int"; }
inline const char* dcopTypeName( ulong ) { return "ulong"; }
inline const char* dcopTypeName( double ) { return "double"; }
inline const char* dcopTypeName( float ) { return "float"; }
inline const char* dcopTypeName( const char* ) { return TQCSTRING_OBJECT_NAME_STRING; }
inline const char* dcopTypeName( const char* ) { return "TQCString"; }
// dcop specialities
class DCOPRef; inline const char* dcopTypeName( const DCOPRef& ) { return "DCOPRef"; }
// Qt variant types
class TQString; inline const char* dcopTypeName( const TQString& ) { return TQSTRING_OBJECT_NAME_STRING; }
class TQCString; inline const char* dcopTypeName( const TQCString& ) { return TQCSTRING_OBJECT_NAME_STRING; }
class TQFont; inline const char* dcopTypeName( const TQFont& ) { return TQFONT_OBJECT_NAME_STRING; }
class TQPixmap; inline const char* dcopTypeName( const TQPixmap& ) { return TQPIXMAP_OBJECT_NAME_STRING; }
class TQBrush; inline const char* dcopTypeName( const TQBrush& ) { return TQBRUSH_OBJECT_NAME_STRING; }
class TQRect; inline const char* dcopTypeName( const TQRect& ) { return TQRECT_OBJECT_NAME_STRING; }
class TQPoint; inline const char* dcopTypeName( const TQPoint& ) { return TQPOINT_OBJECT_NAME_STRING; }
class TQImage; inline const char* dcopTypeName( const TQImage& ) { return TQIMAGE_OBJECT_NAME_STRING; }
class TQSize; inline const char* dcopTypeName( const TQSize& ) { return TQSIZE_OBJECT_NAME_STRING; }
class TQColor; inline const char* dcopTypeName( const TQColor& ) { return TQCOLOR_OBJECT_NAME_STRING; }
class TQPalette; inline const char* dcopTypeName( const TQPalette& ) { return TQPALETTE_OBJECT_NAME_STRING; }
class TQColorGroup; inline const char* dcopTypeName( const TQColorGroup& ) { return TQCOLORGROUP_OBJECT_NAME_STRING; }
class TQIconSet; inline const char* dcopTypeName( const TQIconSet& ) { return TQICONSET_OBJECT_NAME_STRING; }
class TQDataStream; inline const char* dcopTypeName( const TQDataStream& ) { return TQDATASTREAM_OBJECT_NAME_STRING; }
class TQPointArray; inline const char* dcopTypeName( const TQPointArray& ) { return TQPOINTARRAY_OBJECT_NAME_STRING; }
class TQRegion; inline const char* dcopTypeName( const TQRegion& ) { return TQREGION_OBJECT_NAME_STRING; }
class TQBitmap; inline const char* dcopTypeName( const TQBitmap& ) { return TQBITMAP_OBJECT_NAME_STRING; }
class TQCursor; inline const char* dcopTypeName( const TQCursor& ) { return TQCURSOR_OBJECT_NAME_STRING; }
class TQStringList; inline const char* dcopTypeName( const TQStringList& ) { return TQSTRINGLIST_OBJECT_NAME_STRING; }
class TQSizePolicy; inline const char* dcopTypeName( const TQSizePolicy& ) { return TQSIZEPOLICY_OBJECT_NAME_STRING; }
class TQDate; inline const char* dcopTypeName( const TQDate& ) { return TQDATE_OBJECT_NAME_STRING; }
class TQTime; inline const char* dcopTypeName( const TQTime& ) { return TQTIME_OBJECT_NAME_STRING; }
class TQDateTime; inline const char* dcopTypeName( const TQDateTime& ) { return TQDATETIME_OBJECT_NAME_STRING; }
class TQBitArray; inline const char* dcopTypeName( const TQBitArray& ) { return TQBITARRAY_OBJECT_NAME_STRING; }
class TQKeySequence; inline const char* dcopTypeName( const TQKeySequence& ) { return TQKEYSEQUENCE_OBJECT_NAME_STRING; }
class TQVariant; inline const char* dcopTypeName( const TQVariant& ) { return TQVARIANT_OBJECT_NAME_STRING; }
class TQString; inline const char* dcopTypeName( const TQString& ) { return "TQString"; }
class TQCString; inline const char* dcopTypeName( const TQCString& ) { return "TQCString"; }
class TQFont; inline const char* dcopTypeName( const TQFont& ) { return "TQFont"; }
class TQPixmap; inline const char* dcopTypeName( const TQPixmap& ) { return "TQPixmap"; }
class TQBrush; inline const char* dcopTypeName( const TQBrush& ) { return "TQBrush"; }
class TQRect; inline const char* dcopTypeName( const TQRect& ) { return "TQRect"; }
class TQPoint; inline const char* dcopTypeName( const TQPoint& ) { return "TQPoint"; }
class TQImage; inline const char* dcopTypeName( const TQImage& ) { return "TQImage"; }
class TQSize; inline const char* dcopTypeName( const TQSize& ) { return "TQSize"; }
class TQColor; inline const char* dcopTypeName( const TQColor& ) { return "TQColor"; }
class TQPalette; inline const char* dcopTypeName( const TQPalette& ) { return "TQPalette"; }
class TQColorGroup; inline const char* dcopTypeName( const TQColorGroup& ) { return "TQColorGroup"; }
class TQIconSet; inline const char* dcopTypeName( const TQIconSet& ) { return "TQIconSet"; }
class TQDataStream; inline const char* dcopTypeName( const TQDataStream& ) { return "TQDataStream"; }
class TQPointArray; inline const char* dcopTypeName( const TQPointArray& ) { return "TQPointArray"; }
class TQRegion; inline const char* dcopTypeName( const TQRegion& ) { return "TQRegion"; }
class TQBitmap; inline const char* dcopTypeName( const TQBitmap& ) { return "TQBitmap"; }
class TQCursor; inline const char* dcopTypeName( const TQCursor& ) { return "TQCursor"; }
class TQStringList; inline const char* dcopTypeName( const TQStringList& ) { return "TQStringList"; }
class TQSizePolicy; inline const char* dcopTypeName( const TQSizePolicy& ) { return "TQSizePolicy"; }
class TQDate; inline const char* dcopTypeName( const TQDate& ) { return "TQDate"; }
class TQTime; inline const char* dcopTypeName( const TQTime& ) { return "TQTime"; }
class TQDateTime; inline const char* dcopTypeName( const TQDateTime& ) { return "TQDateTime"; }
class TQBitArray; inline const char* dcopTypeName( const TQBitArray& ) { return "TQBitArray"; }
class TQKeySequence; inline const char* dcopTypeName( const TQKeySequence& ) { return "TQKeySequence"; }
class TQVariant; inline const char* dcopTypeName( const TQVariant& ) { return "TQVariant"; }
template<class Key, class T> class TQMap;
typedef TQMap<TQString, TQVariant> TQStringVariantMap;

10
dcop/testdcop.cpp
Unescape View File

@ -57,7 +57,7 @@ bool MyDCOPObject::process(const TQCString &fun, const TQByteArray &data,
printf("Rect x = %d, y = %d, w = %d, h = %d\n", arg1.x(), arg1.y(), arg1.width(), arg1.height());
replyType = TQRECT_OBJECT_NAME_STRING;
replyType = "TQRect";
TQDataStream reply( replyData, IO_WriteOnly );
TQRect r(10,20,100,200);
reply << r;
@ -74,7 +74,7 @@ bool MyDCOPObject::process(const TQCString &fun, const TQByteArray &data,
tqDebug("countDown() countDownAction = %p", countDownAction);
if (countDownAction2)
{
replyType = TQSTRING_OBJECT_NAME_STRING;
replyType = "TQString";
TQDataStream reply( replyData, IO_WriteOnly );
reply << TQString("Hey");
return true;
@ -104,7 +104,7 @@ void MyDCOPObject::slotTimeout()
countDownCount--;
if (countDownCount == 0)
{
TQCString replyType = TQSTRING_OBJECT_NAME_STRING;
TQCString replyType = "TQString";
TQByteArray replyData;
TQDataStream reply( replyData, IO_WriteOnly );
reply << TQString("Hello World");
@ -123,7 +123,7 @@ void MyDCOPObject::slotTimeout2()
countDownCount2--;
if (countDownCount2 == 0)
{
TQCString replyType = TQSTRING_OBJECT_NAME_STRING;
TQCString replyType = "TQString";
TQByteArray replyData;
TQDataStream reply( replyData, IO_WriteOnly );
reply << TQString("Hello World");
@ -139,7 +139,7 @@ void MyDCOPObject::slotTimeout2()
QCStringList MyDCOPObject::functions()
{
QCStringList result = DCOPObject::functions();
result << TQRECT_OBJECT_NAME_STRING " canLaunchRockets(" TQRECT_OBJECT_NAME_STRING ")";
result << "TQRect canLaunchRockets(TQRect)";
return result;
}

2
interfaces/terminal/kde_terminal_interface.h
Unescape View File

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

2
interfaces/terminal/test/main.cpp
Unescape 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_OBJECT_NAME_STRING, "KParts::ReadOnlyPart" ) );
KParts::Part* p = static_cast<KParts::Part*>( factory->create( this, "tralala", "TQObject", "KParts::ReadOnlyPart" ) );
setCentralWidget( p->widget() );
TerminalInterface* t = ::tqqt_cast<TerminalInterface*>( p );

6
kate/plugins/kdatatool/kate_kdatatool.cpp
Unescape View File

@ -160,9 +160,9 @@ void KDataToolPluginView::aboutToShow()
TDEInstance *inst=instance();
TQValueList<KDataToolInfo> tools;
tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "text/plain", inst );
tools += KDataToolInfo::query( "TQString", "text/plain", inst );
if( m_singleWord )
tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "application/x-singleword", inst );
tools += KDataToolInfo::query( "TQString", "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_OBJECT_NAME_STRING;
TQString datatype = "TQString";
// If unsupported (and if we have a single word indeed), try application/x-singleword
if ( !info.mimeTypes().contains( mimetype ) && m_singleWord )

8
tdecore/klibloader.h
Unescape 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_OBJECT_NAME_STRING, it could create a wrapper widget,
* if asked for a "TQWidget", 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_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
TQObject* create( TQObject* parent = 0, const char* name = 0, const char* classname = "TQObject", 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_OBJECT_NAME_STRING, it could create a wrapper widget,
* if asked for a "TQWidget", 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_OBJECT_NAME_STRING,
const char* className = "TQObject",
const TQStringList &args = TQStringList() ) = 0;

2
tdecore/tdeaccelmanager.cpp
Unescape View File

@ -262,7 +262,7 @@ void TDEAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &u
void TDEAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item)
{
TQObjectList *childList = widget->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, false);
TQObjectList *childList = widget->queryList("TQWidget", 0, false, false);
for ( TQObject *it = childList->first(); it; it = childList->next() )
{
TQWidget *w = TQT_TQWIDGET(it);

8
tdecore/tdeapplication.cpp
Unescape View File

@ -2540,8 +2540,8 @@ void TDEApplication::tdedisplaySetPalette()
void TDEApplication::tdedisplaySetFont()
{
TQApplication::setFont(TDEGlobalSettings::generalFont(), true);
TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING);
TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQPOPUPMENU_OBJECT_NAME_STRING);
TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TQMenuBar");
TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TQPopupMenu");
TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TDEPopupTitle");
// "patch" standard TQStyleSheet to follow our fonts
@ -2644,8 +2644,8 @@ void TDEApplication::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_OBJECT_NAME_STRING, "checked" );
kdeMap->insert( TQTABWIDGET_OBJECT_NAME_STRING, "currentPage" );
kdeMap->insert( "TQGroupBox", "checked" );
kdeMap->insert( "TQTabWidget", "currentPage" );
TQSqlPropertyMap::installDefaultMap( kdeMap );
#endif
}

46
tdecore/tdeconfigdialogmanager.cpp
Unescape View File

@ -69,29 +69,29 @@ void TDEConfigDialogManager::init(bool trackChanges)
if(trackChanges)
{
// QT
changedMap.insert(TQBUTTON_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int)));
changedMap.insert(TQCHECKBOX_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int)));
changedMap.insert(TQPUSHBUTTON_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int)));
changedMap.insert(TQRADIOBUTTON_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int)));
changedMap.insert("TQButton", TQT_SIGNAL(stateChanged(int)));
changedMap.insert("TQCheckBox", TQT_SIGNAL(stateChanged(int)));
changedMap.insert("TQPushButton", TQT_SIGNAL(stateChanged(int)));
changedMap.insert("TQRadioButton", TQT_SIGNAL(stateChanged(int)));
// We can only store one thing, so you can't have
// a ButtonGroup that is checkable.
changedMap.insert(TQBUTTONGROUP_OBJECT_NAME_STRING, TQT_SIGNAL(clicked(int)));
changedMap.insert(TQGROUPBOX_OBJECT_NAME_STRING, TQT_SIGNAL(toggled(bool)));
changedMap.insert(TQCOMBOBOX_OBJECT_NAME_STRING, TQT_SIGNAL(activated (int)));
changedMap.insert("TQButtonGroup", TQT_SIGNAL(clicked(int)));
changedMap.insert("TQGroupBox", TQT_SIGNAL(toggled(bool)));
changedMap.insert("TQComboBox", TQT_SIGNAL(activated (int)));
//qsqlproperty map doesn't store the text, but the value!
//changedMap.insert(TQCOMBOBOX_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged(const TQString &)));
changedMap.insert(TQDATEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(const TQDate &)));
changedMap.insert(TQDATETIMEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(const TQDateTime &)));
changedMap.insert(TQDIAL_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged (int)));
changedMap.insert(TQLINEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged(const TQString &)));
changedMap.insert(TQSLIDER_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(int)));
changedMap.insert(TQSPINBOX_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(int)));
changedMap.insert(TQTIMEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(const TQTime &)));
changedMap.insert(TQTEXTEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged()));
changedMap.insert(TQTEXTBROWSER_OBJECT_NAME_STRING, TQT_SIGNAL(sourceChanged(const TQString &)));
changedMap.insert(TQMULTILINEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged()));
changedMap.insert(TQLISTBOX_OBJECT_NAME_STRING, TQT_SIGNAL(selectionChanged()));
changedMap.insert(TQTABWIDGET_OBJECT_NAME_STRING, TQT_SIGNAL(currentChanged(TQWidget *)));
//changedMap.insert("TQComboBox", TQT_SIGNAL(textChanged(const TQString &)));
changedMap.insert("TQDateEdit", TQT_SIGNAL(valueChanged(const TQDate &)));
changedMap.insert("TQDateTimeEdit", TQT_SIGNAL(valueChanged(const TQDateTime &)));
changedMap.insert("TQDial", TQT_SIGNAL(valueChanged (int)));
changedMap.insert("TQLineEdit", TQT_SIGNAL(textChanged(const TQString &)));
changedMap.insert("TQSlider", TQT_SIGNAL(valueChanged(int)));
changedMap.insert("TQSpinBox", TQT_SIGNAL(valueChanged(int)));
changedMap.insert("TQTimeEdit", TQT_SIGNAL(valueChanged(const TQTime &)));
changedMap.insert("TQTextEdit", TQT_SIGNAL(textChanged()));
changedMap.insert("TQTextBrowser", TQT_SIGNAL(sourceChanged(const TQString &)));
changedMap.insert("TQMultiLineEdit", TQT_SIGNAL(textChanged()));
changedMap.insert("TQListBox", TQT_SIGNAL(selectionChanged()));
changedMap.insert("TQTabWidget", TQT_SIGNAL(currentChanged(TQWidget *)));
// KDE
changedMap.insert( "KComboBox", TQT_SIGNAL(activated (int)));
@ -218,7 +218,7 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha
kdWarning(178) << "A widget named '" << widgetName << "' was found but there is no setting named '" << configId << "'" << endl;
}
}
else if (childWidget->inherits(TQLABEL_OBJECT_NAME_STRING))
else if (childWidget->inherits("TQLabel"))
{
TQLabel *label = static_cast<TQLabel *>(childWidget);
TQWidget *buddy = label->buddy();
@ -238,8 +238,8 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha
TQMap<TQString, TQCString>::const_iterator changedIt = changedMap.find(childWidget->className());
if (changedIt != changedMap.end())
{
if ((!d->insideGroupBox || !childWidget->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING)) &&
!childWidget->inherits(TQGROUPBOX_OBJECT_NAME_STRING))
if ((!d->insideGroupBox || !childWidget->inherits("TQRadioButton")) &&
!childWidget->inherits("TQGroupBox"))
kdDebug(178) << "Widget '" << widgetName << "' (" << childWidget->className() << ") remains unmanaged." << endl;
}
}

22
tdefx/tdestyle.cpp
Unescape View File

@ -263,7 +263,7 @@ TQString TDEStyle::defaultStyle()
void TDEStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget* widget = reinterpret_cast<TQWidget*>(ptr);
if ( d->useFilledFrameWorkaround )
{
@ -287,7 +287,7 @@ void TDEStyle::polish( const TQStyleControlElementData &ceData, ControlElementFl
void TDEStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget* widget = reinterpret_cast<TQWidget*>(ptr);
if ( d->useFilledFrameWorkaround )
{
@ -310,7 +310,7 @@ void TDEStyle::polishPopupMenu( const TQStyleControlElementData &ceData, Control
widgetActionRequest(ceData, elementFlags, ptr, WAR_SetCheckable);
}
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget* widget = reinterpret_cast<TQWidget*>(ptr);
TQPopupMenu *p = dynamic_cast<TQPopupMenu*>(widget);
if (p) {
@ -615,13 +615,13 @@ void TDEStyle::drawPrimitive( TQ_PrimitiveElement pe,
// Check if we are a normal toolbar or a hidden dockwidget.
if ( parent &&
(parent->inherits(TQTOOLBAR_OBJECT_NAME_STRING) || // Normal toolbar
(parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) )) // Collapsed dock
(parent->inherits("TQToolBar") || // Normal toolbar
(parent->inherits("TQMainWindow")) )) // Collapsed dock
// Draw a toolbar handle
drawTDEStylePrimitive( KPE_ToolBarHandle, p, ceData, elementFlags, r, cg, flags, opt, widget );
else if (ceData.widgetObjectTypes.contains(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING))
else if (ceData.widgetObjectTypes.contains("TQDockWindowHandle"))
// Draw a dock window handle
drawTDEStylePrimitive( KPE_DockWindowHandle, p, ceData, elementFlags, r, cg, flags, opt, widget );
@ -1025,9 +1025,9 @@ int TDEStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData
// Check that we are not a normal toolbar or a hidden dockwidget,
// in which case we need to adjust the height for font size
if (widget
&& !(ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING))
&& !(ceData.parentWidgetData.widgetObjectTypes.contains(TQMAINWINDOW_OBJECT_NAME_STRING))
&& (ceData.widgetObjectTypes.contains(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING)) )
&& !(ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar"))
&& !(ceData.parentWidgetData.widgetObjectTypes.contains("TQMainWindow"))
&& (ceData.widgetObjectTypes.contains("TQDockWindowHandle")) )
return widget->fontMetrics().lineSpacing();
else
return TQCommonStyle::pixelMetric(m, ceData, elementFlags, widget);
@ -1086,7 +1086,7 @@ int TDEStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData
// SPLITTER
// ------------------------------------------------------------------------
case PM_SplitterWidth:
if (ceData.widgetObjectTypes.contains(TQDOCKWINDOWRESIZEHANDLE_OBJECT_NAME_STRING))
if (ceData.widgetObjectTypes.contains("TQDockWindowResizeHandle"))
return 8; // ### why do we need 2pix extra?
else
return 6;
@ -1936,7 +1936,7 @@ int TDEStyle::styleHint( TQ_StyleHint sh, const TQStyleControlElementData &ceDat
bool TDEStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
{
if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQObject")) {
TQObject* object = reinterpret_cast<TQObject*>(source);
if ( d->useFilledFrameWorkaround )
{

2
tdehtml/html/html_formimpl.cpp
Unescape View File

@ -964,7 +964,7 @@ class FocusHandleWidget : public TQWidget
{
public:
void focusNextPrev(bool n) {
if (!focusNextPrevChild(n) && inherits(TQTEXTEDIT_OBJECT_NAME_STRING))
if (!focusNextPrevChild(n) && inherits("TQTextEdit"))
TQWidget::focusNextPrevChild(n);
}
};

4
tdehtml/rendering/render_frames.cpp
Unescape View File

@ -674,7 +674,7 @@ RenderFrame::RenderFrame( DOM::HTMLFrameElementImpl *frame )
void RenderFrame::slotViewCleared()
{
if(m_widget->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING)) {
if(m_widget->inherits("TQScrollView")) {
#ifdef DEBUG_LAYOUT
kdDebug(6031) << "frame is a scrollview!" << endl;
#endif
@ -989,7 +989,7 @@ void RenderPartObject::layout( )
void RenderPartObject::slotViewCleared()
{
if(m_widget->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING) ) {
if(m_widget->inherits("TQScrollView") ) {
#ifdef DEBUG_LAYOUT
kdDebug(6031) << "iframe is a scrollview!" << endl;
#endif

16
tdehtml/tdehtml_ext.cpp
Unescape View File

@ -114,7 +114,7 @@ void TDEHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget )
connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
this, TQT_SLOT( updateEditActions() ) );
if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) || m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) )
if ( m_editableFormWidget->inherits( "TQLineEdit" ) || m_editableFormWidget->inherits( "TQTextEdit" ) )
connect( m_editableFormWidget, TQT_SIGNAL( selectionChanged() ),
this, TQT_SLOT( updateEditActions() ) );
@ -139,7 +139,7 @@ void TDEHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ )
if ( oldWidget )
{
if ( oldWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) || oldWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) )
if ( oldWidget->inherits( "TQLineEdit" ) || oldWidget->inherits( "TQTextEdit" ) )
disconnect( oldWidget, TQT_SIGNAL( selectionChanged() ),
this, TQT_SLOT( updateEditActions() ) );
}
@ -200,9 +200,9 @@ void TDEHTMLPartBrowserExtension::cut()
if ( !m_editableFormWidget )
return;
if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) )
if ( m_editableFormWidget->inherits( "TQLineEdit" ) )
static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->cut();
else if ( m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) )
else if ( m_editableFormWidget->inherits( "TQTextEdit" ) )
static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->cut();
}
@ -253,9 +253,9 @@ void TDEHTMLPartBrowserExtension::copy()
}
else
{
if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) )
if ( m_editableFormWidget->inherits( "TQLineEdit" ) )
static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->copy();
else if ( m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) )
else if ( m_editableFormWidget->inherits( "TQTextEdit" ) )
static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->copy();
}
}
@ -303,9 +303,9 @@ void TDEHTMLPartBrowserExtension::paste()
if ( !m_editableFormWidget )
return;
if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) )
if ( m_editableFormWidget->inherits( "TQLineEdit" ) )
static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->paste();
else if ( m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) )
else if ( m_editableFormWidget->inherits( "TQTextEdit" ) )
static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->paste();
}

4
tdehtml/tdehtml_part.cpp
Unescape View File

@ -6876,7 +6876,7 @@ void TDEHTMLPart::slotActiveFrameChanged( KParts::Part *part )
return;
}
// kdDebug(6050) << "TDEHTMLPart::slotActiveFrameChanged d->m_activeFrame=" << d->m_activeFrame << endl;
if ( d->m_activeFrame && d->m_activeFrame->widget() && d->m_activeFrame->widget()->inherits( TQFRAME_OBJECT_NAME_STRING ) )
if ( d->m_activeFrame && d->m_activeFrame->widget() && d->m_activeFrame->widget()->inherits( "TQFrame" ) )
{
TQFrame *frame = static_cast<TQFrame *>( d->m_activeFrame->widget() );
if (frame->frameStyle() != TQFrame::NoFrame)
@ -6904,7 +6904,7 @@ void TDEHTMLPart::slotActiveFrameChanged( KParts::Part *part )
d->m_activeFrame = part;
if ( d->m_activeFrame && d->m_activeFrame->widget()->inherits( TQFRAME_OBJECT_NAME_STRING ) )
if ( d->m_activeFrame && d->m_activeFrame->widget()->inherits( "TQFrame" ) )
{
TQFrame *frame = static_cast<TQFrame *>( d->m_activeFrame->widget() );
if (frame->frameStyle() != TQFrame::NoFrame)

2
tdehtml/tdehtmlview.cpp
Unescape View File

@ -897,7 +897,7 @@ void TDEHTMLView::layout()
void TDEHTMLView::closeChildDialogs()
{
TQObjectList *dlgs = queryList(TQDIALOG_OBJECT_NAME_STRING);
TQObjectList *dlgs = queryList("TQDialog");
for (TQObject *dlg = dlgs->first(); dlg; dlg = dlgs->next())
{
KDialogBase* dlgbase = dynamic_cast<KDialogBase *>( dlg );

4
tdeio/kssl/ksslcertificatecache.cpp
Unescape View File

@ -286,7 +286,7 @@ TQStringList KSSLCertificateCache::getHostList(KSSLCertificate& cert) {
"cacheGetHostList(KSSLCertificate)",
data, rettype, retval);
if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) {
if (rc && rettype == "TQStringList") {
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_OBJECT_NAME_STRING) {
if (rc && rettype == "TQStringList") {
TQDataStream retStream(retval, IO_ReadOnly);
TQStringList drc;
retStream >> drc;

4
tdeio/kssl/ksslsigners.cpp
Unescape View File

@ -199,7 +199,7 @@ TQStringList KSSLSigners::list() {
"caList()",
data, rettype, retval);
if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) {
if (rc && rettype == "TQStringList") {
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_OBJECT_NAME_STRING) {
if (rc && rettype == "TQString") {
TQDataStream retStream(retval, IO_ReadOnly);
retStream >> drc;
}

2
tdeio/misc/kpac/proxyscout.cpp
Unescape View File

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

2
tdeio/tdefile/kpropertiesdialog.cpp
Unescape View File

@ -1336,7 +1336,7 @@ void KFilePropsPlugin::applyChanges()
kdDebug(250) << "KFilePropsPlugin::applyChanges" << endl;
if (nameArea->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
if (nameArea->inherits("TQLineEdit"))
{
TQString n = ((TQLineEdit *) nameArea)->text();
// Remove trailing spaces (#4345)

14
tdeio/tdefile/tdefilemetainfowidget.cpp
Unescape View File

@ -196,7 +196,7 @@ TQWidget* KFileMetaInfoWidget::makeIntWidget()
if (m_validator)
{
if (m_validator->inherits(TQINTVALIDATOR_OBJECT_NAME_STRING))
if (m_validator->inherits("TQIntValidator"))
{
sb->setMinValue(static_cast<TQIntValidator*>(m_validator)->bottom());
sb->setMaxValue(static_cast<TQIntValidator*>(m_validator)->top());
@ -301,7 +301,7 @@ void KFileMetaInfoWidget::reparentValidator( TQWidget *widget,
void KFileMetaInfoWidget::slotChanged(bool value)
{
Q_ASSERT(m_widget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING));
Q_ASSERT(m_widget->inherits("TQComboBox"));
m_value = TQVariant(value);
emit valueChanged(m_value);
m_dirty = true;
@ -309,7 +309,7 @@ void KFileMetaInfoWidget::slotChanged(bool value)
void KFileMetaInfoWidget::slotChanged(int value)
{
Q_ASSERT(m_widget->inherits(TQSPINBOX_OBJECT_NAME_STRING));
Q_ASSERT(m_widget->inherits("TQSpinBox"));
m_value = TQVariant(value);
emit valueChanged(m_value);
m_dirty = true;
@ -342,7 +342,7 @@ void KFileMetaInfoWidget::slotLineEditChanged(const TQString& value)
// that may be a little expensive for long texts, but what can we do?
void KFileMetaInfoWidget::slotMultiLineEditChanged()
{
Q_ASSERT(m_widget->inherits(TQTEXTEDIT_OBJECT_NAME_STRING));
Q_ASSERT(m_widget->inherits("TQTextEdit"));
m_value = TQVariant( static_cast<const TQTextEdit*>( sender() )->text() );
emit valueChanged(m_value);
m_dirty = true;
@ -350,7 +350,7 @@ void KFileMetaInfoWidget::slotMultiLineEditChanged()
void KFileMetaInfoWidget::slotDateChanged(const TQDate& value)
{
Q_ASSERT(m_widget->inherits(TQDATEEDIT_OBJECT_NAME_STRING));
Q_ASSERT(m_widget->inherits("TQDateEdit"));
m_value = TQVariant(value);
emit valueChanged(m_value);
m_dirty = true;
@ -358,7 +358,7 @@ void KFileMetaInfoWidget::slotDateChanged(const TQDate& value)
void KFileMetaInfoWidget::slotTimeChanged(const TQTime& value)
{
Q_ASSERT(m_widget->inherits(TQTIMEEDIT_OBJECT_NAME_STRING));
Q_ASSERT(m_widget->inherits("TQTimeEdit"));
m_value = TQVariant(value);
emit valueChanged(m_value);
m_dirty = true;
@ -366,7 +366,7 @@ void KFileMetaInfoWidget::slotTimeChanged(const TQTime& value)
void KFileMetaInfoWidget::slotDateTimeChanged(const TQDateTime& value)
{
Q_ASSERT(m_widget->inherits(TQDATETIMEEDIT_OBJECT_NAME_STRING));
Q_ASSERT(m_widget->inherits("TQDateTimeEdit"));
m_value = TQVariant(value);
emit valueChanged(m_value);
m_dirty = true;

4
tdeio/tdeio/kscan.h
Unescape 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_OBJECT_NAME_STRING,
const char* classname = "TQObject",
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_OBJECT_NAME_STRING,
const char* className = "TQObject",
const TQStringList &args = TQStringList() );

2
tdeio/tdeio/netaccess.cpp
Unescape View File

@ -487,7 +487,7 @@ bool NetAccess::synchronousRunInternal( Job* job, TQWidget* window, TQByteArray*
TQMetaObject *meta = job->metaObject();
static const char dataSignal[] = "data(TDEIO::Job*,const " TQBYTEARRAY_OBJECT_NAME_STRING "&)";
static const char dataSignal[] = "data(TDEIO::Job*,const " "TQByteArray" "&)";
if ( meta->findSignal( dataSignal ) != -1 ) {
connect( job, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)),
this, TQT_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) );

6
tdemdi/tdemdi/tabwidget.cpp
Unescape View File

@ -91,7 +91,7 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e )
// child and its children
TQObject* pLostChild = TQT_TQOBJECT(((TQChildEvent*)e)->child());
if ((pLostChild != 0L) && (pLostChild->isWidgetType())) {
TQObjectList *list = pLostChild->queryList( TQWIDGET_OBJECT_NAME_STRING );
TQObjectList *list = pLostChild->queryList( "TQWidget" );
list->insert(0, pLostChild); // add the lost child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all lost child widgets
TQObject * o;
@ -114,7 +114,7 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e )
TQWidget* pNewWidget = (TQWidget*)pNewChild;
if (pNewWidget->testWFlags((WFlags)(WType_Dialog | WShowModal)))
return false;
TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING );
TQObjectList *list = pNewWidget->queryList( "TQWidget" );
list->insert(0, pNewChild); // add the new child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all new child widgets
TQObject * o;
@ -138,7 +138,7 @@ void TabWidget::childDestroyed()
const TQObject* pLostChild = TQT_TQOBJECT_CONST(sender());
if ((pLostChild != 0L) && (pLostChild->isWidgetType()))
{
TQObjectList *list = ((TQObject*)(pLostChild))->queryList(TQWIDGET_OBJECT_NAME_STRING);
TQObjectList *list = ((TQObject*)(pLostChild))->queryList("TQWidget");
list->insert(0, pLostChild); // add the lost child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all lost child widgets
TQObject * obj;

14
tdemdi/tdemdichildfrm.cpp
Unescape View File

@ -752,7 +752,7 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
// memorize the focuses in a dictionary because they will get lost during reparenting
TQDict<TQ_FocusPolicy>* pFocPolDict = new TQDict<TQ_FocusPolicy>;
pFocPolDict->setAutoDelete( true );
TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING );
TQObjectList *list = m_pClient->queryList( "TQWidget" );
TQObjectListIt it( *list ); // iterate over the buttons
TQObject * obj;
int i = 1;
@ -833,7 +833,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
m_pClient->setMaximumSize( maxs.width(), maxs.height() );
// remember the focus policies using the dictionary and reset them
TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING );
TQObjectList *list = m_pClient->queryList( "TQWidget" );
TQObjectListIt it( *list ); // iterate over all child widgets of child frame
TQObject * obj;
TQWidget* firstFocusableChildWidget = 0;
@ -887,7 +887,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict )
{
// reset the focus policies for all widgets in the view (take them from the dictionary)
TQObjectList* list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING );
TQObjectList* list = m_pClient->queryList( "TQWidget" );
TQObjectListIt it( *list ); // iterate over all child widgets of child frame
TQObject* obj;
while ( ( obj = it.current() ) != 0 )
@ -899,7 +899,7 @@ void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict )
if ( pFocPol != 0 )
widg->setFocusPolicy( *pFocPol );
if ( !( widg->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) )
if ( !( widg->inherits( "TQPopupMenu" ) ) )
widg->installEventFilter( this );
}
@ -936,7 +936,7 @@ TQDict<TQ_FocusPolicy>* KMdiChildFrm::unlinkChildren()
TQDict<TQ_FocusPolicy>* pFocPolDict = new TQDict<TQ_FocusPolicy>;
pFocPolDict->setAutoDelete( true );
TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING );
TQObjectList *list = m_pClient->queryList( "TQWidget" );
TQObjectListIt it( *list ); // iterate over all child widgets of child frame
TQObject * obj;
int i = 1;
@ -1155,7 +1155,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
// if we lost a child we uninstall ourself as event filter for the lost
// child and its children
TQObject* pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e )->child());
if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits(TQWIDGET_OBJECT_NAME_STRING))*/ )
if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits("TQWidget"))*/ )
{
TQObjectList* list = pLostChild->queryList();
list->insert( 0, pLostChild ); // add the lost child to the list too, just to save code
@ -1180,7 +1180,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
if ( ( pNewChild != 0L ) && ::tqqt_cast<TQWidget*>( pNewChild ) )
{
TQWidget * pNewWidget = TQT_TQWIDGET( pNewChild );
TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING );
TQObjectList *list = pNewWidget->queryList( "TQWidget" );
list->insert( 0, pNewChild ); // add the new child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all new child widgets
TQObject * obj;

10
tdemdi/tdemdichildview.cpp
Unescape View File

@ -496,7 +496,7 @@ void KMdiChildView::slot_childDestroyed()
const TQObject * pLostChild = TQT_TQOBJECT_CONST(sender());
if ( pLostChild && ( pLostChild->isWidgetType() ) )
{
TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( TQWIDGET_OBJECT_NAME_STRING );
TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( "TQWidget" );
list->insert( 0, pLostChild ); // add the lost child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all lost child widgets
TQObject* obj;
@ -545,7 +545,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
{
if ( obj->isWidgetType() )
{
TQObjectList * list = queryList( TQWIDGET_OBJECT_NAME_STRING );
TQObjectList * list = queryList( "TQWidget" );
if ( list->find( obj ) != -1 )
m_focusedChildWidget = ( TQWidget* ) obj;
@ -569,7 +569,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
TQObject * pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
if ( ( pLostChild != 0L ) && ( pLostChild->isWidgetType() ) )
{
TQObjectList * list = pLostChild->queryList( TQWIDGET_OBJECT_NAME_STRING );
TQObjectList * list = pLostChild->queryList( "TQWidget" );
list->insert( 0, pLostChild ); // add the lost child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all lost child widgets
TQObject * o;
@ -602,7 +602,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
TQWidget * pNewWidget = ( TQWidget* ) pNewChild;
if ( pNewWidget->testWFlags( (WFlags)(WType_Dialog | WShowModal) ) )
return false;
TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING );
TQObjectList *list = pNewWidget->queryList( "TQWidget" );
list->insert( 0, pNewChild ); // add the new child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all new child widgets
TQObject * o;
@ -647,7 +647,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
/** Switches interposing in event loop of all current child widgets off. */
void KMdiChildView::removeEventFilterForAllChildren()
{
TQObjectList* list = queryList( TQWIDGET_OBJECT_NAME_STRING );
TQObjectList* list = queryList( "TQWidget" );
TQObjectListIt it( *list ); // iterate over all child widgets
TQObject* obj;
while ( ( obj = it.current() ) != 0 )

2
tdemdi/tdemdifocuslist.cpp
Unescape View File

@ -34,7 +34,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w )
w->setFocusPolicy( TQ_ClickFocus );
kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding toplevel" << endl;
connect( w, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) );
TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
TQObjectList *l = w->queryList( "TQWidget" );
TQObjectListIt it( *l );
TQObject *obj;
while ( ( obj = it.current() ) != 0 )

2
tdeparts/factory.h
Unescape 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_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
virtual TQObject *createObject( TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", 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.

2
tdeparts/partmanager.cpp
Unescape View File

@ -208,7 +208,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
if ( !d->m_managedTopLevelWidgets.containsRef( w->topLevelWidget() ) )
return false;
if ( d->m_bIgnoreScrollBars && w->inherits( TQSCROLLBAR_OBJECT_NAME_STRING ) )
if ( d->m_bIgnoreScrollBars && w->inherits( "TQScrollBar" ) )
return false;
if ( mev ) // mouse press or mouse double-click event

8
tdeprint/kprintdialog.cpp
Unescape View File

@ -484,12 +484,12 @@ void KPrintDialog::setDialogPages(TQPtrList<KPrintDialogPage> *pages)
d->m_pages.append(pages->take(0));
d->m_pages.first()->reparent(d->m_dummy, TQPoint(0,0));
d->m_pages.first()->show();
delete d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING);
delete d->m_dummy->child("TabWidget", "TQTabWidget");
}
else
{
// more than one page.
TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING)));
TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget")));
if (!tabs)
{
// TQTabWidget doesn't exist. Create it and reparent all
@ -822,7 +822,7 @@ void KPrintDialog::slotWizard()
void KPrintDialog::reload()
{
// remove printer dependent pages (usually from plugin)
TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING)));
TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget")));
for (uint i=0; i<d->m_pages.count(); i++)
if (d->m_pages.at(i)->onlyRealPrinters())
{
@ -951,7 +951,7 @@ void KPrintDialog::enableDialogPage( int index, bool flag )
if ( d->m_pages.count() > 1 )
{
TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING)));
TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget")));
tabs->setTabEnabled( d->m_pages.at( index ), flag );
}
else

2
tdeprint/lpd/kmlpdfactory.h
Unescape View File

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

2
tdeprint/management/kiconselectaction.cpp
Unescape View File

@ -76,7 +76,7 @@ void TDEIconSelectAction::setItems(const TQStringList& lst, const TQStringList&
int TDEIconSelectAction::plug(TQWidget* widget, int index)
{
int value(-1);
if (widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING))
if (widget->inherits("TQPopupMenu"))
{
createPopupMenu();
value = TDESelectAction::plug(widget, index);

2
tdeprint/tools/escputil/escpwidget.cpp
Unescape 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_OBJECT_NAME_STRING, const TQStringList& args = TQStringList())
TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = "TQObject", const TQStringList& args = TQStringList())
{
Q_UNUSED(className);
KDialogBase *dlg = new KDialogBase(TQT_TQWIDGET(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close);

10
tdestyles/asteroid/asteroid.cpp
Unescape View File

@ -97,7 +97,7 @@ AsteroidStyle::~AsteroidStyle()
void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *w = reinterpret_cast<TQWidget*>(ptr);
/* Screwing with the palette is fun! and required in order to make it feel
authentic. -clee */
@ -124,7 +124,7 @@ void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlEleme
}
}
if (ceData.widgetObjectTypes.contains(TQPUSHBUTTON_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQPushButton")) {
installObjectEventHandler(ceData, elementFlags, ptr, this);
}
else {
@ -1985,7 +1985,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
p->drawRect(hr);
bool draw_skinny_frame = false;
// if (!ceData.widgetObjectTypes.contains(TQCOMBOBOX_OBJECT_NAME_STRING)) draw_skinny_frame = true;
// if (!ceData.widgetObjectTypes.contains("TQComboBox")) draw_skinny_frame = true;
if (ceData.comboBoxListBoxFlags & CEF_IsVisible) draw_skinny_frame = true;
if (draw_skinny_frame) {
p->setPen(cg.mid());
@ -2289,7 +2289,7 @@ int AsteroidStyle::pixelMetric(PixelMetric pm, const TQStyleControlElementData &
}
case PM_DefaultFrameWidth: {
if (ceData.widgetObjectTypes.contains(TQPOPUPMENU_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQPopupMenu")) {
return 3;
} else {
return TDEStyle::pixelMetric(pm, ceData, elementFlags, w);
@ -2618,7 +2618,7 @@ bool AsteroidStyle::objectEventHandler( const TQStyleControlElementData &ceData,
/* Win2K has this interesting behaviour where it sets the current
default button to whatever pushbutton the user presses the mouse
on. I _think_ this emulates that properly. -clee */
if (ceData.widgetObjectTypes.contains(TQPUSHBUTTON_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQPushButton")) {
if (e->type() == TQEvent::MouseButtonPress) {
widgetActionRequest(ceData, elementFlags, source, WAR_SetDefault);
}

24
tdestyles/highcolor/highcolor.cpp
Unescape View File

@ -190,19 +190,19 @@ HighColorStyle::~HighColorStyle()
void HighColorStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
// Put in order of highest occurrence to maximise hit rate
if (widget->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) {
if (widget->inherits("TQPushButton")) {
installObjectEventHandler(ceData, elementFlags, ptr, this);
} else if (widget->inherits(TQMENUBAR_OBJECT_NAME_STRING) || widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) {
} else if (widget->inherits("TQMenuBar") || widget->inherits("TQPopupMenu")) {
widget->setBackgroundMode(TQWidget::NoBackground);
} else if (type == HighColor && widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) {
} else if (type == HighColor && widget->inherits("TQToolBarExtensionWidget")) {
installObjectEventHandler(ceData, elementFlags, ptr, this);
} else if ( !qstrcmp( widget->name(), kdeToolbarWidget) ) {
widget->setBackgroundMode( NoBackground ); // We paint the whole background.
installObjectEventHandler(ceData, elementFlags, ptr, this);
} else if (widget->inherits(TQTOOLBOXBUTTON_OBJECT_NAME_STRING)) {
} else if (widget->inherits("TQToolBoxButton")) {
TQFont font = widget->font();
font.setBold(true);
widget->setFont(font);
@ -215,14 +215,14 @@ void HighColorStyle::polish(const TQStyleControlElementData &ceData, ControlElem
void HighColorStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
if (widget->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) {
if (widget->inherits("TQPushButton")) {
removeObjectEventHandler(ceData, elementFlags, ptr, this);
}
else if (widget->inherits(TQMENUBAR_OBJECT_NAME_STRING) || widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) {
else if (widget->inherits("TQMenuBar") || widget->inherits("TQPopupMenu")) {
widget->setBackgroundMode(TQWidget::PaletteBackground);
} else if (type == HighColor && widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) {
} else if (type == HighColor && widget->inherits("TQToolBarExtensionWidget")) {
removeObjectEventHandler(ceData, elementFlags, ptr, this);
} else if ( !qstrcmp( widget->name(), kdeToolbarWidget) ) {
removeObjectEventHandler(ceData, elementFlags, ptr, this);
@ -1683,7 +1683,7 @@ void HighColorStyle::drawComplexControl( TQ_ComplexControl control,
}
else if (!ceData.parentWidgetData.widgetObjectTypes.isEmpty())
{
if (ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING))
if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar"))
{
TQToolBar* parent = (TQToolBar*)widget->parent();
TQRect pr = parent->rect();
@ -1692,7 +1692,7 @@ void HighColorStyle::drawComplexControl( TQ_ComplexControl control,
parent->orientation() == Qt::Vertical,
r.x(), r.y(), pr.width()-2, pr.height()-2);
}
else if (ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING))
else if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBarExtensionWidget"))
{
TQWidget* parent = (TQWidget*)widget->parent();
TQToolBar* toolbar = (TQToolBar*)parent->parent();
@ -2016,7 +2016,7 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData
TQToolBar* toolbar;
if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING))
if (ceData.widgetObjectTypes.contains("TQObject"))
{
TQObject* object = reinterpret_cast<TQObject*>(source);

20
tdestyles/highcontrast/highcontrast.cpp
Unescape View File

@ -154,14 +154,14 @@ void HighContrastStyle::polish( TQPalette& pal )
void HighContrastStyle::polish (const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
if (widget->inherits (TQBUTTON_OBJECT_NAME_STRING)
|| widget->inherits (TQCOMBOBOX_OBJECT_NAME_STRING)
|| widget->inherits (TQSPINWIDGET_OBJECT_NAME_STRING)
|| widget->inherits (TQLINEEDIT_OBJECT_NAME_STRING)
|| widget->inherits (TQTEXTEDIT_OBJECT_NAME_STRING))
if (widget->inherits ("TQButton")
|| widget->inherits ("TQComboBox")
|| widget->inherits ("TQSpinWidget")
|| widget->inherits ("TQLineEdit")
|| widget->inherits ("TQTextEdit"))
{
installObjectEventHandler(ceData, elementFlags, ptr, this);
@ -181,9 +181,9 @@ void HighContrastStyle::polish (const TQStyleControlElementData &ceData, Control
void HighContrastStyle::unPolish (const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
if (widget->inherits (TQWIDGET_OBJECT_NAME_STRING) || widget->inherits (TQCOMBOBOX_OBJECT_NAME_STRING) || widget->inherits (TQSPINWIDGET_OBJECT_NAME_STRING) || widget->inherits (TQLINEEDIT_OBJECT_NAME_STRING) || widget->inherits (TQTEXTEDIT_OBJECT_NAME_STRING)) {
if (widget->inherits ("TQWidget") || widget->inherits ("TQComboBox") || widget->inherits ("TQSpinWidget") || widget->inherits ("TQLineEdit") || widget->inherits ("TQTextEdit")) {
installObjectEventHandler(ceData, elementFlags, ptr, this);
}
}
@ -724,7 +724,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe,
case KPE_SliderGroove: {
setColorsText (p, cg, flags);
TQRect r2 (r);
if (ceData.widgetObjectTypes.contains(TQSLIDER_OBJECT_NAME_STRING))
if (ceData.widgetObjectTypes.contains("TQSlider"))
{
if (ceData.orientation == TQt::Horizontal)
{
@ -1622,7 +1622,7 @@ int HighContrastStyle::pixelMetric(PixelMetric m, const TQStyleControlElementDat
}
case PM_DefaultFrameWidth: {
if (widget && (ceData.widgetObjectTypes.contains (TQLINEEDIT_OBJECT_NAME_STRING) || ceData.widgetObjectTypes.contains (TQTEXTEDIT_OBJECT_NAME_STRING)))
if (widget && (ceData.widgetObjectTypes.contains ("TQLineEdit") || ceData.widgetObjectTypes.contains ("TQTextEdit")))
return 2*basicLineWidth;
else
return basicLineWidth;

48
tdestyles/keramik/keramik.cpp
Unescape View File

@ -329,7 +329,7 @@ KeramikStyle::~KeramikStyle()
void KeramikStyle::applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr)
{
if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQApplication")) {
TQApplication *app = reinterpret_cast<TQApplication*>(ptr);
if (!qstrcmp(app->argv()[0], "kicker")) {
kickerMode = true;
@ -339,28 +339,28 @@ void KeramikStyle::applicationPolish(const TQStyleControlElementData &ceData, Co
void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
// Put in order of highest occurrence to maximise hit rate
if ( widget->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) || widget->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) )
if ( widget->inherits( "TQPushButton" ) || widget->inherits( "TQComboBox" ) || widget->inherits("TQToolButton") )
{
installObjectEventHandler(ceData, elementFlags, ptr, this);
if ( widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) )
if ( widget->inherits( "TQComboBox" ) )
widget->setBackgroundMode( NoBackground );
}
else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) || widget->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
else if ( widget->inherits( "TQMenuBar" ) || widget->inherits( "TQPopupMenu" ) )
widget->setBackgroundMode( NoBackground );
else if ( widget->parentWidget() &&
( ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) && widget->parentWidget()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) ||
( ( widget->inherits( "TQListBox" ) && widget->parentWidget()->inherits( "TQComboBox" ) ) ||
widget->inherits( "TDECompletionBox" ) ) ) {
TQListBox* listbox = (TQListBox*) widget;
listbox->setLineWidth( 4 );
listbox->setBackgroundMode( NoBackground );
installObjectEventHandler(ceData, elementFlags, ptr, this);
} else if (widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) {
} else if (widget->inherits("TQToolBarExtensionWidget")) {
installObjectEventHandler(ceData, elementFlags, ptr, this);
//widget->setBackgroundMode( NoBackground );
}
@ -384,28 +384,28 @@ void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
//### TODO: This needs major cleanup (and so does polish() )
if ( widget->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) )
if ( widget->inherits( "TQPushButton" ) || widget->inherits( "TQComboBox" ) )
{
if ( widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) )
if ( widget->inherits( "TQComboBox" ) )
widget->setBackgroundMode( PaletteButton );
removeObjectEventHandler(ceData, elementFlags, ptr, this);
}
else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) || widget->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
else if ( widget->inherits( "TQMenuBar" ) || widget->inherits( "TQPopupMenu" ) )
widget->setBackgroundMode( PaletteBackground );
else if ( widget->parentWidget() &&
( ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) && widget->parentWidget()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) ||
( ( widget->inherits( "TQListBox" ) && widget->parentWidget()->inherits( "TQComboBox" ) ) ||
widget->inherits( "TDECompletionBox" ) ) ) {
TQListBox* listbox = (TQListBox*) widget;
listbox->setLineWidth( 1 );
listbox->setBackgroundMode( PaletteBackground );
removeObjectEventHandler(ceData, elementFlags, ptr, this);
widget->clearMask();
} else if (widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) {
} else if (widget->inherits("TQToolBarExtensionWidget")) {
removeObjectEventHandler(ceData, elementFlags, ptr, this);
}
else if ( !qstrcmp( widget->name(), kdeToolbarWidget ) ) {
@ -1283,7 +1283,7 @@ void KeramikStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
TQToolBar* parent = 0;
if (widget && widget->parent() && widget->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING))
if (widget && widget->parent() && widget->parent()->inherits("TQToolBar"))
parent = static_cast<TQToolBar*>(TQT_TQWIDGET(widget->parent()));
renderToolbarEntryBackground(p, parent, r, cg, (flags & Style_Horizontal));
@ -1414,7 +1414,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
}
else
{
if (ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING))
if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar"))
toolbarBlendWidget = widget;
drawPrimitive( PE_ButtonCommand, p, ceData, elementFlags, r, cg, flags );
@ -1520,7 +1520,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
case CE_ToolButtonLabel:
{
bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains( TQTOOLBAR_OBJECT_NAME_STRING );
bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains( "TQToolBar" );
TQRect nr = r;
if (!onToolbar)
@ -1588,7 +1588,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
case CE_DockWindowEmptyArea:
{
TQRect pr = r;
if (ceData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING))
if (ceData.widgetObjectTypes.contains("TQToolBar"))
{
const TQToolBar* tb = static_cast<const TQToolBar*>(widget);
if (tb->place() == TQDockWindow::OutsideDock)
@ -2029,7 +2029,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
if (controls == SC_All)
{
//Double-buffer only when we are in the slower full-blend mode
if ( ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING) || !qstrcmp(ceData.parentWidgetData.name.ascii(), kdeToolbarWidget) )
if ( ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar") || !qstrcmp(ceData.parentWidgetData.name.ascii(), kdeToolbarWidget) )
{
buf = new TQPixmap( r.width(), r.height() );
br.setX(0);
@ -2257,10 +2257,10 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
// TOOLBUTTON
// -------------------------------------------------------------------
case CC_ToolButton: {
bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING);
bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar");
bool onExtender = !onToolbar &&
ceData.parentWidgetData.widgetObjectTypes.contains( TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING) &&
widget && widget->parentWidget()->parentWidget()->inherits( TQTOOLBAR_OBJECT_NAME_STRING );
ceData.parentWidgetData.widgetObjectTypes.contains( "TQToolBarExtensionWidget") &&
widget && widget->parentWidget()->parentWidget()->inherits( "TQToolBar" );
bool onControlButtons = false;
if (!onToolbar && !onExtender && !ceData.parentWidgetData.widgetObjectTypes.isEmpty() &&
@ -2437,7 +2437,7 @@ int KeramikStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ce
case PM_TabBarTabShiftVertical:
{
if (ceData.widgetObjectTypes.contains(TQTABBAR_OBJECT_NAME_STRING))
if (ceData.widgetObjectTypes.contains("TQTabBar"))
{
if (ceData.tabBarData.shape == TQTabBar::RoundedBelow ||
ceData.tabBarData.shape == TQTabBar::TriangularBelow)
@ -2492,7 +2492,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
case CT_ToolButton:
{
bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( TQTOOLBAR_OBJECT_NAME_STRING );
bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( "TQToolBar" );
if (!onToolbar) //Behaves like a button, so scale appropriately to the border
{
int w = contentSize.width();
@ -2795,7 +2795,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
if (TDEStyle::objectEventHandler( ceData, elementFlags, source, event ))
return true;
if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQObject")) {
TQObject* object = reinterpret_cast<TQObject*>(source);
if ( !object->isWidgetType() ) return false;

42
tdestyles/klegacy/klegacystyle.cpp
Unescape View File

@ -1898,23 +1898,23 @@ void KLegacyStyle::polish(TQWidget *widget) {
bool immediateRender = false;
bool bgPixmap = false;
if (widget->inherits(TQBUTTON_OBJECT_NAME_STRING)) {
if (widget->inherits("TQButton")) {
metaobject = TQButton::staticMetaObject();
eventFilter = true;
}
if (widget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) {
if (widget->inherits("TQComboBox")) {
metaobject = TQComboBox::staticMetaObject();
eventFilter = true;
}
if (widget->inherits(TQSCROLLBAR_OBJECT_NAME_STRING)) {
if (widget->inherits("TQScrollBar")) {
metaobject = TQScrollBar::staticMetaObject();
eventFilter = true;
mouseTrack = true;
}
if (widget->inherits(TQMENUBAR_OBJECT_NAME_STRING)) {
if (widget->inherits("TQMenuBar")) {
eventFilter = true;
immediateRender = true;
@ -1930,7 +1930,7 @@ void KLegacyStyle::polish(TQWidget *widget) {
widget->setBackgroundMode(TQWidget::PaletteBackground);
}
if (widget->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) {
if (widget->inherits("TQToolBar")) {
metaobject = TQToolBar::staticMetaObject();
eventFilter = true;
@ -1944,7 +1944,7 @@ void KLegacyStyle::polish(TQWidget *widget) {
widget->setBackgroundMode(TQWidget::PaletteBackground);
}
if (widget->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) {
if (widget->inherits("TQLineEdit")) {
metaobject = TQLineEdit::staticMetaObject();
eventFilter = true;
@ -1968,7 +1968,7 @@ void KLegacyStyle::polish(TQWidget *widget) {
detail = "base";
}
if (widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) {
if (widget->inherits("TQPopupMenu")) {
tqDebug("polishing popup '%s'", widget->className());
metaobject = TQPopupMenu::staticMetaObject();
widget->setBackgroundMode(TQWidget::PaletteBackground);
@ -2544,7 +2544,7 @@ void KLegacyStyle::drawComboButton(TQPainter *p, int x, int y, int w, int h,
key.data.state = KLegacy::Normal;
key.data.shadow = KLegacy::Out;
if (priv->lastWidget && priv->lastWidget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING))
if (priv->lastWidget && priv->lastWidget->inherits("TQComboBox"))
key.data.state = KLegacy::Prelight;
TQPixmap *pix = gobj->draw(key, w, h, "optionmenu");
@ -3081,7 +3081,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
{
TQWidget *w = (TQWidget *) obj;
if (w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) && w->width() < 700) {
if (w->inherits("TQPopupMenu") && w->width() < 700) {
GtkObject *gobj = priv->gtkDict.find(TQPopupMenu::staticMetaObject());
if (gobj) {
@ -3151,7 +3151,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
if (p && (! p->isNull()))
w->setBackgroundPixmap(*p);
}
} else if (w->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) {
} else if (w->inherits("TQLineEdit")) {
GtkObject *gobj = priv->gtkDict.find(TQLineEdit::staticMetaObject());
if (gobj) {
@ -3191,8 +3191,8 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
w->setPalette(pal);
}
}
} else if (w->inherits(TQMENUBAR_OBJECT_NAME_STRING) ||
w->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) {
} else if (w->inherits("TQMenuBar") ||
w->inherits("TQToolBar")) {
GtkObject *gobj = priv->gtkDict.find(TQMenuBar::staticMetaObject());
if (gobj) {
@ -3256,13 +3256,13 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
case TQEvent::Enter:
{
if (obj->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING) ||
obj->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) ||
obj->inherits(TQSLIDER_OBJECT_NAME_STRING) ||
obj->inherits(TQSCROLLBAR_OBJECT_NAME_STRING)) {
if (obj->inherits("TQPushButton") ||
obj->inherits("TQComboBox") ||
obj->inherits("TQSlider") ||
obj->inherits("TQScrollBar")) {
priv->lastWidget = (TQWidget *) obj;
priv->lastWidget->repaint(false);
} else if (obj->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING)) {
} else if (obj->inherits("TQRadioButton")) {
TQWidget *w = (TQWidget *) obj;
if (! w->isTopLevel() && w->isEnabled()) {
@ -3290,7 +3290,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
}
}
}
} else if (obj->inherits(TQCHECKBOX_OBJECT_NAME_STRING)) {
} else if (obj->inherits("TQCheckBox")) {
TQWidget *w = (TQWidget *) obj;
if (! w->isTopLevel() && w->isEnabled()) {
@ -3328,8 +3328,8 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
if (obj == priv->lastWidget) {
priv->lastWidget = 0;
((TQWidget *) obj)->repaint(false);
} else if (obj->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING) ||
obj->inherits(TQCHECKBOX_OBJECT_NAME_STRING)) {
} else if (obj->inherits("TQRadioButton") ||
obj->inherits("TQCheckBox")) {
TQWidget *w = (TQWidget *) obj;
if (! w->isTopLevel()) {
@ -3346,7 +3346,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
{
TQMouseEvent *me = (TQMouseEvent *) e;
priv->mousePos = me->pos();
if (obj->inherits(TQSCROLLBAR_OBJECT_NAME_STRING) &&
if (obj->inherits("TQScrollBar") &&
(! (me->state() & (LeftButton | MidButton | RightButton)))) {
priv->hovering = true;
((TQWidget *) obj)->repaint(false);

12
tdestyles/kthemestyle/kthemestyle.cpp
Unescape View File

@ -422,7 +422,7 @@ KThemeStyle::~KThemeStyle()
void KThemeStyle::applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr )
{
if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQApplication")) {
TQApplication *app = reinterpret_cast<TQApplication*>(ptr);
if (!qstrcmp(app->argv()[0], "kicker")) {
kickerMode = true;
@ -470,7 +470,7 @@ void KThemeStyle::paletteChanged()
void KThemeStyle::applicationUnPolish( const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr )
{
if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQApplication")) {
TQApplication *app = reinterpret_cast<TQApplication*>(ptr);
app->setPalette( oldPalette, true );
}
@ -478,7 +478,7 @@ void KThemeStyle::applicationUnPolish( const TQStyleControlElementData &ceData,
bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
{
if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQObject")) {
TQObject* object = reinterpret_cast<TQObject*>(source);
if( object->inherits("KActiveLabel"))
@ -506,7 +506,7 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C
w->setPalette(pal);
}
}
if (!qstrcmp(object->name(), "tde toolbar widget") && object->inherits(TQLABEL_OBJECT_NAME_STRING))
if (!qstrcmp(object->name(), "tde toolbar widget") && object->inherits("TQLabel"))
{
TQWidget* lb = TQT_TQWIDGET(object);
if (lb->backgroundMode() == TQt::PaletteButton)
@ -520,7 +520,7 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C
void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *w = reinterpret_cast<TQWidget*>(ptr);
if (::tqqt_cast<TQStatusBar*>(w))
@ -631,7 +631,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen
void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *w = reinterpret_cast<TQWidget*>(ptr);
if (w->backgroundPixmap() && !w->isTopLevel())

2
tdestyles/light/lightstyle-v2.cpp
Unescape View File

@ -298,7 +298,7 @@ void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe,
if ( p && p->device()->devType() == TQInternal::Widget ) {
TQWidget *w = (TQWidget *) p->device();
TQWidget *p = w->parentWidget();
if (p->inherits(TQDOCKWINDOW_OBJECT_NAME_STRING) && ! p->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) {
if (p->inherits("TQDockWindow") && ! p->inherits("TQToolBar")) {
drawTitle = true;
title = p->caption();
}

2
tdestyles/light/lightstyle-v3.cpp
Unescape View File

@ -430,7 +430,7 @@ void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe,
if ( p && p->device()->devType() == TQInternal::Widget ) {
TQWidget *w = (TQWidget *) p->device();
TQWidget *p = w->parentWidget();
if (p->inherits(TQDOCKWINDOW_OBJECT_NAME_STRING) && ! p->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) {
if (p->inherits("TQDockWindow") && ! p->inherits("TQToolBar")) {
drawTitle = true;
title = p->caption();
}

12
tdestyles/plastik/plastik.cpp
Unescape View File

@ -225,7 +225,7 @@ PlastikStyle::~PlastikStyle()
void PlastikStyle::applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr)
{
if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQApplication")) {
TQApplication *app = reinterpret_cast<TQApplication*>(ptr);
if (!qstrcmp(app->argv()[0], "kicker"))
@ -237,7 +237,7 @@ void PlastikStyle::applicationPolish(const TQStyleControlElementData &ceData, Co
void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...?
@ -250,7 +250,7 @@ void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
if ( ::tqqt_cast<TQPushButton*>(widget) || ::tqqt_cast<TQComboBox*>(widget) ||
::tqqt_cast<TQSpinWidget*>(widget) || ::tqqt_cast<TQSlider*>(widget) ||
::tqqt_cast<TQCheckBox*>(widget) || ::tqqt_cast<TQRadioButton*>(widget) ||
::tqqt_cast<TQToolButton*>(widget) || widget->inherits(TQSPLITTERHANDLE_OBJECT_NAME_STRING) )
::tqqt_cast<TQToolButton*>(widget) || widget->inherits("TQSplitterHandle") )
{
// widget->setBackgroundMode(PaletteBackground);
installObjectEventHandler(ceData, elementFlags, ptr, this);
@ -280,7 +280,7 @@ void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...?
@ -292,7 +292,7 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem
::tqqt_cast<TQSpinWidget*>(widget) || ::tqqt_cast<TQSlider*>(widget) ||
::tqqt_cast<TQCheckBox*>(widget) || ::tqqt_cast<TQRadioButton*>(widget) ||
::tqqt_cast<TQToolButton*>(widget) || ::tqqt_cast<TQLineEdit*>(widget) ||
widget->inherits(TQSPLITTERHANDLE_OBJECT_NAME_STRING) )
widget->inherits("TQSplitterHandle") )
{
removeObjectEventHandler(ceData, elementFlags, ptr, this);
}
@ -3497,7 +3497,7 @@ bool PlastikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
if (TDEStyle::objectEventHandler(ceData, elementFlags, source, ev) )
return true;
if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQObject")) {
TQObject* obj = reinterpret_cast<TQObject*>(source);
if (!obj->isWidgetType() ) return false;

8
tdestyles/web/webstyle.cpp
Unescape View File

@ -250,10 +250,10 @@ WebStyle::unPolish(TQApplication *)
void
WebStyle::polish(TQWidget * w)
{
if (w->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING))
if (w->inherits("TQPushButton"))
w->installEventFilter(this);
else if (w->inherits(TQGROUPBOX_OBJECT_NAME_STRING) || w->inherits(TQFRAME_OBJECT_NAME_STRING))
else if (w->inherits("TQGroupBox") || w->inherits("TQFrame"))
{
TQFrame * f(static_cast<TQFrame *>(w));
@ -282,7 +282,7 @@ WebStyle::polish(TQWidget * w)
void
WebStyle::unPolish(TQWidget * w)
{
if (w->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING))
if (w->inherits("TQPushButton"))
w->removeEventFilter(this);
else if (w == _currentFrame)
@ -1046,7 +1046,7 @@ WebStyle::drawTDEToolBarButton
{
bool toggleAndOn = false;
if (button->inherits(TQBUTTON_OBJECT_NAME_STRING))
if (button->inherits("TQButton"))
{
TQButton * b = static_cast<TQButton *>(button);
toggleAndOn = b->isToggleButton() && b->isOn();

2
tdeui/kbugreport.cpp
Unescape View File

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

2
tdeui/kcombobox.cpp
Unescape View File

@ -249,7 +249,7 @@ void KComboBox::wheelEvent( TQWheelEvent *ev )
void KComboBox::setLineEdit( TQLineEdit *edit )
{
if ( !editable() && edit &&
!qstrcmp( edit->className(), TQLINEEDIT_OBJECT_NAME_STRING ) )
!qstrcmp( edit->className(), "TQLineEdit" ) )
{
// uic generates code that creates a read-only KComboBox and then
// calls combo->setEditable( true ), which causes TQComboBox to set up

4
tdeui/kdockwidget.cpp
Unescape View File

@ -1699,7 +1699,7 @@ void KDockManager::activate()
obj->show();
}
}
if ( !main->inherits(TQDIALOG_OBJECT_NAME_STRING) ) main->show();
if ( !main->inherits("TQDialog") ) main->show();
}
bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
@ -3105,7 +3105,7 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize)
#ifndef NO_KDE2
// kdDebug(282)<<"KDockArea::resize"<<endl;
#endif
TQObjectList *list=queryList(TQWIDGET_OBJECT_NAME_STRING,0,false);
TQObjectList *list=queryList("TQWidget",0,false);
TQObjectListIt it( *list ); // iterate over the buttons
TQObject *obj;

2
tdeui/kjanuswidget.cpp
Unescape View File

@ -684,7 +684,7 @@ int KJanusWidget::pageIndex( TQWidget *widget ) const
// and addGridPage() but not with addPage() which returns a child of
// the toplevel page. addPage() returns a TQFrame so I check for that.
//
if( widget->isA(TQFRAME_OBJECT_NAME_STRING) )
if( widget->isA("TQFrame") )
{
return d->mPageToInt[widget->parentWidget()];
}

2
tdeui/tdeactionselector.cpp
Unescape View File

@ -392,7 +392,7 @@ bool TDEActionSelector::eventFilter( TQObject *o, TQEvent *e )
}
return true;
}
else if ( o->inherits( TQLISTBOX_OBJECT_NAME_STRING ) )
else if ( o->inherits( "TQListBox" ) )
{
switch ( ((TQKeyEvent*)e)->key() )
{

2
tdeui/tdecompletionbox.cpp
Unescape View File

@ -343,7 +343,7 @@ TQRect TDECompletionBox::calculateGeometry() const
// to adjust it. Do that here as well, for consistency
const TQObject* combo;
if ( d->m_parent && (combo = d->m_parent->parent() ) &&
combo->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) )
combo->inherits("TQComboBox") )
{
const TQComboBox* cb = static_cast<const TQComboBox*>(TQT_TQWIDGET_CONST(combo));

2
tdeui/tdemainwindow.cpp
Unescape View File

@ -403,7 +403,7 @@ void TDEMainWindow::hide()
d->hiddenDockWindows.clear();
TQObjectList *list = queryList( TQDOCKWINDOW_OBJECT_NAME_STRING );
TQObjectList *list = queryList( "TQDockWindow" );
for( TQObjectListIt it( *list ); it.current(); ++it ) {
TQDockWindow *dw = (TQDockWindow*)it.current();
if ( dw->isTopLevel() && dw->isVisible() ) {

2
tdeui/tdetoolbar.cpp
Unescape View File

@ -2237,7 +2237,7 @@ void TDEToolBar::slotContextAboutToHide()
TQPtrListIterator<TQWidget> it( widgets );
TQWidget *wdg;
while ( ( wdg = it.current() ) != 0 ) {
if ( wdg->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) )
if ( wdg->inherits( "TQToolButton" ) )
static_cast<TQToolButton*>( wdg )->setDown( false );
++it;
}

2
tdeui/twindowinfo.cpp
Unescape View File

@ -85,7 +85,7 @@ void KWindowInfo::permanent( const TQString &text )
void KWindowInfo::permanent( const TQString &text, const TQPixmap &pix )
{
if ( !oldText.isNull() ) {
TQObjectList *l = queryList( TQTIMER_OBJECT_NAME_STRING );
TQObjectList *l = queryList( "TQTimer" );
TQObjectListIt it( *l );
TQObject *obj;

Write Preview
Loading…
Cancel
Save