TDE
/
tdenetwork
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdenetwork
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>
pull/49/head
Michele Calgaro 10 months ago
parent 1e65a9c99e
commit 75b9f40221
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
23 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File

2
kget/kget_plug_in/kget_plug_in.h
Unescape View File

@ -50,7 +50,7 @@ public:
~KPluginFactory() ;
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING,
const char* name = "TQObject",
const TQStringList &args = TQStringList() );
private:

2
knewsticker/common/newsiconmgr.cpp
Unescape View File

@ -146,7 +146,7 @@ TQString NewsIconMgr::favicon(const KURL &url) const
kapp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data, replyType, reply);
if (replyType == TQSTRING_OBJECT_NAME_STRING) {
if (replyType == "TQString") {
TQDataStream replyStream(reply, IO_ReadOnly);
TQString result;
replyStream >> result;

2
knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h
Unescape View File

@ -35,7 +35,7 @@ class KntSrcFilePropsFactory : public KLibFactory
public:
virtual TQObject *createObject(TQObject * = 0, const char * = 0,
const char * = TQOBJECT_OBJECT_NAME_STRING, const TQStringList & = TQStringList());
const char * = "TQObject", const TQStringList & = TQStringList());
};
class KntSrcFilePropsDlg : public KPropsDlgPlugin

2
kopete/kopete/chatwindow/emoticonselector.cpp
Unescape View File

@ -109,7 +109,7 @@ void EmoticonSelector::emoticonClicked(const TQString &str)
// KDE4/TQt TODO: use qobject_cast instead.
emit ItemSelected ( str );
if ( isVisible() && parentWidget() &&
parentWidget()->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
parentWidget()->inherits("TQPopupMenu") )
{
parentWidget()->close();
}

4
kopete/kopete/chatwindow/kopeteemoticonaction.cpp
Unescape View File

@ -136,7 +136,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index )
// kdDebug(14010) << "KopeteEmoticonAction::plug( " << widget << ", " << index << " )" << endl;
// KDE4/TQt TODO: Use qobject_cast instead.
if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
if ( widget->inherits("TQPopupMenu") )
{
TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget );
int id;
@ -202,7 +202,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index )
return containerCount() - 1;
}
// KDE4/TQt TODO: Use qobject_cast instead.
else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) )
else if ( widget->inherits( "TQMenuBar" ) )
{
TQMenuBar *bar = static_cast<TQMenuBar *>( widget );

46
kopete/libkopete/kautoconfig.cpp
Unescape View File

@ -86,11 +86,11 @@ public:
TQAsciiDict<int> ignoreTheseWidgets;
void init(){
ignoreTheseWidgets.insert(TQLABEL_OBJECT_NAME_STRING, new int(1));
ignoreTheseWidgets.insert(TQFRAME_OBJECT_NAME_STRING, new int(2));
ignoreTheseWidgets.insert(TQGROUPBOX_OBJECT_NAME_STRING, new int(3));
ignoreTheseWidgets.insert(TQBUTTONGROUP_OBJECT_NAME_STRING, new int(4));
ignoreTheseWidgets.insert(TQWIDGET_OBJECT_NAME_STRING, new int(5));
ignoreTheseWidgets.insert("TQLabel", new int(1));
ignoreTheseWidgets.insert("TQFrame", new int(2));
ignoreTheseWidgets.insert("TQGroupBox", new int(3));
ignoreTheseWidgets.insert("TQButtonGroup", new int(4));
ignoreTheseWidgets.insert("TQWidget", new int(5));
ignoreTheseWidgets.setAutoDelete(true);
static bool defaultKDEPropertyMapInstalled = false;
@ -141,25 +141,25 @@ bool KAutoConfig::retrieveSettings(bool trackChanges){
if(trackChanges){
// QT
changedMap.insert(TQString::fromLatin1(TQBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int)));
changedMap.insert(TQString::fromLatin1(TQCHECKBOX_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int)));
changedMap.insert(TQString::fromLatin1(TQPUSHBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int)));
changedMap.insert(TQString::fromLatin1(TQRADIOBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int)));
changedMap.insert(TQString::fromLatin1(TQCOMBOBOX_OBJECT_NAME_STRING), TQT_SIGNAL(activated (int)));
changedMap.insert(TQString::fromLatin1("TQButton"), TQT_SIGNAL(stateChanged(int)));
changedMap.insert(TQString::fromLatin1("TQCheckBox"), TQT_SIGNAL(stateChanged(int)));
changedMap.insert(TQString::fromLatin1("TQPushButton"), TQT_SIGNAL(stateChanged(int)));
changedMap.insert(TQString::fromLatin1("TQRadioButton"), TQT_SIGNAL(stateChanged(int)));
changedMap.insert(TQString::fromLatin1("TQComboBox"), TQT_SIGNAL(activated (int)));
//qsqlproperty map doesn't store the text, but the value!
//changedMap.insert(TQString::fromLatin1(TQCOMBOBOX_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged(const TQString &)));
changedMap.insert(TQString::fromLatin1(TQDATEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQDate &)));
changedMap.insert(TQString::fromLatin1(TQDATETIMEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQDateTime &)));
changedMap.insert(TQString::fromLatin1(TQDIAL_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged (int)));
changedMap.insert(TQString::fromLatin1(TQLINEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged(const TQString &)));
changedMap.insert(TQString::fromLatin1(TQSLIDER_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(int)));
changedMap.insert(TQString::fromLatin1(TQSPINBOX_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(int)));
changedMap.insert(TQString::fromLatin1(TQTIMEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQTime &)));
changedMap.insert(TQString::fromLatin1(TQTEXTEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged()));
changedMap.insert(TQString::fromLatin1(TQTEXTBROWSER_OBJECT_NAME_STRING), TQT_SIGNAL(sourceChanged(const TQString &)));
changedMap.insert(TQString::fromLatin1(TQMULTILINEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged()));
changedMap.insert(TQString::fromLatin1(TQLISTBOX_OBJECT_NAME_STRING), TQT_SIGNAL(selectionChanged()));
changedMap.insert(TQString::fromLatin1(TQTABWIDGET_OBJECT_NAME_STRING), TQT_SIGNAL(currentChanged(TQWidget *)));
//changedMap.insert(TQString::fromLatin1("TQComboBox"), TQT_SIGNAL(textChanged(const TQString &)));
changedMap.insert(TQString::fromLatin1("TQDateEdit"), TQT_SIGNAL(valueChanged(const TQDate &)));
changedMap.insert(TQString::fromLatin1("TQDateTimeEdit"), TQT_SIGNAL(valueChanged(const TQDateTime &)));
changedMap.insert(TQString::fromLatin1("TQDial"), TQT_SIGNAL(valueChanged (int)));
changedMap.insert(TQString::fromLatin1("TQLineEdit"), TQT_SIGNAL(textChanged(const TQString &)));
changedMap.insert(TQString::fromLatin1("TQSlider"), TQT_SIGNAL(valueChanged(int)));
changedMap.insert(TQString::fromLatin1("TQSpinBox"), TQT_SIGNAL(valueChanged(int)));
changedMap.insert(TQString::fromLatin1("TQTimeEdit"), TQT_SIGNAL(valueChanged(const TQTime &)));
changedMap.insert(TQString::fromLatin1("TQTextEdit"), TQT_SIGNAL(textChanged()));
changedMap.insert(TQString::fromLatin1("TQTextBrowser"), TQT_SIGNAL(sourceChanged(const TQString &)));
changedMap.insert(TQString::fromLatin1("TQMultiLineEdit"), TQT_SIGNAL(textChanged()));
changedMap.insert(TQString::fromLatin1("TQListBox"), TQT_SIGNAL(selectionChanged()));
changedMap.insert(TQString::fromLatin1("TQTabWidget"), TQT_SIGNAL(currentChanged(TQWidget *)));
// KDE
changedMap.insert( TQString::fromLatin1("KComboBox"), TQT_SIGNAL(activated (int)));

6
kopete/plugins/nowlistening/nlamarok.cpp
Unescape View File

@ -91,7 +91,7 @@ void NLamaroK::update()
{
TQDataStream reply( replyData, IO_ReadOnly );
if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
if ( replyType == "TQString" ) {
reply >> newTrack;
}
}
@ -107,7 +107,7 @@ void NLamaroK::update()
{
TQDataStream reply( replyData, IO_ReadOnly );
if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
if ( replyType == "TQString" ) {
reply >> m_album;
}
}
@ -117,7 +117,7 @@ void NLamaroK::update()
{
TQDataStream reply( replyData, IO_ReadOnly );
if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
if ( replyType == "TQString" ) {
reply >> m_artist;
}
}

6
kopete/plugins/nowlistening/nljuk.cpp
Unescape View File

@ -64,7 +64,7 @@ void NLJuk::update()
{
TQDataStream reply( replyData, IO_ReadOnly );
if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
if ( replyType == "TQString" ) {
reply >> m_album;
}
}
@ -78,7 +78,7 @@ void NLJuk::update()
{
TQDataStream reply( replyData, IO_ReadOnly );
if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
if ( replyType == "TQString" ) {
reply >> m_artist;
}
}
@ -92,7 +92,7 @@ void NLJuk::update()
{
TQDataStream reply( replyData, IO_ReadOnly );
if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
if ( replyType == "TQString" ) {
reply >> newTrack;
}
}

6
kopete/plugins/nowlistening/nlkaffeine.cpp
Unescape View File

@ -85,7 +85,7 @@ void NLKaffeine::update()
{
TQDataStream reply( replyData, IO_ReadOnly );
if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
if ( replyType == "TQString" ) {
reply >> newTrack;
}
}
@ -105,7 +105,7 @@ void NLKaffeine::update()
{
TQDataStream reply( replyData, IO_ReadOnly );
if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
if ( replyType == "TQString" ) {
reply >> m_album;
}
}
@ -115,7 +115,7 @@ void NLKaffeine::update()
{
TQDataStream reply( replyData, IO_ReadOnly );
if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
if ( replyType == "TQString" ) {
reply >> m_artist;
}
}

6
kopete/plugins/nowlistening/nlkscd.cpp
Unescape View File

@ -69,7 +69,7 @@ void NLKscd::update()
<< endl;
else {
TQDataStream reply( replyData, IO_ReadOnly );
if ( replyType == TQSTRING_OBJECT_NAME_STRING )
if ( replyType == "TQString" )
reply >> m_artist;
else
kdDebug( 14307 ) << "NLKscd::update() trackList returned unexpected reply type!" << endl;
@ -82,7 +82,7 @@ void NLKscd::update()
<< endl;
else {
TQDataStream reply( replyData, IO_ReadOnly );
if ( replyType == TQSTRING_OBJECT_NAME_STRING )
if ( replyType == "TQString" )
reply >> m_album;
else
kdDebug( 14307 ) << "NLKscd::update() trackList returned unexpected reply type!" << endl;
@ -94,7 +94,7 @@ void NLKscd::update()
kdDebug( 14307 ) << "NLKscd::update() - there was some error using DCOP." << endl;
else {
TQDataStream reply( replyData, IO_ReadOnly );
if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
if ( replyType == "TQString" ) {
reply >> newTrack;
//kdDebug( 14307 ) << "the result is: " << newTrack.latin1()
// << endl;

4
kopete/plugins/nowlistening/nlnoatun.cpp
Unescape View File

@ -76,7 +76,7 @@ void NLNoatun::update()
<< endl;
else {
TQDataStream reply( replyData, IO_ReadOnly );
if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
if ( replyType == "TQString" ) {
reply >> newTrack;
} else
kdDebug( 14307 ) << "NLNoatun::update(), title() returned unexpected reply type!" << endl;
@ -137,7 +137,7 @@ TQString NLNoatun::currentProperty( TQCString appname, TQString property ) const
else
{
TQDataStream reply( replyData, IO_ReadOnly );
if ( replyType == TQSTRING_OBJECT_NAME_STRING )
if ( replyType == "TQString" )
{
reply >> result;
}

2
ksirc/puke/pbutton.cpp
Unescape View File

@ -84,7 +84,7 @@ void PButton::messageHandler(int fd, PukeMessage *pm)
void PButton::setWidget(TQObject *_qb)
{
if(_qb != 0 && _qb->inherits(TQBUTTON_OBJECT_NAME_STRING) == FALSE)
if(_qb != 0 && _qb->inherits("TQButton") == FALSE)
{
errorInvalidSet(_qb);
return;

2
ksirc/puke/pframe.cpp
Unescape View File

@ -63,7 +63,7 @@ void PFrame::messageHandler(int fd, PukeMessage *pm)
void PFrame::setWidget(TQObject *w)
{
if(w != 0 && w->inherits(TQFRAME_OBJECT_NAME_STRING) == FALSE)
if(w != 0 && w->inherits("TQFrame") == FALSE)
{
errorInvalidSet(w);
return;

4
ksirc/puke/plabel.cpp
Unescape View File

@ -10,7 +10,7 @@ PLabel::createWidget(CreateArgs &ca)
{
PLabel *pw = new PLabel(ca.parent);
TQLabel *le;
if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQLABEL_OBJECT_NAME_STRING) == TRUE){
if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("TQLabel") == TRUE){
le = (TQLabel *) ca.fetchedObj;
pw->setDeleteAble(FALSE);
}
@ -97,7 +97,7 @@ void PLabel::messageHandler(int fd, PukeMessage *pm)
void PLabel::setWidget(TQObject *_l)
{
if(_l != 0 && _l->inherits(TQLABEL_OBJECT_NAME_STRING) == FALSE)
if(_l != 0 && _l->inherits("TQLabel") == FALSE)
{
errorInvalidSet(_l);
return;

4
ksirc/puke/playout.cpp
Unescape View File

@ -88,7 +88,7 @@ void PLayout::messageHandler(int fd, PukeMessage *pm)
}
PObject *pld = controller()->id2pobject(fd, pm->iWinId);
PObject *pls = controller()->id2pobject(fd, pm->iArg);
if( (pld->widget()->inherits(TQBOXLAYOUT_OBJECT_NAME_STRING) == FALSE) || (pls->widget()->inherits(TQBOXLAYOUT_OBJECT_NAME_STRING) == FALSE))
if( (pld->widget()->inherits("TQBoxLayout") == FALSE) || (pls->widget()->inherits("TQBoxLayout") == FALSE))
throw(errorCommandFailed(PUKE_LAYOUT_ADDLAYOUT_ACK, 1));
PLayout *plbd = (PLayout *) pld;
PLayout *plbs = (PLayout *) pls;
@ -136,7 +136,7 @@ void PLayout::messageHandler(int fd, PukeMessage *pm)
void PLayout::setWidget(TQObject *_layout)
{
// kdDebug(5008) << "PObject setwidget called" << endl;
if(_layout != 0 && _layout->inherits(TQBOXLAYOUT_OBJECT_NAME_STRING) == FALSE)
if(_layout != 0 && _layout->inherits("TQBoxLayout") == FALSE)
{
errorInvalidSet(_layout);
return;

2
ksirc/puke/plined.cpp
Unescape View File

@ -103,7 +103,7 @@ void PLineEdit::messageHandler(int fd, PukeMessage *pm)
void PLineEdit::setWidget(TQObject *_le)
{
if(_le != 0 && _le->inherits(TQLINEEDIT_OBJECT_NAME_STRING) == FALSE)
if(_le != 0 && _le->inherits("TQLineEdit") == FALSE)
{
errorInvalidSet(_le);
return;

4
ksirc/puke/plistbox.cpp
Unescape View File

@ -8,7 +8,7 @@ PListBox::createWidget(CreateArgs &ca)
{
PListBox *plb = new PListBox(ca.parent);
TQListBox *lb;
if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQLISTBOX_OBJECT_NAME_STRING) == TRUE){
if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("TQListBox") == TRUE){
lb = (TQListBox *) ca.fetchedObj;
plb->setDeleteAble(FALSE);
}
@ -152,7 +152,7 @@ void PListBox::messageHandler(int fd, PukeMessage *pm)
void PListBox::setWidget(TQObject *_lb)
{
if(_lb != 0 && _lb->inherits(TQLISTBOX_OBJECT_NAME_STRING) == FALSE)
if(_lb != 0 && _lb->inherits("TQListBox") == FALSE)
{
errorInvalidSet(_lb);
return;

4
ksirc/puke/ppopmenu.cpp
Unescape View File

@ -8,7 +8,7 @@ PPopupMenu::createWidget(CreateArgs &ca)
{
PPopupMenu *pm = new PPopupMenu(ca.parent);
TQPopupMenu *qpm;
if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) == TRUE){
if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("TQPopupMenu") == TRUE){
qpm= (TQPopupMenu *) ca.fetchedObj;
pm->setDeleteAble(FALSE);
}
@ -81,7 +81,7 @@ void PPopupMenu::messageHandler(int fd, PukeMessage *pm)
void PPopupMenu::setWidget(TQObject *_menu)
{
if(_menu != 0 && _menu->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) == FALSE)
if(_menu != 0 && _menu->inherits("TQPopupMenu") == FALSE)
{
errorInvalidSet(_menu);
return;

2
ksirc/puke/ppushbt.cpp
Unescape View File

@ -45,7 +45,7 @@ void PPushButton::messageHandler(int fd, PukeMessage *pm)
void PPushButton::setWidget(TQObject *_qb)
{
if(_qb != 0 && _qb->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING) == FALSE)
if(_qb != 0 && _qb->inherits("TQPushButton") == FALSE)
{
errorInvalidSet(_qb);
return;

4
ksirc/puke/ptabdialog.cpp
Unescape View File

@ -12,7 +12,7 @@ PTabDialog::createWidget(CreateArgs &ca)
TQTabDialog *qtd;
// Retreive the border and direction information out of the
// carg string
if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQTABDIALOG_OBJECT_NAME_STRING) == TRUE){
if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("TQTabDialog") == TRUE){
qtd = (TQTabDialog *) ca.fetchedObj;
ptd->setDeleteAble(FALSE);
}
@ -78,7 +78,7 @@ void PTabDialog::messageHandler(int fd, PukeMessage *pm)
void PTabDialog::setWidget(TQObject *tb)
{
if(tb != 0 && tb->inherits(TQTABDIALOG_OBJECT_NAME_STRING) == FALSE)
if(tb != 0 && tb->inherits("TQTabDialog") == FALSE)
{
errorInvalidSet(tb);
return;

2
ksirc/puke/ptablevw.cpp
Unescape View File

@ -52,7 +52,7 @@ void PTableView::messageHandler(int fd, PukeMessage *pm)
void PTableView::setWidget(TQObject *_tbv)
{
if(_tbv != 0 && _tbv->inherits(TQGRIDVIEW_OBJECT_NAME_STRING) == FALSE)
if(_tbv != 0 && _tbv->inherits("TQGridView") == FALSE)
{
errorInvalidSet(_tbv);
return;

4
ksirc/puke/pwidget.cpp
Unescape View File

@ -55,7 +55,7 @@ PObject *PWidget::createWidget(CreateArgs &ca)
{
PWidget *pw = new PWidget();
TQWidget *tw;
if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQWIDGET_OBJECT_NAME_STRING) == TRUE){
if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("TQWidget") == TRUE){
tw = (TQWidget *) ca.fetchedObj;
pw->setDeleteAble(FALSE);
}
@ -266,7 +266,7 @@ void PWidget::messageHandler(int fd, PukeMessage *pm)
void PWidget::setWidget(TQObject *_w)
{
if(_w != 0 && _w->inherits(TQWIDGET_OBJECT_NAME_STRING) == FALSE)
if(_w != 0 && _w->inherits("TQWidget") == FALSE)
{
errorInvalidSet(_w);
return;

2
ksirc/toplevel.cpp
Unescape View File

@ -1285,7 +1285,7 @@ void KSircTopLevel::control_message(int command, TQString str)
logFile->open();
}
setName(m_channelInfo.server().utf8() + "_" + m_channelInfo.channel().utf8() + "_" + "toplevel");
pan->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_" + TQSPLITTER_OBJECT_NAME_STRING);
pan->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_" + "TQSplitter");
kmenu->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_tdetoolframe");
linee->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_" + "LineEnter");
kmenu->show();

Write Preview
Loading…
Cancel
Save