diff options
Diffstat (limited to 'kommander/widget/kommanderwidget.cpp')
| -rw-r--r-- | kommander/widget/kommanderwidget.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp index 7d80c8db..bcea2b11 100644 --- a/kommander/widget/kommanderwidget.cpp +++ b/kommander/widget/kommanderwidget.cpp @@ -23,7 +23,7 @@ #include <tdelocale.h> #include <kdialogbase.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> /* QT INCLUDES */ #include <tqcstring.h> @@ -295,7 +295,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query) byteDataStream << a_query[i+3].toDouble(); else if (argTypes[i] == "bool") byteDataStream << (bool)(a_query[i+3] != "false" && a_query[i+3] != "false" && a_query[i+3] != "0"); - else if (argTypes[i] == TQSTRINGLIST_OBJECT_NAME_STRING) + else if (argTypes[i] == "TQStringList") if (a_query[i+3].find('\n') != -1) byteDataStream << TQStringList::split("\n", a_query[i+3], true); else @@ -312,7 +312,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query) } TQDataStream byteReplyStream(byteReply, IO_ReadOnly); - if (replyType == TQSTRING_OBJECT_NAME_STRING) + if (replyType == "TQString") { TQString text; byteReplyStream >> text; @@ -330,7 +330,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query) byteReplyStream >> b; return TQString::number(b); } - else if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) + else if (replyType == "TQStringList") { TQStringList text; byteReplyStream >> text; @@ -347,7 +347,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query) TQString KommanderWidget::localDCOPQuery(const TQString function, const TQStringList& args) { TQStringList pArgs; - pArgs.append(kapp->dcopClient()->appId()); + pArgs.append(tdeApp->dcopClient()->appId()); pArgs.append("KommanderIf"); pArgs.append(function); for (uint i=0; i<args.count(); i++) @@ -359,7 +359,7 @@ TQString KommanderWidget::localDCOPQuery(const TQString function, const TQString const TQString& arg2, const TQString& arg3, const TQString& arg4) { TQStringList pArgs; - pArgs.append(kapp->dcopClient()->appId()); + pArgs.append(tdeApp->dcopClient()->appId()); pArgs.append("KommanderIf"); pArgs.append(function); pArgs.append(arg1); @@ -413,13 +413,13 @@ void KommanderWidget::printError(const TQString& a_error) const case KDialogBase::Yes: break; case KDialogBase::Cancel: - if (parentDialog()->inherits(TQDIALOG_OBJECT_NAME_STRING)) + if (parentDialog()->inherits("TQDialog")) { parentDialog()->close(); exit(-1); } - else if (parentDialog()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) - kapp->quit(); + else if (parentDialog()->inherits("TQMainWindow")) + tdeApp->quit(); } } else @@ -655,7 +655,7 @@ TQWidget* KommanderWidget::parentDialog() const while (superParent->parent()) { superParent = superParent->parent(); - if (superParent->inherits(TQDIALOG_OBJECT_NAME_STRING) || superParent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) + if (superParent->inherits("TQDialog") || superParent->inherits("TQMainWindow")) break; } return (TQWidget*)superParent; @@ -695,7 +695,7 @@ TQString KommanderWidget::handleDCOP(const int function, const TQStringList& arg case DCOP::children: { TQStringList matching; - TQObjectList* widgets = current->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, args.count() == 0 || args[0] != "false"); + TQObjectList* widgets = current->queryList("TQWidget", 0, false, args.count() == 0 || args[0] != "false"); for (TQObject* w = widgets->first(); w; w = widgets->next()) if (w->name() && (dynamic_cast<KommanderWidget*>(w))) matching.append(w->name()); |