summaryrefslogtreecommitdiffstats
path: root/clients/tde
diff options
context:
space:
mode:
Diffstat (limited to 'clients/tde')
-rw-r--r--clients/tde/src/app/Makefile.am2
-rw-r--r--clients/tde/src/app/main.cpp43
-rw-r--r--clients/tde/src/app/remotemdi.cpp30
-rw-r--r--clients/tde/src/app/remotemdi.h8
-rw-r--r--clients/tde/src/app/views/instrumentview.cpp12
-rw-r--r--clients/tde/src/app/views/instrumentview.h14
-rw-r--r--clients/tde/src/dialogs/selectserverdlgbase.ui2
-rw-r--r--clients/tde/src/part/adminconsole/Makefile.am2
-rw-r--r--clients/tde/src/part/adminconsole/layout.ui4
-rw-r--r--clients/tde/src/part/adminconsole/part.cpp12
-rw-r--r--clients/tde/src/part/adminconsole/part.h10
-rw-r--r--clients/tde/src/part/adminconsole/terminatedlg.cpp4
-rw-r--r--clients/tde/src/part/adminusermgmt/Makefile.am2
-rw-r--r--clients/tde/src/part/adminusermgmt/groupauthdlg.cpp4
-rw-r--r--clients/tde/src/part/adminusermgmt/groupauthdlgbase.ui2
-rw-r--r--clients/tde/src/part/adminusermgmt/layout.ui4
-rw-r--r--clients/tde/src/part/adminusermgmt/part.cpp12
-rw-r--r--clients/tde/src/part/adminusermgmt/part.h10
-rw-r--r--clients/tde/src/part/commanalyzer/Makefile.am2
-rw-r--r--clients/tde/src/part/commanalyzer/part.cpp8
-rw-r--r--clients/tde/src/part/commanalyzer/part.h10
-rw-r--r--clients/tde/src/part/fpgaprogram/Makefile.am2
-rw-r--r--clients/tde/src/part/fpgaprogram/part.cpp12
-rw-r--r--clients/tde/src/part/fpgaprogram/part.h10
-rw-r--r--clients/tde/src/part/fpgaview/Makefile.am2
-rw-r--r--clients/tde/src/part/fpgaview/part.cpp22
-rw-r--r--clients/tde/src/part/fpgaview/part.h24
-rw-r--r--clients/tde/src/part/scope/Makefile.am2
-rw-r--r--clients/tde/src/part/scope/part.cpp10
-rw-r--r--clients/tde/src/part/scope/part.h10
-rw-r--r--clients/tde/src/part/sensormonitor/Makefile.am2
-rw-r--r--clients/tde/src/part/sensormonitor/part.cpp10
-rw-r--r--clients/tde/src/part/sensormonitor/part.h10
33 files changed, 166 insertions, 147 deletions
diff --git a/clients/tde/src/app/Makefile.am b/clients/tde/src/app/Makefile.am
index e62de97..6d58a44 100644
--- a/clients/tde/src/app/Makefile.am
+++ b/clients/tde/src/app/Makefile.am
@@ -8,4 +8,4 @@ KDE_ICON = remote_laboratory_client
bin_PROGRAMS = remote_laboratory_client
remote_laboratory_client_SOURCES = main.cpp remotemdi.cpp
remote_laboratory_client_LDADD = ./views/libinstrumentview.la ../dialogs/libselectserverdlg.la $(LIB_KPARTS) $(LIB_TDEUI)
-remote_laboratory_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkmdi -ltdekrbsocket -ltqtrla
+remote_laboratory_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdemdi -ltdekrbsocket -ltqtrla
diff --git a/clients/tde/src/app/main.cpp b/clients/tde/src/app/main.cpp
index b2d2988..6334312 100644
--- a/clients/tde/src/app/main.cpp
+++ b/clients/tde/src/app/main.cpp
@@ -1,5 +1,24 @@
-//Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>, (C) 2012
-//Copyright: See COPYING file that comes with this distribution
+/*
+ * Remote Laboratory Workspaces Client
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * (c) 2012-2013 Timothy Pearson
+ * Raptor Engineering
+ * http://www.raptorengineeringinc.com
+ */
#include "define.h"
#include <kaboutdata.h>
@@ -8,19 +27,19 @@
#include <kcmdlineargs.h>
#include <klocale.h>
#include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include "remotemdi.h"
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
{
{ "+[server]", I18N_NOOP( "Connect to remote server 'server'" ), 0 },
{ 0, 0, 0 }
};
-static KAboutData about(
+static TDEAboutData about(
APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION,
- I18N_NOOP("Graphical remote laboratory client"), KAboutData::License_GPL_V2,
- I18N_NOOP("(C) 2012 Timothy Pearson"), 0,
+ I18N_NOOP("Graphical Remote Laboratory Workspaces Client"), TDEAboutData::License_GPL_V2,
+ I18N_NOOP("(C) 2012-2013 Timothy Pearson"), 0,
"http://remotefpga.pearsoncomputing.net/", "kb9vqf@pearsoncomputing.net" );
@@ -28,20 +47,20 @@ int main(int argc, char *argv[])
{
about.addAuthor("Timothy Pearson", I18N_NOOP("Author, maintainer"), "kb9vqf@pearsoncomputing.net", "http://remotefpga.pearsoncomputing.net/");
- KCmdLineArgs::init(argc, argv, &about);
- KCmdLineArgs::addCmdLineOptions(options);
+ TDECmdLineArgs::init(argc, argv, &about);
+ TDECmdLineArgs::addCmdLineOptions(options);
- KApplication app;
+ TDEApplication app;
// Read MDI settings (window positions, etc)
// FIXME
- KConfig *c = app.config();
+ TDEConfig *c = app.config();
// Create main window
RemoteMDI *mainWin = new RemoteMDI();
app.setMainWidget(mainWin);
- KCmdLineArgs* const args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs* const args = TDECmdLineArgs::parsedArgs();
if (args->count() > 0) {
mainWin->setServerHost(args->arg(0));
}
diff --git a/clients/tde/src/app/remotemdi.cpp b/clients/tde/src/app/remotemdi.cpp
index 32043c2..7630c66 100644
--- a/clients/tde/src/app/remotemdi.cpp
+++ b/clients/tde/src/app/remotemdi.cpp
@@ -11,7 +11,7 @@ using namespace std;
#include <kapplication.h>
#include <klocale.h>
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kmessagebox.h>
#include <tqlabel.h>
@@ -20,9 +20,9 @@ using namespace std;
#include <kiconloader.h>
#include <kstdaction.h>
#include <kstatusbar.h>
-#include <kmdichildview.h>
-#include <klistbox.h>
-#include <kactionclasses.h>
+#include <tdemdichildview.h>
+#include <tdelistbox.h>
+#include <tdeactionclasses.h>
#include <kedittoolbar.h>
#include <kkeydialog.h>
@@ -44,13 +44,13 @@ RemoteMDI::RemoteMDI()
KStdAction::close(this, SLOT(closeCurrent()), actionCollection());
KStdAction::quit(this, SLOT(close()), actionCollection());
- KActionCollection *const ac = actionCollection();
+ TDEActionCollection *const ac = actionCollection();
setStandardToolBarMenuEnabled(true);
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), ac);
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configToolbars()), ac);
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configKeys()), ac);
- connect_action = new KAction(i18n("Connect to Server"), "connect_creating", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(connectToServer()), ac, "connect_server");
- disconnect_action = new KAction(i18n("Disconnect from Server"), "connect_no", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(disconnectFromServer()), ac, "disconnect_server");
+ connect_action = new TDEAction(i18n("Connect to Server"), "connect_creating", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(connectToServer()), ac, "connect_server");
+ disconnect_action = new TDEAction(i18n("Disconnect from Server"), "connect_no", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(disconnectFromServer()), ac, "disconnect_server");
setMenuForSDIModeSysButtons(menuBar());
@@ -140,13 +140,13 @@ void RemoteMDI::resizeEvent(TQResizeEvent *e) {
void RemoteMDI::processActions() {
// Add dynamic actions
- KActionCollection *const ac = actionCollection();
+ TDEActionCollection *const ac = actionCollection();
- KAction* action;
+ TDEAction* action;
ServiceType st;
for (ServiceList::Iterator it(m_activeStation.services.begin()); it != m_activeStation.services.end(); ++it) {
st = *it;
- action = new KAction(i18n("Launch")+" "+st.name, st.clientLibrary, KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(startModule()), ac, st.clientLibrary.ascii());
+ action = new TDEAction(i18n("Launch")+" "+st.name, st.clientLibrary, TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(startModule()), ac, st.clientLibrary.ascii());
m_instrumentActionList.append(action);
}
plugActionList("instrumentMenu_actionlist", m_instrumentActionList);
@@ -154,7 +154,7 @@ void RemoteMDI::processActions() {
}
void RemoteMDI::startModule() {
- const KAction* sendingAction = dynamic_cast<const KAction*>(sender());
+ const TDEAction* sendingAction = dynamic_cast<const TDEAction*>(sender());
if (sendingAction) {
bool serviceFound = false;
ServiceType st;
@@ -175,7 +175,7 @@ void RemoteMDI::startModule() {
view->setName(st.clientLibrary.ascii());
connect(view, SIGNAL(statusMessageSet(const TQString&)), this, SLOT(updateStatusBarWindowMessage(const TQString&)));
if (st.singleInstance) {
- const_cast<KAction*>(sendingAction)->setEnabled(false);
+ const_cast<TDEAction*>(sendingAction)->setEnabled(false);
}
openNewWindow(view);
showViewTaskBar();
@@ -467,7 +467,7 @@ void RemoteMDI::processLockouts() {
connect_action->setEnabled(!connected);
disconnect_action->setEnabled(connected);
- for (TQPtrList<KAction>::Iterator it(m_instrumentActionList.begin()); it != m_instrumentActionList.end(); ++it) {
+ for (TQPtrList<TDEAction>::Iterator it(m_instrumentActionList.begin()); it != m_instrumentActionList.end(); ++it) {
(*it)->setEnabled(connected);
}
@@ -588,7 +588,7 @@ void RemoteMDI::childClosed(KMdiChildView * w) {
RemoteLab::InstrumentView* view = dynamic_cast<RemoteLab::InstrumentView*>(w);
if (view) {
TQString libraryName = view->name();
- for (TQPtrList<KAction>::Iterator it(m_instrumentActionList.begin()); it != m_instrumentActionList.end(); ++it) {
+ for (TQPtrList<TDEAction>::Iterator it(m_instrumentActionList.begin()); it != m_instrumentActionList.end(); ++it) {
if ((*it)->name() == libraryName) {
(*it)->setEnabled(true);
}
@@ -619,7 +619,7 @@ bool RemoteMDI::queryClose() {
// Save current MDI settings (window positions, etc.)
// FIXME
- KConfig *c = kapp->config();
+ TDEConfig *c = kapp->config();
c->sync();
diff --git a/clients/tde/src/app/remotemdi.h b/clients/tde/src/app/remotemdi.h
index ff93ea2..fe21d7f 100644
--- a/clients/tde/src/app/remotemdi.h
+++ b/clients/tde/src/app/remotemdi.h
@@ -9,7 +9,7 @@
#endif
#include <tqvaluelist.h>
-#include <kmdimainfrm.h>
+#include <tdemdimainfrm.h>
#include <tdekrbclientsocket.h>
@@ -89,9 +89,9 @@ class RemoteMDI : public KMdiMainFrm
TQTimer *connToServerTimeoutTimer;
TQTimer *masterPollTimer;
- KAction *connect_action;
- KAction *disconnect_action;
- TQPtrList<KAction> m_instrumentActionList;
+ TDEAction *connect_action;
+ TDEAction *disconnect_action;
+ TQPtrList<TDEAction> m_instrumentActionList;
StationType m_activeStation;
};
diff --git a/clients/tde/src/app/views/instrumentview.cpp b/clients/tde/src/app/views/instrumentview.cpp
index dc4e3ad..74c75be 100644
--- a/clients/tde/src/app/views/instrumentview.cpp
+++ b/clients/tde/src/app/views/instrumentview.cpp
@@ -9,7 +9,7 @@
#include <kiconloader.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kmdimainfrm.h>
+#include <tdemdimainfrm.h>
namespace RemoteLab {
@@ -112,12 +112,12 @@ void InstrumentView::resizeEvent(TQResizeEvent *) {
setChildSizeData();
}
-TQPtrList<KAction> InstrumentView::menuActionList() {
+TQPtrList<TDEAction> InstrumentView::menuActionList() {
if (m_instrumentPart) {
return m_instrumentPart->menuActionList();
}
else {
- return TQPtrList<KAction>();
+ return TQPtrList<TDEAction>();
}
}
@@ -163,10 +163,10 @@ void InstrumentView::connectServer(TQString server) {
SESSION MANAGEMENT
**********************************************/
-void InstrumentView::saveProperties( KConfig *config ) {
+void InstrumentView::saveProperties( TDEConfig *config ) {
}
-void InstrumentView::readProperties( KConfig *config ) {
+void InstrumentView::readProperties( TDEConfig *config ) {
}
-} //namespace RemoteLab \ No newline at end of file
+} //namespace RemoteLab
diff --git a/clients/tde/src/app/views/instrumentview.h b/clients/tde/src/app/views/instrumentview.h
index a866b9d..36b9aad 100644
--- a/clients/tde/src/app/views/instrumentview.h
+++ b/clients/tde/src/app/views/instrumentview.h
@@ -4,13 +4,13 @@
#ifndef INSTRUMENTVIEW_H
#define INSTRUMENTVIEW_H
-#include <kconfig.h>
-#include <kparts/part.h>
-#include <kmdichildview.h>
+#include <tdeconfig.h>
+#include <tdeparts/part.h>
+#include <tdemdichildview.h>
#include <tqtrla.h>
-class KAction;
+class TDEAction;
namespace RemoteLab {
@@ -27,11 +27,11 @@ class InstrumentView : public KMdiChildView
void connectServer(TQString server);
void closeConnections();
- TQPtrList<KAction> menuActionList();
+ TQPtrList<TDEAction> menuActionList();
protected:
- virtual void saveProperties(KConfig *);
- virtual void readProperties(KConfig *);
+ virtual void saveProperties(TDEConfig *);
+ virtual void readProperties(TDEConfig *);
virtual bool queryExit();
virtual void resizeEvent(TQResizeEvent *);
virtual bool eventFilter(TQObject *o, TQEvent *e);
diff --git a/clients/tde/src/dialogs/selectserverdlgbase.ui b/clients/tde/src/dialogs/selectserverdlgbase.ui
index 6be0eff..ecd6006 100644
--- a/clients/tde/src/dialogs/selectserverdlgbase.ui
+++ b/clients/tde/src/dialogs/selectserverdlgbase.ui
@@ -41,7 +41,7 @@
<string>Please select the type of laboratory workspace you wish to use</string>
</property>
</widget>
- <widget class="KListView" row="2" column="0" colspan="3">
+ <widget class="TDEListView" row="2" column="0" colspan="3">
<column>
<property name="text">
<string>Workspace Services</string>
diff --git a/clients/tde/src/part/adminconsole/Makefile.am b/clients/tde/src/part/adminconsole/Makefile.am
index 9db32f5..6c8ee4d 100644
--- a/clients/tde/src/part/adminconsole/Makefile.am
+++ b/clients/tde/src/part/adminconsole/Makefile.am
@@ -7,5 +7,5 @@ KDE_ICON = libremotelab_adminconsole
# Part
kde_module_LTLIBRARIES = libremotelab_adminconsole.la
libremotelab_adminconsole_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
-libremotelab_adminconsole_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -lkio -ltdefx
+libremotelab_adminconsole_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx
libremotelab_adminconsole_la_SOURCES = part.cpp layout.ui terminatedlg.cpp terminatedlgbase.ui
diff --git a/clients/tde/src/part/adminconsole/layout.ui b/clients/tde/src/part/adminconsole/layout.ui
index 5a56809..dbb695a 100644
--- a/clients/tde/src/part/adminconsole/layout.ui
+++ b/clients/tde/src/part/adminconsole/layout.ui
@@ -34,7 +34,7 @@
<property name="orientation">
<enum>Vertical</enum>
</property>
- <widget class="KListView" row="1" column="0" colspan="4">
+ <widget class="TDEListView" row="1" column="0" colspan="4">
<column>
<property name="text">
<string>Session ID</string>
@@ -196,7 +196,7 @@
<property name="orientation">
<enum>Vertical</enum>
</property>
- <widget class="KListView" row="1" column="0" colspan="4">
+ <widget class="TDEListView" row="1" column="0" colspan="4">
<column>
<property name="text">
<string>Session ID</string>
diff --git a/clients/tde/src/part/adminconsole/part.cpp b/clients/tde/src/part/adminconsole/part.cpp
index f38500b..1bc460f 100644
--- a/clients/tde/src/part/adminconsole/part.cpp
+++ b/clients/tde/src/part/adminconsole/part.cpp
@@ -24,12 +24,12 @@
#include "part.h"
#include <kaboutdata.h> //::createAboutData()
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include <ktextedit.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kmessagebox.h> //::start()
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
#include <kstatusbar.h>
#include <kstdaction.h>
#include <knuminput.h>
@@ -47,7 +47,7 @@
#include <tqpushbutton.h>
#include <tqprogressbar.h>
#include <tqlistview.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <unistd.h> //access()
#include <stdint.h>
@@ -630,8 +630,8 @@ void AdminConsolePart::mainEventLoop() {
m_connectionMutex->unlock();
}
-KAboutData* AdminConsolePart::createAboutData() {
- return new KAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
+TDEAboutData* AdminConsolePart::createAboutData() {
+ return new TDEAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
}
} //namespace RemoteLab
diff --git a/clients/tde/src/part/adminconsole/part.h b/clients/tde/src/part/adminconsole/part.h
index d8a9076..a8f8f60 100644
--- a/clients/tde/src/part/adminconsole/part.h
+++ b/clients/tde/src/part/adminconsole/part.h
@@ -29,15 +29,15 @@
#include <tqframe.h>
#include <tqimage.h>
-#include <kparts/browserextension.h>
-#include <kparts/statusbarextension.h>
-#include <kparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/statusbarextension.h>
+#include <tdeparts/part.h>
#include <kurl.h>
#include <kled.h>
#include <tqtrla.h>
-class KAboutData;
+class TDEAboutData;
using KParts::StatusBarExtension;
class TraceWidget;
class TQSocket;
@@ -58,7 +58,7 @@ namespace RemoteLab
virtual bool openFile() { return false; } // pure virtual in the base class
virtual bool closeURL();
- static KAboutData *createAboutData();
+ static TDEAboutData *createAboutData();
public slots:
virtual bool openURL(const KURL &url);
diff --git a/clients/tde/src/part/adminconsole/terminatedlg.cpp b/clients/tde/src/part/adminconsole/terminatedlg.cpp
index f87ae4b..9b9afd7 100644
--- a/clients/tde/src/part/adminconsole/terminatedlg.cpp
+++ b/clients/tde/src/part/adminconsole/terminatedlg.cpp
@@ -22,13 +22,13 @@
#include <klineedit.h>
#include <ktextedit.h>
#include <knuminput.h>
-#include <kactionselector.h>
+#include <tdeactionselector.h>
#include <tqlistbox.h>
#include <kpushbutton.h>
#include <tqpixmap.h>
#include <tqiconset.h>
#include <tqlabel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tqcheckbox.h>
#include <tqradiobutton.h>
diff --git a/clients/tde/src/part/adminusermgmt/Makefile.am b/clients/tde/src/part/adminusermgmt/Makefile.am
index c1273d0..f7eabde 100644
--- a/clients/tde/src/part/adminusermgmt/Makefile.am
+++ b/clients/tde/src/part/adminusermgmt/Makefile.am
@@ -7,5 +7,5 @@ KDE_ICON = libremotelab_adminusermgmt
# Part
kde_module_LTLIBRARIES = libremotelab_adminusermgmt.la
libremotelab_adminusermgmt_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
-libremotelab_adminusermgmt_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -lkio -ltdefx
+libremotelab_adminusermgmt_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx
libremotelab_adminusermgmt_la_SOURCES = part.cpp layout.ui groupauthdlg.cpp groupauthdlgbase.ui
diff --git a/clients/tde/src/part/adminusermgmt/groupauthdlg.cpp b/clients/tde/src/part/adminusermgmt/groupauthdlg.cpp
index 7832b10..0a10668 100644
--- a/clients/tde/src/part/adminusermgmt/groupauthdlg.cpp
+++ b/clients/tde/src/part/adminusermgmt/groupauthdlg.cpp
@@ -22,14 +22,14 @@
#include <klineedit.h>
#include <ktextedit.h>
#include <knuminput.h>
-#include <kactionselector.h>
+#include <tdeactionselector.h>
#include <tqlistbox.h>
#include <kpushbutton.h>
#include <tqpixmap.h>
#include <tqiconset.h>
#include <tqlabel.h>
#include <tqgroupbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tqcheckbox.h>
#include <tqradiobutton.h>
diff --git a/clients/tde/src/part/adminusermgmt/groupauthdlgbase.ui b/clients/tde/src/part/adminusermgmt/groupauthdlgbase.ui
index cf28002..8e57340 100644
--- a/clients/tde/src/part/adminusermgmt/groupauthdlgbase.ui
+++ b/clients/tde/src/part/adminusermgmt/groupauthdlgbase.ui
@@ -71,7 +71,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KActionSelector" row="0" column="0">
+ <widget class="TDEActionSelector" row="0" column="0">
<property name="name">
<cstring>permissionsSelector</cstring>
</property>
diff --git a/clients/tde/src/part/adminusermgmt/layout.ui b/clients/tde/src/part/adminusermgmt/layout.ui
index 104134a..00c519e 100644
--- a/clients/tde/src/part/adminusermgmt/layout.ui
+++ b/clients/tde/src/part/adminusermgmt/layout.ui
@@ -34,7 +34,7 @@
<property name="orientation">
<enum>Vertical</enum>
</property>
- <widget class="KListView" row="1" column="0" colspan="4">
+ <widget class="TDEListView" row="1" column="0" colspan="4">
<column>
<property name="text">
<string>Group Name</string>
@@ -157,7 +157,7 @@
<property name="orientation">
<enum>Vertical</enum>
</property>
- <widget class="KListView" row="1" column="0" colspan="4">
+ <widget class="TDEListView" row="1" column="0" colspan="4">
<column>
<property name="text">
<string>Group Name</string>
diff --git a/clients/tde/src/part/adminusermgmt/part.cpp b/clients/tde/src/part/adminusermgmt/part.cpp
index 37b0b4d..8de3a70 100644
--- a/clients/tde/src/part/adminusermgmt/part.cpp
+++ b/clients/tde/src/part/adminusermgmt/part.cpp
@@ -24,12 +24,12 @@
#include "part.h"
#include <kaboutdata.h> //::createAboutData()
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include <ktextedit.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kmessagebox.h> //::start()
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
#include <kstatusbar.h>
#include <kstdaction.h>
#include <knuminput.h>
@@ -47,7 +47,7 @@
#include <tqpushbutton.h>
#include <tqprogressbar.h>
#include <tqlistview.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <unistd.h> //access()
#include <stdint.h>
@@ -878,8 +878,8 @@ void UserManagementPart::mainEventLoop() {
m_connectionMutex->unlock();
}
-KAboutData* UserManagementPart::createAboutData() {
- return new KAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
+TDEAboutData* UserManagementPart::createAboutData() {
+ return new TDEAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
}
} //namespace RemoteLab
diff --git a/clients/tde/src/part/adminusermgmt/part.h b/clients/tde/src/part/adminusermgmt/part.h
index 00d4577..ba57459 100644
--- a/clients/tde/src/part/adminusermgmt/part.h
+++ b/clients/tde/src/part/adminusermgmt/part.h
@@ -29,15 +29,15 @@
#include <tqframe.h>
#include <tqimage.h>
-#include <kparts/browserextension.h>
-#include <kparts/statusbarextension.h>
-#include <kparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/statusbarextension.h>
+#include <tdeparts/part.h>
#include <kurl.h>
#include <kled.h>
#include <tqtrla.h>
-class KAboutData;
+class TDEAboutData;
using KParts::StatusBarExtension;
class TraceWidget;
class TQSocket;
@@ -58,7 +58,7 @@ namespace RemoteLab
virtual bool openFile() { return false; } // pure virtual in the base class
virtual bool closeURL();
- static KAboutData *createAboutData();
+ static TDEAboutData *createAboutData();
public slots:
virtual bool openURL(const KURL &url);
diff --git a/clients/tde/src/part/commanalyzer/Makefile.am b/clients/tde/src/part/commanalyzer/Makefile.am
index d1b61c6..8e72f05 100644
--- a/clients/tde/src/part/commanalyzer/Makefile.am
+++ b/clients/tde/src/part/commanalyzer/Makefile.am
@@ -7,6 +7,6 @@ KDE_ICON = libremotelab_commanalyzer
#Part
kde_module_LTLIBRARIES = libremotelab_commanalyzer.la
libremotelab_commanalyzer_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT)
-libremotelab_commanalyzer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -lkio -ltdefx -ltdekrbsocket -ltqtrla
+libremotelab_commanalyzer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -ltdeio -ltdefx -ltdekrbsocket -ltqtrla
libremotelab_commanalyzer_la_SOURCES = \
part.cpp layout.ui
diff --git a/clients/tde/src/part/commanalyzer/part.cpp b/clients/tde/src/part/commanalyzer/part.cpp
index 2e86b92..617c1eb 100644
--- a/clients/tde/src/part/commanalyzer/part.cpp
+++ b/clients/tde/src/part/commanalyzer/part.cpp
@@ -5,10 +5,10 @@
#include "part.h"
#include <kaboutdata.h> //::createAboutData()
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include <kmessagebox.h> //::start()
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
#include <kstatusbar.h>
#include <kstdaction.h>
#include <tqfile.h> //encodeName()
@@ -760,8 +760,8 @@ void CommAnalyzerPart::saRefLevelChanged(double newval) {
}
}
-KAboutData* CommAnalyzerPart::createAboutData() {
- return new KAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
+TDEAboutData* CommAnalyzerPart::createAboutData() {
+ return new TDEAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
}
} //namespace RemoteLab
diff --git a/clients/tde/src/part/commanalyzer/part.h b/clients/tde/src/part/commanalyzer/part.h
index a45618c..15bef4e 100644
--- a/clients/tde/src/part/commanalyzer/part.h
+++ b/clients/tde/src/part/commanalyzer/part.h
@@ -4,14 +4,14 @@
#ifndef REMOTELAB_COMMANALYZERPART_H
#define REMOTELAB_COMMANALYZERPART_H
-#include <kparts/browserextension.h>
-#include <kparts/statusbarextension.h>
-#include <kparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/statusbarextension.h>
+#include <tdeparts/part.h>
#include <kurl.h>
#include <tqtrla.h>
-class KAboutData;
+class TDEAboutData;
using KParts::StatusBarExtension;
class TraceWidget;
class TQSocket;
@@ -32,7 +32,7 @@ namespace RemoteLab
virtual bool openFile() { return false; } // pure virtual in the base class
virtual bool closeURL();
- static KAboutData *createAboutData();
+ static TDEAboutData *createAboutData();
public slots:
virtual bool openURL(const KURL &url);
diff --git a/clients/tde/src/part/fpgaprogram/Makefile.am b/clients/tde/src/part/fpgaprogram/Makefile.am
index 1fe1065..903571d 100644
--- a/clients/tde/src/part/fpgaprogram/Makefile.am
+++ b/clients/tde/src/part/fpgaprogram/Makefile.am
@@ -7,5 +7,5 @@ KDE_ICON = libremotelab_fpgaprogrammer
# Part
kde_module_LTLIBRARIES = libremotelab_fpgaprogrammer.la
libremotelab_fpgaprogrammer_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
-libremotelab_fpgaprogrammer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -lkio -ltdefx
+libremotelab_fpgaprogrammer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx
libremotelab_fpgaprogrammer_la_SOURCES = part.cpp layout.ui
diff --git a/clients/tde/src/part/fpgaprogram/part.cpp b/clients/tde/src/part/fpgaprogram/part.cpp
index a9dd169..3539baf 100644
--- a/clients/tde/src/part/fpgaprogram/part.cpp
+++ b/clients/tde/src/part/fpgaprogram/part.cpp
@@ -15,7 +15,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * (c) 2012 Timothy Pearson
+ * (c) 2012-2013 Timothy Pearson
* Raptor Engineering
* http://www.raptorengineeringinc.com
*/
@@ -24,12 +24,12 @@
#include "part.h"
#include <kaboutdata.h> //::createAboutData()
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include <ktextedit.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kmessagebox.h> //::start()
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
#include <kstatusbar.h>
#include <kstdaction.h>
#include <knuminput.h>
@@ -526,8 +526,8 @@ void FPGAProgramPart::mainEventLoop() {
m_connectionMutex->unlock();
}
-KAboutData* FPGAProgramPart::createAboutData() {
- return new KAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
+TDEAboutData* FPGAProgramPart::createAboutData() {
+ return new TDEAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
}
} //namespace RemoteLab
diff --git a/clients/tde/src/part/fpgaprogram/part.h b/clients/tde/src/part/fpgaprogram/part.h
index 9242ae1..48dde79 100644
--- a/clients/tde/src/part/fpgaprogram/part.h
+++ b/clients/tde/src/part/fpgaprogram/part.h
@@ -29,15 +29,15 @@
#include <tqframe.h>
#include <tqimage.h>
-#include <kparts/browserextension.h>
-#include <kparts/statusbarextension.h>
-#include <kparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/statusbarextension.h>
+#include <tdeparts/part.h>
#include <kurl.h>
#include <kled.h>
#include <tqtrla.h>
-class KAboutData;
+class TDEAboutData;
using KParts::StatusBarExtension;
class TraceWidget;
class TQSocket;
@@ -58,7 +58,7 @@ namespace RemoteLab
virtual bool openFile() { return false; } // pure virtual in the base class
virtual bool closeURL();
- static KAboutData *createAboutData();
+ static TDEAboutData *createAboutData();
public slots:
virtual bool openURL(const KURL &url);
diff --git a/clients/tde/src/part/fpgaview/Makefile.am b/clients/tde/src/part/fpgaview/Makefile.am
index a291ae1..9b469b4 100644
--- a/clients/tde/src/part/fpgaview/Makefile.am
+++ b/clients/tde/src/part/fpgaview/Makefile.am
@@ -7,5 +7,5 @@ KDE_ICON = libremotelab_fpgaviewer
# Part
kde_module_LTLIBRARIES = libremotelab_fpgaviewer.la
libremotelab_fpgaviewer_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
-libremotelab_fpgaviewer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -lkio -ltdefx -lkmdi
+libremotelab_fpgaviewer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx -ltdemdi
libremotelab_fpgaviewer_la_SOURCES = part.cpp layout.ui
diff --git a/clients/tde/src/part/fpgaview/part.cpp b/clients/tde/src/part/fpgaview/part.cpp
index 6498b3d..c158a85 100644
--- a/clients/tde/src/part/fpgaview/part.cpp
+++ b/clients/tde/src/part/fpgaview/part.cpp
@@ -24,11 +24,11 @@
#include "part.h"
#include <kaboutdata.h> //::createAboutData()
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include <kmessagebox.h> //::start()
-#include <kparts/genericfactory.h>
-#include <kmdimainfrm.h>
+#include <tdeparts/genericfactory.h>
+#include <tdemdimainfrm.h>
#include <kstatusbar.h>
#include <kstdaction.h>
#include <knuminput.h>
@@ -604,15 +604,15 @@ FPGAViewPart::FPGAViewPart(TQWidget *parentWidget, const char *widgetName, TQObj
// Create menu actions
// Submenus
- KActionCollection *const ac = actionCollection();
- m_modeSubMenu = new KActionMenu(i18n("Mode"), ac, "mode_submenu");
+ TDEActionCollection *const ac = actionCollection();
+ m_modeSubMenu = new TDEActionMenu(i18n("Mode"), ac, "mode_submenu");
m_menuActionList.append(m_modeSubMenu);
// Menu items
- m_modeBasicEnabled = new KToggleAction(i18n("Basic"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(switchToBasicMode()), ac, "mode_basic_enabled");
+ m_modeBasicEnabled = new TDEToggleAction(i18n("Basic"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(switchToBasicMode()), ac, "mode_basic_enabled");
m_modeSubMenu->insert(m_modeBasicEnabled);
- m_modeIntermediateEnabled = new KToggleAction(i18n("Intermediate"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(switchToIntermediateMode()), ac, "mode_intermediate_enabled");
+ m_modeIntermediateEnabled = new TDEToggleAction(i18n("Intermediate"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(switchToIntermediateMode()), ac, "mode_intermediate_enabled");
m_modeSubMenu->insert(m_modeIntermediateEnabled);
- m_modeAdvancedEnabled = new KToggleAction(i18n("Advanced"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(switchToAdvancedMode()), ac, "mode_advanced_enabled");
+ m_modeAdvancedEnabled = new TDEToggleAction(i18n("Advanced"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(switchToAdvancedMode()), ac, "mode_advanced_enabled");
m_modeSubMenu->insert(m_modeAdvancedEnabled);
// Initialize widgets
@@ -1071,7 +1071,7 @@ void FPGAViewPart::connectionStatusChangedCallback() {
processLockouts();
}
-TQPtrList<KAction> FPGAViewPart::menuActionList() {
+TQPtrList<TDEAction> FPGAViewPart::menuActionList() {
return m_menuActionList;
}
@@ -1510,8 +1510,8 @@ void FPGAViewPart::updateDisplay() {
}
}
-KAboutData* FPGAViewPart::createAboutData() {
- return new KAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
+TDEAboutData* FPGAViewPart::createAboutData() {
+ return new TDEAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
}
} //namespace RemoteLab
diff --git a/clients/tde/src/part/fpgaview/part.h b/clients/tde/src/part/fpgaview/part.h
index c03b0b2..5e25529 100644
--- a/clients/tde/src/part/fpgaview/part.h
+++ b/clients/tde/src/part/fpgaview/part.h
@@ -29,17 +29,17 @@
#include <tqframe.h>
#include <tqimage.h>
-#include <kparts/browserextension.h>
-#include <kparts/statusbarextension.h>
-#include <kparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/statusbarextension.h>
+#include <tdeparts/part.h>
#include <kurl.h>
#include <kled.h>
-#include <kmdichildview.h>
+#include <tdemdichildview.h>
#include <tqtrla.h>
-class KAboutData;
+class TDEAboutData;
using KParts::StatusBarExtension;
class TraceWidget;
class TQSocket;
@@ -163,8 +163,8 @@ namespace RemoteLab
virtual bool openFile() { return false; } // pure virtual in the base class
virtual bool closeURL();
- static KAboutData *createAboutData();
- virtual TQPtrList<KAction> menuActionList();
+ static TDEAboutData *createAboutData();
+ virtual TQPtrList<TDEAction> menuActionList();
public slots:
virtual bool openURL(const KURL &url);
@@ -204,11 +204,11 @@ namespace RemoteLab
TQMutex* m_connectionMutex;
TQTimer* m_updateTimer;
- TQPtrList<KAction> m_menuActionList;
- KActionMenu* m_modeSubMenu;
- KToggleAction* m_modeBasicEnabled;
- KToggleAction* m_modeIntermediateEnabled;
- KToggleAction* m_modeAdvancedEnabled;
+ TQPtrList<TDEAction> m_menuActionList;
+ TDEActionMenu* m_modeSubMenu;
+ TDEToggleAction* m_modeBasicEnabled;
+ TDEToggleAction* m_modeIntermediateEnabled;
+ TDEToggleAction* m_modeAdvancedEnabled;
InterfaceMode m_interfaceMode;
diff --git a/clients/tde/src/part/scope/Makefile.am b/clients/tde/src/part/scope/Makefile.am
index e92e6ba..61dd2b5 100644
--- a/clients/tde/src/part/scope/Makefile.am
+++ b/clients/tde/src/part/scope/Makefile.am
@@ -7,6 +7,6 @@ KDE_ICON = libremotelab_scope
#Part
kde_module_LTLIBRARIES = libremotelab_scope.la
libremotelab_scope_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT)
-libremotelab_scope_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -lkio -ltdefx -ltdekrbsocket -ltqtrla
+libremotelab_scope_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -ltdeio -ltdefx -ltdekrbsocket -ltqtrla
libremotelab_scope_la_SOURCES = \
part.cpp layout.ui
diff --git a/clients/tde/src/part/scope/part.cpp b/clients/tde/src/part/scope/part.cpp
index da36f7a..ea8c772 100644
--- a/clients/tde/src/part/scope/part.cpp
+++ b/clients/tde/src/part/scope/part.cpp
@@ -5,11 +5,11 @@
#include "part.h"
#include <kaboutdata.h> //::createAboutData()
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include <kmessagebox.h> //::start()
-#include <kfiledialog.h>
-#include <kparts/genericfactory.h>
+#include <tdefiledialog.h>
+#include <tdeparts/genericfactory.h>
#include <kstatusbar.h>
#include <kstdaction.h>
#include <tqfile.h> //encodeName()
@@ -1566,8 +1566,8 @@ void ScopePart::stopScope() {
m_runningSet = true;
}
-KAboutData* ScopePart::createAboutData() {
- return new KAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
+TDEAboutData* ScopePart::createAboutData() {
+ return new TDEAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
}
} //namespace RemoteLab
diff --git a/clients/tde/src/part/scope/part.h b/clients/tde/src/part/scope/part.h
index c559f1e..202919d 100644
--- a/clients/tde/src/part/scope/part.h
+++ b/clients/tde/src/part/scope/part.h
@@ -4,16 +4,16 @@
#ifndef REMOTELAB_SCOPEPART_H
#define REMOTELAB_SCOPEPART_H
-#include <kparts/browserextension.h>
-#include <kparts/statusbarextension.h>
-#include <kparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/statusbarextension.h>
+#include <tdeparts/part.h>
#include <kurl.h>
#include <tqtrla.h>
#define MAXTRACES 255
-class KAboutData;
+class TDEAboutData;
using KParts::StatusBarExtension;
class TraceWidget;
class TQSocket;
@@ -68,7 +68,7 @@ namespace RemoteLab
virtual bool openFile() { return false; } // pure virtual in the base class
virtual bool closeURL();
- static KAboutData *createAboutData();
+ static TDEAboutData *createAboutData();
public slots:
virtual bool openURL(const KURL &url);
diff --git a/clients/tde/src/part/sensormonitor/Makefile.am b/clients/tde/src/part/sensormonitor/Makefile.am
index 7a0fb82..9e7f45d 100644
--- a/clients/tde/src/part/sensormonitor/Makefile.am
+++ b/clients/tde/src/part/sensormonitor/Makefile.am
@@ -7,5 +7,5 @@ KDE_ICON = libremotelab_sensormonitor
# Part
kde_module_LTLIBRARIES = libremotelab_sensormonitor.la
libremotelab_sensormonitor_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
-libremotelab_sensormonitor_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -lkio -ltdefx
+libremotelab_sensormonitor_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx
libremotelab_sensormonitor_la_SOURCES = part.cpp layout.ui
diff --git a/clients/tde/src/part/sensormonitor/part.cpp b/clients/tde/src/part/sensormonitor/part.cpp
index 92fd199..4e28b6b 100644
--- a/clients/tde/src/part/sensormonitor/part.cpp
+++ b/clients/tde/src/part/sensormonitor/part.cpp
@@ -24,12 +24,12 @@
#include "part.h"
#include <kaboutdata.h> //::createAboutData()
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include <ktextedit.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kmessagebox.h> //::start()
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
#include <kstatusbar.h>
#include <kstdaction.h>
#include <knuminput.h>
@@ -984,8 +984,8 @@ void SensorMonitorPart::recallWaveforms() {
}
}
-KAboutData* SensorMonitorPart::createAboutData() {
- return new KAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
+TDEAboutData* SensorMonitorPart::createAboutData() {
+ return new TDEAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
}
} //namespace RemoteLab
diff --git a/clients/tde/src/part/sensormonitor/part.h b/clients/tde/src/part/sensormonitor/part.h
index f0a5527..f14eca8 100644
--- a/clients/tde/src/part/sensormonitor/part.h
+++ b/clients/tde/src/part/sensormonitor/part.h
@@ -30,9 +30,9 @@
#include <tqimage.h>
#include <tqdatetime.h>
-#include <kparts/browserextension.h>
-#include <kparts/statusbarextension.h>
-#include <kparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/statusbarextension.h>
+#include <tdeparts/part.h>
#include <kurl.h>
#include <tqtrla.h>
@@ -41,7 +41,7 @@
#define MAXTRACES 255
-class KAboutData;
+class TDEAboutData;
using KParts::StatusBarExtension;
class TraceWidget;
class TQSocket;
@@ -133,7 +133,7 @@ namespace RemoteLab
virtual bool openFile() { return false; } // pure virtual in the base class
virtual bool closeURL();
- static KAboutData *createAboutData();
+ static TDEAboutData *createAboutData();
public slots:
virtual bool openURL(const KURL &url);