diff options
Diffstat (limited to 'kmobile')
35 files changed, 497 insertions, 485 deletions
diff --git a/kmobile/DESIGN b/kmobile/DESIGN index 287a3d9a2..96dea2b1b 100644 --- a/kmobile/DESIGN +++ b/kmobile/DESIGN @@ -7,10 +7,10 @@ "kmobile" is suite to easily access "Mobile Devices", which means, that you have one single interface to access -any type of mobile device (e.g. cellular phone, PDAs, +any type of mobile tqdevice (e.g. cellular phone, PDAs, MP3-Players, Digital Cameras and a lot more). -Each of this devices have different types of information, +Each of this tqdevices have different types of information, (capatibilities) which can be: - An addressbook - A collection of notes @@ -18,28 +18,28 @@ Each of this devices have different types of information, - a file storage section (e.g. pictures in digital cameras) - and more -The whole interface is pretty extendable. Each device has -a device driver, which reports the capatibilities of the -connected device to the higher level. -So, if you once write a device driver, you can access it's +The whole interface is pretty extendable. Each tqdevice has +a tqdevice driver, which reports the capatibilities of the +connected tqdevice to the higher level. +So, if you once write a tqdevice driver, you can access it's contents from any KDE application later. Currently the whole interface is divided into 3 sections: -a) The low-level device driver +a) The low-level tqdevice driver b) A mid-layer, which is realized in the "kmobile" application c) A userland library, to which KDE applications should link. Here is some background info: -a) The low-level device driver (libkmobile_xxxx.so) +a) The low-level tqdevice driver (libkmobile_xxxx.so) The low-level driver has to be derived from the KMobileDevice class (#include <kmobiledevice.h>). The drivers should be located below the -directory /device, and you can find a sample implementation in -/device/skeleton-directory. See below for some hints on how to -write such a device driver. +directory /tqdevice, and you can find a sample implementation in +/tqdevice/skeleton-directory. See below for some hints on how to +write such a tqdevice driver. b) The mid-layer (kmobile) @@ -47,7 +47,7 @@ b) The mid-layer (kmobile) The mid-layer handles the main functionality, which is entirely implemented in the kmobile application. All low-level drivers are loaded by kmobile only, and then all low-level functions -to any device is made available to other applications +to any tqdevice is made available to other applications with a DCOP interface. Normal KDE applications should prefer the userland library (see below) instead of using direct DCOP calls. Nevertheless, the DCOP interface might be very interesting to write @@ -56,14 +56,14 @@ standalone command line tools. c) The userland library (libkmobileclient.so) -Any KDE application which wants to access mobile devices +Any KDE application which wants to access mobile tqdevices should #include <kmobileclient.h> and link to the libkmobileclient.la library. libkmobileclient translates all calls to DCOP calls and -makes accessing mobile devices completely transparent to the +makes accessing mobile tqdevices completely transparent to the application. One sample program which uses the client library is the kmobile -kioslave. In Konqueror you might access any mobile device directly +kioslave. In Konqueror you might access any mobile tqdevice directly by giving "mobile:/" as the URL. @@ -72,7 +72,7 @@ by giving "mobile:/" as the URL. HINTS FOR DRIVER DEVELOPERS: ---------------------------- -- KMobile device drivers are very similiar to kioslaves. Refer +- KMobile tqdevice drivers are very similiar to kioslaves. Refer at the kioslave documentation if needed. - derive your driver only from the KMobileDevice class (#include <kmobiledevice.h>) @@ -86,8 +86,8 @@ HINTS FOR DRIVER DEVELOPERS: all calls to your driver, so you always will have a clean state - use lockDevice("/dev/ttyS1") and unlockDevice("/dev/ttyS1") to - lock those devices system-wide (creates /var/lock/LCK..<devname> files), - and to prevent other applications to access the same physical ports/devices + lock those tqdevices system-wide (creates /var/lock/LCK..<devname> files), + and to prevent other applications to access the same physical ports/tqdevices - use the helper functions createDirEntry() and createFileEntry() to create the right UDSEntries for listEntries(), stat(), ... diff --git a/kmobile/TODO b/kmobile/TODO index f5b209fc8..c3cd68d86 100644 --- a/kmobile/TODO +++ b/kmobile/TODO @@ -1,7 +1,7 @@ DONE: ----- -- devices:/ kioslave integration -- show per-device icons in konqueror (same as in the kmobile view) +- tqdevices:/ kioslave integration +- show per-tqdevice icons in konqueror (same as in the kmobile view) - fix mimetypes and their location under /share/mimelnk - kioslaves: cellphone:/, organizer:/, pda:/, (camera:/ not activated) - system tray plugin @@ -10,11 +10,11 @@ DONE: TODO: ----- - fix doubled loading of plugins -- where do I get the device name from the kmobile unique process? +- where do I get the tqdevice 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 + makes direct access to mobile tqdevices really easy - make the daemon a KDED (KDE Meta Daemon) module (kdelibs/kded/HOWTO, README.kded) - more drivers (always) diff --git a/kmobile/devices/digicam/libkmobile_digicam.desktop b/kmobile/devices/digicam/libkmobile_digicam.desktop index adb3c9ab9..6e39cce6b 100644 --- a/kmobile/devices/digicam/libkmobile_digicam.desktop +++ b/kmobile/devices/digicam/libkmobile_digicam.desktop @@ -107,6 +107,6 @@ Comment[uk]=Цей драйвер підтримує багато цифрови Comment[zh_CN]=此驱动程序支持许多数码相机 Comment[zh_TW]=此驅動程式支援許多數位相機 Type=Service -ServiceTypes=kdedevice/mobiledevice +ServiceTypes=kdetqdevice/mobiletqdevice X-KDE-Library=libkmobile_digicam Icon=mobile_camera diff --git a/kmobile/devices/gammu/libkmobile_gammu.desktop b/kmobile/devices/gammu/libkmobile_gammu.desktop index 925e6facd..daaa2372f 100644 --- a/kmobile/devices/gammu/libkmobile_gammu.desktop +++ b/kmobile/devices/gammu/libkmobile_gammu.desktop @@ -57,7 +57,7 @@ Comment[af]=Hierdie drywer ondersteun baie Nokia en ander selfone d.m.v. die gam Comment[bg]=Драйвер за поддръжка на мобилни телефони, предимно Нокиа, чрез библиотеката gammu Comment[bs]=Ovaj drajver podržava mnoge NOKIA i druge mobilne telefone putem gammu biblioteke Comment[ca]=Aquest controlador accepta molts NOKIA i d'altres telèfons mòbils mitjançant la biblioteca «gammu» -Comment[cs]=Tento ovladač podporuje mnoho mobilních telefonů NOKIA a dalších pomocí knihovny gammu +Comment[cs]=Tento ovladač podporuje mnoho mobilních telefonů NOKIA a dalších potqmocí knihovny gammu Comment[cy]=Cynhala'r gyrrydd yma lawer o ffoniau NOKIA a ffoniau symudol eraill drwy'r rhaglengell gammu Comment[da]=Denne driver understøtter mange NOKIA og andre mobiltelefoner via gammu-biblioteket Comment[de]=Ein Treiber, der zahlreiche NOKIA- und sonstige Mobiltelefone über die gammu-Bibliothek unterstützt @@ -85,11 +85,11 @@ Comment[nds]=Disse Driever ünnerstütt vele Nokia- un anner Mobiltelefonen öve Comment[ne]=यो ड्राइभरले गामु लाइब्रेरीबाट धेरै नोकिया र अन्य मोबाइल फोन समर्थन गर्छ Comment[nl]=Dit stuurprogramma biedt ondersteuning voor veel Nokia- en andere mobiele telefoons via de gammu-bibliotheek Comment[nn]=Denne drivaren støttar mange NOKIA og andre mobiltelefonar via gammu-biblioteket -Comment[pl]=Ten sterownik obsługuje wiele telefonów komórkowychNokia i innych za pomocą biblioteki gammu +Comment[pl]=Ten sterownik obsługuje wiele telefonów komórkowychNokia i innych za potqmocą biblioteki gammu Comment[pt]=Este controlador suportar muitos NOKIAs, bem como outros telemóveis, com a biblioteca 'gammu' Comment[pt_BR]=Este driver suporta muitos telefones móveis, NOKIA e outros, via biblioteca gammu Comment[ru]=Этот драйвер поддерживает множество моделей мобильных телефонов Nokia и других производителей через библиотеку gammu -Comment[sk]=Tento ovládač podporuje veľa mobilov NOKIA a iných pomocou knižnice gammu +Comment[sk]=Tento ovládač podporuje veľa mobilov NOKIA a iných potqmocou knižnice gammu Comment[sl]=Ta gonilnik preko knjižnice gammu podpira mnoge prenosne telefone NOKIA kot tudi druge Comment[sr]=Овај управљачки програм подржава многе Nokia-ине и друге мобилне телефоне преко библиотеке gammu Comment[sr@Latn]=Ovaj upravljački program podržava mnoge Nokia-ine i druge mobilne telefone preko biblioteke gammu @@ -101,6 +101,6 @@ Comment[uk]=Цей драйвер підтримує багато мобільн Comment[zh_CN]=此驱动程序通过 gammu 库支持许多诺基亚和其它移动电话 Comment[zh_TW]=此驅動程式支援許多 NOKIA 及其他手機，使用 gammu 函式庫 Type=Service -ServiceTypes=kdedevice/mobiledevice +ServiceTypes=kdetqdevice/mobiletqdevice X-KDE-Library=libkmobile_gammu Icon=mobile_phone diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp index 0b2889a62..dabccb89b 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.cpp +++ b/kmobile/devices/gnokii/gnokii_mobile.cpp @@ -56,10 +56,10 @@ K_EXPORT_COMPONENT_FACTORY( libkmobile_gnokii, KMobileGnokii() ) /* createObject needs to be reimplemented by every KMobileDevice driver */ -TQObject *KMobileGnokii::createObject( TQObject *parent, const char *name, +TQObject *KMobileGnokii::createObject( TQObject *tqparent, const char *name, const char *, const TQStringList &args ) { - return new KMobileGnokii( parent, name, args ); + return new KMobileGnokii( tqparent, name, args ); } @@ -74,16 +74,16 @@ static gn_calnote_list calnote_list; /** - * The KDE gnokii mobile device driver. + * The KDE gnokii mobile tqdevice driver. */ KMobileGnokii::KMobileGnokii(TQObject *obj, const char *name, const TQStringList &args ) : KMobileDevice(obj, name, args) { - // set initial device info + // set initial tqdevice info setClassType( Phone ); - m_deviceName = i18n("Mobile Phone accessed via GNOKII"); - m_deviceRevision = ""; + m_tqdeviceName = i18n("Mobile Phone accessed via GNOKII"); + m_tqdeviceRevision = ""; m_connectionName = "/dev/ircomm0"; setCapabilities( hasAddressBook | hasNotes ); @@ -148,7 +148,7 @@ bool KMobileGnokii::setGnokiiStateMachine() { // set the state machine to our configuration qstrncpy( state.config.model, m_modelnr.utf8(), sizeof(state.config.model)-1 ); - qstrncpy( state.config.port_device, m_port.utf8(), sizeof(state.config.port_device)-1 ); + qstrncpy( state.config.port_tqdevice, m_port.utf8(), sizeof(state.config.port_tqdevice)-1 ); state.config.connection_type = connectionToValue(m_connection); state.config.serial_baudrate = m_baud.toUInt(); return true; @@ -206,7 +206,7 @@ bool KMobileGnokii::loadDeviceConfiguration() static void busterminate(void) { gn_sm_functions(GN_OP_Terminate, NULL, &state); - if (lockfile) gn_device_unlock(lockfile); + if (lockfile) gn_tqdevice_unlock(lockfile); } static TQString businit(void) @@ -222,7 +222,7 @@ static TQString businit(void) aux = gn_cfg_get(gn_cfg_info, "global", "use_locking"); // Defaults to 'no' if (aux && !strcmp(aux, "yes")) { - lockfile = gn_device_lock(state.config.port_device); + lockfile = gn_tqdevice_lock(state.config.port_tqdevice); if (lockfile == NULL) { return i18n("Lock file error.\n " "Please exit all other running instances of gnokii and try again."); @@ -269,7 +269,7 @@ static TQString businit(void) PhoneProductId = TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei); - return TQString::null; + return TQString(); } @@ -282,7 +282,7 @@ static gn_error read_phone_memstat( gn_memory_type memtype, gn_memory_status *me memset(memstat, 0, sizeof(*memstat)); memstat->memory_type = memtype; data.memory_status = memstat; - error = gn_sm_functions(GN_OP_GetMemoryStatus, &data, &state); + error = gn_sm_functions(GN_OP_GetMemorytqStatus, &data, &state); GNOKII_CHECK_ERROR(error); if (error != GN_ERR_NONE) { switch (memtype) { @@ -378,7 +378,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt // try to split Name into FamilyName and GivenName s = TQString(entry.name).simplifyWhiteSpace(); a->setFormattedName(s); - if (s.find(',')!=-1) { + if (s.tqfind(',')!=-1) { addrlist = TQStringList::split(',', s); if (addrlist.count()==2) { a->setFamilyName(addrlist[0].simplifyWhiteSpace()); @@ -493,8 +493,8 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt -// connect the device and ask user to turn device on (if necessary) -bool KMobileGnokii::connectDevice(TQWidget * /*parent*/) +// connect the tqdevice and ask user to turn tqdevice on (if necessary) +bool KMobileGnokii::connectDevice(TQWidget * /*tqparent*/) { if (connected()) return true; @@ -505,8 +505,8 @@ bool KMobileGnokii::connectDevice(TQWidget * /*parent*/) return m_connected; } -// disconnect the device and return true, if sucessful -bool KMobileGnokii::disconnectDevice(TQWidget * /*parent*/) +// disconnect the tqdevice and return true, if sucessful +bool KMobileGnokii::disconnectDevice(TQWidget * /*tqparent*/) { if (!connected()) return true; @@ -517,11 +517,11 @@ bool KMobileGnokii::disconnectDevice(TQWidget * /*parent*/) } // provice the own configuration dialog -bool KMobileGnokii::configDialog(TQWidget *parent) +bool KMobileGnokii::configDialog(TQWidget *tqparent) { TQString model, connection, port, baud; int ok = 0; - GnokiiConfig *dialog = new GnokiiConfig(parent); + GnokiiConfig *dialog = new GnokiiConfig(tqparent); if (dialog) { dialog->setValues(m_modelnr, m_connection, m_port, m_baud); ok = dialog->exec(); @@ -545,7 +545,7 @@ TQString KMobileGnokii::iconFileName() const // return a unique ID, e.g. the IMEI number of phones, or a serial number // this String is used to have a unique identification for syncronisation. -TQString KMobileGnokii::deviceUniqueID() +TQString KMobileGnokii::tqdeviceUniqueID() { return TQString("GNOKII-IMEI-%1").arg(TQString::fromLocal8Bit(imei)); } @@ -609,7 +609,7 @@ int KMobileGnokii::readAddress( int index, KABC::Addressee &addr ) int KMobileGnokii::storeAddress( int, const KABC::Addressee &, bool ) { - /* XXX: this is a read-only device */ + /* XXX: this is a read-only tqdevice */ return KIO::ERR_WRITE_ACCESS_DENIED; } @@ -619,7 +619,7 @@ int KMobileGnokii::storeAddress( int, const KABC::Addressee &, bool ) * Calendar support * **********************************************************************************/ -static void QDateTime_2_timestamp( const TQDateTime &qdt, gn_timestamp &ts ) +static void TQDateTime_2_timestamp( const TQDateTime &qdt, gn_timestamp &ts ) { ts.year = qdt.date().year(); ts.month = qdt.date().month(); @@ -630,7 +630,7 @@ static void QDateTime_2_timestamp( const TQDateTime &qdt, gn_timestamp &ts ) ts.timezone = 0; } -static TQDateTime timestamp_2_QDateTime( const gn_timestamp &ts ) +static TQDateTime timestamp_2_TQDateTime( const gn_timestamp &ts ) { return TQDateTime( TQDate(ts.year, ts.month, ts.day), TQTime(ts.hour, ts.minute, ts.second) ); @@ -700,7 +700,7 @@ int KMobileGnokii::readCalendarEntry( int index, KCal::Event &event ) print_calnote( entry ); - TQDateTime dt_start = timestamp_2_QDateTime(entry.time); + TQDateTime dt_start = timestamp_2_TQDateTime(entry.time); TQDateTime dt_end = dt_start.addSecs( 60*60 ); // XXX: assume one hour event.setDtStart( dt_start ); event.setDtEnd( dt_end ); @@ -727,7 +727,7 @@ int KMobileGnokii::readCalendarEntry( int index, KCal::Event &event ) // alarm: if (entry.alarm.enabled) { - TQDateTime at = timestamp_2_QDateTime(entry.alarm.timestamp); + TQDateTime at = timestamp_2_TQDateTime(entry.alarm.timestamp); if (at.isValid() && dt_start.isValid()) { int seconds = abs(at.secsTo(dt_start)); seconds %= 60*60*24; /* max. 1 day in advance... */ @@ -779,7 +779,7 @@ int KMobileGnokii::storeCalendarEntry( int index, const KCal::Event &event ) error = gn_sm_functions(GN_OP_GetCalendarNote, &data, &state); // GNOKII_CHECK_ERROR(error); - QDateTime_2_timestamp( event.dtStart(), entry.time ); + TQDateTime_2_timestamp( event.dtStart(), entry.time ); strncpy(entry.text, event.summary().utf8(), sizeof(entry.text)-1); // type: @@ -802,12 +802,12 @@ int KMobileGnokii::storeCalendarEntry( int index, const KCal::Event &event ) if (eventalarm) { if (eventalarm->hasTime()) { - QDateTime_2_timestamp( eventalarm->time(), entry.alarm.timestamp ); + TQDateTime_2_timestamp( eventalarm->time(), entry.alarm.timestamp ); } else if (eventalarm->hasStartOffset()) { TQDateTime dt = event.dtStart(); dt = dt.addSecs(-eventalarm->startOffset().asSeconds()); - QDateTime_2_timestamp( dt, entry.alarm.timestamp ); + TQDateTime_2_timestamp( dt, entry.alarm.timestamp ); } } } @@ -871,7 +871,7 @@ int KMobileGnokii::readNote( int index, TQString ¬e ) "Device Driver : %4\n" "Device Revision: %5\n") .arg(index).arg(index) - .arg(deviceClassName()).arg(deviceName()).arg(revision()); + .arg(tqdeviceClassName()).arg(tqdeviceName()).arg(revision()); return 0; } diff --git a/kmobile/devices/gnokii/gnokii_mobile.h b/kmobile/devices/gnokii/gnokii_mobile.h index 6be2196a0..9562c2221 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.h +++ b/kmobile/devices/gnokii/gnokii_mobile.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef LIBKMOBILE_GNOKII_H @@ -30,25 +30,26 @@ class KMobileGnokii : public KMobileDevice { Q_OBJECT + TQ_OBJECT public: KMobileGnokii( TQObject *obj=0, const char *name=0, const TQStringList &args=TQStringList() ); ~KMobileGnokii(); // createObject needs to be reimplemented by every KMobileDevice driver - TQObject *createObject( TQObject *parent=0, const char *name=0, - const char *classname="TQObject", const TQStringList &args=TQStringList() ); + TQObject *createObject( TQObject *tqparent=0, const char *name=0, + const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args=TQStringList() ); // connect, disconnect and current status - bool connectDevice(TQWidget *parent); - bool disconnectDevice(TQWidget *parent); + bool connectDevice(TQWidget *tqparent); + bool disconnectDevice(TQWidget *tqparent); - // provide a device-specific configure dialog - bool configDialog(TQWidget *parent); + // provide a tqdevice-specific configure dialog + bool configDialog(TQWidget *tqparent); // filename and path to gnokii-icon TQString iconFileName() const; - TQString deviceUniqueID(); + TQString tqdeviceUniqueID(); /* * Addressbook / Phonebook support diff --git a/kmobile/devices/gnokii/gnokiiconfig.cpp b/kmobile/devices/gnokii/gnokiiconfig.cpp index 07bc46f46..f5bcd648e 100644 --- a/kmobile/devices/gnokii/gnokiiconfig.cpp +++ b/kmobile/devices/gnokii/gnokiiconfig.cpp @@ -43,8 +43,8 @@ #define BAUDRATES "57600 38400 19200 14400 9600 4800 2400" -GnokiiConfig::GnokiiConfig( TQWidget* parent, const char* name, bool modal, WFlags fl ) - : GnokiiConfigUI(parent, name, modal, fl) +GnokiiConfig::GnokiiConfig( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) + : GnokiiConfigUI(tqparent, name, modal, fl) { TQStringList list = TQStringList::split(" ", MODELS); cb_Model->insertStringList(list); @@ -85,7 +85,7 @@ void GnokiiConfig::getValues(TQString &model, TQString &connection, TQString &po void GnokiiConfig::slotCheckValues(const TQString &txt) { - bool disable_serial = (TQString("infrared irda").find(txt,0,false)>=0); + bool disable_serial = (TQString("infrared irda").tqfind(txt,0,false)>=0); textLabelBaudRate->setDisabled(disable_serial); cb_Baud->setDisabled(disable_serial); } diff --git a/kmobile/devices/gnokii/gnokiiconfig.h b/kmobile/devices/gnokii/gnokiiconfig.h index 30f548bf3..bb6ffe771 100644 --- a/kmobile/devices/gnokii/gnokiiconfig.h +++ b/kmobile/devices/gnokii/gnokiiconfig.h @@ -26,8 +26,9 @@ class GnokiiConfig : public GnokiiConfigUI { Q_OBJECT + TQ_OBJECT public: - GnokiiConfig( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + GnokiiConfig( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~GnokiiConfig(); void setValues(const TQString &model, const TQString &connection, const TQString &port, const TQString &baud); diff --git a/kmobile/devices/gnokii/gnokiiconfigui.ui b/kmobile/devices/gnokii/gnokiiconfigui.ui index 24b663f81..418cc0a7e 100644 --- a/kmobile/devices/gnokii/gnokiiconfigui.ui +++ b/kmobile/devices/gnokii/gnokiiconfigui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>GnokiiConfigUI</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>GnokiiConfigUI</cstring> </property> @@ -28,7 +28,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -42,7 +42,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -73,7 +73,7 @@ </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -87,7 +87,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -100,7 +100,7 @@ </widget> </hbox> </widget> - <widget class="QFrame" row="0" column="0"> + <widget class="TQFrame" row="0" column="0"> <property name="name"> <cstring>frame7</cstring> </property> @@ -122,12 +122,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> <property name="text"> - <string>Please configure your Gnokii mobile device</string> + <string>Please configure your Gnokii mobile tqdevice</string> </property> </widget> <spacer row="2" column="0"> @@ -147,7 +147,7 @@ </size> </property> </spacer> - <widget class="QFrame" row="1" column="0"> + <widget class="TQFrame" row="1" column="0"> <property name="name"> <cstring>frame8</cstring> </property> @@ -161,12 +161,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="3" column="1"> + <widget class="TQComboBox" row="3" column="1"> <property name="name"> <cstring>cb_Baud</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>cb_Connection</cstring> </property> @@ -179,7 +179,7 @@ </sizepolicy> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <property name="name"> <cstring>cb_Port</cstring> </property> @@ -187,7 +187,7 @@ <bool>true</bool> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>cb_Model</cstring> </property> @@ -209,7 +209,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -217,7 +217,7 @@ <string>Connection:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -233,7 +233,7 @@ <string>Phone model:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -241,7 +241,7 @@ <string>Port:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabelBaudRate</cstring> </property> diff --git a/kmobile/devices/gnokii/libkmobile_gnokii.desktop b/kmobile/devices/gnokii/libkmobile_gnokii.desktop index f6ec4b96e..986eded04 100644 --- a/kmobile/devices/gnokii/libkmobile_gnokii.desktop +++ b/kmobile/devices/gnokii/libkmobile_gnokii.desktop @@ -57,7 +57,7 @@ Comment[af]=Hierdie drywer ondersteun baie Nokia en ander selfone d.m.v. die gno Comment[bg]=Драйвер за поддръжка на мобилни телефони, предимно Нокиа, чрез библиотеката gnokii Comment[bs]=Ovaj drajver podržava mnoge NOKIA i druge mobilne telefone putem gnokii biblioteke Comment[ca]=Aquest controlador accepta molts NOKIA i d'altres telèfons mòbils mitjançant la biblioteca «gnokii» -Comment[cs]=Tento ovladač podporuje mnoho mobilních telefonů NOKIA a dalších pomocí knihovny gnokii +Comment[cs]=Tento ovladač podporuje mnoho mobilních telefonů NOKIA a dalších potqmocí knihovny gnokii Comment[cy]=Cynhala'r gyrrydd yma lawer o ffoniau NOKIA a ffoniau symudol eraill drwy'r rhaglengell gnokii Comment[da]=Denne driver understøtter mange NOKIA og andre mobiltelefoner via gnokii-biblioteket Comment[de]=Ein Treiber, der zahlreiche NOKIA- und sonstige Mobiltelefone über die gnokii-Bibliothek unterstützt @@ -85,11 +85,11 @@ Comment[nds]=Disse Driever ünnerstütt vele Nokia- un anner Mobiltelefonen öve Comment[ne]=यो ड्राइभरले जिनोकी लाइब्रेरीबाट धेरै नोकिया र अन्य मोबाइल फोन समर्थन गर्छ Comment[nl]=Dit stuurprogramma biedt ondersteuning voor veel Nokia- en andere mobiele telefoons via de gnokii-bibliotheek Comment[nn]=Denne drivaren støttar mange NOKIA og andre mobiltelefonar via gnokii-biblioteket -Comment[pl]=Ten sterownik obsługuje wiele telefonów komórkowychNokia i innych za pomocą biblioteki gnokii +Comment[pl]=Ten sterownik obsługuje wiele telefonów komórkowychNokia i innych za potqmocą biblioteki gnokii Comment[pt]=Este controlador suportar muitos NOKIAs, bem como outros telemóveis, com a biblioteca 'gnokii' Comment[pt_BR]=Este driver suporta muitos telefones móveis, NOKIA e outros, via biblioteca gnokii Comment[ru]=Этот драйвер поддерживает множество моделей мобильных телефонов Nokia и других производителей через библиотеку gnokii -Comment[sk]=Tento ovládač podporuje veľa mobilov NOKIA a iných pomocou knižnice gnokii +Comment[sk]=Tento ovládač podporuje veľa mobilov NOKIA a iných potqmocou knižnice gnokii Comment[sl]=Ta gonilnik preko knjižnice gnokii podpira mnoge prenosne telefone NOKIA kot tudi druge Comment[sr]=Овај управљачки програм подржава многе Nokia-ине и друге мобилне телефоне преко библиотеке gnokii Comment[sr@Latn]=Ovaj upravljački program podržava mnoge Nokia-ine i druge mobilne telefone preko biblioteke gnokii @@ -101,6 +101,6 @@ Comment[uk]=Цей драйвер підтримує багато мобільн Comment[zh_CN]=此驱动程序通过 gnokii 库支持许多诺基亚和其它移动电话 Comment[zh_TW]=此驅動程式支援許多 NOKIA 及其他手機，使用 gnokii 函式庫 Type=Service -ServiceTypes=kdedevice/mobiledevice +ServiceTypes=kdetqdevice/mobiletqdevice X-KDE-Library=libkmobile_gnokii Icon=mobile_phone diff --git a/kmobile/devices/skeleton/libkmobile_skeleton.desktop b/kmobile/devices/skeleton/libkmobile_skeleton.desktop index 72943d15a..2b22ca6eb 100644 --- a/kmobile/devices/skeleton/libkmobile_skeleton.desktop +++ b/kmobile/devices/skeleton/libkmobile_skeleton.desktop @@ -102,6 +102,6 @@ Comment[uk]=Прототип мобільного пристрою Comment[zh_CN]=移动万能设备 Comment[zh_TW]=行動通訊空殼裝置 Type=Service -ServiceTypes=kdedevice/mobiledevice +ServiceTypes=kdetqdevice/mobiletqdevice X-KDE-Library=libkmobile_skeleton Icon=mobile_unknown diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp index e6b1d9c59..c027baaeb 100644 --- a/kmobile/devices/skeleton/skeleton.cpp +++ b/kmobile/devices/skeleton/skeleton.cpp @@ -35,24 +35,24 @@ K_EXPORT_COMPONENT_FACTORY( libkmobile_skeleton, KMobileSkeleton() ) /* createObject needs to be reimplemented by every KMobileDevice driver */ -TQObject *KMobileSkeleton::createObject( TQObject *parent, const char *name, +TQObject *KMobileSkeleton::createObject( TQObject *tqparent, const char *name, const char *, const TQStringList &args ) { - return new KMobileSkeleton( parent, name, args ); + return new KMobileSkeleton( tqparent, name, args ); } /** - * The KDE skeleton mobile device driver. + * The KDE skeleton mobile tqdevice driver. */ KMobileSkeleton::KMobileSkeleton(TQObject *obj, const char *name, const TQStringList &args ) : KMobileDevice(obj, name, args) { - // set initial device info + // set initial tqdevice info setClassType( Phone ); - m_deviceName = i18n("LX-50-Moohoo Addressbook (Skeleton)"); - m_deviceRevision = "0.1"; + m_tqdeviceName = i18n("LX-50-Moohoo Addressbook (Skeleton)"); + m_tqdeviceRevision = "0.1"; setCapabilities( hasAddressBook | hasNotes ); } @@ -60,26 +60,26 @@ KMobileSkeleton::~KMobileSkeleton() { } -// connect the device and ask user to turn device on (if necessary) -bool KMobileSkeleton::connectDevice(TQWidget *parent) +// connect the tqdevice and ask user to turn tqdevice on (if necessary) +bool KMobileSkeleton::connectDevice(TQWidget *tqparent) { - if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parent, - i18n("Please turn on your %1 on now and press continue to proceed.").arg(m_deviceName), - m_deviceClassName ) ) + if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparent, + i18n("Please turn on your %1 on now and press continue to proceed.").arg(m_tqdeviceName), + m_tqdeviceClassName ) ) return false; // connect it now... m_connected = true; return m_connected; } -// disconnect the device and return true, if sucessful +// disconnect the tqdevice and return true, if sucessful bool KMobileSkeleton::disconnectDevice(TQWidget *) { m_connected = true; return true; } -// returns true, if this device is read-only (default: false) +// returns true, if this tqdevice is read-only (default: false) bool KMobileSkeleton::isReadOnly() const { return true; @@ -87,7 +87,7 @@ bool KMobileSkeleton::isReadOnly() const // return a unique ID, e.g. the IMEI number of phones, or a serial number // this String is used to have a unique identification for syncronisation. -TQString KMobileSkeleton::deviceUniqueID() +TQString KMobileSkeleton::tqdeviceUniqueID() { return TQString::fromLocal8Bit("SkElEtOn-123456789"); } @@ -132,7 +132,7 @@ int KMobileSkeleton::readAddress( int index, KABC::Addressee &addr ) int KMobileSkeleton::storeAddress( int, const KABC::Addressee &, bool ) { - /* this is a read-only device */ + /* this is a read-only tqdevice */ return KIO::ERR_WRITE_ACCESS_DENIED; } @@ -157,7 +157,7 @@ int KMobileSkeleton::readNote( int index, TQString ¬e ) "Device Driver : %4\n" "Device Revision: %5\n") .arg(index).arg(index) - .arg(deviceClassName()).arg(deviceName()).arg(revision()); + .arg(tqdeviceClassName()).arg(tqdeviceName()).arg(revision()); return 0; } diff --git a/kmobile/devices/skeleton/skeleton.h b/kmobile/devices/skeleton/skeleton.h index de57947a3..8d5c3db4c 100644 --- a/kmobile/devices/skeleton/skeleton.h +++ b/kmobile/devices/skeleton/skeleton.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef LIBKMOBILE_SKELETON_H @@ -29,26 +29,27 @@ class KMobileSkeleton : public KMobileDevice { Q_OBJECT + TQ_OBJECT public: KMobileSkeleton( TQObject *obj=0, const char *name=0, const TQStringList &args=TQStringList() ); ~KMobileSkeleton(); // createObject needs to be reimplemented by every KMobileDevice driver - TQObject *createObject( TQObject *parent=0, const char *name=0, - const char *classname="TQObject", const TQStringList &args=TQStringList() ); + TQObject *createObject( TQObject *tqparent=0, const char *name=0, + const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args=TQStringList() ); // connect, disconnect and current status - bool connectDevice(TQWidget *parent); - bool disconnectDevice(TQWidget *parent); + bool connectDevice(TQWidget *tqparent); + bool disconnectDevice(TQWidget *tqparent); - // returns true, if this device is read-only (default: false) + // returns true, if this tqdevice is read-only (default: false) bool isReadOnly() const; // you may provide your own icon() implementation to display // an appropriate Pixmap (e.g. a Palm Pilot or a Zaurus image). TQString iconFileName() const; - TQString deviceUniqueID(); + TQString tqdeviceUniqueID(); /* * Addressbook / Phonebook support diff --git a/kmobile/kioslave/kio_mobile.cpp b/kmobile/kioslave/kio_mobile.cpp index 5cf5bed5e..b22930e2b 100644 --- a/kmobile/kioslave/kio_mobile.cpp +++ b/kmobile/kioslave/kio_mobile.cpp @@ -78,7 +78,7 @@ KMobileProtocol::~KMobileProtocol() } /* - * getDeviceAndRessource("mobile:/<devicename>/<resource>/...") - split + * getDeviceAndRessource("mobile:/<tqdevicename>/<resource>/...") - split */ int KMobileProtocol::getDeviceAndRessource(const TQString &_path, TQString &devName, TQString &resource, TQString &devPath, @@ -87,7 +87,7 @@ int KMobileProtocol::getDeviceAndRessource(const TQString &_path, // PRINT_DEBUG << TQString("###getDeviceAndRessource### %1\n").arg(_path); TQStringList path = TQStringList::split('/', _path, false); - devName = resource = devPath = TQString::null; + devName = resource = devPath = TQString(); devCaps = KMobileDevice::hasNothing; if (path.count() >= 1) { devName = path[0]; path.pop_front(); }; @@ -120,7 +120,7 @@ int KMobileProtocol::getDeviceAndRessource(const TQString &_path, static -void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString::null) +void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString()) { KIO::UDSAtom atom; atom.m_uds = ID; @@ -227,7 +227,7 @@ void KMobileProtocol::get(const KURL &url) /* - * listRoot() - gives listing of all devices + * listRoot() - gives listing of all tqdevices */ void KMobileProtocol::listRoot(const KURL& url) { @@ -235,8 +235,8 @@ void KMobileProtocol::listRoot(const KURL& url) KIO::UDSEntry entry; - TQStringList deviceNames = m_dev.deviceNames(); - unsigned int dirs = deviceNames.count(); + TQStringList tqdeviceNames = m_dev.tqdeviceNames(); + unsigned int dirs = tqdeviceNames.count(); totalSize(dirs); int classMask = KMobileDevice::Unclassified; @@ -251,14 +251,14 @@ void KMobileProtocol::listRoot(const KURL& url) for (unsigned int i=0; i<dirs; i++) { - TQString devName = deviceNames[i]; + TQString devName = tqdeviceNames[i]; if (classMask != KMobileDevice::Unclassified && m_dev.classType(devName) != classMask) continue; createDirEntry(entry, devName, "mobile:/"+devName, - KMOBILE_MIMETYPE_DEVICE_KONQUEROR(devName)); + KMOBILE_MIMETYPE_DEVICE_KONTQUEROR(devName)); listEntry(entry, false); processedSize(i+1); @@ -307,7 +307,7 @@ TQString KMobileProtocol::entryMimeType(int cap) } /* - * listTopDeviceDir("mobile:/<devicename>") - sub-directory of a devices + * listTopDeviceDir("mobile:/<tqdevicename>") - sub-directory of a tqdevices */ void KMobileProtocol::listTopDeviceDir(const TQString &devName) @@ -334,7 +334,7 @@ void KMobileProtocol::listTopDeviceDir(const TQString &devName) /* - * listEntries("mobile:/<devicename>/<resource>") - resources of a device + * listEntries("mobile:/<tqdevicename>/<resource>") - resources of a tqdevice */ void KMobileProtocol::listEntries(const TQString &devName, const TQString &resource, const TQString &devPath, @@ -356,7 +356,7 @@ void KMobileProtocol::listEntries(const TQString &devName, } /* - * listAddressBook("mobile:/<devicename>/Addressbook) - list the addressbook + * listAddressBook("mobile:/<tqdevicename>/Addressbook) - list the addressbook */ void KMobileProtocol::listAddressBook(const TQString &devName, const TQString &resource) { @@ -377,7 +377,7 @@ void KMobileProtocol::listAddressBook(const TQString &devName, const TQString &r #if 0 TQString content = m_dev.readAddress(devName, i); if ( rx.search( content ) < 0 ) - name = TQString::null; + name = TQString(); else name = "_" + rx.cap(1); #endif @@ -405,7 +405,7 @@ int KMobileProtocol::getVCard( const TQString &devName, TQCString &result, TQStr { PRINT_DEBUG << TQString("getVCard(%1)\n").arg(path); - int index = path.find('.'); + int index = path.tqfind('.'); if (index>0) index = path.left(index).toInt(); if (index<0 || index>=m_dev.numAddresses(devName)) @@ -421,7 +421,7 @@ int KMobileProtocol::getVCard( const TQString &devName, TQCString &result, TQStr } /* - * listCalendar("mobile:/<devicename>/Calendar) - list the calendar entries + * listCalendar("mobile:/<tqdevicename>/Calendar) - list the calendar entries */ void KMobileProtocol::listCalendar( const TQString &devName, const TQString &resource) { @@ -460,7 +460,7 @@ int KMobileProtocol::getCalendar( const TQString &devName, TQCString &result, TQ /* - * listNotes("mobile:/<devicename>/Notes) - list the notes + * listNotes("mobile:/<tqdevicename>/Notes) - list the notes */ void KMobileProtocol::listNotes( const TQString &devName, const TQString &resource) { @@ -494,7 +494,7 @@ int KMobileProtocol::getNote( const TQString &devName, TQCString &result, TQStri { PRINT_DEBUG << TQString("getNote(%1)\n").arg(path); - int index = path.find('_'); + int index = path.tqfind('_'); if (index>0) index = path.left(index).toInt(); if (index<0 || index>=m_dev.numNotes(devName)) @@ -510,7 +510,7 @@ int KMobileProtocol::getNote( const TQString &devName, TQCString &result, TQStri } /* - * listFileStorage("mobile:/<devicename>/Files) - list the files on the device + * listFileStorage("mobile:/<tqdevicename>/Files) - list the files on the tqdevice */ void KMobileProtocol::listFileStorage(const TQString &devName, const TQString &resource, const TQString &devPath) { @@ -536,7 +536,7 @@ int KMobileProtocol::getFileStorage(const TQString &devName, TQCString &result, /** - * Test if the url tqcontains a directory or a file. + * Test if the url contains a directory or a file. */ void KMobileProtocol::stat( const KURL &url ) { diff --git a/kmobile/kioslave/mimetypes/mobile_device.desktop b/kmobile/kioslave/mimetypes/mobile_device.desktop index 4462b124d..a04b0b8fe 100644 --- a/kmobile/kioslave/mimetypes/mobile_device.desktop +++ b/kmobile/kioslave/mimetypes/mobile_device.desktop @@ -58,7 +58,7 @@ Comment[zh_CN]=移动设备 Comment[zh_TW]=行動裝置 Icon=kmobile Type=MimeType -MimeType=kdedevice/mobiledevice +MimeType=kdetqdevice/mobiletqdevice Patterns= X-KDE-AutoEmbed=true diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp index 07fa1582b..a34215e4a 100644 --- a/kmobile/kmobile.cpp +++ b/kmobile/kmobile.cpp @@ -77,7 +77,7 @@ KMobile::KMobile() connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), this, TQT_SLOT(changeStatusbar(const TQString&))); - // restore all configured devices + // restore all configured tqdevices restoreAll(); // setup the system tray @@ -105,13 +105,13 @@ void KMobile::setupActions() KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); new KAction(i18n("&Add Device..."), "folder_new", 0, - this, TQT_SLOT(addDevice()), actionCollection(), "device_add"); - new KAction( KGuiItem( i18n("&Remove Device"), "edittrash", i18n("Remove this device") ), - "Delete", this, TQT_SLOT(removeDevice()), actionCollection(), "device_remove"); + this, TQT_SLOT(addDevice()), actionCollection(), "tqdevice_add"); + new KAction( KGuiItem( i18n("&Remove Device"), "edittrash", i18n("Remove this tqdevice") ), + "Delete", this, TQT_SLOT(removeDevice()), actionCollection(), "tqdevice_remove"); new KAction(i18n("Re&name Device..."), 0, Key_F2, - this, TQT_SLOT(renameDevice()), actionCollection(), "device_rename"); + this, TQT_SLOT(renameDevice()), actionCollection(), "tqdevice_rename"); new KAction(i18n("&Configure Device..."), "configure", 0, - this, TQT_SLOT(configDevice()), actionCollection(), "device_configure"); + this, TQT_SLOT(configDevice()), actionCollection(), "tqdevice_configure"); createGUI(); @@ -240,7 +240,7 @@ void KMobile::optionsPreferences() void KMobile::renameDevice() { - // rename the current selected device + // rename the current selected tqdevice TQIconViewItem *item = m_view->currentItem(); if (item) item->rename(); @@ -258,7 +258,7 @@ void KMobile::addDevice() dialog->setCaption( i18n("Add New Mobile or Portable Device") ); - dialog->helpText->setText( i18n("Please select the category to which your new device belongs:") ); + dialog->helpText->setText( i18n("Please select the category to which your new tqdevice belongs:") ); dialog->addButton->setText( i18n("&Scan for New Devices...") ); dialog->addButton->setDisabled(true); dialog->iconView->connect( dialog->iconView, TQT_SIGNAL(doubleClicked(TQIconViewItem*)), @@ -297,7 +297,7 @@ void KMobile::addDevice() ptr = list[index]; - // add the new device to the list + // add the new tqdevice to the list if (!m_view->addNewDevice(m_config, ptr)) { KMessageBox::error(this, TQString("<qt>KMobile could not load the <b>%1</b> Device Driver.<p>" @@ -313,34 +313,34 @@ void KMobile::addDevice() #if 0 /* * show dialog to user, in which he may choose and select one of the already - * configured mobile devices. + * configured mobile tqdevices. */ -KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent, +KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *tqparent, enum KMobileDevice::ClassType /*type*/, enum KMobileDevice::Capabilities /*caps*/ ) { int num; - m_parent = parent; + m_tqparent = tqparent; - // do we already have some devices configured ? + // do we already have some tqdevices configured ? num = readDevicesList(); if (!num) { int answ; - answ = KMessageBox::questionYesNo(parent, - i18n( "<qt>You have no mobile devices configured yet.<p>" - "Do you want to add a device now ?</qt>" ), + answ = KMessageBox::questionYesNo(tqparent, + i18n( "<qt>You have no mobile tqdevices configured yet.<p>" + "Do you want to add a tqdevice now ?</qt>" ), i18n( "KDE Mobile Device Access" ), KStdGuiItem::add(), i18n("Do Not Add") ); if (answ != KMessageBox::Yes) return 0L; - // add a new device - addDeviceDialog(parent); + // add a new tqdevice + addDeviceDialog(tqparent); } num = readDevicesList(); if (!num) return 0L; - // let the user select one of the configured devices - KMobile_selectiondialog *dialog = new KMobile_selectiondialog(parent); + // let the user select one of the configured tqdevices + KMobile_selectiondialog *dialog = new KMobile_selectiondialog(tqparent); if (!dialog) return 0L; @@ -384,7 +384,7 @@ KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent, void KMobile::removeDevice() { - // remove the current selected device + // remove the current selected tqdevice TQIconViewItem *item = m_view->currentItem(); if (item) m_view->removeDevice( item->text() ); @@ -392,7 +392,7 @@ void KMobile::removeDevice() void KMobile::configDevice() { - // configure the current selected device + // configure the current selected tqdevice TQIconViewItem *item = m_view->currentItem(); if (item) m_view->configDevice( item->text() ); diff --git a/kmobile/kmobile.h b/kmobile/kmobile.h index 18403ffa3..b576352fe 100644 --- a/kmobile/kmobile.h +++ b/kmobile/kmobile.h @@ -23,6 +23,7 @@ class SystemTray; class KMobile : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/kmobile/kmobile_selectiondialog.ui b/kmobile/kmobile_selectiondialog.ui index f637ca9fe..f2e6a5d22 100644 --- a/kmobile/kmobile_selectiondialog.ui +++ b/kmobile/kmobile_selectiondialog.ui @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>tqlayout3</cstring> </property> @@ -27,15 +27,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>helpText</cstring> </property> <property name="text"> - <string><b>Select mobile device:</b></string> + <string><b>Select mobile tqdevice:</b></string> </property> </widget> - <widget class="QIconView" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQIconView" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>iconView</cstring> </property> diff --git a/kmobile/kmobileclient.cpp b/kmobile/kmobileclient.cpp index 05bcff554..518185534 100644 --- a/kmobile/kmobileclient.cpp +++ b/kmobile/kmobileclient.cpp @@ -111,7 +111,7 @@ bool KMobileClient::startKMobileApplication() reply >> ret; \ return ret; -#define RETURN_QSTRING( FUNC, PARAMS ) \ +#define RETURN_TQSTRING( FUNC, PARAMS ) \ RETURN_TYPE( FUNC, PARAMS, TQString ) #define RETURN_BOOL( FUNC, PARAMS ) \ @@ -122,110 +122,110 @@ bool KMobileClient::startKMobileApplication() -TQStringList KMobileClient::deviceNames() +TQStringList KMobileClient::tqdeviceNames() { if (!isKMobileAvailable()) return TQStringList(); - RETURN_TYPE( "deviceNames()", TQString::tqfromLatin1(""), TQStringList ); + RETURN_TYPE( "tqdeviceNames()", TQString::tqfromLatin1(""), TQStringList ); } -void KMobileClient::removeDevice( TQString deviceName ) +void KMobileClient::removeDevice( TQString tqdeviceName ) { - PREPARE( "removeDevice(TQString)", deviceName ); + PREPARE( "removeDevice(TQString)", tqdeviceName ); Q_UNUSED(ok); } -void KMobileClient::configDevice( TQString deviceName ) +void KMobileClient::configDevice( TQString tqdeviceName ) { - PREPARE( "configDevice(TQString)", deviceName ); + PREPARE( "configDevice(TQString)", tqdeviceName ); Q_UNUSED(ok); } -bool KMobileClient::connectDevice( TQString deviceName ) +bool KMobileClient::connectDevice( TQString tqdeviceName ) { - RETURN_BOOL( "connectDevice(TQString)", deviceName ); + RETURN_BOOL( "connectDevice(TQString)", tqdeviceName ); } -bool KMobileClient::disconnectDevice( TQString deviceName ) +bool KMobileClient::disconnectDevice( TQString tqdeviceName ) { - RETURN_BOOL( "disconnectDevice(TQString)", deviceName ); + RETURN_BOOL( "disconnectDevice(TQString)", tqdeviceName ); } -bool KMobileClient::connected( TQString deviceName ) +bool KMobileClient::connected( TQString tqdeviceName ) { - RETURN_BOOL( "connected(TQString)", deviceName ); + RETURN_BOOL( "connected(TQString)", tqdeviceName ); } -TQString KMobileClient::deviceClassName( TQString deviceName ) +TQString KMobileClient::tqdeviceClassName( TQString tqdeviceName ) { - RETURN_QSTRING( "deviceClassName(TQString)", deviceName ); + RETURN_TQSTRING( "tqdeviceClassName(TQString)", tqdeviceName ); } -TQString KMobileClient::deviceName( TQString deviceName ) +TQString KMobileClient::tqdeviceName( TQString tqdeviceName ) { - RETURN_QSTRING( "deviceName(TQString)", deviceName ); + RETURN_TQSTRING( "tqdeviceName(TQString)", tqdeviceName ); } -TQString KMobileClient::revision( TQString deviceName ) +TQString KMobileClient::revision( TQString tqdeviceName ) { - RETURN_QSTRING( "revision(TQString)", deviceName ); + RETURN_TQSTRING( "revision(TQString)", tqdeviceName ); } -int KMobileClient::classType( TQString deviceName ) +int KMobileClient::classType( TQString tqdeviceName ) { - RETURN_INT( "classType(TQString)", deviceName ); + RETURN_INT( "classType(TQString)", tqdeviceName ); } -int KMobileClient::capabilities( TQString deviceName ) +int KMobileClient::capabilities( TQString tqdeviceName ) { - RETURN_INT( "capabilities(TQString)", deviceName ); + RETURN_INT( "capabilities(TQString)", tqdeviceName ); } -TQString KMobileClient::nameForCap( TQString deviceName, int cap ) +TQString KMobileClient::nameForCap( TQString tqdeviceName, int cap ) { - RETURN_QSTRING( "nameForCap(TQString,int)", deviceName << cap ); + RETURN_TQSTRING( "nameForCap(TQString,int)", tqdeviceName << cap ); } -TQString KMobileClient::iconFileName( TQString deviceName ) +TQString KMobileClient::iconFileName( TQString tqdeviceName ) { - RETURN_QSTRING( "iconFileName(TQString)", deviceName ); + RETURN_TQSTRING( "iconFileName(TQString)", tqdeviceName ); } -int KMobileClient::numAddresses( TQString deviceName ) +int KMobileClient::numAddresses( TQString tqdeviceName ) { - RETURN_INT( "numAddresses(TQString)", deviceName ); + RETURN_INT( "numAddresses(TQString)", tqdeviceName ); } -TQString KMobileClient::readAddress( TQString deviceName, int index ) +TQString KMobileClient::readAddress( TQString tqdeviceName, int index ) { - RETURN_QSTRING( "readAddress(TQString,int)", deviceName << index ); + RETURN_TQSTRING( "readAddress(TQString,int)", tqdeviceName << index ); } -bool KMobileClient::storeAddress( TQString deviceName, int index, TQString vcard, bool append ) +bool KMobileClient::storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append ) { - RETURN_BOOL( "storeAddress(TQString,int,TQString,bool)", deviceName << index << vcard << append ); + RETURN_BOOL( "storeAddress(TQString,int,TQString,bool)", tqdeviceName << index << vcard << append ); } -int KMobileClient::numCalendarEntries( TQString deviceName ) +int KMobileClient::numCalendarEntries( TQString tqdeviceName ) { - RETURN_INT( "numCalendarEntries(TQString)", deviceName ); + RETURN_INT( "numCalendarEntries(TQString)", tqdeviceName ); } -int KMobileClient::numNotes( TQString deviceName ) +int KMobileClient::numNotes( TQString tqdeviceName ) { - RETURN_INT( "numNotes(TQString)", deviceName ); + RETURN_INT( "numNotes(TQString)", tqdeviceName ); } -TQString KMobileClient::readNote( TQString deviceName, int index ) +TQString KMobileClient::readNote( TQString tqdeviceName, int index ) { - RETURN_QSTRING( "readNote(TQString,int)", deviceName << index ); + RETURN_TQSTRING( "readNote(TQString,int)", tqdeviceName << index ); } -bool KMobileClient::storeNote( TQString deviceName, int index, TQString note ) +bool KMobileClient::storeNote( TQString tqdeviceName, int index, TQString note ) { - RETURN_BOOL( "storeNote(TQString,int,TQString)", deviceName << index << note ); + RETURN_BOOL( "storeNote(TQString,int,TQString)", tqdeviceName << index << note ); } diff --git a/kmobile/kmobileclient.h b/kmobile/kmobileclient.h index 8ad6204ac..1a813a453 100644 --- a/kmobile/kmobileclient.h +++ b/kmobile/kmobileclient.h @@ -11,6 +11,7 @@ class KDE_EXPORT KMobileClient : public DCOPClient { Q_OBJECT + TQ_OBJECT public: KMobileClient(); virtual ~KMobileClient(); @@ -23,34 +24,34 @@ public: /** * DCOP implementation */ - TQStringList deviceNames(); + TQStringList tqdeviceNames(); - void removeDevice( TQString deviceName ); - void configDevice( TQString deviceName ); + void removeDevice( TQString tqdeviceName ); + void configDevice( TQString tqdeviceName ); - bool connectDevice( TQString deviceName ); - bool disconnectDevice( TQString deviceName ); - bool connected( TQString deviceName ); + bool connectDevice( TQString tqdeviceName ); + bool disconnectDevice( TQString tqdeviceName ); + bool connected( TQString tqdeviceName ); - TQString deviceClassName( TQString deviceName ); - TQString deviceName( TQString deviceName ); - TQString revision( TQString deviceName ); - int classType( TQString deviceName ); + TQString tqdeviceClassName( TQString tqdeviceName ); + TQString tqdeviceName( TQString tqdeviceName ); + TQString revision( TQString tqdeviceName ); + int classType( TQString tqdeviceName ); - int capabilities( TQString deviceName ); - TQString nameForCap( TQString deviceName, int cap ); + int capabilities( TQString tqdeviceName ); + TQString nameForCap( TQString tqdeviceName, int cap ); - TQString iconFileName( TQString deviceName ); + TQString iconFileName( TQString tqdeviceName ); - int numAddresses( TQString deviceName ); - TQString readAddress( TQString deviceName, int index ); - bool storeAddress( TQString deviceName, int index, TQString vcard, bool append ); + int numAddresses( TQString tqdeviceName ); + TQString readAddress( TQString tqdeviceName, int index ); + bool storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append ); - int numCalendarEntries( TQString deviceName ); + int numCalendarEntries( TQString tqdeviceName ); - int numNotes( TQString deviceName ); - TQString readNote( TQString deviceName, int index ); - bool storeNote( TQString deviceName, int index, TQString note ); + int numNotes( TQString tqdeviceName ); + TQString readNote( TQString tqdeviceName, int index ); + bool storeNote( TQString tqdeviceName, int index, TQString note ); private: TQCString m_clientAppId; diff --git a/kmobile/kmobiledevice.cpp b/kmobile/kmobiledevice.cpp index cfcbf6e88..9fdddf6fa 100644 --- a/kmobile/kmobiledevice.cpp +++ b/kmobile/kmobiledevice.cpp @@ -44,7 +44,7 @@ #define PRINT_DEBUG kdDebug(KMOBILEDEVICE_DEBUG_AREA) << "KMobileDevice: " /** - * The base plugin class of all mobile device drivers. + * The base plugin class of all mobile tqdevice drivers. */ KMobileDevice::KMobileDevice(TQObject *obj, const char *name, const TQStringList &args) @@ -53,8 +53,8 @@ KMobileDevice::KMobileDevice(TQObject *obj, const char *name, const TQStringList { setClassType(Unclassified); setCapabilities(hasNothing); - m_deviceName = i18n("Unknown Device"); - m_deviceRevision = i18n("n/a"); /* not available */ + m_tqdeviceName = i18n("Unknown Device"); + m_tqdeviceRevision = i18n("n/a"); /* not available */ m_connectionName = i18n("Unknown Connection"); // set the config file name @@ -78,20 +78,20 @@ bool KMobileDevice::connected() } // returns e.g. "Nokia mobile phone", "MP3 Player", "Handspring Organizer" -TQString KMobileDevice::deviceClassName() const +TQString KMobileDevice::tqdeviceClassName() const { - return m_deviceClassName; + return m_tqdeviceClassName; } -// returns real device name, e.g. "Nokia 6310" or "Rio MP3 Player" -TQString KMobileDevice::deviceName() const +// returns real tqdevice name, e.g. "Nokia 6310" or "Rio MP3 Player" +TQString KMobileDevice::tqdeviceName() const { - return m_deviceName; + return m_tqdeviceName; } TQString KMobileDevice::revision() const { - return m_deviceRevision; + return m_tqdeviceRevision; } bool KMobileDevice::isSlowDevice() const @@ -104,18 +104,18 @@ bool KMobileDevice::isReadOnly() const return false; } -bool KMobileDevice::configDialog( TQWidget *parent ) +bool KMobileDevice::configDialog( TQWidget *tqparent ) { - KMessageBox::information( parent, - i18n("This device does not need any configuration."), - deviceName() ); + KMessageBox::information( tqparent, + i18n("This tqdevice does not need any configuration."), + tqdeviceName() ); return true; } void KMobileDevice::setClassType( enum ClassType ct ) { m_classType = ct; - m_deviceClassName = defaultClassName(ct); + m_tqdeviceClassName = defaultClassName(ct); } enum KMobileDevice::ClassType KMobileDevice::classType() const @@ -239,11 +239,11 @@ int KMobileDevice::storeNote( int, const TQString & ) /* * File storage support - * @param fileName path and name of a file in the mobile device, e.g. "/MYFILE.TXT", "/mp3/song1.mp3" + * @param fileName path and name of a file in the mobile tqdevice, e.g. "/MYFILE.TXT", "/mp3/song1.mp3" */ static -void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString::null) +void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString()) { KIO::UDSAtom atom; atom.m_uds = ID; @@ -282,64 +282,64 @@ void KMobileDevice::createFileEntry(KIO::UDSEntry& entry, const TQString& name, void KMobileDevice::listDir( const TQString & ) { - emit error(KIO::ERR_CANNOT_ENTER_DIRECTORY,TQString::null); + emit error(KIO::ERR_CANNOT_ENTER_DIRECTORY,TQString()); } void KMobileDevice::mkdir( const TQString &, int ) { - emit error(KIO::ERR_COULD_NOT_MKDIR, TQString::null); + emit error(KIO::ERR_COULD_NOT_MKDIR, TQString()); } void KMobileDevice::rename( const TQString &, const TQString &, bool ) { - emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString::null); + emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString()); } void KMobileDevice::symlink( const TQString &, const TQString &, bool ) { - emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString::null); + emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString()); } void KMobileDevice::del( const TQString &, bool ) { - emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString::null); + emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString()); } void KMobileDevice::stat( const TQString & ) { - emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString::null); + emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString()); } void KMobileDevice::chmod( const TQString &, int ) { - emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString::null); + emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString()); } void KMobileDevice::get( const TQString & ) { - emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString::null); + emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString()); } void KMobileDevice::put( const TQString &, int, bool, bool ) { - emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString::null); + emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString()); } void KMobileDevice::mimetype( const TQString & ) { - emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString::null); + emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString()); } void KMobileDevice::special( const TQByteArray & ) { - emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString::null); + emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString()); } /* - * device locking/unlocking functions + * tqdevice locking/unlocking functions */ #ifdef HAVE_BAUDBOY_H @@ -374,7 +374,7 @@ void KMobileDevice::special( const TQByteArray & ) #define DEVICE_LOCK_PATH_PREFIX "/var/lock/LCK.." -bool KMobileDevice::lockDevice(const TQString &device, TQString &err_reason) +bool KMobileDevice::lockDevice(const TQString &tqdevice, TQString &err_reason) { #ifdef HAVE_BAUDBOY_H return ttylock(device.local8bit()) == EXIT_SUCCESS; @@ -383,9 +383,9 @@ bool KMobileDevice::lockDevice(const TQString &device, TQString &err_reason) return !dev_lock(device.local8bit()); # else int pid = -1; - TQStringList all = TQStringList::split('/', device); + TQStringList all = TQStringList::split('/', tqdevice); if (!all.count()) { - err_reason = i18n("Invalid device (%1)").arg(device); + err_reason = i18n("Invalid tqdevice (%1)").arg(tqdevice); return false; } TQString lockName = DEVICE_LOCK_PATH_PREFIX + all[all.count()-1]; @@ -410,12 +410,12 @@ bool KMobileDevice::lockDevice(const TQString &device, TQString &err_reason) sleep(1); if (!file.remove()) { PRINT_DEBUG << TQString("Overriding failed, please check the permissions\n"); - PRINT_DEBUG << TQString("Cannot lock device %1\n").arg(device); + PRINT_DEBUG << TQString("Cannot lock tqdevice %1\n").arg(tqdevice); err_reason = i18n("Lockfile %1 is stale. Please check permissions.").arg(lockName); return false; } } else { - err_reason = i18n("Device %1 already locked.").arg(device); + err_reason = i18n("Device %1 already locked.").arg(tqdevice); return false; } } @@ -424,7 +424,7 @@ bool KMobileDevice::lockDevice(const TQString &device, TQString &err_reason) int fd = open(lockName.local8Bit(), O_CREAT | O_EXCL | O_WRONLY, 0644); if (fd == -1) { if (errno == EEXIST) - err_reason = i18n("Device %1 seems to be locked by unknown process.").arg(device); + err_reason = i18n("Device %1 seems to be locked by unknown process.").arg(tqdevice); else if (errno == EACCES) err_reason = i18n("Please check permission on lock directory."); else if (errno == ENOENT) @@ -439,16 +439,16 @@ bool KMobileDevice::lockDevice(const TQString &device, TQString &err_reason) close(fd); PRINT_DEBUG << TQString("%1: Device %2 locked with lockfile %3.\n") - .arg(deviceName()).arg(device).arg(lockName); + .arg(tqdeviceName()).arg(tqdevice).arg(lockName); - err_reason = TQString::null; + err_reason = TQString(); return true; # endif #endif } -bool KMobileDevice::unlockDevice(const TQString &device) +bool KMobileDevice::unlockDevice(const TQString &tqdevice) { #ifdef HAVE_BAUDBOY_H return ttyunlock(device.local8bit()) == EXIT_SUCCESS; @@ -456,7 +456,7 @@ bool KMobileDevice::unlockDevice(const TQString &device) # ifdef HAVE_LOCKDEV_H return 0 <= dev_unlock(device.local8bit(), getpid()); # else - TQStringList all = TQStringList::split('/', device); + TQStringList all = TQStringList::split('/', tqdevice); if (!all.count()) return false; TQString lockName = DEVICE_LOCK_PATH_PREFIX + all[all.count()-1]; TQFile file(lockName); diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h index 04bd10d2c..16e12aad5 100644 --- a/kmobile/kmobiledevice.h +++ b/kmobile/kmobiledevice.h @@ -37,24 +37,24 @@ class KConfig; -#define KMOBILE_MIMETYPE_DEVICE "kdedevice/mobiledevice" -#define KMOBILE_MIMETYPE_DEVICE_KONQUEROR(name) TQString("kdedevice/kmobile_%1").arg(name) +#define KMOBILE_MIMETYPE_DEVICE "kdetqdevice/mobiletqdevice" +#define KMOBILE_MIMETYPE_DEVICE_KONTQUEROR(name) TQString("kdetqdevice/kmobile_%1").arg(name) #define KMOBILE_MIMETYPE_INODE "inode/" #define KMOBILE_ICON_UNKNOWN "mobile_unknown" /** - * @short Represents the base class for dynamically loaded mobile device drivers. + * @short Represents the base class for dynamically loaded mobile tqdevice drivers. * - * KMobileDevice is the base class for all hardware device drivers. + * KMobileDevice is the base class for all hardware tqdevice drivers. * Every derived class has to add additional functionality. * * For a KMobileSomeDevice driver you have to write the following code: * <pre> - * K_EXPORT_COMPONENT_FACTORY( libkmobile_somedevice, KMobileSomeDevice() ); - * TQObject *KMobileSomeDevice::createObject( TQObject *parent, const char *name, + * K_EXPORT_COMPONENT_FACTORY( libkmobile_sometqdevice, KMobileSomeDevice() ); + * TQObject *KMobileSomeDevice::createObject( TQObject *tqparent, const char *name, * const char *, const TQStringList &args ) * { - * return new KMobileSomeDevice( parent, name, args ); + * return new KMobileSomeDevice( tqparent, name, args ); * } * </pre> * @@ -65,13 +65,14 @@ class KConfig; class KDE_EXPORT KMobileDevice : public KLibFactory { Q_OBJECT + TQ_OBJECT friend class KMobileView; public: /** * Construct a new KMobileDevice. * - * @param obj The parent object. This is usually 0. + * @param obj The tqparent object. This is usually 0. * @param name The object name. For session management and window management to work. * @param args Additional commandline parameters - the first entry has the config file name. */ @@ -82,46 +83,46 @@ public: /** * Connect to the device. * - * @param parent The parent widget. It will be used as parent for message boxes. + * @param tqparent The tqparent widget. It will be used as tqparent for message boxes. */ - virtual bool connectDevice( TQWidget *parent = 0 ) = 0; + virtual bool connectDevice( TQWidget *tqparent = 0 ) = 0; /** * Disconnect from the device. * - * @param parent The parent widget. It will be used as parent for message boxes. + * @param tqparent The tqparent widget. It will be used as tqparent for message boxes. */ - virtual bool disconnectDevice( TQWidget *parent = 0 ) = 0; + virtual bool disconnectDevice( TQWidget *tqparent = 0 ) = 0; /** - * Returns true, if the device is currently connected and the link is online. + * Returns true, if the tqdevice is currently connected and the link is online. */ virtual bool connected(); /** - * Returns the classname, to which the device belongs. Examples are e.g. + * Returns the classname, to which the tqdevice belongs. Examples are e.g. * "Nokia mobile phone", "MP3 Player", "Handspring Organizer" */ - virtual TQString deviceClassName() const; + virtual TQString tqdeviceClassName() const; /** - * Returns the real devices name, e.g. "Nokia 6310" or "Rio MP3 Player" + * Returns the real tqdevices name, e.g. "Nokia 6310" or "Rio MP3 Player" */ - virtual TQString deviceName() const; + virtual TQString tqdeviceName() const; /** - * Returns the hardware revision of the devices, e.g. "Revision 1.2" + * Returns the hardware revision of the tqdevices, e.g. "Revision 1.2" */ virtual TQString revision() const; /** - * Returns an unique ID for the device, e.g. IMEI number on phones, or serial number. + * Returns an unique ID for the tqdevice, e.g. IMEI number on phones, or serial number. * The returned String is used to have a unique identification for syncronisation. */ - virtual TQString deviceUniqueID() = 0; + virtual TQString tqdeviceUniqueID() = 0; /** - * Returns true, if the device is connected via a slow connection. + * Returns true, if the tqdevice is connected via a slow connection. * Good examples for slow connections are serial or infrared ports. */ virtual bool isSlowDevice() const; @@ -132,11 +133,11 @@ public: virtual bool isReadOnly() const; /** - * Pop-up a device-specific configuration dialog. + * Pop-up a tqdevice-specific configuration dialog. * - * @param parent The parent widget. It will be used as parent for the configuration dialog. + * @param tqparent The tqparent widget. It will be used as tqparent for the configuration dialog. */ - virtual bool configDialog(TQWidget *parent); + virtual bool configDialog(TQWidget *tqparent); // The ClassType may be used e.g. to select an suitable icon enum ClassType { @@ -157,14 +158,14 @@ public: static TQString defaultIconFileName( ClassType ct = Unclassified ); static TQString defaultClassName( ClassType ct = Unclassified ); - // The capabilities of this device (bitmapped value) + // The capabilities of this tqdevice (bitmapped value) enum Capabilities { hasNothing = 0, // not supported hasAddressBook = 1, // mobile phones, organizers, ... hasCalendar = 2, // organizers, mobile phones, ... hasNotes = 4, // organizers, mobile phones, ... hasFileStorage = 8, // organizers, handhelds, mp3-player, ... - hasAnyCapability = 0xffff // used to select devices independent of the capatibilities + hasAnyCapability = 0xffff // used to select tqdevices independent of the capatibilities }; int capabilities() const; const TQString nameForCap(int cap) const; @@ -205,7 +206,7 @@ public: */ /** - * helper functions for the kmobile device drivers + * helper functions for the kmobile tqdevice drivers */ void createDirEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime) const; @@ -316,7 +317,7 @@ public: signals: /** * Call this from stat() to express details about an object, the - * UDSEntry customarily tqcontains the atoms describing file name, size, + * UDSEntry customarily contains the atoms describing file name, size, * mimetype, etc. * @param _entry The UDSEntry containing all of the object attributes. */ @@ -447,9 +448,9 @@ signals: * @return a button code, as defined in KMessageBox, or 0 on communication error. */ int messageBox( MessageBoxType type, const TQString &text, - const TQString &caption = TQString::null, - const TQString &buttonYes = TQString::null, - const TQString &buttonNo = TQString::null ); + const TQString &caption = TQString(), + const TQString &buttonYes = TQString(), + const TQString &buttonNo = TQString() ); /** * Call this in @ref #get and @ref #copy, to give the total size @@ -469,7 +470,7 @@ signals: void connectionChanged( bool conn_established ); protected: - // only available to sub-classed device drivers: + // only available to sub-classed tqdevice drivers: void setClassType( enum ClassType ct ); void setCapabilities( int caps ); KConfig *config() const { return m_config; }; @@ -477,21 +478,21 @@ protected: /** - * Lock/Unlock serial ports and other devices - * @param device Name of a device port (e.g. /dev/ttyS1, ttyS1, /dev/ircomm0) - * Returns true, if device could be locked or unlocked + * Lock/Unlock serial ports and other tqdevices + * @param tqdevice Name of a tqdevice port (e.g. /dev/ttyS1, ttyS1, /dev/ircomm0) + * Returns true, if tqdevice could be locked or unlocked */ - bool lockDevice(const TQString &device, TQString &err_reason); - bool unlockDevice(const TQString &device); + bool lockDevice(const TQString &tqdevice, TQString &err_reason); + bool unlockDevice(const TQString &tqdevice); protected: - TQMutex m_mutex; // mutex to syncronize DCOP accesses to this device + TQMutex m_mutex; // mutex to syncronize DCOP accesses to this tqdevice TQString m_configFileName; - KConfig *m_config; // this is where this device should store it's configuration + KConfig *m_config; // this is where this tqdevice should store it's configuration enum ClassType m_classType; - TQString m_deviceClassName; // e.g. "Nokia mobile phone", "MP3 Player", "Handspring Organizer" - TQString m_deviceName; // e.g. "Nokia 6310", "Opie" - TQString m_deviceRevision; // e.g. "Revision 1.2" or "n/a" + TQString m_tqdeviceClassName; // e.g. "Nokia mobile phone", "MP3 Player", "Handspring Organizer" + TQString m_tqdeviceName; // e.g. "Nokia 6310", "Opie" + TQString m_tqdeviceRevision; // e.g. "Revision 1.2" or "n/a" TQString m_connectionName; // e.g. "IRDA", "USB", "Cable", "gnokii", "gammu", ... int m_caps; // see enum Capabilities bool m_connected; diff --git a/kmobile/kmobileiface.h b/kmobile/kmobileiface.h index 60974b268..5d39f236c 100644 --- a/kmobile/kmobileiface.h +++ b/kmobile/kmobileiface.h @@ -16,40 +16,40 @@ class kmobileIface : virtual public DCOPObject public: k_dcop: - virtual TQStringList deviceNames() = 0; + virtual TQStringList tqdeviceNames() = 0; - virtual void removeDevice( TQString deviceName ) = 0; - virtual void configDevice( TQString deviceName ) = 0; + virtual void removeDevice( TQString tqdeviceName ) = 0; + virtual void configDevice( TQString tqdeviceName ) = 0; - virtual bool connectDevice( TQString deviceName ) = 0; - virtual bool disconnectDevice( TQString deviceName ) = 0; - virtual bool connected( TQString deviceName ) = 0; + virtual bool connectDevice( TQString tqdeviceName ) = 0; + virtual bool disconnectDevice( TQString tqdeviceName ) = 0; + virtual bool connected( TQString tqdeviceName ) = 0; - virtual TQString deviceClassName( TQString deviceName ) = 0; - virtual TQString deviceName( TQString deviceName ) = 0; - virtual TQString revision( TQString deviceName ) = 0; - virtual int classType( TQString deviceName ) = 0; + virtual TQString tqdeviceClassName( TQString tqdeviceName ) = 0; + virtual TQString tqdeviceName( TQString tqdeviceName ) = 0; + virtual TQString revision( TQString tqdeviceName ) = 0; + virtual int classType( TQString tqdeviceName ) = 0; - virtual int capabilities( TQString deviceName ) = 0; - virtual TQString nameForCap( TQString deviceName, int cap ) = 0; + virtual int capabilities( TQString tqdeviceName ) = 0; + virtual TQString nameForCap( TQString tqdeviceName, int cap ) = 0; - virtual TQString iconFileName( TQString deviceName ) = 0; + virtual TQString iconFileName( TQString tqdeviceName ) = 0; - virtual int numAddresses( TQString deviceName ) = 0; - virtual TQString readAddress( TQString deviceName, int index ) = 0; - virtual bool storeAddress( TQString deviceName, int index, TQString vcard, bool append ) = 0; + virtual int numAddresses( TQString tqdeviceName ) = 0; + virtual TQString readAddress( TQString tqdeviceName, int index ) = 0; + virtual bool storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append ) = 0; - virtual int numCalendarEntries( TQString deviceName ) = 0; + virtual int numCalendarEntries( TQString tqdeviceName ) = 0; - virtual int numNotes( TQString deviceName ) = 0; - virtual TQString readNote( TQString deviceName, int index ) = 0; - virtual bool storeNote( TQString deviceName, int index, TQString note ) = 0; + virtual int numNotes( TQString tqdeviceName ) = 0; + virtual TQString readNote( TQString tqdeviceName, int index ) = 0; + virtual bool storeNote( TQString tqdeviceName, int index, TQString note ) = 0; /* - * DCOP functions for the devices:/ kioslave + * DCOP functions for the tqdevices:/ kioslave */ k_dcop: - virtual TQStringList kio_devices_deviceInfo(TQString deviceName) = 0; + virtual TQStringList kio_tqdevices_tqdeviceInfo(TQString tqdeviceName) = 0; }; #endif // _KMOBILEIFACE_H_ diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp index 3780c9801..0ea93353f 100644 --- a/kmobile/kmobileitem.cpp +++ b/kmobile/kmobileitem.cpp @@ -29,17 +29,17 @@ #define PRINT_DEBUG kdDebug() << "KMobileItem: " -KMobileItem::KMobileItem(TQIconView *parent, KConfig *_config, KService::Ptr service) - : TQObject(parent), TQIconViewItem(parent), m_dev(0L) +KMobileItem::KMobileItem(TQIconView *tqparent, KConfig *_config, KService::Ptr service) + : TQObject(tqparent), TQIconViewItem(tqparent), m_dev(0L) { config = _config; Q_CHECK_PTR(service); if (service) { setText(service->name()); - m_deviceDesktopFile = service->desktopEntryName(); - m_deviceConfigFile = TQString("kmobile_%1_rc").arg(text()); - m_deviceConfigFile = m_deviceConfigFile.tqreplace(' ', ""); + m_tqdeviceDesktopFile = service->desktopEntryName(); + m_tqdeviceConfigFile = TQString("kmobile_%1_rc").arg(text()); + m_tqdeviceConfigFile = m_tqdeviceConfigFile.tqreplace(' ', ""); m_iconName = service->icon(); }; @@ -51,8 +51,8 @@ KMobileItem::KMobileItem(TQIconView *parent, KConfig *_config, KService::Ptr ser } /* restore this item from the config file */ -KMobileItem::KMobileItem(TQIconView *parent, KConfig *_config, int reload_index) - : TQObject(parent), TQIconViewItem(parent), m_dev(0L) +KMobileItem::KMobileItem(TQIconView *tqparent, KConfig *_config, int reload_index) + : TQObject(tqparent), TQIconViewItem(tqparent), m_dev(0L) { config = _config; @@ -75,8 +75,8 @@ void KMobileItem::configSave() const { config->setGroup( config_SectionName() ); config->writeEntry( "Name", text() ); - config->writeEntry( "Config", m_deviceConfigFile ); - config->writeEntry( "DesktopFile", m_deviceDesktopFile ); + config->writeEntry( "Config", m_tqdeviceConfigFile ); + config->writeEntry( "DesktopFile", m_tqdeviceDesktopFile ); config->writeEntry( "IconName", m_iconName ); config->sync(); } @@ -85,12 +85,12 @@ bool KMobileItem::configLoad(int idx) { config->setGroup( config_SectionName(idx) ); setText( config->readEntry("Name") ); - m_deviceConfigFile = config->readEntry( "Config" ); - m_deviceDesktopFile = config->readEntry( "DesktopFile" ); + m_tqdeviceConfigFile = config->readEntry( "Config" ); + m_tqdeviceDesktopFile = config->readEntry( "DesktopFile" ); m_iconName = config->readEntry( "IconName" ); - if (text().isEmpty() || m_deviceConfigFile.isEmpty() || - m_deviceDesktopFile.isEmpty() || m_iconName.isEmpty() ) + if (text().isEmpty() || m_tqdeviceConfigFile.isEmpty() || + m_tqdeviceDesktopFile.isEmpty() || m_iconName.isEmpty() ) return false; return true; @@ -110,7 +110,7 @@ TQString KMobileItem::config_SectionName(int idx) const /* this MimeType is used by konqueror */ TQString KMobileItem::getKonquMimeType() const { - return KMOBILE_MIMETYPE_DEVICE_KONQUEROR(text()); + return KMOBILE_MIMETYPE_DEVICE_KONTQUEROR(text()); } /* provide MimeType for konqueror */ @@ -120,12 +120,12 @@ void KMobileItem::writeKonquMimeFile() const TQString icon = m_iconName; int p = icon.findRev('/'); if (p>=0) icon = icon.mid(p+1); - p = icon.find('.'); + p = icon.tqfind('.'); if (p>=0) icon = icon.left(p); TQString comment; if (m_dev) - comment = m_dev->deviceClassName(); + comment = m_dev->tqdeviceClassName(); if (comment.isEmpty()) comment = KMobileDevice::defaultClassName(KMobileDevice::Unclassified); @@ -142,7 +142,7 @@ void KMobileItem::writeKonquMimeFile() const /* - * get a list of all services providing a libkmobile device driver + * get a list of all services providing a libkmobile tqdevice driver */ KTrader::OfferList KMobileItem::getMobileDevicesList() { @@ -158,16 +158,16 @@ KService::Ptr KMobileItem::getServicePtr() const KService::Ptr ptr; for ( it = list.begin(); it != list.end(); ++it ) { KService::Ptr ptr = *it; - if (ptr->desktopEntryName() == m_deviceDesktopFile) + if (ptr->desktopEntryName() == m_tqdeviceDesktopFile) return ptr; } PRINT_DEBUG << TQString("Service for library '%1' not found in KService list\n") - .arg(m_deviceDesktopFile); + .arg(m_tqdeviceDesktopFile); return 0L; } /* - * loads & initializes the device and returns a pointer to it. + * loads & initializes the tqdevice and returns a pointer to it. */ bool KMobileItem::driverAvailable() { @@ -184,9 +184,9 @@ bool KMobileItem::driverAvailable() return false; m_dev = static_cast<KMobileDevice *>(factory->create(this, ptr->name().utf8(), - "KMobileDevice", TQStringList(m_deviceConfigFile))); + "KMobileDevice", TQStringList(m_tqdeviceConfigFile))); PRINT_DEBUG << TQString("Got KMobileDevice object at 0x%1, configfile=%2\n") - .arg((unsigned long)m_dev, 0, 16).arg(m_deviceConfigFile); + .arg((unsigned long)m_dev, 0, 16).arg(m_tqdeviceConfigFile); return (m_dev != 0); } diff --git a/kmobile/kmobileitem.h b/kmobile/kmobileitem.h index 2977fda7d..cfbca72c7 100644 --- a/kmobile/kmobileitem.h +++ b/kmobile/kmobileitem.h @@ -13,10 +13,11 @@ class KMobileItem : public TQObject, public TQIconViewItem { Q_OBJECT + TQ_OBJECT friend class KMobileView; public: - KMobileItem(TQIconView *parent, KConfig *config, KService::Ptr service); - KMobileItem(TQIconView *parent, KConfig *config, int reload_index); + KMobileItem(TQIconView *tqparent, KConfig *config, KService::Ptr service); + KMobileItem(TQIconView *tqparent, KConfig *config, int reload_index); virtual ~KMobileItem(); void configSave() const; @@ -43,8 +44,8 @@ private slots: private: KConfig *config; - TQString m_deviceConfigFile; - TQString m_deviceDesktopFile; + TQString m_tqdeviceConfigFile; + TQString m_tqdeviceDesktopFile; TQString m_iconName; }; diff --git a/kmobile/kmobileui.rc b/kmobile/kmobileui.rc index 95af1dd3b..9b259334a 100644 --- a/kmobile/kmobileui.rc +++ b/kmobile/kmobileui.rc @@ -8,22 +8,22 @@ </Menu> <Menu name="Device"> <text>&Device</text> - <Action name="device_add" /> - <Action name="device_remove" /> + <Action name="tqdevice_add" /> + <Action name="tqdevice_remove" /> <Separator/> - <Action name="device_rename" /> - <Action name="device_changeicon" /> + <Action name="tqdevice_rename" /> + <Action name="tqdevice_changeicon" /> <Separator/> - <Action name="device_configure" /> + <Action name="tqdevice_configure" /> </Menu> </MenuBar> <ToolBar noMerge="1" name="mainToolBar" fullWidth="true" > <text>Main Toolbar</text> <Action name="file_save" /> <Separator/> - <Action name="device_add" /> - <Action name="device_remove" /> + <Action name="tqdevice_add" /> + <Action name="tqdevice_remove" /> <Separator/> - <Action name="device_configure"/> + <Action name="tqdevice_configure"/> </ToolBar> </kpartgui> diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp index 616b9edc6..7a83f52ef 100644 --- a/kmobile/kmobileview.cpp +++ b/kmobile/kmobileview.cpp @@ -32,8 +32,8 @@ #include "kmobileitem.h" -KMobileView::KMobileView(TQWidget *parent, KConfig *_config) - : DCOPObject("kmobileIface"), TQIconView(parent) +KMobileView::KMobileView(TQWidget *tqparent, KConfig *_config) + : DCOPObject("kmobileIface"), TQIconView(tqparent) { m_config = _config; setSelectionMode(TQIconView::Single); @@ -49,7 +49,7 @@ KMobileView::~KMobileView() bool KMobileView::addNewDevice(KConfig *config, KService::Ptr service) { - kdDebug() << "New mobile device item:\n"; + kdDebug() << "New mobile tqdevice item:\n"; kdDebug() << TQString("LIBRARY: '%1', NAME: '%2', ICON: '%3', COMMENT: '%4'\n") .arg(service->library()).arg(service->name()).arg(service->icon()) .arg(service->comment()); @@ -89,10 +89,10 @@ void KMobileView::restoreAll() emit signalChangeStatusbar( i18n("Configuration restored") ); } -KMobileItem *KMobileView::findDevice( const TQString &deviceName ) const +KMobileItem *KMobileView::findDevice( const TQString &tqdeviceName ) const { for ( TQIconViewItem *item = firstItem(); item; item = item->nextItem() ) { - if (item->text() == deviceName) + if (item->text() == tqdeviceName) return static_cast<KMobileItem *>(item); } return 0L; @@ -119,7 +119,7 @@ void KMobileView::slotDoubleClicked( TQIconViewItem * item ) #define MUTEX_UNLOCK(dev) dev->m_mutex.unlock(); } -TQStringList KMobileView::deviceNames() +TQStringList KMobileView::tqdeviceNames() { TQStringList names; for ( TQIconViewItem *item = firstItem(); item; item = item->nextItem() ) { @@ -128,15 +128,15 @@ TQStringList KMobileView::deviceNames() return names; } -void KMobileView::removeDevice( TQString deviceName ) +void KMobileView::removeDevice( TQString tqdeviceName ) { - delete findDevice(deviceName); - emit signalChangeStatusbar( i18n("%1 removed").arg(deviceName) ); + delete findDevice(tqdeviceName); + emit signalChangeStatusbar( i18n("%1 removed").arg(tqdeviceName) ); } -void KMobileView::configDevice( TQString deviceName ) +void KMobileView::configDevice( TQString tqdeviceName ) { - KMobileItem *dev = findDevice(deviceName); + KMobileItem *dev = findDevice(tqdeviceName); if (!dev || !dev->driverAvailable()) return; MUTEX_LOCK(dev->m_dev); @@ -145,9 +145,9 @@ void KMobileView::configDevice( TQString deviceName ) } -bool KMobileView::connectDevice( TQString deviceName ) +bool KMobileView::connectDevice( TQString tqdeviceName ) { - KMobileItem *dev = findDevice(deviceName); + KMobileItem *dev = findDevice(tqdeviceName); if (!dev || !dev->driverAvailable()) return false; bool connected; @@ -155,14 +155,14 @@ bool KMobileView::connectDevice( TQString deviceName ) connected = dev->m_dev->connectDevice(); MUTEX_UNLOCK(dev->m_dev); emit signalChangeStatusbar( - connected ? i18n("Connection to %1 established").arg(deviceName) - : i18n("Connection to %1 failed").arg(deviceName) ); + connected ? i18n("Connection to %1 established").arg(tqdeviceName) + : i18n("Connection to %1 failed").arg(tqdeviceName) ); return connected; } -bool KMobileView::disconnectDevice( TQString deviceName ) +bool KMobileView::disconnectDevice( TQString tqdeviceName ) { - KMobileItem *dev = findDevice(deviceName); + KMobileItem *dev = findDevice(tqdeviceName); if (!dev || !dev->driverAvailable()) return true; bool disconnected; @@ -170,14 +170,14 @@ bool KMobileView::disconnectDevice( TQString deviceName ) disconnected = dev->m_dev->disconnectDevice(); MUTEX_UNLOCK(dev->m_dev); emit signalChangeStatusbar( - disconnected ? i18n("%1 disconnected").arg(deviceName) - : i18n("Disconnection of %1 failed").arg(deviceName) ); + disconnected ? i18n("%1 disconnected").arg(tqdeviceName) + : i18n("Disconnection of %1 failed").arg(tqdeviceName) ); return disconnected; } -bool KMobileView::connected( TQString deviceName ) +bool KMobileView::connected( TQString tqdeviceName ) { - KMobileItem *dev = findDevice(deviceName); + KMobileItem *dev = findDevice(tqdeviceName); if (!dev || !dev->driverAvailable()) return false; bool conn; @@ -188,35 +188,35 @@ bool KMobileView::connected( TQString deviceName ) } -TQString KMobileView::deviceClassName( TQString deviceName ) +TQString KMobileView::tqdeviceClassName( TQString tqdeviceName ) { - KMobileItem *dev = findDevice(deviceName); + KMobileItem *dev = findDevice(tqdeviceName); if (!dev || !dev->driverAvailable()) - return TQString::null; + return TQString(); TQString cn; MUTEX_LOCK(dev->m_dev); - cn = dev->m_dev->deviceClassName(); + cn = dev->m_dev->tqdeviceClassName(); MUTEX_UNLOCK(dev->m_dev); return cn; } -TQString KMobileView::deviceName( TQString deviceName ) +TQString KMobileView::tqdeviceName( TQString tqdeviceName ) { - KMobileItem *dev = findDevice(deviceName); + KMobileItem *dev = findDevice(tqdeviceName); if (!dev || !dev->driverAvailable()) - return TQString::null; + return TQString(); TQString dn; MUTEX_LOCK(dev->m_dev); - dn = dev->m_dev->deviceName(); + dn = dev->m_dev->tqdeviceName(); MUTEX_UNLOCK(dev->m_dev); return dn; } -TQString KMobileView::revision( TQString deviceName ) +TQString KMobileView::revision( TQString tqdeviceName ) { - KMobileItem *dev = findDevice(deviceName); + KMobileItem *dev = findDevice(tqdeviceName); if (!dev || !dev->driverAvailable()) - return TQString::null; + return TQString(); TQString rev; MUTEX_LOCK(dev->m_dev); rev = dev->m_dev->revision(); @@ -224,9 +224,9 @@ TQString KMobileView::revision( TQString deviceName ) return rev; } -int KMobileView::classType( TQString deviceName ) +int KMobileView::classType( TQString tqdeviceName ) { - KMobileItem *dev = findDevice(deviceName); + KMobileItem *dev = findDevice(tqdeviceName); if (!dev || !dev->driverAvailable()) return KMobileDevice::Unclassified; int ct; @@ -236,9 +236,9 @@ int KMobileView::classType( TQString deviceName ) return ct; } -int KMobileView::capabilities( TQString deviceName ) +int KMobileView::capabilities( TQString tqdeviceName ) { - KMobileItem *dev = findDevice(deviceName); + KMobileItem *dev = findDevice(tqdeviceName); if (!dev || !dev->driverAvailable()) return KMobileDevice::hasNothing; int cap; @@ -248,11 +248,11 @@ int KMobileView::capabilities( TQString deviceName ) return cap; } -TQString KMobileView::nameForCap( TQString deviceName, int cap ) +TQString KMobileView::nameForCap( TQString tqdeviceName, int cap ) { - KMobileItem *dev = findDevice(deviceName); + KMobileItem *dev = findDevice(tqdeviceName); if (!dev || !dev->driverAvailable()) - return TQString::null; + return TQString(); TQString nc; MUTEX_LOCK(dev->m_dev); nc = dev->m_dev->nameForCap(cap); @@ -260,11 +260,11 @@ TQString KMobileView::nameForCap( TQString deviceName, int cap ) return nc; } -TQString KMobileView::iconFileName( TQString deviceName ) +TQString KMobileView::iconFileName( TQString tqdeviceName ) { - KMobileItem *dev = findDevice(deviceName); + KMobileItem *dev = findDevice(tqdeviceName); if (!dev || !dev->driverAvailable()) - return TQString::null; + return TQString(); TQString fn; MUTEX_LOCK(dev->m_dev); fn = dev->m_dev->iconFileName(); @@ -272,9 +272,9 @@ TQString KMobileView::iconFileName( TQString deviceName ) return fn; } -int KMobileView::numAddresses( TQString deviceName ) +int KMobileView::numAddresses( TQString tqdeviceName ) { - KMobileItem *dev = findDevice(deviceName); + KMobileItem *dev = findDevice(tqdeviceName); if (!dev || !dev->driverAvailable()) return 0; int num; @@ -284,11 +284,11 @@ int KMobileView::numAddresses( TQString deviceName ) return num; } -TQString KMobileView::readAddress( TQString deviceName, int index ) +TQString KMobileView::readAddress( TQString tqdeviceName, int index ) { - KMobileItem *dev = findDevice(deviceName); + KMobileItem *dev = findDevice(tqdeviceName); if (!dev || !dev->driverAvailable()) - return TQString::null; + return TQString(); int err; KABC::Addressee adr; @@ -296,22 +296,22 @@ TQString KMobileView::readAddress( TQString deviceName, int index ) err = dev->m_dev->readAddress(index, adr); MUTEX_UNLOCK(dev->m_dev); if (err) - return TQString::null; + return TQString(); KABC::VCardConverter converter; TQString str = converter.createVCard(adr); if (str.isEmpty()) - return TQString::null; + return TQString(); emit signalChangeStatusbar( i18n("Read addressbook entry %1 from %2") - .arg(index).arg(deviceName) ); + .arg(index).arg(tqdeviceName) ); return str; } -bool KMobileView::storeAddress( TQString deviceName, int index, TQString vcard, bool append ) +bool KMobileView::storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append ) { - KMobileItem *dev = findDevice(deviceName); + KMobileItem *dev = findDevice(tqdeviceName); if (!dev || !dev->driverAvailable()) return false; @@ -325,14 +325,14 @@ bool KMobileView::storeAddress( TQString deviceName, int index, TQString vcard, err = dev->m_dev->storeAddress(index, adr, append); MUTEX_UNLOCK(dev->m_dev); emit signalChangeStatusbar( - err ? i18n("Storing contact %1 on %2 failed").arg(index).arg(deviceName) - : i18n("Contact %1 stored on %2").arg(index).arg(deviceName) ); + err ? i18n("Storing contact %1 on %2 failed").arg(index).arg(tqdeviceName) + : i18n("Contact %1 stored on %2").arg(index).arg(tqdeviceName) ); return (err == 0); } -int KMobileView::numCalendarEntries( TQString deviceName ) +int KMobileView::numCalendarEntries( TQString tqdeviceName ) { - KMobileItem *dev = findDevice(deviceName); + KMobileItem *dev = findDevice(tqdeviceName); if (!dev || !dev->driverAvailable()) return 0; int num; @@ -342,9 +342,9 @@ int KMobileView::numCalendarEntries( TQString deviceName ) return num; } -int KMobileView::numNotes( TQString deviceName ) +int KMobileView::numNotes( TQString tqdeviceName ) { - KMobileItem *dev = findDevice(deviceName); + KMobileItem *dev = findDevice(tqdeviceName); if (!dev || !dev->driverAvailable()) return 0; int num; @@ -354,11 +354,11 @@ int KMobileView::numNotes( TQString deviceName ) return num; } -TQString KMobileView::readNote( TQString deviceName, int index ) +TQString KMobileView::readNote( TQString tqdeviceName, int index ) { - KMobileItem *dev = findDevice(deviceName); + KMobileItem *dev = findDevice(tqdeviceName); if (!dev || !dev->driverAvailable()) - return TQString::null; + return TQString(); TQString note; int err; @@ -366,15 +366,15 @@ TQString KMobileView::readNote( TQString deviceName, int index ) err = dev->m_dev->readNote(index, note); MUTEX_UNLOCK(dev->m_dev); if (err) - return TQString::null; + return TQString(); emit signalChangeStatusbar( i18n("Read note %1 from %2") - .arg(index).arg(deviceName) ); + .arg(index).arg(tqdeviceName) ); return note; } -bool KMobileView::storeNote( TQString deviceName, int index, TQString note ) +bool KMobileView::storeNote( TQString tqdeviceName, int index, TQString note ) { - KMobileItem *dev = findDevice(deviceName); + KMobileItem *dev = findDevice(tqdeviceName); if (!dev || !dev->driverAvailable()) return false; @@ -385,28 +385,28 @@ bool KMobileView::storeNote( TQString deviceName, int index, TQString note ) if (err) return false; emit signalChangeStatusbar( i18n("Stored note %1 to %2") - .arg(index).arg(deviceName) ); + .arg(index).arg(tqdeviceName) ); return true; } /* - * DCOP Implementation for the devices:/ kioslave + * DCOP Implementation for the tqdevices:/ kioslave */ /* - * returns the information for the given deviceName for usage in the - * the devices kioslave. The TQStringList returned is comparable to the - * format of /etc/fstab file. Please refer to the devices kioslave for + * returns the information for the given tqdeviceName for usage in the + * the tqdevices kioslave. The TQStringList returned is comparable to the + * format of /etc/fstab file. Please refer to the tqdevices kioslave for * further information. - * If deviceName is empty, this functions returns information for all - * active mobile devices. - * (function is only used by the devices kioslave - don't use elsewhere !) + * If tqdeviceName is empty, this functions returns information for all + * active mobile tqdevices. + * (function is only used by the tqdevices kioslave - don't use elsewhere !) */ -TQStringList KMobileView::kio_devices_deviceInfo(TQString deviceName) +TQStringList KMobileView::kio_tqdevices_tqdeviceInfo(TQString tqdeviceName) { - TQStringList mobiles = deviceNames(); + TQStringList mobiles = tqdeviceNames(); if (mobiles.count() == 0) return mobiles; @@ -414,10 +414,10 @@ TQStringList KMobileView::kio_devices_deviceInfo(TQString deviceName) for ( TQStringList::Iterator it = mobiles.begin(); it != mobiles.end(); ++it ) { TQString name = *it; - if (deviceName.isEmpty()) + if (tqdeviceName.isEmpty()) mountList << name; else - if (deviceName!=name) + if (tqdeviceName!=name) continue; KMobileItem *dev = findDevice(name); @@ -429,7 +429,7 @@ TQStringList KMobileView::kio_devices_deviceInfo(TQString deviceName) mountList << mime; mountList << "true"; // mountState mountList << "---"; - if (!deviceName.isEmpty()) + if (!tqdeviceName.isEmpty()) break; } return mountList; diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h index 079eaf925..bcbfd4e1e 100644 --- a/kmobile/kmobileview.h +++ b/kmobile/kmobileview.h @@ -23,8 +23,9 @@ class KMobileItem; class KDE_EXPORT KMobileView : public TQIconView, public kmobileIface { Q_OBJECT + TQ_OBJECT public: - KMobileView(TQWidget *parent, KConfig *_config); + KMobileView(TQWidget *tqparent, KConfig *_config); virtual ~KMobileView(); bool addNewDevice(KConfig *config, KService::Ptr service); @@ -33,44 +34,44 @@ public: /** * DCOP implementation */ - TQStringList deviceNames(); + TQStringList tqdeviceNames(); - void removeDevice( TQString deviceName ); - void configDevice( TQString deviceName ); + void removeDevice( TQString tqdeviceName ); + void configDevice( TQString tqdeviceName ); - bool connectDevice( TQString deviceName ); - bool disconnectDevice( TQString deviceName ); - bool connected( TQString deviceName ); + bool connectDevice( TQString tqdeviceName ); + bool disconnectDevice( TQString tqdeviceName ); + bool connected( TQString tqdeviceName ); - TQString deviceClassName( TQString deviceName ); - TQString deviceName( TQString deviceName ); - TQString revision( TQString deviceName ); - int classType( TQString deviceName ); + TQString tqdeviceClassName( TQString tqdeviceName ); + TQString tqdeviceName( TQString tqdeviceName ); + TQString revision( TQString tqdeviceName ); + int classType( TQString tqdeviceName ); - int capabilities( TQString deviceName ); - TQString nameForCap( TQString deviceName, int cap ); + int capabilities( TQString tqdeviceName ); + TQString nameForCap( TQString tqdeviceName, int cap ); - TQString iconFileName( TQString deviceName ); + TQString iconFileName( TQString tqdeviceName ); - int numAddresses( TQString deviceName ); - TQString readAddress( TQString deviceName, int index ); - bool storeAddress( TQString deviceName, int index, TQString vcard, bool append ); + int numAddresses( TQString tqdeviceName ); + TQString readAddress( TQString tqdeviceName, int index ); + bool storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append ); - int numCalendarEntries( TQString deviceName ); + int numCalendarEntries( TQString tqdeviceName ); - int numNotes( TQString deviceName ); - TQString readNote( TQString deviceName, int index ); - bool storeNote( TQString deviceName, int index, TQString note ); + int numNotes( TQString tqdeviceName ); + TQString readNote( TQString tqdeviceName, int index ); + bool storeNote( TQString tqdeviceName, int index, TQString note ); - /* devices kioslave support: */ - TQStringList kio_devices_deviceInfo(TQString deviceName); + /* tqdevices kioslave support: */ + TQStringList kio_tqdevices_tqdeviceInfo(TQString tqdeviceName); public: void saveAll(); void restoreAll(); protected: - KMobileItem * findDevice( const TQString &deviceName ) const; + KMobileItem * findDevice( const TQString &tqdeviceName ) const; protected slots: void slotDoubleClicked( TQIconViewItem * item ); diff --git a/kmobile/libkmobile.desktop b/kmobile/libkmobile.desktop index b6444d2a8..dedeb3701 100644 --- a/kmobile/libkmobile.desktop +++ b/kmobile/libkmobile.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=ServiceType -X-KDE-ServiceType=kdedevice/mobiledevice +X-KDE-ServiceType=kdetqdevice/mobiletqdevice Name=KDE Mobile Device Lowlevel Hardware Driver Name[af]=KDE draagbare toestel laevlak hardeware toestel Name[bs]=KDE hardverski drajver niskog nivoa za mobilne uređaje @@ -28,11 +28,11 @@ Name[kk]=KDE-нің қалта құрылғы жабдықтың төмен де Name[km]=កម្មវិធីបញ្ជាផ្នែករឹងកម្រិតទាបរបស់ឧបករណ៍ចល័ត KDE Name[lt]=KDE mobiliųjų įrenginių žemo lygmens aparatinės įrangos tvarkyklė Name[ms]=Pemacu Perkakasan Tahap Rendah Peranti Mudah Alih KDE -Name[nb]=KDE lavnivå maskinvaredriver for mobile enheter +Name[nb]=KDE lavnivå tqmaskinvaredriver for mobile enheter Name[nds]=Sietstoop-Driever för Mobilreedschappen Name[ne]=केडीई मोबाइल यन्त्रको न्यूनस्तर हार्डवेयर ड्राइभर Name[nl]=Hardware-stuurprogramma voor mobiele apparaten -Name[nn]=Lågnivå maskinvaredrivar for mobileiningar i KDE +Name[nn]=Lågnivå tqmaskinvaredrivar for mobileiningar i KDE Name[pl]=Niskopoziomowy sterownik sprzętu urządzenia przenośnego dla KDE Name[pt]=Controlador de Baixo-Nível de Dispositivos Móveis do KDE Name[pt_BR]=Driver de Hardware de Baixo Nível de Dispositivos Móveis do KDE diff --git a/kmobile/main.cpp b/kmobile/main.cpp index 1b03f9716..c9d7d124d 100644 --- a/kmobile/main.cpp +++ b/kmobile/main.cpp @@ -25,7 +25,7 @@ #include <klocale.h> static const char description[] = - I18N_NOOP("KDE mobile devices manager"); + I18N_NOOP("KDE mobile tqdevices manager"); static const char version[] = "0.1"; diff --git a/kmobile/pref.cpp b/kmobile/pref.cpp index 2bb907445..a6d113350 100644 --- a/kmobile/pref.cpp +++ b/kmobile/pref.cpp @@ -24,8 +24,8 @@ KMobilePreferences::KMobilePreferences() m_pageTwo = new KMobilePrefPageTwo(frame); } -KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *parent) - : TQFrame(parent) +KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *tqparent) + : TQFrame(tqparent) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); @@ -33,8 +33,8 @@ KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *parent) new TQLabel(i18n("Add something here"), this); } -KMobilePrefPageTwo::KMobilePrefPageTwo(TQWidget *parent) - : TQFrame(parent) +KMobilePrefPageTwo::KMobilePrefPageTwo(TQWidget *tqparent) + : TQFrame(tqparent) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); diff --git a/kmobile/pref.h b/kmobile/pref.h index 0b6415a30..641571082 100644 --- a/kmobile/pref.h +++ b/kmobile/pref.h @@ -14,6 +14,7 @@ class KMobilePrefPageTwo; class KMobilePreferences : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KMobilePreferences(); @@ -22,18 +23,20 @@ private: KMobilePrefPageTwo *m_pageTwo; }; -class KMobilePrefPageOne : public QFrame +class KMobilePrefPageOne : public TQFrame { Q_OBJECT + TQ_OBJECT public: - KMobilePrefPageOne(TQWidget *parent = 0); + KMobilePrefPageOne(TQWidget *tqparent = 0); }; -class KMobilePrefPageTwo : public QFrame +class KMobilePrefPageTwo : public TQFrame { Q_OBJECT + TQ_OBJECT public: - KMobilePrefPageTwo(TQWidget *parent = 0); + KMobilePrefPageTwo(TQWidget *tqparent = 0); }; #endif // _KMOBILEPREF_H_ diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp index 01f21c8a5..e40dff642 100644 --- a/kmobile/systemtray.cpp +++ b/kmobile/systemtray.cpp @@ -35,7 +35,7 @@ #include "kmobileview.h" -SystemTray::SystemTray(KMainWindow *parent, const char *name) : KSystemTray(parent, name) +SystemTray::SystemTray(KMainWindow *tqparent, const char *name) : KSystemTray(tqparent, name) { m_appPix = KGlobal::instance()->iconLoader()->loadIcon("kmobile", KIcon::Small); @@ -43,8 +43,8 @@ SystemTray::SystemTray(KMainWindow *parent, const char *name) : KSystemTray(pare setToolTip(); - m_actionCollection = parent->actionCollection(); - KAction *addAction = m_actionCollection->action("device_add"); + m_actionCollection = tqparent->actionCollection(); + KAction *addAction = m_actionCollection->action("tqdevice_add"); KPopupMenu* menu = contextMenu(); addAction->plug(menu); @@ -60,15 +60,15 @@ SystemTray::~SystemTray() void SystemTray::contextMenuAboutToShow(KPopupMenu *menu) { - KMobile *main = static_cast<KMobile *>(parent()); + KMobile *main = static_cast<KMobile *>(tqparent()); const int pos = 3; while (menu->idAt(pos)>=SYSTEMTRAY_STARTID && menu->idAt(pos)<=(SYSTEMTRAY_STARTID+1000)) menu->removeItemAt(pos); - // create menu entries for each mobile device and add it's icon - TQStringList list = main->mainView()->deviceNames(); + // create menu entries for each mobile tqdevice and add it's icon + TQStringList list = main->mainView()->tqdeviceNames(); for (unsigned int no=0; no<list.count(); no++) { TQString devName = list[no]; TQString iconName = main->mainView()->iconFileName(devName); @@ -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 *>(parent()); + KMobile *main = static_cast<KMobile *>(tqparent()); main->mainView()->startKonqueror(devName); } diff --git a/kmobile/systemtray.h b/kmobile/systemtray.h index 4fdef04ca..dce846174 100644 --- a/kmobile/systemtray.h +++ b/kmobile/systemtray.h @@ -28,9 +28,10 @@ class KAction; class SystemTray : public KSystemTray { Q_OBJECT + TQ_OBJECT public: - SystemTray(KMainWindow *parent = 0, const char *name = 0); + SystemTray(KMainWindow *tqparent = 0, const char *name = 0); virtual ~SystemTray(); protected slots: @@ -41,7 +42,7 @@ protected: void contextMenuAboutToShow( KPopupMenu* menu ); private: - void setToolTip(const TQString &tip = TQString::null); + void setToolTip(const TQString &tip = TQString()); TQPixmap m_appPix; TQLabel *m_currentLabel; diff --git a/kmobile/testlibkmobile.cpp b/kmobile/testlibkmobile.cpp index e8ff85580..5d6d17527 100644 --- a/kmobile/testlibkmobile.cpp +++ b/kmobile/testlibkmobile.cpp @@ -25,16 +25,16 @@ int main(int argc, char **argv) TQCString replyType; TQByteArray replyData; - ok = client->call("kmobile", "kmobileIface", "deviceNames()", data, replyType, replyData); + ok = client->call("kmobile", "kmobileIface", "tqdeviceNames()", data, replyType, replyData); TQDataStream reply(replyData, IO_ReadOnly); - TQStringList deviceNames; - reply >> deviceNames; + TQStringList tqdeviceNames; + reply >> tqdeviceNames; kdDebug() << TQString("%1\n").arg(ok?"Ok":"Failure"); - kdDebug() << TQString("Number of currently registered drivers: %1\n").arg(deviceNames.count()); - for (int i=0; i<deviceNames.count(); i++) - kdDebug() << TQString("Device %1: %2\n").arg(i+1).arg(deviceNames[i]); + kdDebug() << TQString("Number of currently registered drivers: %1\n").arg(tqdeviceNames.count()); + for (int i=0; i<tqdeviceNames.count(); i++) + kdDebug() << TQString("Device %1: %2\n").arg(i+1).arg(tqdeviceNames[i]); // return app.exec(); } |