summaryrefslogtreecommitdiffstats
path: root/kmobile
diff options
context:
space:
mode:
Diffstat (limited to 'kmobile')
-rw-r--r--kmobile/TODO8
-rw-r--r--kmobile/devices/gnokii/gnokii_mobile.h4
-rw-r--r--kmobile/devices/gnokii/gnokiiconfig.cpp2
-rw-r--r--kmobile/devices/gnokii/gnokiiconfig.h2
-rw-r--r--kmobile/devices/skeleton/skeleton.h4
-rw-r--r--kmobile/kmobile.cpp48
-rw-r--r--kmobile/kmobile.h2
-rw-r--r--kmobile/kmobileclient.h4
-rw-r--r--kmobile/kmobiledevice.h4
-rw-r--r--kmobile/kmobileitem.h2
-rw-r--r--kmobile/kmobileview.cpp4
-rw-r--r--kmobile/kmobileview.h4
-rw-r--r--kmobile/pref.h6
-rw-r--r--kmobile/systemtray.cpp8
-rw-r--r--kmobile/systemtray.h2
-rw-r--r--kmobile/tdeioslave/tdeio_mobile.cpp2
16 files changed, 49 insertions, 57 deletions
diff --git a/kmobile/TODO b/kmobile/TODO
index 33b60b83..e3822225 100644
--- a/kmobile/TODO
+++ b/kmobile/TODO
@@ -12,7 +12,6 @@ TODO:
- fix doubled loading of plugins
- where do I get the device name from the kmobile unique process?
- finish the functions which are available to client apps.
-- kitchensync driver/plugin (starting...)
- a plugin for the left side of the "Open File Dialog". ->
makes direct access to mobile devices really easy
- make the daemon a KDED (KDE Meta Daemon) module (tdelibs/kded/HOWTO, README.kded)
@@ -22,10 +21,3 @@ General Interface TODO:
-----------------------
- automatic logoff timers
- Authentication
-
-
-TODO (lower priority):
-----------------------
-- a kmobile-driver, which can connect to another KDE-computer
- to be able to access Calendar-Entries, ToDo's, ... from there
- and to be able to syncronize them via kitchensync (maybe?)
diff --git a/kmobile/devices/gnokii/gnokii_mobile.h b/kmobile/devices/gnokii/gnokii_mobile.h
index cc55911c..461c6d3f 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.h
+++ b/kmobile/devices/gnokii/gnokii_mobile.h
@@ -29,7 +29,7 @@
class KMobileGnokii : public KMobileDevice
{
-Q_OBJECT
+TQ_OBJECT
public:
KMobileGnokii( TQObject *obj=0, const char *name=0, const TQStringList &args=TQStringList() );
@@ -37,7 +37,7 @@ public:
// createObject needs to be reimplemented by every KMobileDevice driver
TQObject *createObject( TQObject *parent=0, const char *name=0,
- const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args=TQStringList() );
+ const char *classname="TQObject", const TQStringList &args=TQStringList() );
// connect, disconnect and current status
bool connectDevice(TQWidget *parent);
diff --git a/kmobile/devices/gnokii/gnokiiconfig.cpp b/kmobile/devices/gnokii/gnokiiconfig.cpp
index 07bc46f4..4be8fb36 100644
--- a/kmobile/devices/gnokii/gnokiiconfig.cpp
+++ b/kmobile/devices/gnokii/gnokiiconfig.cpp
@@ -72,7 +72,7 @@ void GnokiiConfig::setValues(const TQString &model, const TQString &connection,
slotCheckValues();
- connect( cb_Connection, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckValues(const TQString &)) );
+ connect( cb_Connection, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotCheckValues(const TQString &)) );
}
void GnokiiConfig::getValues(TQString &model, TQString &connection, TQString &port, TQString &baud) const
diff --git a/kmobile/devices/gnokii/gnokiiconfig.h b/kmobile/devices/gnokii/gnokiiconfig.h
index 530bb4e4..a3f3b04b 100644
--- a/kmobile/devices/gnokii/gnokiiconfig.h
+++ b/kmobile/devices/gnokii/gnokiiconfig.h
@@ -25,7 +25,7 @@
class GnokiiConfig : public GnokiiConfigUI
{
-Q_OBJECT
+TQ_OBJECT
public:
GnokiiConfig( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
diff --git a/kmobile/devices/skeleton/skeleton.h b/kmobile/devices/skeleton/skeleton.h
index abd1e8bc..b96af359 100644
--- a/kmobile/devices/skeleton/skeleton.h
+++ b/kmobile/devices/skeleton/skeleton.h
@@ -28,7 +28,7 @@
class KMobileSkeleton : public KMobileDevice
{
-Q_OBJECT
+TQ_OBJECT
public:
KMobileSkeleton( TQObject *obj=0, const char *name=0, const TQStringList &args=TQStringList() );
@@ -36,7 +36,7 @@ public:
// createObject needs to be reimplemented by every KMobileDevice driver
TQObject *createObject( TQObject *parent=0, const char *name=0,
- const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args=TQStringList() );
+ const char *classname="TQObject", const TQStringList &args=TQStringList() );
// connect, disconnect and current status
bool connectDevice(TQWidget *parent);
diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp
index 379a17cd..6febb6aa 100644
--- a/kmobile/kmobile.cpp
+++ b/kmobile/kmobile.cpp
@@ -74,8 +74,8 @@ KMobile::KMobile()
setAutoSaveSettings();
// allow the view to change the statusbar and caption
- connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)),
- this, TQT_SLOT(changeStatusbar(const TQString&)));
+ connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)),
+ this, TQ_SLOT(changeStatusbar(const TQString&)));
// restore all configured devices
restoreAll();
@@ -83,7 +83,7 @@ KMobile::KMobile()
// setup the system tray
m_systemTray = new SystemTray(this, "systemTray");
m_systemTray->show();
- connect(m_systemTray, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotQuit()));
+ connect(m_systemTray, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotQuit()));
}
KMobile::~KMobile()
@@ -93,29 +93,29 @@ KMobile::~KMobile()
void KMobile::setupActions()
{
- KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(dockApplication()), actionCollection());
- KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
+ KStdAction::close(this, TQ_SLOT(dockApplication()), actionCollection());
+ KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
- m_toolbarAction = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowToolbar()), actionCollection());
+ m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection());
optionsShowToolbar();
- m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection());
+ m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection());
- KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection());
+ KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
+ KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
+ KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
new TDEAction(i18n("&Add Device..."), "folder-new", 0,
- TQT_TQOBJECT(this), TQT_SLOT(addDevice()), actionCollection(), "device_add");
+ this, TQ_SLOT(addDevice()), actionCollection(), "device_add");
new TDEAction( KGuiItem( i18n("&Remove Device"), "edittrash", i18n("Remove this device") ),
- "Delete", TQT_TQOBJECT(this), TQT_SLOT(removeDevice()), actionCollection(), "device_remove");
+ "Delete", this, TQ_SLOT(removeDevice()), actionCollection(), "device_remove");
new TDEAction(i18n("Re&name Device..."), 0, Key_F2,
- TQT_TQOBJECT(this), TQT_SLOT(renameDevice()), actionCollection(), "device_rename");
+ this, TQ_SLOT(renameDevice()), actionCollection(), "device_rename");
new TDEAction(i18n("&Configure Device..."), "configure", 0,
- TQT_TQOBJECT(this), TQT_SLOT(configDevice()), actionCollection(), "device_configure");
+ this, TQ_SLOT(configDevice()), actionCollection(), "device_configure");
createGUI();
- connect( kapp, TQT_SIGNAL(aboutToQuit()), TQT_TQOBJECT(this), TQT_SLOT(saveAll()) );
+ connect( kapp, TQ_SIGNAL(aboutToQuit()), this, TQ_SLOT(saveAll()) );
}
@@ -261,11 +261,11 @@ void KMobile::addDevice()
dialog->helpText->setText( i18n("Please select the category to which your new device belongs:") );
dialog->addButton->setText( i18n("&Scan for New Devices...") );
dialog->addButton->setDisabled(true);
- dialog->iconView->connect( dialog->iconView, TQT_SIGNAL(doubleClicked(TQIconViewItem*)),
- dialog, TQT_SLOT(accept()) );
+ dialog->iconView->connect( dialog->iconView, TQ_SIGNAL(doubleClicked(TQIconViewItem*)),
+ dialog, TQ_SLOT(accept()) );
dialog->selectButton->setText( i18n("&Add") );
- dialog->selectButton->connect( dialog->selectButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(accept()) );
- dialog->cancelButton->connect( dialog->cancelButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(reject()) );
+ dialog->selectButton->connect( dialog->selectButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(accept()) );
+ dialog->cancelButton->connect( dialog->cancelButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(reject()) );
TDETrader::OfferList list = KMobileItem::getMobileDevicesList();
TDETrader::OfferListIterator it;
@@ -344,11 +344,11 @@ KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent,
if (!dialog)
return 0L;
- dialog->addButton->connect( dialog->addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddDevice()) );
- dialog->iconView->connect( dialog->iconView, TQT_SIGNAL(doubleClicked(TQIconViewItem*)),
- dialog, TQT_SLOT(accept()) );
- dialog->selectButton->connect( dialog->selectButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(accept()) );
- dialog->cancelButton->connect( dialog->cancelButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(reject()) );
+ dialog->addButton->connect( dialog->addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddDevice()) );
+ dialog->iconView->connect( dialog->iconView, TQ_SIGNAL(doubleClicked(TQIconViewItem*)),
+ dialog, TQ_SLOT(accept()) );
+ dialog->selectButton->connect( dialog->selectButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(accept()) );
+ dialog->cancelButton->connect( dialog->cancelButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(reject()) );
for (int i=0; i<countDevices(); i++) {
KService::Ptr ptr;
diff --git a/kmobile/kmobile.h b/kmobile/kmobile.h
index f2e110ac..b3223232 100644
--- a/kmobile/kmobile.h
+++ b/kmobile/kmobile.h
@@ -22,7 +22,7 @@ class SystemTray;
*/
class KMobile : public TDEMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kmobile/kmobileclient.h b/kmobile/kmobileclient.h
index 72bf6605..bdb5b19a 100644
--- a/kmobile/kmobileclient.h
+++ b/kmobile/kmobileclient.h
@@ -6,11 +6,11 @@
#define _KMOBILECLIENT_H_
#include <dcopclient.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
class KDE_EXPORT KMobileClient : public DCOPClient
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMobileClient();
diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h
index 78fc50e8..6647ab73 100644
--- a/kmobile/kmobiledevice.h
+++ b/kmobile/kmobiledevice.h
@@ -24,7 +24,7 @@
#include <tqstringlist.h>
#include <tqmutex.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
#include <klibloader.h>
#include <tdeabc/addressee.h>
@@ -64,7 +64,7 @@ class TDEConfig;
class KDE_EXPORT KMobileDevice : public KLibFactory
{
- Q_OBJECT
+ TQ_OBJECT
friend class KMobileView;
diff --git a/kmobile/kmobileitem.h b/kmobile/kmobileitem.h
index 02ee75cb..d4ae627d 100644
--- a/kmobile/kmobileitem.h
+++ b/kmobile/kmobileitem.h
@@ -12,7 +12,7 @@
class KMobileItem : public TQObject, public TQIconViewItem
{
- Q_OBJECT
+ TQ_OBJECT
friend class KMobileView;
public:
diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp
index 87f691d9..49d69105 100644
--- a/kmobile/kmobileview.cpp
+++ b/kmobile/kmobileview.cpp
@@ -39,8 +39,8 @@ KMobileView::KMobileView(TQWidget *parent, TDEConfig *_config)
setSelectionMode(TQIconView::Single);
setResizeMode(TQIconView::Adjust);
setAutoArrange(true);
- connect(this, TQT_SIGNAL(doubleClicked(TQIconViewItem *)),
- TQT_SLOT(slotDoubleClicked(TQIconViewItem *)));
+ connect(this, TQ_SIGNAL(doubleClicked(TQIconViewItem *)),
+ TQ_SLOT(slotDoubleClicked(TQIconViewItem *)));
}
KMobileView::~KMobileView()
diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h
index 166b8eb9..d8862b85 100644
--- a/kmobile/kmobileview.h
+++ b/kmobile/kmobileview.h
@@ -9,7 +9,7 @@
#include "kmobileiface.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
class TDEConfig;
class KMobileItem;
@@ -22,7 +22,7 @@ class KMobileItem;
*/
class KDE_EXPORT KMobileView : public TQIconView, public kmobileIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMobileView(TQWidget *parent, TDEConfig *_config);
diff --git a/kmobile/pref.h b/kmobile/pref.h
index 81430335..787cc581 100644
--- a/kmobile/pref.h
+++ b/kmobile/pref.h
@@ -13,7 +13,7 @@ class KMobilePrefPageTwo;
class KMobilePreferences : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMobilePreferences();
@@ -25,7 +25,7 @@ private:
class KMobilePrefPageOne : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMobilePrefPageOne(TQWidget *parent = 0);
@@ -33,7 +33,7 @@ public:
class KMobilePrefPageTwo : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMobilePrefPageTwo(TQWidget *parent = 0);
diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp
index f3e8b8a2..020aec1c 100644
--- a/kmobile/systemtray.cpp
+++ b/kmobile/systemtray.cpp
@@ -60,7 +60,7 @@ SystemTray::~SystemTray()
void SystemTray::contextMenuAboutToShow(TDEPopupMenu *menu)
{
- KMobile *main = static_cast<KMobile *>(TQT_TQWIDGET(parent()));
+ KMobile *main = static_cast<KMobile *>(parent());
const int pos = 3;
while (menu->idAt(pos)>=SYSTEMTRAY_STARTID &&
@@ -74,9 +74,9 @@ void SystemTray::contextMenuAboutToShow(TDEPopupMenu *menu)
TQString iconName = main->mainView()->iconFileName(devName);
TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon(iconName, TDEIcon::Small);
menu->insertItem(pm, devName, SYSTEMTRAY_STARTID+no, 3+no);
- menu->connectItem(SYSTEMTRAY_STARTID+no, this, TQT_SLOT(menuItemSelected()));
+ menu->connectItem(SYSTEMTRAY_STARTID+no, this, TQ_SLOT(menuItemSelected()));
}
- connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuItemActivated(int)));
+ connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuItemActivated(int)));
}
void SystemTray::menuItemSelected()
@@ -84,7 +84,7 @@ void SystemTray::menuItemSelected()
if (m_menuID<SYSTEMTRAY_STARTID || m_menuID>SYSTEMTRAY_STARTID+1000)
return;
TQString devName = contextMenu()->text(m_menuID);
- KMobile *main = static_cast<KMobile *>(TQT_TQWIDGET(parent()));
+ KMobile *main = static_cast<KMobile *>(parent());
main->mainView()->startKonqueror(devName);
}
diff --git a/kmobile/systemtray.h b/kmobile/systemtray.h
index a64cabad..88219269 100644
--- a/kmobile/systemtray.h
+++ b/kmobile/systemtray.h
@@ -27,7 +27,7 @@ class TDEAction;
class SystemTray : public KSystemTray
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmobile/tdeioslave/tdeio_mobile.cpp b/kmobile/tdeioslave/tdeio_mobile.cpp
index db531417..7b254410 100644
--- a/kmobile/tdeioslave/tdeio_mobile.cpp
+++ b/kmobile/tdeioslave/tdeio_mobile.cpp
@@ -33,7 +33,7 @@
#include "tdeio_mobile.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
using namespace TDEIO;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 08:26:11 +0000