From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kontact/interfaces/core.cpp | 8 ++++---- kontact/interfaces/core.h | 2 +- kontact/interfaces/plugin.h | 4 ++-- kontact/interfaces/summary.cpp | 18 +++++++++--------- kontact/interfaces/summary.h | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'kontact/interfaces') diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index 6d048504b..e940a53c2 100644 --- a/kontact/interfaces/core.cpp +++ b/kontact/interfaces/core.cpp @@ -42,7 +42,7 @@ Core::Core( TQWidget *parent, const char *name ) { d = new Private; TQTimer* timer = new TQTimer( this ); - mLastDate = TQDate::currentDate(); + mLastDate = TQDate::tqcurrentDate(); connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkNewDay() ) ); timer->start( 1000*60 ); } @@ -114,10 +114,10 @@ void Core::slotPartDestroyed( TQObject * obj ) void Core::checkNewDay() { - if ( mLastDate != TQDate::currentDate() ) - emit dayChanged( TQDate::currentDate() ); + if ( mLastDate != TQDate::tqcurrentDate() ) + emit dayChanged( TQDate::tqcurrentDate() ); - mLastDate = TQDate::currentDate(); + mLastDate = TQDate::tqcurrentDate(); } TQString Core::lastErrorMessage() const diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h index 2d75fb227..e84b3b8d7 100644 --- a/kontact/interfaces/core.h +++ b/kontact/interfaces/core.h @@ -79,7 +79,7 @@ class KDE_EXPORT Core : public KParts::MainWindow void dayChanged( const TQDate& ); protected: - Core( TQWidget *parentWidget = 0, const char *name = 0 ); + Core( TQWidget *tqparentWidget = 0, const char *name = 0 ); TQString lastErrorMessage() const; diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h index 13f14c580..5a62beea4 100644 --- a/kontact/interfaces/plugin.h +++ b/kontact/interfaces/plugin.h @@ -114,7 +114,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient TQString executableName() const; /** - Set name of library which contains the KPart used by this plugin. + Set name of library which tqcontains the KPart used by this plugin. */ void setPartLibraryName( const TQCString & ); @@ -196,7 +196,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient The clients name is taken from the name argument in the constructor. @note: The DCOPClient object will only be created when this method is called for the first time. Make sure that the part has been loaded - before calling this method, if it's the one that contains the DCOP + before calling this method, if it's the one that tqcontains the DCOP interface that other parts might use. */ DCOPClient *dcopClient() const; diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp index da978d6e2..86902ca0d 100644 --- a/kontact/interfaces/summary.cpp +++ b/kontact/interfaces/summary.cpp @@ -55,20 +55,20 @@ TQWidget* Summary::createHeader(TQWidget *parent, const TQPixmap& icon, const TQ TQLabel *label = new TQLabel( hbox ); label->setPixmap( icon ); - label->setFixedSize( label->sizeHint() ); - label->setPaletteBackgroundColor( colorGroup().mid() ); + label->setFixedSize( label->tqsizeHint() ); + label->setPaletteBackgroundColor( tqcolorGroup().mid() ); label->setAcceptDrops( true ); label = new TQLabel( heading, hbox ); - label->setAlignment( AlignLeft|AlignVCenter ); + label->tqsetAlignment( AlignLeft|AlignVCenter ); label->setIndent( KDialog::spacingHint() ); label->setFont( boldFont ); - label->setPaletteForegroundColor( colorGroup().light() ); - label->setPaletteBackgroundColor( colorGroup().mid() ); + label->setPaletteForegroundColor( tqcolorGroup().light() ); + label->setPaletteBackgroundColor( tqcolorGroup().mid() ); - hbox->setPaletteBackgroundColor( colorGroup().mid() ); + hbox->setPaletteBackgroundColor( tqcolorGroup().mid() ); - hbox->setMaximumHeight( hbox->minimumSizeHint().height() ); + hbox->setMaximumHeight( hbox->tqminimumSizeHint().height() ); return hbox; } @@ -109,8 +109,8 @@ void Summary::dragEnterEvent( TQDragEnterEvent *event ) void Summary::dropEvent( TQDropEvent *event ) { - int alignment = (event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom); - emit summaryWidgetDropped( this, event->source(), alignment ); + int tqalignment = (event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom); + emit summaryWidgetDropped( this, event->source(), tqalignment ); } #include "summary.moc" diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h index 5bbfcf2b3..29a890190 100644 --- a/kontact/interfaces/summary.h +++ b/kontact/interfaces/summary.h @@ -73,7 +73,7 @@ class KDE_EXPORT Summary : public QWidget signals: void message( const TQString &message ); - void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment ); + void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment ); protected: virtual void mousePressEvent( TQMouseEvent* ); -- cgit v1.2.1