diff options
Diffstat (limited to 'kontact/interfaces')
-rw-r--r-- | kontact/interfaces/CMakeLists.txt | 8 | ||||
-rw-r--r-- | kontact/interfaces/core.cpp | 9 | ||||
-rw-r--r-- | kontact/interfaces/core.h | 6 | ||||
-rw-r--r-- | kontact/interfaces/kontactplugin.desktop | 52 | ||||
-rw-r--r-- | kontact/interfaces/plugin.cpp | 4 | ||||
-rw-r--r-- | kontact/interfaces/plugin.h | 4 | ||||
-rw-r--r-- | kontact/interfaces/summary.cpp | 4 | ||||
-rw-r--r-- | kontact/interfaces/summary.h | 4 | ||||
-rw-r--r-- | kontact/interfaces/uniqueapphandler.cpp | 8 | ||||
-rw-r--r-- | kontact/interfaces/uniqueapphandler.h | 4 |
10 files changed, 24 insertions, 79 deletions
diff --git a/kontact/interfaces/CMakeLists.txt b/kontact/interfaces/CMakeLists.txt index 94446b1e..f7e630e5 100644 --- a/kontact/interfaces/CMakeLists.txt +++ b/kontact/interfaces/CMakeLists.txt @@ -31,9 +31,11 @@ install( FILES ##### other data ################################ -install( FILES - kontactplugin.desktop - DESTINATION ${SERVICETYPES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE kontactplugin.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} + PO_DIR kontact-desktops +) ##### kpinterfaces (shared) ######################### diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index edaf86da..859e76fa 100644 --- a/kontact/interfaces/core.cpp +++ b/kontact/interfaces/core.cpp @@ -43,7 +43,7 @@ Core::Core( TQWidget *parent, const char *name ) d = new Private; TQTimer* timer = new TQTimer( this ); mLastDate = TQDate::currentDate(); - connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkNewDay() ) ); + connect(timer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkNewDay() ) ); timer->start( 1000*60 ); } @@ -66,13 +66,13 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname ) KParts::ReadOnlyPart *part = KParts::ComponentFactory:: createPartInstanceFromLibrary<KParts::ReadOnlyPart> - ( libname, this, 0, TQT_TQOBJECT(this), "kontact", TQStringList(), &error ); + ( libname, this, 0, this, "kontact", TQStringList(), &error ); KParts::ReadOnlyPart *pimPart = dynamic_cast<KParts::ReadOnlyPart*>( part ); if ( pimPart ) { mParts.insert( libname, pimPart ); - QObject::connect( pimPart, TQT_SIGNAL( destroyed( TQObject * ) ), - TQT_SLOT( slotPartDestroyed( TQObject * ) ) ); + TQObject::connect( pimPart, TQ_SIGNAL( destroyed( TQObject * ) ), + TQ_SLOT( slotPartDestroyed( TQObject * ) ) ); } else { // TODO move to KParts::ComponentFactory switch( error ) { @@ -126,4 +126,3 @@ TQString Core::lastErrorMessage() const } #include "core.moc" -// vim: sw=2 sts=2 et tw=80 diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h index 65e939b9..7317febc 100644 --- a/kontact/interfaces/core.h +++ b/kontact/interfaces/core.h @@ -24,7 +24,7 @@ #define KONTACT_CORE_H #include <tqdatetime.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeparts/mainwindow.h> #include <tdeparts/part.h> @@ -40,7 +40,7 @@ class Plugin; */ class KDE_EXPORT Core : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: virtual ~Core(); @@ -99,5 +99,3 @@ class KDE_EXPORT Core : public KParts::MainWindow } #endif - -// vim: sw=2 sts=2 et tw=80 diff --git a/kontact/interfaces/kontactplugin.desktop b/kontact/interfaces/kontactplugin.desktop index fc4f17cb..1ff8657c 100644 --- a/kontact/interfaces/kontactplugin.desktop +++ b/kontact/interfaces/kontactplugin.desktop @@ -2,58 +2,6 @@ Type=ServiceType X-TDE-ServiceType=Kontact/Plugin Name=Kontact Plugin -Name[af]=Kontact inprop module -Name[ar]=قابس Kontact -Name[be]=Дапаўненне Кантакту -Name[bg]=Приставка на Kontact -Name[br]=Lugent Kontact -Name[bs]=Dodatak za Kontact -Name[ca]=Endollable Kontact -Name[cs]=Modul aplikace Kontact -Name[cy]=Ategyn Kontact -Name[da]=Kontact-plugin -Name[de]=Kontact-Modul -Name[el]=Πρόσθετο Kontact -Name[es]=Plugin Kontact -Name[et]=Kontacti plugin -Name[eu]=Kontact plugin-a -Name[fa]=وصلۀ Kontact -Name[fi]=Kontact-liitännäinen -Name[fr]=Module Kontact -Name[ga]=Breiseán Kontact -Name[gl]=Extensión de Kontact -Name[he]=תוסף Kontact -Name[hi]=कॉन्टेक्ट प्लगइन -Name[hu]=Kontact-bővítőmodul -Name[is]=Kontact íforrit -Name[it]=Plugin Kontact -Name[ja]=Kontact プラグイン -Name[kk]=Kontact модулі -Name[km]=កម្មវិធីជំនួយ Kontact -Name[lt]=Kontact priedas -Name[mk]=Приклучок за Контакт -Name[ms]=Plugin Kontact -Name[nb]=Kontact-programtillegg -Name[nds]=Kontact-Moduul -Name[ne]=सम्पर्क प्लगइन -Name[nn]=Kontact-programtillegg -Name[pl]=Wtyczka Kontakt -Name[pt]='Plugin' do Kontact -Name[pt_BR]=Plug-in do Kontact -Name[ro]=Modul Kontact -Name[ru]=Модуль Kontact -Name[se]=Kontact-lassemoduvla -Name[sl]=Vstavek za Kontact -Name[sr]=Прикључак Kontact-а -Name[sr@Latn]=Priključak Kontact-a -Name[sv]=Kontact-insticksprogram -Name[ta]=சொருகுப்பொருளை தொடர்புக்கொள் -Name[tg]=Модули Kontact -Name[tr]=Kontact Eklentisi -Name[uk]=Втулок Kontact -Name[uz]=Kontact учун плагин -Name[zh_CN]=Kontact 插件 -Name[zh_TW]=Kontack 外掛程式 [PropertyDef::X-TDE-KontactPluginVersion] Type=int diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp index ed81dcb6..71364b6a 100644 --- a/kontact/interfaces/plugin.cpp +++ b/kontact/interfaces/plugin.cpp @@ -147,7 +147,7 @@ KParts::ReadOnlyPart *Plugin::part() if ( !d->part ) { d->part = createPart(); if ( d->part ) { - connect( d->part, TQT_SIGNAL( destroyed() ), TQT_SLOT( partDestroyed() ) ); + connect( d->part, TQ_SIGNAL( destroyed() ), TQ_SLOT( partDestroyed() ) ); core()->partLoaded( this, d->part ); } } @@ -255,5 +255,3 @@ void Plugin::virtual_hook( int, void* ) { } #include "plugin.moc" - -// vim: sw=2 et sts=2 tw=80 diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h index 3d8c66cf..af7cbfa7 100644 --- a/kontact/interfaces/plugin.h +++ b/kontact/interfaces/plugin.h @@ -26,7 +26,7 @@ #include <tqobject.h> #include <kxmlguiclient.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqptrlist.h> class TQStringList; @@ -57,7 +57,7 @@ class Summary; */ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp index 6192dd4c..c48e7889 100644 --- a/kontact/interfaces/summary.cpp +++ b/kontact/interfaces/summary.cpp @@ -82,14 +82,14 @@ void Summary::mousePressEvent( TQMouseEvent *event ) void Summary::mouseMoveEvent( TQMouseEvent *event ) { - if ( (event->state() & Qt::LeftButton) && + if ( (event->state() & TQt::LeftButton) && (event->pos() - mDragStartPoint).manhattanLength() > 4 ) { TQDragObject *drag = new TQTextDrag( "", this, "SummaryWidgetDrag" ); TQPixmap pm = TQPixmap::grabWidget( this ); if ( pm.width() > 300 ) - pm = pm.convertToImage().smoothScale( 300, 300, TQ_ScaleMin ); + pm = pm.convertToImage().smoothScale( 300, 300, TQImage::ScaleMin ); TQPainter painter; painter.begin( &pm ); diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h index 961c4b07..945395c8 100644 --- a/kontact/interfaces/summary.h +++ b/kontact/interfaces/summary.h @@ -23,7 +23,7 @@ #include <tqwidget.h> #include <tqpixmap.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KStatusBar; @@ -35,7 +35,7 @@ namespace Kontact */ class KDE_EXPORT Summary : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp index 98a5d45b..2ad0f638 100644 --- a/kontact/interfaces/uniqueapphandler.cpp +++ b/kontact/interfaces/uniqueapphandler.cpp @@ -156,8 +156,8 @@ UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin if ( mRunningStandalone ) { kapp->dcopClient()->setNotifications( true ); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ), - this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ), + this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); } else { mFactory->createHandler( mPlugin ); } @@ -174,8 +174,8 @@ UniqueAppWatcher::~UniqueAppWatcher() void UniqueAppWatcher::unregisteredFromDCOP( const TQCString& appId ) { if ( appId == mPlugin->name() && mRunningStandalone ) { - disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ), - this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + disconnect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ), + this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); kdDebug(5601) << k_funcinfo << appId << endl; mFactory->createHandler( mPlugin ); kapp->dcopClient()->setNotifications( false ); diff --git a/kontact/interfaces/uniqueapphandler.h b/kontact/interfaces/uniqueapphandler.h index 6ecc2381..bef34d47 100644 --- a/kontact/interfaces/uniqueapphandler.h +++ b/kontact/interfaces/uniqueapphandler.h @@ -24,7 +24,7 @@ #include <dcopobject.h> #include <plugin.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kontact { @@ -93,7 +93,7 @@ template <class T> class UniqueAppHandlerFactory : public UniqueAppHandlerFactor */ class KDE_EXPORT UniqueAppWatcher : public TQObject { - Q_OBJECT + TQ_OBJECT public: |