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/kmobileitem.cpp | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'kmobile/kmobileitem.cpp') diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp index 3780c980..0ea93353 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(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); } -- cgit v1.2.3