summaryrefslogtreecommitdiffstats
path: root/kommander/widget
diff options
context:
space:
mode:
Diffstat (limited to 'kommander/widget')
-rw-r--r--kommander/widget/CMakeLists.txt49
-rw-r--r--kommander/widget/functionlib.cpp30
-rw-r--r--kommander/widget/invokeclass.cpp4
-rw-r--r--kommander/widget/invokeclass.h2
-rw-r--r--kommander/widget/kmdrmainwindow.cpp7
-rw-r--r--kommander/widget/kmdrmainwindow.h4
-rw-r--r--kommander/widget/kommander_export.h4
-rw-r--r--kommander/widget/kommanderfunctions.cpp4
-rw-r--r--kommander/widget/kommanderwidget.cpp22
-rw-r--r--kommander/widget/kommanderwidget.h2
-rw-r--r--kommander/widget/myprocess.cpp10
-rw-r--r--kommander/widget/myprocess.h4
12 files changed, 97 insertions, 45 deletions
diff --git a/kommander/widget/CMakeLists.txt b/kommander/widget/CMakeLists.txt
new file mode 100644
index 00000000..866a0dfd
--- /dev/null
+++ b/kommander/widget/CMakeLists.txt
@@ -0,0 +1,49 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_SOURCE_DIR}/kommander/plugin
+ ${CMAKE_SOURCE_DIR}/kommander/factory
+)
+
+include_directories( SYSTEM
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### kommanderwidget (shared)
+
+tde_add_library( kommanderwidget SHARED AUTOMOC
+
+ SOURCES
+ expression.cpp function.cpp
+ functionlib.cpp invokeclass.cpp
+ kmdrmainwindow.cpp kommanderfunctions.cpp
+ kommanderwidget.cpp kommanderwindow.cpp
+ myprocess.cpp parsenode.cpp
+ parser.cpp parserdata.cpp
+ LINK
+ tdecore-shared
+ tdeio-shared
+ tdeui-shared
+ kommanderplugin-shared
+ kommanderfactory-static
+
+ DESTINATION ${LIB_INSTALL_DIR}
+
+ VERSION 0.0.0
+)
+
+
+##### headers
+
+install(
+ FILES kommanderwidget.h kommander_export.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}
+)
diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp
index b0579897..ddfe8a86 100644
--- a/kommander/widget/functionlib.cpp
+++ b/kommander/widget/functionlib.cpp
@@ -164,7 +164,7 @@ static ParseNode f_return(Parser* p, const ParameterList& params)
static ParseNode f_stringRound(Parser*, const ParameterList& params)
{
TQString s;
- s.sprintf("%."+params[1].toString()+"f", params[0].toDouble());
+ s.sprintf("%.*f", params[1].toInt(), params[0].toDouble());
return s;
}
@@ -172,7 +172,7 @@ static ParseNode f_stringRound(Parser*, const ParameterList& params)
static ParseNode f_debug(Parser*, const ParameterList& params)
{
for (uint i=0; i<params.count(); i++)
- std::cerr << params[i].toString();
+ std::cerr << params[i].toString().local8Bit();
std::cerr << "\n";
fflush(stderr);
return ParseNode();
@@ -181,7 +181,7 @@ static ParseNode f_debug(Parser*, const ParameterList& params)
static ParseNode f_echo(Parser*, const ParameterList& params)
{
for (uint i=0; i<params.count(); i++)
- std::cout << params[i].toString();
+ std::cout << params[i].toString().local8Bit();
fflush(stdout);
return ParseNode();
}
@@ -283,7 +283,7 @@ static ParseNode f_executeSlot(Parser* parser, const ParameterList& params)
/******************* DCOP function ********************************/
static ParseNode f_dcopid(Parser*, const ParameterList& )
{
- return TQString(kapp->dcopClient()->appId());
+ return TQString(tdeApp->dcopClient()->appId());
}
static ParseNode f_pid(Parser*, const ParameterList& )
@@ -353,7 +353,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params)
byteDataStream << params[i++].toDouble();
else if (*it == "bool")
byteDataStream << (bool)params[i++].toInt();
- else if (*it == TQSTRINGLIST_OBJECT_NAME_STRING)
+ else if (*it == "TQStringList")
if (params[i].toString().find('\n') != -1)
byteDataStream << TQStringList::split("\n", params[i++].toString(), true);
else
@@ -371,7 +371,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params)
return ParseNode();
}
TQDataStream byteReplyStream(byteReply, IO_ReadOnly);
- if (replyType == TQSTRING_OBJECT_NAME_STRING)
+ if (replyType == "TQString")
{
TQString text;
byteReplyStream >> text;
@@ -389,7 +389,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params)
byteReplyStream >> b;
return b;
}
- else if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING)
+ else if (replyType == "TQStringList")
{
TQStringList text;
byteReplyStream >> text;
@@ -429,9 +429,9 @@ static ParseNode f_widgetExists(Parser* p, const ParameterList& params)
static ParseNode f_connect(Parser* p, const ParameterList& params)
{
TQString sender = params[0].toString();
- TQString signal = TQString::number(TQSIGNAL_CODE) + params[1].toString();
+ TQString signal = TQString::number(TQ_SIGNAL_CODE) + params[1].toString();
TQString receiver = params[2].toString();
- TQString slot = TQString::number(TQSLOT_CODE) + params[3].toString();
+ TQString slot = TQString::number(TQ_SLOT_CODE) + params[3].toString();
KommanderWidget *senderW = p->currentWidget()->widgetByName(sender);
if (!senderW)
return ParseNode::error("unknown widget");
@@ -445,9 +445,9 @@ static ParseNode f_connect(Parser* p, const ParameterList& params)
static ParseNode f_disconnect(Parser* p, const ParameterList& params)
{
TQString sender = params[0].toString();
- TQString signal = TQString::number(TQSIGNAL_CODE) + params[1].toString();
+ TQString signal = TQString::number(TQ_SIGNAL_CODE) + params[1].toString();
TQString receiver = params[2].toString();
- TQString slot = TQString::number(TQSLOT_CODE) + params[3].toString();
+ TQString slot = TQString::number(TQ_SLOT_CODE) + params[3].toString();
KommanderWidget *senderW = p->currentWidget()->widgetByName(sender);
if (!senderW)
return ParseNode::error("unknown widget");
@@ -510,7 +510,7 @@ static ParseNode f_dialog(Parser* P, const ParameterList& params)
static ParseNode f_i18n(Parser*, const ParameterList& params)
{
- return TDEGlobal::locale()->translate(params[0].toString());
+ return TDEGlobal::locale()->translate(params[0].toString().utf8());
}
static ParseNode f_env(Parser*, const ParameterList& params)
@@ -567,13 +567,11 @@ static ParseNode f_arrayToString(Parser* P, const ParameterList& params)
TQStringList keys = P->array(name).keys();
TQValueList<ParseNode> values = P->array(name).values();
- TQStringList::Iterator it = keys.begin();
+ TQStringList::Iterator it = keys.begin();
TQValueList<ParseNode>::Iterator itval = values.begin();
- while (*it)
+ for (; it != keys.end(); ++it, ++itval)
{
array += TQString("%1\t%2\n").arg(*it).arg((*itval).toString());
- ++it;
- ++itval;
}
return array;
}
diff --git a/kommander/widget/invokeclass.cpp b/kommander/widget/invokeclass.cpp
index ec360d69..033ea770 100644
--- a/kommander/widget/invokeclass.cpp
+++ b/kommander/widget/invokeclass.cpp
@@ -24,8 +24,8 @@ void InvokeClass::invokeSlot(TQObject *object, const TQString& slot, TQStringLis
{
TQString invokeName = slot;
invokeName = invokeName.mid(invokeName.find('('));
- invokeName.prepend(TQString::number(TQSIGNAL_CODE) + "invoke");
- TQString slotName = TQString::number(TQSLOT_CODE) + slot;
+ invokeName.prepend(TQString::number(TQ_SIGNAL_CODE) + "invoke");
+ TQString slotName = TQString::number(TQ_SLOT_CODE) + slot;
connect(this, invokeName.ascii(), object, slotName.ascii());
if (args.count() == 0)
diff --git a/kommander/widget/invokeclass.h b/kommander/widget/invokeclass.h
index 341aa78f..ac6ce32f 100644
--- a/kommander/widget/invokeclass.h
+++ b/kommander/widget/invokeclass.h
@@ -17,7 +17,7 @@
#include <tqstringlist.h>
class InvokeClass : public TQObject {
-Q_OBJECT
+TQ_OBJECT
public:
InvokeClass(TQObject *parent);
diff --git a/kommander/widget/kmdrmainwindow.cpp b/kommander/widget/kmdrmainwindow.cpp
index 5805c58d..c44ea4a6 100644
--- a/kommander/widget/kmdrmainwindow.cpp
+++ b/kommander/widget/kmdrmainwindow.cpp
@@ -9,6 +9,11 @@
// Copyright: See COPYING file that comes with this distribution
//
//
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "kmdrmainwindow.h"
#include <tqtimer.h>
@@ -16,7 +21,7 @@
KmdrMainWindow::KmdrMainWindow(TQWidget *parent, const char *name, WFlags f)
: TDEMainWindow(parent, name, f)
{
- TQTimer::singleShot(10, this, TQT_SIGNAL(initialize()));
+ TQTimer::singleShot(10, this, TQ_SIGNAL(initialize()));
}
diff --git a/kommander/widget/kmdrmainwindow.h b/kommander/widget/kmdrmainwindow.h
index 91be985d..484969d5 100644
--- a/kommander/widget/kmdrmainwindow.h
+++ b/kommander/widget/kmdrmainwindow.h
@@ -17,9 +17,9 @@
/**
@author Andras Mantia <amantia@kdewebdev.org>
*/
-class KmdrMainWindow : public TDEMainWindow
+class TDE_EXPORT KmdrMainWindow : public TDEMainWindow
{
-Q_OBJECT
+TQ_OBJECT
public:
KmdrMainWindow(TQWidget *parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose);
diff --git a/kommander/widget/kommander_export.h b/kommander/widget/kommander_export.h
index 3cc7aa73..f9e5d4ed 100644
--- a/kommander/widget/kommander_export.h
+++ b/kommander/widget/kommander_export.h
@@ -25,9 +25,9 @@
#if KDE_IS_VERSION(3,3,90)
-#include <kdemacros.h>
+#include <tdemacros.h>
-#define KOMMANDER_EXPORT KDE_EXPORT
+#define KOMMANDER_EXPORT TDE_EXPORT
#else
#define KOMMANDER_EXPORT
diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp
index 3d580f88..7d56f0af 100644
--- a/kommander/widget/kommanderfunctions.cpp
+++ b/kommander/widget/kommanderfunctions.cpp
@@ -41,7 +41,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL
case Kommander::selectedWidgetText:
return handleDCOP(DCOP::selection);
case Kommander::dcopid:
- return kapp->dcopClient()->appId();
+ return tdeApp->dcopClient()->appId();
case Kommander::pid:
return TQString().setNum(getpid());
case Kommander::null:
@@ -57,7 +57,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL
case Kommander::env:
return TQString(getenv(args[0].latin1()));
case Kommander::i18n:
- return TDEGlobal::locale()->translate(args[0]);
+ return TDEGlobal::locale()->translate(args[0].utf8());
case Kommander::global:
return global(args[0]);
case Kommander::setGlobal:
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());
diff --git a/kommander/widget/kommanderwidget.h b/kommander/widget/kommanderwidget.h
index d3116c80..fa59db0e 100644
--- a/kommander/widget/kommanderwidget.h
+++ b/kommander/widget/kommanderwidget.h
@@ -19,7 +19,7 @@
#define _HAVE_KOMMANDERWIDGET_H_
/* KDE INCLUDES */
-#include <kprocess.h>
+#include <tdeprocess.h>
#include "kommander_export.h"
/* QT INCLUDES */
diff --git a/kommander/widget/myprocess.cpp b/kommander/widget/myprocess.cpp
index 45e64790..3405e34a 100644
--- a/kommander/widget/myprocess.cpp
+++ b/kommander/widget/myprocess.cpp
@@ -15,7 +15,7 @@
***************************************************************************/
/* KDE INCLUDES */
#include <tdelocale.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdelocale.h>
/* QT INCLUDES */
@@ -85,9 +85,9 @@ TQString MyProcess::run(const TQString& a_command, const TQString& a_shell)
mProcess = new TDEProcess;
(*mProcess) << shellName.latin1();
- connect(mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
- TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
- connect(mProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*)));
+ connect(mProcess, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
+ connect(mProcess, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*)));
if(!mProcess->start(TDEProcess::NotifyOnExit, TDEProcess::All))
{
@@ -102,7 +102,7 @@ TQString MyProcess::run(const TQString& a_command, const TQString& a_shell)
else
{
TQWidget dummy(0, 0, WType_Dialog | WShowModal);
- dummy.setFocusPolicy(TQ_NoFocus);
+ dummy.setFocusPolicy(TQWidget::NoFocus);
m_loopStarted = true;
tqt_enter_modal(&dummy);
tqApp->enter_loop();
diff --git a/kommander/widget/myprocess.h b/kommander/widget/myprocess.h
index 039db894..cda9c92d 100644
--- a/kommander/widget/myprocess.h
+++ b/kommander/widget/myprocess.h
@@ -17,7 +17,7 @@
#define _HAVE_MYPROCESS_H_
/* KDE INCLUDES */
-#include <kprocess.h>
+#include <tdeprocess.h>
/* QT INCLUDES */
#include <tqstring.h>
@@ -28,7 +28,7 @@ class KommanderWidget;
class KOMMANDER_EXPORT MyProcess : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
MyProcess(const KommanderWidget *);
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-19 11:43:45 +0000