From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmobile/devices/gnokii/gnokii_mobile.cpp | 56 ++++++++++++------------ kmobile/devices/gnokii/gnokii_mobile.h | 19 ++++---- kmobile/devices/gnokii/gnokiiconfig.cpp | 6 +-- kmobile/devices/gnokii/gnokiiconfig.h | 3 +- kmobile/devices/gnokii/gnokiiconfigui.ui | 34 +++++++------- kmobile/devices/gnokii/libkmobile_gnokii.desktop | 8 ++-- 6 files changed, 64 insertions(+), 62 deletions(-) (limited to 'kmobile/devices/gnokii') 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 @@ GnokiiConfigUI - + GnokiiConfigUI @@ -28,7 +28,7 @@ 6 - + Layout1 @@ -42,7 +42,7 @@ 6 - + buttonHelp @@ -73,7 +73,7 @@ - + buttonOk @@ -87,7 +87,7 @@ true - + buttonCancel @@ -100,7 +100,7 @@ - + frame7 @@ -122,12 +122,12 @@ unnamed - + textLabel2 - Please configure your Gnokii mobile device + Please configure your Gnokii mobile tqdevice @@ -147,7 +147,7 @@ - + frame8 @@ -161,12 +161,12 @@ unnamed - + cb_Baud - + cb_Connection @@ -179,7 +179,7 @@ - + cb_Port @@ -187,7 +187,7 @@ true - + cb_Model @@ -209,7 +209,7 @@ true - + textLabel1 @@ -217,7 +217,7 @@ Connection: - + textLabel1_2 @@ -233,7 +233,7 @@ Phone model: - + textLabel1_3 @@ -241,7 +241,7 @@ Port: - + textLabelBaudRate 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 -- cgit v1.2.1