From 7be55ffa061c026e35e2d6a0effe1161ddb0d41f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:53:50 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kontact/interfaces/core.cpp | 34 +-- kontact/interfaces/core.h | 18 +- kontact/interfaces/plugin.cpp | 56 ++-- kontact/interfaces/plugin.h | 46 +-- kontact/interfaces/summary.cpp | 48 +-- kontact/interfaces/summary.h | 26 +- kontact/interfaces/uniqueapphandler.cpp | 24 +- kontact/interfaces/uniqueapphandler.h | 2 +- kontact/plugins/akregator/akregator_plugin.cpp | 16 +- kontact/plugins/akregator/akregator_plugin.h | 6 +- .../plugins/kaddressbook/kaddressbook_plugin.cpp | 36 +-- kontact/plugins/kaddressbook/kaddressbook_plugin.h | 16 +- kontact/plugins/karm/karm_plugin.cpp | 4 +- kontact/plugins/karm/karm_plugin.h | 2 +- kontact/plugins/kitchensync/kitchensync_plugin.cpp | 8 +- kontact/plugins/kitchensync/kitchensync_plugin.h | 4 +- kontact/plugins/kmail/kcmkmailsummary.cpp | 44 +-- kontact/plugins/kmail/kcmkmailsummary.h | 8 +- kontact/plugins/kmail/kmail_plugin.cpp | 36 +-- kontact/plugins/kmail/kmail_plugin.h | 20 +- kontact/plugins/kmail/summarywidget.cpp | 58 ++-- kontact/plugins/kmail/summarywidget.h | 20 +- kontact/plugins/knode/knode_plugin.cpp | 12 +- kontact/plugins/knode/knode_plugin.h | 6 +- kontact/plugins/knotes/knotes_part.cpp | 124 ++++---- kontact/plugins/knotes/knotes_part.h | 36 +-- kontact/plugins/knotes/knotes_part_p.h | 34 +-- kontact/plugins/knotes/knotes_plugin.cpp | 10 +- kontact/plugins/knotes/knotes_plugin.h | 4 +- kontact/plugins/knotes/knotetip.cpp | 84 +++--- kontact/plugins/knotes/knotetip.h | 12 +- kontact/plugins/knotes/summarywidget.cpp | 54 ++-- kontact/plugins/knotes/summarywidget.h | 16 +- kontact/plugins/korganizer/journalplugin.cpp | 16 +- kontact/plugins/korganizer/journalplugin.h | 6 +- kontact/plugins/korganizer/kcmkorgsummary.cpp | 52 ++-- kontact/plugins/korganizer/kcmkorgsummary.h | 8 +- kontact/plugins/korganizer/korganizerplugin.cpp | 54 ++-- kontact/plugins/korganizer/korganizerplugin.h | 18 +- kontact/plugins/korganizer/summarywidget.cpp | 98 +++---- kontact/plugins/korganizer/summarywidget.h | 20 +- kontact/plugins/korganizer/todoplugin.cpp | 46 +-- kontact/plugins/korganizer/todoplugin.h | 12 +- kontact/plugins/korganizer/todosummarywidget.cpp | 86 +++--- kontact/plugins/korganizer/todosummarywidget.h | 22 +- kontact/plugins/kpilot/kpilot_plugin.cpp | 4 +- kontact/plugins/kpilot/kpilot_plugin.h | 6 +- kontact/plugins/kpilot/summarywidget.cpp | 88 +++--- kontact/plugins/kpilot/summarywidget.h | 62 ++-- kontact/plugins/newsticker/kcmkontactknt.cpp | 144 ++++----- kontact/plugins/newsticker/kcmkontactknt.h | 26 +- kontact/plugins/newsticker/newsfeeds.h | 322 ++++++++++----------- kontact/plugins/newsticker/newsticker_plugin.cpp | 4 +- kontact/plugins/newsticker/newsticker_plugin.h | 4 +- kontact/plugins/newsticker/summarywidget.cpp | 104 +++---- kontact/plugins/newsticker/summarywidget.h | 38 +-- kontact/plugins/specialdates/kcmsdsummary.cpp | 66 ++--- kontact/plugins/specialdates/kcmsdsummary.h | 24 +- kontact/plugins/specialdates/sdsummarywidget.cpp | 182 ++++++------ kontact/plugins/specialdates/sdsummarywidget.h | 24 +- .../plugins/specialdates/specialdates_plugin.cpp | 4 +- kontact/plugins/specialdates/specialdates_plugin.h | 4 +- kontact/plugins/summary/dropwidget.cpp | 12 +- kontact/plugins/summary/dropwidget.h | 10 +- kontact/plugins/summary/kcmkontactsummary.cpp | 42 +-- kontact/plugins/summary/kcmkontactsummary.h | 6 +- kontact/plugins/summary/summaryview_part.cpp | 130 ++++----- kontact/plugins/summary/summaryview_part.h | 34 +-- kontact/plugins/summary/summaryview_plugin.cpp | 26 +- kontact/plugins/summary/summaryview_plugin.h | 6 +- kontact/plugins/test/test_part.cpp | 24 +- kontact/plugins/test/test_part.h | 6 +- kontact/plugins/test/test_plugin.cpp | 4 +- kontact/plugins/test/test_plugin.h | 2 +- kontact/plugins/weather/summarywidget.cpp | 98 +++---- kontact/plugins/weather/summarywidget.h | 86 +++--- kontact/plugins/weather/weather_plugin.cpp | 4 +- kontact/plugins/weather/weather_plugin.h | 4 +- kontact/src/aboutdialog.cpp | 54 ++-- kontact/src/aboutdialog.h | 4 +- kontact/src/iconsidepane.cpp | 152 +++++----- kontact/src/iconsidepane.h | 70 ++--- kontact/src/kcmkontact.cpp | 42 +-- kontact/src/kcmkontact.h | 12 +- kontact/src/kontactiface.h | 2 +- kontact/src/main.cpp | 12 +- kontact/src/mainwindow.cpp | 242 ++++++++-------- kontact/src/mainwindow.h | 42 +-- kontact/src/profiledialog.cpp | 100 +++---- kontact/src/profiledialog.h | 32 +- kontact/src/profilemanager.cpp | 80 ++--- kontact/src/profilemanager.h | 68 ++--- kontact/src/sidepanebase.cpp | 4 +- kontact/src/sidepanebase.h | 8 +- 94 files changed, 1943 insertions(+), 1943 deletions(-) (limited to 'kontact') diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index 19ed8bad..6d048504 100644 --- a/kontact/interfaces/core.cpp +++ b/kontact/interfaces/core.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include using namespace Kontact; @@ -34,16 +34,16 @@ using namespace Kontact; class Core::Private { public: - QString lastErrorMessage; + TQString lastErrorMessage; }; -Core::Core( QWidget *parent, const char *name ) +Core::Core( TQWidget *parent, const char *name ) : KParts::MainWindow( parent, name ) { d = new Private; - QTimer* timer = new QTimer( this ); - mLastDate = QDate::currentDate(); - connect(timer, SIGNAL( timeout() ), SLOT( checkNewDay() ) ); + TQTimer* timer = new TQTimer( this ); + mLastDate = TQDate::currentDate(); + connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkNewDay() ) ); timer->start( 1000*60 ); } @@ -56,7 +56,7 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname ) { kdDebug(5601) << "Core::createPart(): " << libname << endl; - QMap::ConstIterator it; + TQMap::ConstIterator it; it = mParts.find( libname ); if ( it != mParts.end() ) return it.data(); @@ -66,13 +66,13 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname ) KParts::ReadOnlyPart *part = KParts::ComponentFactory:: createPartInstanceFromLibrary - ( libname, this, 0, this, "kontact", QStringList(), &error ); + ( libname, this, 0, this, "kontact", TQStringList(), &error ); KParts::ReadOnlyPart *pimPart = dynamic_cast( part ); if ( pimPart ) { mParts.insert( libname, pimPart ); - QObject::connect( pimPart, SIGNAL( destroyed( QObject * ) ), - SLOT( slotPartDestroyed( QObject * ) ) ); + TQObject::connect( pimPart, TQT_SIGNAL( destroyed( TQObject * ) ), + TQT_SLOT( slotPartDestroyed( TQObject * ) ) ); } else { // TODO move to KParts::ComponentFactory switch( error ) { @@ -98,12 +98,12 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname ) return pimPart; } -void Core::slotPartDestroyed( QObject * obj ) +void Core::slotPartDestroyed( TQObject * obj ) { // the part was deleted, we need to remove it from the part map to not return // a dangling pointer in createPart - QMap::Iterator end = mParts.end(); - QMap::Iterator it = mParts.begin(); + TQMap::Iterator end = mParts.end(); + TQMap::Iterator it = mParts.begin(); for ( ; it != end; ++it ) { if ( it.data() == obj ) { mParts.remove( it ); @@ -114,13 +114,13 @@ void Core::slotPartDestroyed( QObject * obj ) void Core::checkNewDay() { - if ( mLastDate != QDate::currentDate() ) - emit dayChanged( QDate::currentDate() ); + if ( mLastDate != TQDate::currentDate() ) + emit dayChanged( TQDate::currentDate() ); - mLastDate = QDate::currentDate(); + mLastDate = TQDate::currentDate(); } -QString Core::lastErrorMessage() const +TQString Core::lastErrorMessage() const { return d->lastErrorMessage; } diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h index 2ebe088f..2d75fb22 100644 --- a/kontact/interfaces/core.h +++ b/kontact/interfaces/core.h @@ -23,7 +23,7 @@ #ifndef KONTACT_CORE_H #define KONTACT_CORE_H -#include +#include #include #include #include @@ -54,12 +54,12 @@ class KDE_EXPORT Core : public KParts::MainWindow This is an overloaded member function. It behaves essentially like the above function. */ - virtual void selectPlugin( const QString &plugin ) = 0; + virtual void selectPlugin( const TQString &plugin ) = 0; /** Returns the pointer list of available plugins. */ - virtual QValueList pluginList() const = 0; + virtual TQValueList pluginList() const = 0; /** @internal (for Plugin) @@ -76,20 +76,20 @@ class KDE_EXPORT Core : public KParts::MainWindow /** Emitted when a new day starts */ - void dayChanged( const QDate& ); + void dayChanged( const TQDate& ); protected: - Core( QWidget *parentWidget = 0, const char *name = 0 ); + Core( TQWidget *parentWidget = 0, const char *name = 0 ); - QString lastErrorMessage() const; + TQString lastErrorMessage() const; private slots: - void slotPartDestroyed( QObject * ); + void slotPartDestroyed( TQObject * ); void checkNewDay(); private: - QMap mParts; - QDate mLastDate; + TQMap mParts; + TQDate mLastDate; class Private; Private *d; diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp index 33662015..6025664f 100644 --- a/kontact/interfaces/plugin.cpp +++ b/kontact/interfaces/plugin.cpp @@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include #include @@ -40,29 +40,29 @@ class Plugin::Private public: Kontact::Core *core; DCOPClient *dcopClient; - QPtrList *newActions; - QPtrList *syncActions; - QString identifier; - QString title; - QString icon; - QString executableName; - QCString partLibraryName; + TQPtrList *newActions; + TQPtrList *syncActions; + TQString identifier; + TQString title; + TQString icon; + TQString executableName; + TQCString partLibraryName; bool hasPart; KParts::ReadOnlyPart *part; bool disabled; }; -Plugin::Plugin( Kontact::Core *core, QObject *parent, const char *name ) - : KXMLGUIClient( core ), QObject( parent, name ), d( new Private ) +Plugin::Plugin( Kontact::Core *core, TQObject *parent, const char *name ) + : KXMLGUIClient( core ), TQObject( parent, name ), d( new Private ) { core->factory()->addClient( this ); KGlobal::locale()->insertCatalogue(name); d->core = core; d->dcopClient = 0; - d->newActions = new QPtrList; - d->syncActions = new QPtrList; + d->newActions = new TQPtrList; + d->syncActions = new TQPtrList; d->hasPart = true; d->part = 0; d->disabled = false; @@ -76,47 +76,47 @@ Plugin::~Plugin() delete d; } -void Plugin::setIdentifier( const QString &identifier ) +void Plugin::setIdentifier( const TQString &identifier ) { d->identifier = identifier; } -QString Plugin::identifier() const +TQString Plugin::identifier() const { return d->identifier; } -void Plugin::setTitle( const QString &title ) +void Plugin::setTitle( const TQString &title ) { d->title = title; } -QString Plugin::title() const +TQString Plugin::title() const { return d->title; } -void Plugin::setIcon( const QString &icon ) +void Plugin::setIcon( const TQString &icon ) { d->icon = icon; } -QString Plugin::icon() const +TQString Plugin::icon() const { return d->icon; } -void Plugin::setExecutableName( const QString& bin ) +void Plugin::setExecutableName( const TQString& bin ) { d->executableName = bin; } -QString Plugin::executableName() const +TQString Plugin::executableName() const { return d->executableName; } -void Plugin::setPartLibraryName( const QCString &libName ) +void Plugin::setPartLibraryName( const TQCString &libName ) { d->partLibraryName = libName; } @@ -147,16 +147,16 @@ KParts::ReadOnlyPart *Plugin::part() if ( !d->part ) { d->part = createPart(); if ( d->part ) { - connect( d->part, SIGNAL( destroyed() ), SLOT( partDestroyed() ) ); + connect( d->part, TQT_SIGNAL( destroyed() ), TQT_SLOT( partDestroyed() ) ); core()->partLoaded( this, d->part ); } } return d->part; } -QString Plugin::tipFile() const +TQString Plugin::tipFile() const { - return QString::null; + return TQString::null; } @@ -183,12 +183,12 @@ void Plugin::insertSyncAction( KAction *action ) d->syncActions->append( action ); } -QPtrList *Plugin::newActions() const +TQPtrList *Plugin::newActions() const { return d->newActions; } -QPtrList *Plugin::syncActions() const +TQPtrList *Plugin::syncActions() const { return d->syncActions; } @@ -242,11 +242,11 @@ bool Kontact::Plugin::disabled() const return d->disabled; } -void Kontact::Plugin::loadProfile( const QString& ) +void Kontact::Plugin::loadProfile( const TQString& ) { } -void Kontact::Plugin::saveToProfile( const QString& ) const +void Kontact::Plugin::saveToProfile( const TQString& ) const { } diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h index c8022798..f3b44431 100644 --- a/kontact/interfaces/plugin.h +++ b/kontact/interfaces/plugin.h @@ -24,10 +24,10 @@ #ifndef KONTACT_PLUGIN_H #define KONTACT_PLUGIN_H -#include +#include #include #include -#include +#include class QStringList; class DCOPClient; @@ -55,7 +55,7 @@ class Summary; to get a plugin. It can insert an icon into the sidepane, add widgets to the widgetstack and add menu items via XMLGUI. */ -class KDE_EXPORT Plugin : public QObject, virtual public KXMLGUIClient +class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient { Q_OBJECT @@ -68,61 +68,61 @@ class KDE_EXPORT Plugin : public QObject, virtual public KXMLGUIClient provides the part! This is the name used for DCOP registration. It's ok to have several plugins using the same application name. */ - Plugin( Core *core, QObject *parent, const char *name ); + Plugin( Core *core, TQObject *parent, const char *name ); ~Plugin(); /** Sets the identifier. */ - void setIdentifier( const QString &identifier ); + void setIdentifier( const TQString &identifier ); /** Returns the identifier. It is used as argument for several methods of Kontacts core. */ - QString identifier() const; + TQString identifier() const; /** Sets the localized title. */ - void setTitle( const QString &title ); + void setTitle( const TQString &title ); /** Returns the localized title. */ - QString title() const; + TQString title() const; /** Sets the icon name. */ - void setIcon( const QString &icon ); + void setIcon( const TQString &icon ); /** Returns the icon name. */ - QString icon() const; + TQString icon() const; /** Sets the name of executable (if existant). */ - void setExecutableName( const QString &bin ); + void setExecutableName( const TQString &bin ); /** Returns the name of the binary (if existant). */ - QString executableName() const; + TQString executableName() const; /** Set name of library which contains the KPart used by this plugin. */ - void setPartLibraryName( const QCString & ); + void setPartLibraryName( const TQCString & ); /** Create the DCOP interface for the given @p serviceType, if this plugin provides it. Return false otherwise. */ - virtual bool createDCOPInterface( const QString& /*serviceType*/ ) { return false; } + virtual bool createDCOPInterface( const TQString& /*serviceType*/ ) { return false; } /** Reimplement this method and return wether a standalone application is still running @@ -153,7 +153,7 @@ class KDE_EXPORT Plugin : public QObject, virtual public KXMLGUIClient /** Reimplement this method and return the a path relative to "data" to the tips file. */ - virtual QString tipFile() const; + virtual TQString tipFile() const; /** This function is called when the plugin is selected by the user before the @@ -171,7 +171,7 @@ class KDE_EXPORT Plugin : public QObject, virtual public KXMLGUIClient Reimplement this method if you want to add a widget for your application to Kontact's summary page. */ - virtual Summary *createSummaryWidget( QWidget * /*parent*/ ) { return 0; } + virtual Summary *createSummaryWidget( TQWidget * /*parent*/ ) { return 0; } /** Returns wether the plugin provides a part that should be shown in the sidebar. @@ -220,31 +220,31 @@ class KDE_EXPORT Plugin : public QObject, virtual public KXMLGUIClient /** FIXME: write API doc for Kontact::Plugin::newActions(). */ - QPtrList* newActions() const; + TQPtrList* newActions() const; /** FIXME: write API doc for Kontact::Plugin::syncActions(). */ - QPtrList* syncActions() const; + TQPtrList* syncActions() const; /** Returns a list of action name which shall be hidden in the main toolbar. */ - virtual QStringList invisibleToolbarActions() const { return QStringList(); } + virtual TQStringList invisibleToolbarActions() const { return TQStringList(); } /** Return, if the plugin can handle the drag object of the given mime type. */ - virtual bool canDecodeDrag( QMimeSource * ) { return false; } + virtual bool canDecodeDrag( TQMimeSource * ) { return false; } /** Process drop event. */ - virtual void processDropEvent( QDropEvent * ) {} + virtual void processDropEvent( TQDropEvent * ) {} - virtual void loadProfile( const QString& directoryPath ); + virtual void loadProfile( const TQString& directoryPath ); - virtual void saveToProfile( const QString& directoryPath ) const; + virtual void saveToProfile( const TQString& directoryPath ) const; /** * Session management: read properties diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp index f4e38771..da978d6e 100644 --- a/kontact/interfaces/summary.cpp +++ b/kontact/interfaces/summary.cpp @@ -22,20 +22,20 @@ #include "summary.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include using namespace Kontact; -Summary::Summary( QWidget *parent, const char *name ) - : QWidget( parent, name ) +Summary::Summary( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { setAcceptDrops( true ); } @@ -44,22 +44,22 @@ Summary::~Summary() { } -QWidget* Summary::createHeader(QWidget *parent, const QPixmap& icon, const QString& heading) +TQWidget* Summary::createHeader(TQWidget *parent, const TQPixmap& icon, const TQString& heading) { - QHBox* hbox = new QHBox( parent ); + TQHBox* hbox = new TQHBox( parent ); hbox->setMargin( 2 ); - QFont boldFont; + TQFont boldFont; boldFont.setBold( true ); boldFont.setPointSize( boldFont.pointSize() + 2 ); - QLabel *label = new QLabel( hbox ); + TQLabel *label = new TQLabel( hbox ); label->setPixmap( icon ); label->setFixedSize( label->sizeHint() ); label->setPaletteBackgroundColor( colorGroup().mid() ); label->setAcceptDrops( true ); - label = new QLabel( heading, hbox ); + label = new TQLabel( heading, hbox ); label->setAlignment( AlignLeft|AlignVCenter ); label->setIndent( KDialog::spacingHint() ); label->setFont( boldFont ); @@ -73,25 +73,25 @@ QWidget* Summary::createHeader(QWidget *parent, const QPixmap& icon, const QStri return hbox; } -void Summary::mousePressEvent( QMouseEvent *event ) +void Summary::mousePressEvent( TQMouseEvent *event ) { mDragStartPoint = event->pos(); - QWidget::mousePressEvent( event ); + TQWidget::mousePressEvent( event ); } -void Summary::mouseMoveEvent( QMouseEvent *event ) +void Summary::mouseMoveEvent( TQMouseEvent *event ) { if ( (event->state() & LeftButton) && (event->pos() - mDragStartPoint).manhattanLength() > 4 ) { - QDragObject *drag = new QTextDrag( "", this, "SummaryWidgetDrag" ); + TQDragObject *drag = new TQTextDrag( "", this, "SummaryWidgetDrag" ); - QPixmap pm = QPixmap::grabWidget( this ); + TQPixmap pm = TQPixmap::grabWidget( this ); if ( pm.width() > 300 ) - pm = pm.convertToImage().smoothScale( 300, 300, QImage::ScaleMin ); + pm = pm.convertToImage().smoothScale( 300, 300, TQImage::ScaleMin ); - QPainter painter; + TQPainter painter; painter.begin( &pm ); painter.setPen( Qt::gray ); painter.drawRect( 0, 0, pm.width(), pm.height() ); @@ -99,15 +99,15 @@ void Summary::mouseMoveEvent( QMouseEvent *event ) drag->setPixmap( pm ); drag->dragMove(); } else - QWidget::mouseMoveEvent( event ); + TQWidget::mouseMoveEvent( event ); } -void Summary::dragEnterEvent( QDragEnterEvent *event ) +void Summary::dragEnterEvent( TQDragEnterEvent *event ) { - event->accept( QTextDrag::canDecode( event ) ); + event->accept( TQTextDrag::canDecode( event ) ); } -void Summary::dropEvent( QDropEvent *event ) +void Summary::dropEvent( TQDropEvent *event ) { int alignment = (event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom); emit summaryWidgetDropped( this, event->source(), alignment ); diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h index 8ef96ef2..5bbfcf2b 100644 --- a/kontact/interfaces/summary.h +++ b/kontact/interfaces/summary.h @@ -21,8 +21,8 @@ #ifndef KONTACT_SUMMARY_H #define KONTACT_SUMMARY_H -#include -#include +#include +#include #include class KStatusBar; @@ -38,7 +38,7 @@ class KDE_EXPORT Summary : public QWidget Q_OBJECT public: - Summary( QWidget *parent, const char *name = 0 ); + Summary( TQWidget *parent, const char *name = 0 ); virtual ~Summary(); @@ -52,15 +52,15 @@ class KDE_EXPORT Summary : public QWidget /** Creates a heading for a typical summary view with an icon and a heading. */ - QWidget *createHeader( QWidget* parent, const QPixmap &icon, - const QString& heading ); + TQWidget *createHeader( TQWidget* parent, const TQPixmap &icon, + const TQString& heading ); /** Return list of strings identifying configuration modules for this summary part. The string has to be suitable for being passed to KCMultiDialog::addModule(). */ - virtual QStringList configModules() const { return QStringList(); } + virtual TQStringList configModules() const { return TQStringList(); } public slots: virtual void configChanged() {} @@ -72,18 +72,18 @@ class KDE_EXPORT Summary : public QWidget virtual void updateSummary( bool force = false ) { Q_UNUSED( force ); } signals: - void message( const QString &message ); - void summaryWidgetDropped( QWidget *target, QWidget *widget, int alignment ); + void message( const TQString &message ); + void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment ); protected: - virtual void mousePressEvent( QMouseEvent* ); - virtual void mouseMoveEvent( QMouseEvent* ); - virtual void dragEnterEvent( QDragEnterEvent* ); - virtual void dropEvent( QDropEvent* ); + virtual void mousePressEvent( TQMouseEvent* ); + virtual void mouseMoveEvent( TQMouseEvent* ); + virtual void dragEnterEvent( TQDragEnterEvent* ); + virtual void dropEvent( TQDropEvent* ); private: KStatusBar *mStatusBar; - QPoint mDragStartPoint; + TQPoint mDragStartPoint; class Private; Private *d; diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp index de77df7d..34de0180 100644 --- a/kontact/interfaces/uniqueapphandler.cpp +++ b/kontact/interfaces/uniqueapphandler.cpp @@ -90,8 +90,8 @@ int UniqueAppHandler::newInstance() return 0; } -bool UniqueAppHandler::process( const QCString &fun, const QByteArray &data, - QCString& replyType, QByteArray &replyData ) +bool UniqueAppHandler::process( const TQCString &fun, const TQByteArray &data, + TQCString& replyType, TQByteArray &replyData ) { if ( fun == "newInstance()" ) { replyType = "int"; @@ -100,15 +100,15 @@ bool UniqueAppHandler::process( const QCString &fun, const QByteArray &data, loadCommandLineOptions(); // implemented by plugin // This bit is duplicated from KUniqueApplication::processDelayed() - QDataStream ds( data, IO_ReadOnly ); + TQDataStream ds( data, IO_ReadOnly ); KCmdLineArgs::loadAppArgs( ds ); if ( !ds.atEnd() ) { // backwards compatibility - QCString asn_id; + TQCString asn_id; ds >> asn_id; kapp->setStartupId( asn_id ); } - QDataStream _replyStream( replyData, IO_WriteOnly ); + TQDataStream _replyStream( replyData, IO_WriteOnly ); _replyStream << newInstance(); // OK, we're done, reload the initial kontact command line options, @@ -121,7 +121,7 @@ bool UniqueAppHandler::process( const QCString &fun, const QByteArray &data, replyType = "bool"; (void)mPlugin->part(); // load the part without bringing it to front - QDataStream _replyStream( replyData, IO_WriteOnly ); + TQDataStream _replyStream( replyData, IO_WriteOnly ); _replyStream << true; } else { return DCOPObject::process( fun, data, replyType, replyData ); @@ -145,7 +145,7 @@ QCStringList UniqueAppHandler::functions() } UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin* plugin ) - : QObject( plugin ), mFactory( factory ), mPlugin( plugin ) + : TQObject( plugin ), mFactory( factory ), mPlugin( plugin ) { // The app is running standalone if 1) that name is known to DCOP mRunningStandalone = kapp->dcopClient()->isApplicationRegistered( plugin->name() ); @@ -156,8 +156,8 @@ UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin if ( mRunningStandalone ) { kapp->dcopClient()->setNotifications( true ); - connect( kapp->dcopClient(), SIGNAL( applicationRemoved( const QCString& ) ), - this, SLOT( unregisteredFromDCOP( const QCString& ) ) ); + connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ), + this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); } else { mFactory->createHandler( mPlugin ); } @@ -171,11 +171,11 @@ UniqueAppWatcher::~UniqueAppWatcher() delete mFactory; } -void UniqueAppWatcher::unregisteredFromDCOP( const QCString& appId ) +void UniqueAppWatcher::unregisteredFromDCOP( const TQCString& appId ) { if ( appId == mPlugin->name() && mRunningStandalone ) { - disconnect( kapp->dcopClient(), SIGNAL( applicationRemoved( const QCString& ) ), - this, SLOT( unregisteredFromDCOP( const QCString& ) ) ); + disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ), + this, TQT_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 23a593af..62886cc1 100644 --- a/kontact/interfaces/uniqueapphandler.h +++ b/kontact/interfaces/uniqueapphandler.h @@ -110,7 +110,7 @@ class KDE_EXPORT UniqueAppWatcher : public QObject bool isRunningStandalone() const { return mRunningStandalone; } protected slots: - void unregisteredFromDCOP( const QCString& appId ); + void unregisteredFromDCOP( const TQCString& appId ); private: bool mRunningStandalone; diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp index d57cea7f..16f80e80 100644 --- a/kontact/plugins/akregator/akregator_plugin.cpp +++ b/kontact/plugins/akregator/akregator_plugin.cpp @@ -22,7 +22,7 @@ without including the source code for Qt in the source distribution. */ -#include +#include #include #include @@ -48,13 +48,13 @@ typedef KGenericFactory PluginFactory; K_EXPORT_COMPONENT_FACTORY( libkontact_akregator, PluginFactory( "kontact_akregator" ) ) -Plugin::Plugin( Kontact::Core *core, const char *, const QStringList& ) +Plugin::Plugin( Kontact::Core *core, const char *, const TQStringList& ) : Kontact::Plugin( core, core, "akregator" ), m_stub(0) { setInstance( PluginFactory::instance() ); - insertNewAction( new KAction( i18n( "New Feed..." ), "bookmark_add", CTRL+SHIFT+Key_F, this, SLOT( addFeed() ), actionCollection(), "feed_new" ) ); + insertNewAction( new KAction( i18n( "New Feed..." ), "bookmark_add", CTRL+SHIFT+Key_F, this, TQT_SLOT( addFeed() ), actionCollection(), "feed_new" ) ); m_uniqueAppWatcher = new Kontact::UniqueAppWatcher( new Kontact::UniqueAppHandlerFactory(), this ); @@ -69,9 +69,9 @@ bool Plugin::isRunningStandalone() return m_uniqueAppWatcher->isRunningStandalone(); } -QStringList Plugin::invisibleToolbarActions() const +TQStringList Plugin::invisibleToolbarActions() const { - return QStringList( "file_new_contact" ); + return TQStringList( "file_new_contact" ); } @@ -90,7 +90,7 @@ MyBasePart* Plugin::createPart() { MyBasePart* p = loadPart(); - connect(p, SIGNAL(showPart()), this, SLOT(showPart())); + connect(p, TQT_SIGNAL(showPart()), this, TQT_SLOT(showPart())); m_stub = new Akregator::AkregatorPartIface_stub( dcopClient(), "akregator", "AkregatorIface" ); m_stub->openStandardFeedList(); @@ -108,9 +108,9 @@ void Plugin::addFeed() interface()->addFeed(); } -QStringList Plugin::configModules() const +TQStringList Plugin::configModules() const { - QStringList modules; + TQStringList modules; modules << "PIM/akregator.desktop"; return modules; } diff --git a/kontact/plugins/akregator/akregator_plugin.h b/kontact/plugins/akregator/akregator_plugin.h index af1a905f..42808464 100644 --- a/kontact/plugins/akregator/akregator_plugin.h +++ b/kontact/plugins/akregator/akregator_plugin.h @@ -54,15 +54,15 @@ class Plugin : public Kontact::Plugin public: Plugin( Kontact::Core *core, const char *name, - const QStringList & ); + const TQStringList & ); ~Plugin(); int weight() const { return 700; } AkregatorPartIface_stub *interface(); - virtual QStringList configModules() const; - virtual QStringList invisibleToolbarActions() const; + virtual TQStringList configModules() const; + virtual TQStringList invisibleToolbarActions() const; virtual bool isRunningStandalone(); virtual void readProperties( KConfig *config ); virtual void saveProperties( KConfig *config ); diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp index e2f5a706..be1fb08d 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp @@ -22,8 +22,8 @@ without including the source code for Qt in the source distribution. */ -#include -#include +#include +#include #include #include @@ -51,21 +51,21 @@ typedef KGenericFactory< KAddressbookPlugin, Kontact::Core > KAddressbookPluginF K_EXPORT_COMPONENT_FACTORY( libkontact_kaddressbookplugin, KAddressbookPluginFactory( "kontact_kaddressbookplugin" ) ) -KAddressbookPlugin::KAddressbookPlugin( Kontact::Core *core, const char *, const QStringList& ) +KAddressbookPlugin::KAddressbookPlugin( Kontact::Core *core, const char *, const TQStringList& ) : Kontact::Plugin( core, core, "kaddressbook" ), mStub( 0 ) { setInstance( KAddressbookPluginFactory::instance() ); insertNewAction( new KAction( i18n( "New Contact..." ), "identity", - CTRL+SHIFT+Key_C, this, SLOT( slotNewContact() ), actionCollection(), + CTRL+SHIFT+Key_C, this, TQT_SLOT( slotNewContact() ), actionCollection(), "new_contact" ) ); insertNewAction( new KAction( i18n( "&New Distribution List..." ), "kontact_contacts", 0, this, - SLOT( slotNewDistributionList() ), actionCollection(), "new_distributionlist" ) ); + TQT_SLOT( slotNewDistributionList() ), actionCollection(), "new_distributionlist" ) ); insertSyncAction( new KAction( i18n( "Synchronize Contacts" ), "reload", - 0, this, SLOT( slotSyncContacts() ), actionCollection(), + 0, this, TQT_SLOT( slotSyncContacts() ), actionCollection(), "kaddressbook_sync" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( new Kontact::UniqueAppHandlerFactory(), this ); @@ -86,16 +86,16 @@ KParts::ReadOnlyPart* KAddressbookPlugin::createPart() return part; } -QStringList KAddressbookPlugin::configModules() const +TQStringList KAddressbookPlugin::configModules() const { - QStringList modules; + TQStringList modules; modules << "PIM/kabconfig.desktop" << "PIM/kabldapconfig.desktop"; return modules; } -QStringList KAddressbookPlugin::invisibleToolbarActions() const +TQStringList KAddressbookPlugin::invisibleToolbarActions() const { - return QStringList( "file_new_contact" ); + return TQStringList( "file_new_contact" ); } KAddressBookIface_stub *KAddressbookPlugin::interface() @@ -121,10 +121,10 @@ void KAddressbookPlugin::slotNewDistributionList() void KAddressbookPlugin::slotSyncContacts() { DCOPRef ref( "kmail", "KMailICalIface" ); - ref.send( "triggerSync", QString("Contact") ); + ref.send( "triggerSync", TQString("Contact") ); } -bool KAddressbookPlugin::createDCOPInterface( const QString& serviceType ) +bool KAddressbookPlugin::createDCOPInterface( const TQString& serviceType ) { if ( serviceType == "DCOP/AddressBook" ) { Q_ASSERT( mStub ); @@ -143,15 +143,15 @@ bool KAddressbookPlugin::isRunningStandalone() return mUniqueAppWatcher->isRunningStandalone(); } -bool KAddressbookPlugin::canDecodeDrag( QMimeSource *mimeSource ) +bool KAddressbookPlugin::canDecodeDrag( TQMimeSource *mimeSource ) { - return QTextDrag::canDecode( mimeSource ) || + return TQTextDrag::canDecode( mimeSource ) || KPIM::MailListDrag::canDecode( mimeSource ); } #include -void KAddressbookPlugin::processDropEvent( QDropEvent *event ) +void KAddressbookPlugin::processDropEvent( TQDropEvent *event ) { KPIM::MailList mails; if ( KPIM::MailListDrag::decode( event, mails ) ) { @@ -162,7 +162,7 @@ void KAddressbookPlugin::processDropEvent( QDropEvent *event ) KPIM::MailSummary mail = mails.first(); KMailIface_stub kmailIface( "kmail", "KMailIface" ); - QString sFrom = kmailIface.getFrom( mail.serialNumber() ); + TQString sFrom = kmailIface.getFrom( mail.serialNumber() ); if ( !sFrom.isEmpty() ) { KAddrBookExternal::addEmail( sFrom, core() ); @@ -176,13 +176,13 @@ void KAddressbookPlugin::processDropEvent( QDropEvent *event ) } -void KAddressbookPlugin::loadProfile( const QString& directory ) +void KAddressbookPlugin::loadProfile( const TQString& directory ) { DCOPRef ref( "kaddressbook", "KAddressBookIface" ); ref.send( "loadProfile", directory ); } -void KAddressbookPlugin::saveToProfile( const QString& directory ) const +void KAddressbookPlugin::saveToProfile( const TQString& directory ) const { DCOPRef ref( "kaddressbook", "KAddressBookIface" ); ref.send( "saveToProfile", directory ); diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.h b/kontact/plugins/kaddressbook/kaddressbook_plugin.h index f66d44aa..85107d0b 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.h +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.h @@ -47,29 +47,29 @@ class KAddressbookPlugin : public Kontact::Plugin Q_OBJECT public: - KAddressbookPlugin( Kontact::Core *core, const char *name, const QStringList& ); + KAddressbookPlugin( Kontact::Core *core, const char *name, const TQStringList& ); ~KAddressbookPlugin(); - virtual bool createDCOPInterface( const QString &serviceType ); + virtual bool createDCOPInterface( const TQString &serviceType ); virtual bool isRunningStandalone(); int weight() const { return 300; } - bool canDecodeDrag( QMimeSource * ); - void processDropEvent( QDropEvent * ); + bool canDecodeDrag( TQMimeSource * ); + void processDropEvent( TQDropEvent * ); - virtual QStringList configModules() const; + virtual TQStringList configModules() const; - virtual QStringList invisibleToolbarActions() const; + virtual TQStringList invisibleToolbarActions() const; virtual void configUpdated(); KAddressBookIface_stub *interface(); //override - void loadProfile( const QString& directory ); + void loadProfile( const TQString& directory ); //override - void saveToProfile( const QString& directory ) const; + void saveToProfile( const TQString& directory ) const; protected: KParts::ReadOnlyPart *createPart(); diff --git a/kontact/plugins/karm/karm_plugin.cpp b/kontact/plugins/karm/karm_plugin.cpp index a3a9d277..c79bdab2 100644 --- a/kontact/plugins/karm/karm_plugin.cpp +++ b/kontact/plugins/karm/karm_plugin.cpp @@ -36,13 +36,13 @@ typedef KGenericFactory KarmPluginFactory; K_EXPORT_COMPONENT_FACTORY( libkontact_karm, KarmPluginFactory( "kontact_karm" ) ) -KarmPlugin::KarmPlugin( Kontact::Core *core, const char *, const QStringList& ) +KarmPlugin::KarmPlugin( Kontact::Core *core, const char *, const TQStringList& ) : Kontact::Plugin( core, core, "KArm" ) { setInstance( KarmPluginFactory::instance() ); (void)dcopClient(); insertNewAction( new KAction( i18n( "New Task" ), "karm", - CTRL+SHIFT+Key_W, this, SLOT( newTask() ), actionCollection(), + CTRL+SHIFT+Key_W, this, TQT_SLOT( newTask() ), actionCollection(), "new_task" ) ); } diff --git a/kontact/plugins/karm/karm_plugin.h b/kontact/plugins/karm/karm_plugin.h index c5ef3e28..f4cb04bd 100644 --- a/kontact/plugins/karm/karm_plugin.h +++ b/kontact/plugins/karm/karm_plugin.h @@ -40,7 +40,7 @@ class KarmPlugin : public Kontact::Plugin public: KarmPlugin( Kontact::Core *core, const char *name, - const QStringList & ); + const TQStringList & ); ~KarmPlugin(); int weight() const { return 700; } diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.cpp b/kontact/plugins/kitchensync/kitchensync_plugin.cpp index 4de6cf8d..343d724b 100644 --- a/kontact/plugins/kitchensync/kitchensync_plugin.cpp +++ b/kontact/plugins/kitchensync/kitchensync_plugin.cpp @@ -22,7 +22,7 @@ without including the source code for Qt in the source distribution. */ -#include +#include #include #include @@ -42,7 +42,7 @@ typedef KGenericFactory< KitchenSyncPlugin, Kontact::Core > KitchenSyncPluginFac K_EXPORT_COMPONENT_FACTORY( libkontact_kitchensync, KitchenSyncPluginFactory( "kontact_kitchensync" ) ) -KitchenSyncPlugin::KitchenSyncPlugin( Kontact::Core *core, const char *, const QStringList& ) +KitchenSyncPlugin::KitchenSyncPlugin( Kontact::Core *core, const char *, const TQStringList& ) : Kontact::Plugin( core, core, "KitchenSync" ) { setInstance( KitchenSyncPluginFactory::instance() ); @@ -57,9 +57,9 @@ KParts::ReadOnlyPart* KitchenSyncPlugin::createPart() return loadPart(); } -QStringList KitchenSyncPlugin::configModules() const +TQStringList KitchenSyncPlugin::configModules() const { - QStringList modules; + TQStringList modules; modules << "PIM/kitchensync.desktop"; return modules; } diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.h b/kontact/plugins/kitchensync/kitchensync_plugin.h index fafa12d7..f3b8c62a 100644 --- a/kontact/plugins/kitchensync/kitchensync_plugin.h +++ b/kontact/plugins/kitchensync/kitchensync_plugin.h @@ -38,12 +38,12 @@ class KitchenSyncPlugin : public Kontact::Plugin public: KitchenSyncPlugin( Kontact::Core *core, const char *name, - const QStringList & ); + const TQStringList & ); ~KitchenSyncPlugin(); int weight() const { return 800; } - virtual QStringList configModules() const; + virtual TQStringList configModules() const; protected: KParts::ReadOnlyPart *createPart(); }; diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index 02627c0f..656ffe4e 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -21,8 +21,8 @@ without including the source code for Qt in the source distribution. */ -#include -#include +#include +#include #include @@ -41,19 +41,19 @@ extern "C" { - KDE_EXPORT KCModule *create_kmailsummary( QWidget *parent, const char * ) + KDE_EXPORT KCModule *create_kmailsummary( TQWidget *parent, const char * ) { return new KCMKMailSummary( parent, "kcmkmailsummary" ); } } -KCMKMailSummary::KCMKMailSummary( QWidget *parent, const char *name ) +KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name ) : KCModule( parent, name ) { initGUI(); - connect( mFolderView, SIGNAL( clicked( QListViewItem* ) ), SLOT( modified() ) ); - connect( mFullPath, SIGNAL( toggled( bool ) ), SLOT( modified() ) ); + connect( mFolderView, TQT_SIGNAL( clicked( TQListViewItem* ) ), TQT_SLOT( modified() ) ); + connect( mFullPath, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); KAcceleratorManager::manage( this ); @@ -75,7 +75,7 @@ void KCMKMailSummary::modified() void KCMKMailSummary::initGUI() { - QVBoxLayout *layout = new QVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); mFolderView = new KListView( this ); mFolderView->setRootIsDecorated( true ); @@ -83,7 +83,7 @@ void KCMKMailSummary::initGUI() mFolderView->addColumn( i18n( "Summary" ) ); - mFullPath = new QCheckBox( i18n( "Show full path for folders" ), this ); + mFullPath = new TQCheckBox( i18n( "Show full path for folders" ), this ); layout->addWidget( mFolderView ); layout->addWidget( mFullPath ); @@ -93,32 +93,32 @@ void KCMKMailSummary::initFolders() { DCOPRef kmail( "kmail", "KMailIface" ); - QStringList folderList; + TQStringList folderList; kmail.call( "folderList" ).get( folderList ); mFolderView->clear(); mFolderMap.clear(); - QStringList::Iterator it; + TQStringList::Iterator it; for ( it = folderList.begin(); it != folderList.end(); ++it ) { - QString displayName; + TQString displayName; if ( (*it) == "/Local" ) displayName = i18n( "prefix for local folders", "Local" ); else { - DCOPRef folderRef = kmail.call( "getFolder(QString)", *it ); + DCOPRef folderRef = kmail.call( "getFolder(TQString)", *it ); folderRef.call( "displayName()" ).get( displayName ); } if ( (*it).contains( '/' ) == 1 ) { if ( mFolderMap.find( *it ) == mFolderMap.end() ) - mFolderMap.insert( *it, new QListViewItem( mFolderView, + mFolderMap.insert( *it, new TQListViewItem( mFolderView, displayName ) ); } else { const int pos = (*it).findRev( '/' ); - const QString parentFolder = (*it).left( pos ); + const TQString parentFolder = (*it).left( pos ); mFolderMap.insert( *it, - new QCheckListItem( mFolderMap[ parentFolder ], + new TQCheckListItem( mFolderMap[ parentFolder ], displayName, - QCheckListItem::CheckBox ) ); + TQCheckListItem::CheckBox ) ); } } } @@ -128,15 +128,15 @@ void KCMKMailSummary::loadFolders() KConfig config( "kcmkmailsummaryrc" ); config.setGroup( "General" ); - QStringList folders; + TQStringList folders; if ( !config.hasKey( "ActiveFolders" ) ) folders << "/Local/inbox"; else folders = config.readListEntry( "ActiveFolders" ); - QMap::Iterator it; + TQMap::Iterator it; for ( it = mFolderMap.begin(); it != mFolderMap.end(); ++it ) { - if ( QCheckListItem *qli = dynamic_cast( it.data() ) ) { + if ( TQCheckListItem *qli = dynamic_cast( it.data() ) ) { if ( folders.contains( it.key() ) ) { qli->setOn( true ); mFolderView->ensureItemVisible( it.data() ); @@ -153,11 +153,11 @@ void KCMKMailSummary::storeFolders() KConfig config( "kcmkmailsummaryrc" ); config.setGroup( "General" ); - QStringList folders; + TQStringList folders; - QMap::Iterator it; + TQMap::Iterator it; for ( it = mFolderMap.begin(); it != mFolderMap.end(); ++it ) - if ( QCheckListItem *qli = dynamic_cast( it.data() ) ) + if ( TQCheckListItem *qli = dynamic_cast( it.data() ) ) if ( qli->isOn() ) folders.append( it.key() ); diff --git a/kontact/plugins/kmail/kcmkmailsummary.h b/kontact/plugins/kmail/kcmkmailsummary.h index e2959dea..da43a0b2 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.h +++ b/kontact/plugins/kmail/kcmkmailsummary.h @@ -24,7 +24,7 @@ #ifndef KCMKMAILSUMMARY_H #define KCMKMAILSUMMARY_H -#include +#include #include @@ -38,7 +38,7 @@ class KCMKMailSummary : public KCModule Q_OBJECT public: - KCMKMailSummary( QWidget *parent = 0, const char *name = 0 ); + KCMKMailSummary( TQWidget *parent = 0, const char *name = 0 ); virtual void load(); virtual void save(); @@ -54,8 +54,8 @@ class KCMKMailSummary : public KCModule void storeFolders(); KListView *mFolderView; - QCheckBox *mFullPath; - QMap mFolderMap; + TQCheckBox *mFullPath; + TQMap mFolderMap; }; #endif diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index 3d9f45be..5a879747 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -21,7 +21,7 @@ without including the source code for Qt in the source distribution. */ -#include +#include #include #include @@ -55,35 +55,35 @@ typedef KGenericFactory KMailPluginFactory; K_EXPORT_COMPONENT_FACTORY( libkontact_kmailplugin, KMailPluginFactory( "kontact_kmailplugin" ) ) -KMailPlugin::KMailPlugin(Kontact::Core *core, const char *, const QStringList& ) +KMailPlugin::KMailPlugin(Kontact::Core *core, const char *, const TQStringList& ) : Kontact::Plugin( core, core, "kmail" ), mStub( 0 ) { setInstance( KMailPluginFactory::instance() ); insertNewAction( new KAction( i18n( "New Message..." ), "mail_new", - CTRL+SHIFT+Key_M, this, SLOT( slotNewMail() ), actionCollection(), + CTRL+SHIFT+Key_M, this, TQT_SLOT( slotNewMail() ), actionCollection(), "new_mail" ) ); insertSyncAction( new KAction( i18n( "Synchronize Mail" ), "reload", - 0, this, SLOT( slotSyncFolders() ), actionCollection(), + 0, this, TQT_SLOT( slotSyncFolders() ), actionCollection(), "sync_mail" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( new Kontact::UniqueAppHandlerFactory(), this ); } -bool KMailPlugin::canDecodeDrag( QMimeSource *qms ) +bool KMailPlugin::canDecodeDrag( TQMimeSource *qms ) { return ( ICalDrag::canDecode( qms ) || VCalDrag::canDecode( qms ) || KVCardDrag::canDecode( qms ) ); } -void KMailPlugin::processDropEvent( QDropEvent * de ) +void KMailPlugin::processDropEvent( TQDropEvent * de ) { kdDebug() << k_funcinfo << endl; - CalendarLocal cal( QString::fromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("UTC") ); KABC::Addressee::List list; if ( VCalDrag::decode( de, &cal ) || ICalDrag::decode( de, &cal ) ) { @@ -93,7 +93,7 @@ void KMailPlugin::processDropEvent( QDropEvent * de ) } else if ( KVCardDrag::decode( de, list ) ) { KABC::Addressee::List::Iterator it; - QStringList to; + TQStringList to; for ( it = list.begin(); it != list.end(); ++it ) { to.append( ( *it ).fullEmail() ); } @@ -114,7 +114,7 @@ void KMailPlugin::openComposer( const KURL& attach ) } } -void KMailPlugin::openComposer( const QString& to ) +void KMailPlugin::openComposer( const TQString& to ) { (void) part(); // ensure part is loaded Q_ASSERT( mStub ); @@ -125,7 +125,7 @@ void KMailPlugin::openComposer( const QString& to ) void KMailPlugin::slotNewMail() { - openComposer( QString::null ); + openComposer( TQString::null ); } void KMailPlugin::slotSyncFolders() @@ -138,7 +138,7 @@ KMailPlugin::~KMailPlugin() { } -bool KMailPlugin::createDCOPInterface( const QString& serviceType ) +bool KMailPlugin::createDCOPInterface( const TQString& serviceType ) { if ( serviceType == "DCOP/ResourceBackend/IMAP" ) { if ( part() ) @@ -148,9 +148,9 @@ bool KMailPlugin::createDCOPInterface( const QString& serviceType ) return false; } -QString KMailPlugin::tipFile() const +TQString KMailPlugin::tipFile() const { - QString file = ::locate("data", "kmail/tips"); + TQString file = ::locate("data", "kmail/tips"); return file; } @@ -164,9 +164,9 @@ KParts::ReadOnlyPart* KMailPlugin::createPart() return part; } -QStringList KMailPlugin::invisibleToolbarActions() const +TQStringList KMailPlugin::invisibleToolbarActions() const { - return QStringList( "new_message" ); + return TQStringList( "new_message" ); } bool KMailPlugin::isRunningStandalone() @@ -174,7 +174,7 @@ bool KMailPlugin::isRunningStandalone() return mUniqueAppWatcher->isRunningStandalone(); } -Kontact::Summary *KMailPlugin::createSummaryWidget( QWidget *parent ) +Kontact::Summary *KMailPlugin::createSummaryWidget( TQWidget *parent ) { return new SummaryWidget( this, parent ); } @@ -208,12 +208,12 @@ bool KMailPlugin::queryClose() const { return canClose; } -void KMailPlugin::loadProfile( const QString& profileDirectory ) { +void KMailPlugin::loadProfile( const TQString& profileDirectory ) { DCOPRef ref( "kmail", "KMailIface" ); ref.send( "loadProfile", profileDirectory ); } -void KMailPlugin::saveToProfile( const QString& profileDirectory ) { +void KMailPlugin::saveToProfile( const TQString& profileDirectory ) { DCOPRef ref( "kmail", "KMailIface" ); ref.send( "saveToProfile", profileDirectory ); } diff --git a/kontact/plugins/kmail/kmail_plugin.h b/kontact/plugins/kmail/kmail_plugin.h index 0d601386..73bb361b 100644 --- a/kontact/plugins/kmail/kmail_plugin.h +++ b/kontact/plugins/kmail/kmail_plugin.h @@ -48,30 +48,30 @@ class KMailPlugin : public Kontact::Plugin Q_OBJECT public: - KMailPlugin( Kontact::Core *core, const char *name, const QStringList& ); + KMailPlugin( Kontact::Core *core, const char *name, const TQStringList& ); ~KMailPlugin(); virtual bool isRunningStandalone(); - virtual bool createDCOPInterface( const QString& serviceType ); - virtual Kontact::Summary *createSummaryWidget( QWidget *parent ); - virtual QString tipFile() const; + virtual bool createDCOPInterface( const TQString& serviceType ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parent ); + virtual TQString tipFile() const; int weight() const { return 200; } - virtual QStringList invisibleToolbarActions() const; + virtual TQStringList invisibleToolbarActions() const; virtual bool queryClose() const; //override - void loadProfile( const QString& profileDirectory ); + void loadProfile( const TQString& profileDirectory ); //override - void saveToProfile( const QString& profileDirectory ); + void saveToProfile( const TQString& profileDirectory ); protected: virtual KParts::ReadOnlyPart* createPart(); void openComposer( const KURL& = KURL() ); - void openComposer( const QString& to ); - bool canDecodeDrag( QMimeSource * ); - void processDropEvent( QDropEvent * ); + void openComposer( const TQString& to ); + bool canDecodeDrag( TQMimeSource * ); + void processDropEvent( TQDropEvent * ); protected slots: diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp index 79f2f465..43c1e2cb 100644 --- a/kontact/plugins/kmail/summarywidget.cpp +++ b/kontact/plugins/kmail/summarywidget.cpp @@ -22,8 +22,8 @@ without including the source code for Qt in the source distribution. */ -#include -#include +#include +#include #include #include @@ -41,17 +41,17 @@ #include -SummaryWidget::SummaryWidget( Kontact::Plugin *plugin, QWidget *parent, const char *name ) +SummaryWidget::SummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name ) : Kontact::Summary( parent, name ), - DCOPObject( QCString("MailSummary") ), + DCOPObject( TQCString("MailSummary") ), mPlugin( plugin ) { - QVBoxLayout *mainLayout = new QVBoxLayout( this, 3, 3 ); + TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); - QPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_mail", KIcon::Desktop, + TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_mail", KIcon::Desktop, KIcon::SizeMedium ); - QWidget *header = createHeader(this, icon, i18n("E-Mail")); - mLayout = new QGridLayout( 1, 3, 3 ); + TQWidget *header = createHeader(this, icon, i18n("E-Mail")); + mLayout = new TQGridLayout( 1, 3, 3 ); mainLayout->addWidget(header); mainLayout->addLayout(mLayout); @@ -61,16 +61,16 @@ SummaryWidget::SummaryWidget( Kontact::Plugin *plugin, QWidget *parent, const ch false ); } -void SummaryWidget::selectFolder( const QString& folder ) +void SummaryWidget::selectFolder( const TQString& folder ) { if ( mPlugin->isRunningStandalone() ) mPlugin->bringToForeground(); else mPlugin->core()->selectPlugin( mPlugin ); - QByteArray data; - QDataStream arg( data, IO_WriteOnly ); + TQByteArray data; + TQDataStream arg( data, IO_WriteOnly ); arg << folder; - emitDCOPSignal( "kmailSelectFolder(QString)", data ); + emitDCOPSignal( "kmailSelectFolder(TQString)", data ); } void SummaryWidget::updateSummary( bool ) @@ -88,7 +88,7 @@ void SummaryWidget::slotUnreadCountChanged() DCOPRef kmail( "kmail", "KMailIface" ); DCOPReply reply = kmail.call( "folderList" ); if ( reply.isValid() ) { - QStringList folderList = reply; + TQStringList folderList = reply; updateFolderList( folderList ); } else { @@ -98,7 +98,7 @@ void SummaryWidget::slotUnreadCountChanged() mTimeOfLastMessageCountUpdate = ::time( 0 ); } -void SummaryWidget::updateFolderList( const QStringList& folders ) +void SummaryWidget::updateFolderList( const TQStringList& folders ) { mLabels.setAutoDelete( true ); mLabels.clear(); @@ -107,24 +107,24 @@ void SummaryWidget::updateFolderList( const QStringList& folders ) KConfig config( "kcmkmailsummaryrc" ); config.setGroup( "General" ); - QStringList activeFolders; + TQStringList activeFolders; if ( !config.hasKey( "ActiveFolders" ) ) activeFolders << "/Local/inbox"; else activeFolders = config.readListEntry( "ActiveFolders" ); int counter = 0; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; DCOPRef kmail( "kmail", "KMailIface" ); for ( it = folders.begin(); it != folders.end(); ++it ) { if ( activeFolders.contains( *it ) ) { - DCOPRef folderRef = kmail.call( "getFolder(QString)", *it ); + DCOPRef folderRef = kmail.call( "getFolder(TQString)", *it ); const int numMsg = folderRef.call( "messages()" ); const int numUnreadMsg = folderRef.call( "unreadMessages()" ); if ( numUnreadMsg == 0 ) continue; - QString folderPath; + TQString folderPath; if ( config.readBoolEntry( "ShowFullPath", true ) ) folderRef.call( "displayPath()" ).get( folderPath ); else @@ -134,13 +134,13 @@ void SummaryWidget::updateFolderList( const QStringList& folders ) urlLabel->installEventFilter( this ); urlLabel->setAlignment( AlignLeft ); urlLabel->show(); - connect( urlLabel, SIGNAL( leftClickedURL( const QString& ) ), - SLOT( selectFolder( const QString& ) ) ); + connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), + TQT_SLOT( selectFolder( const TQString& ) ) ); mLayout->addWidget( urlLabel, counter, 0 ); mLabels.append( urlLabel ); - QLabel *label = - new QLabel( QString( i18n("%1: number of unread messages " + TQLabel *label = + new TQLabel( TQString( i18n("%1: number of unread messages " "%2: total number of messages", "%1 / %2") ) .arg( numUnreadMsg ).arg( numMsg ), this ); label->setAlignment( AlignLeft ); @@ -153,7 +153,7 @@ void SummaryWidget::updateFolderList( const QStringList& folders ) } if ( counter == 0 ) { - QLabel *label = new QLabel( i18n( "No unread messages in your monitored folders" ), this ); + TQLabel *label = new TQLabel( i18n( "No unread messages in your monitored folders" ), this ); label->setAlignment( AlignHCenter | AlignVCenter ); mLayout->addMultiCellWidget( label, 0, 0, 0, 2 ); label->show(); @@ -161,22 +161,22 @@ void SummaryWidget::updateFolderList( const QStringList& folders ) } } -bool SummaryWidget::eventFilter( QObject *obj, QEvent* e ) +bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) { if ( obj->inherits( "KURLLabel" ) ) { KURLLabel* label = static_cast( obj ); - if ( e->type() == QEvent::Enter ) + if ( e->type() == TQEvent::Enter ) emit message( i18n( "Open Folder: \"%1\"" ).arg( label->text() ) ); - if ( e->type() == QEvent::Leave ) - emit message( QString::null ); + if ( e->type() == TQEvent::Leave ) + emit message( TQString::null ); } return Kontact::Summary::eventFilter( obj, e ); } -QStringList SummaryWidget::configModules() const +TQStringList SummaryWidget::configModules() const { - return QStringList( "kcmkmailsummary.desktop" ); + return TQStringList( "kcmkmailsummary.desktop" ); } #include "summarywidget.moc" diff --git a/kontact/plugins/kmail/summarywidget.h b/kontact/plugins/kmail/summarywidget.h index 563a021e..dc058e45 100644 --- a/kontact/plugins/kmail/summarywidget.h +++ b/kontact/plugins/kmail/summarywidget.h @@ -24,9 +24,9 @@ #ifndef SUMMARYWIDGET_H #define SUMMARYWIDGET_H -#include -#include -#include +#include +#include +#include #include #include @@ -44,28 +44,28 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject K_DCOP public: - SummaryWidget( Kontact::Plugin *plugin, QWidget *parent, const char *name = 0 ); + SummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name = 0 ); int summaryHeight() const { return 1; } - QStringList configModules() const; + TQStringList configModules() const; k_dcop_hidden: void slotUnreadCountChanged(); protected: - virtual bool eventFilter( QObject *obj, QEvent* e ); + virtual bool eventFilter( TQObject *obj, TQEvent* e ); public slots: virtual void updateSummary( bool force ); private slots: - void selectFolder( const QString& ); + void selectFolder( const TQString& ); private: - void updateFolderList( const QStringList& folders ); + void updateFolderList( const TQStringList& folders ); - QPtrList mLabels; - QGridLayout *mLayout; + TQPtrList mLabels; + TQGridLayout *mLayout; Kontact::Plugin *mPlugin; int mTimeOfLastMessageCountUpdate; }; diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp index 6ad7fedb..131c8bdf 100644 --- a/kontact/plugins/knode/knode_plugin.cpp +++ b/kontact/plugins/knode/knode_plugin.cpp @@ -36,7 +36,7 @@ #include -#include +#include typedef KGenericFactory KNodePluginFactory; @@ -44,13 +44,13 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_knodeplugin, KNodePluginFactory( "kontact_knodeplugin" ) ) -KNodePlugin::KNodePlugin( Kontact::Core *core, const char *, const QStringList& ) +KNodePlugin::KNodePlugin( Kontact::Core *core, const char *, const TQStringList& ) : Kontact::Plugin( core, core, "knode" ), mStub(0) { setInstance( KNodePluginFactory::instance() ); insertNewAction( new KAction( i18n( "New Article..." ), "mail_new", CTRL+SHIFT+Key_A, - this, SLOT( slotPostArticle() ), actionCollection(), "post_article" ) ); + this, TQT_SLOT( slotPostArticle() ), actionCollection(), "post_article" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( new Kontact::UniqueAppHandlerFactory(), this ); @@ -60,7 +60,7 @@ KNodePlugin::~KNodePlugin() { } -bool KNodePlugin::createDCOPInterface( const QString& /*serviceType*/ ) +bool KNodePlugin::createDCOPInterface( const TQString& /*serviceType*/ ) { return false; } @@ -70,9 +70,9 @@ bool KNodePlugin::isRunningStandalone() return mUniqueAppWatcher->isRunningStandalone(); } -QStringList KNodePlugin::invisibleToolbarActions() const +TQStringList KNodePlugin::invisibleToolbarActions() const { - return QStringList( "article_postNew" ); + return TQStringList( "article_postNew" ); } void KNodePlugin::slotPostArticle() diff --git a/kontact/plugins/knode/knode_plugin.h b/kontact/plugins/knode/knode_plugin.h index 78d4275e..3701dc7b 100644 --- a/kontact/plugins/knode/knode_plugin.h +++ b/kontact/plugins/knode/knode_plugin.h @@ -45,14 +45,14 @@ class KNodePlugin : public Kontact::Plugin Q_OBJECT public: - KNodePlugin( Kontact::Core *core, const char *name, const QStringList& ); + KNodePlugin( Kontact::Core *core, const char *name, const TQStringList& ); ~KNodePlugin(); - virtual bool createDCOPInterface( const QString& serviceType ); + virtual bool createDCOPInterface( const TQString& serviceType ); virtual bool isRunningStandalone(); int weight() const { return 500; } - virtual QStringList invisibleToolbarActions() const; + virtual TQStringList invisibleToolbarActions() const; protected: virtual KParts::ReadOnlyPart* createPart(); diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index 5bd160d1..4702eb2d 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include #include @@ -38,7 +38,7 @@ #include "knotetip.h" -KNotesPart::KNotesPart( QObject *parent, const char *name ) +KNotesPart::KNotesPart( TQObject *parent, const char *name ) : DCOPObject( "KNotesIface" ), KParts::ReadOnlyPart( parent, name ), mNotesView( new KNotesIconView() ), mNoteTip( new KNoteTip( mNotesView ) ), @@ -50,38 +50,38 @@ KNotesPart::KNotesPart( QObject *parent, const char *name ) setInstance( new KInstance( "knotes" ) ); // create the actions - new KAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, SLOT( newNote() ), + new KAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQT_SLOT( newNote() ), actionCollection(), "file_new" ); - new KAction( i18n( "Rename..." ), "text", this, SLOT( renameNote() ), + new KAction( i18n( "Rename..." ), "text", this, TQT_SLOT( renameNote() ), actionCollection(), "edit_rename" ); - new KAction( i18n( "Delete" ), "editdelete", Key_Delete, this, SLOT( killSelectedNotes() ), + new KAction( i18n( "Delete" ), "editdelete", Key_Delete, this, TQT_SLOT( killSelectedNotes() ), actionCollection(), "edit_delete" ); - new KAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, SLOT( printSelectedNotes() ), + new KAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQT_SLOT( printSelectedNotes() ), actionCollection(), "print_note" ); // TODO icons: s/editdelete/knotes_delete/ or the other way round in knotes // set the view up - mNotesView->setSelectionMode( QIconView::Extended ); + mNotesView->setSelectionMode( TQIconView::Extended ); mNotesView->setItemsMovable( false ); - mNotesView->setResizeMode( QIconView::Adjust ); + mNotesView->setResizeMode( TQIconView::Adjust ); mNotesView->setAutoArrange( true ); mNotesView->setSorting( true ); - connect( mNotesView, SIGNAL( executed( QIconViewItem* ) ), - this, SLOT( editNote( QIconViewItem* ) ) ); - connect( mNotesView, SIGNAL( returnPressed( QIconViewItem* ) ), - this, SLOT( editNote( QIconViewItem* ) ) ); - connect( mNotesView, SIGNAL( itemRenamed( QIconViewItem* ) ), - this, SLOT( renamedNote( QIconViewItem* ) ) ); - connect( mNotesView, SIGNAL( contextMenuRequested( QIconViewItem*, const QPoint& ) ), - this, SLOT( popupRMB( QIconViewItem*, const QPoint& ) ) ); - connect( mNotesView, SIGNAL( onItem( QIconViewItem* ) ), - this, SLOT( slotOnItem( QIconViewItem* ) ) ); - connect( mNotesView, SIGNAL( onViewport() ), - this, SLOT( slotOnViewport() ) ); - connect( mNotesView, SIGNAL( currentChanged( QIconViewItem* ) ), - this, SLOT( slotOnCurrentChanged( QIconViewItem* ) ) ); + connect( mNotesView, TQT_SIGNAL( executed( TQIconViewItem* ) ), + this, TQT_SLOT( editNote( TQIconViewItem* ) ) ); + connect( mNotesView, TQT_SIGNAL( returnPressed( TQIconViewItem* ) ), + this, TQT_SLOT( editNote( TQIconViewItem* ) ) ); + connect( mNotesView, TQT_SIGNAL( itemRenamed( TQIconViewItem* ) ), + this, TQT_SLOT( renamedNote( TQIconViewItem* ) ) ); + connect( mNotesView, TQT_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ), + this, TQT_SLOT( popupRMB( TQIconViewItem*, const TQPoint& ) ) ); + connect( mNotesView, TQT_SIGNAL( onItem( TQIconViewItem* ) ), + this, TQT_SLOT( slotOnItem( TQIconViewItem* ) ) ); + connect( mNotesView, TQT_SIGNAL( onViewport() ), + this, TQT_SLOT( slotOnViewport() ) ); + connect( mNotesView, TQT_SIGNAL( currentChanged( TQIconViewItem* ) ), + this, TQT_SLOT( slotOnCurrentChanged( TQIconViewItem* ) ) ); slotOnCurrentChanged( 0 ); @@ -91,10 +91,10 @@ KNotesPart::KNotesPart( QObject *parent, const char *name ) setXMLFile( "knotes_part.rc" ); // connect the resource manager - connect( mManager, SIGNAL( sigRegisteredNote( KCal::Journal* ) ), - this, SLOT( createNote( KCal::Journal* ) ) ); - connect( mManager, SIGNAL( sigDeregisteredNote( KCal::Journal* ) ), - this, SLOT( killNote( KCal::Journal* ) ) ); + connect( mManager, TQT_SIGNAL( sigRegisteredNote( KCal::Journal* ) ), + this, TQT_SLOT( createNote( KCal::Journal* ) ) ); + connect( mManager, TQT_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ), + this, TQT_SLOT( killNote( KCal::Journal* ) ) ); // read the notes mManager->load(); @@ -111,9 +111,9 @@ KNotesPart::~KNotesPart() void KNotesPart::printSelectedNotes() { - QValueList journals; + TQValueList journals; - for ( QIconViewItem *it = mNotesView->firstItem(); it; it = it->nextItem() ) { + for ( TQIconViewItem *it = mNotesView->firstItem(); it; it = it->nextItem() ) { if ( it->isSelected() ) { journals.append( static_cast( it )->journal() ); } @@ -128,9 +128,9 @@ void KNotesPart::printSelectedNotes() printer.printNotes(journals ); #if 0 - QString content; + TQString content; if ( m_editor->textFormat() == PlainText ) - content = QStyleSheet::convertFromPlainText( m_editor->text() ); + content = TQStyleSheet::convertFromPlainText( m_editor->text() ); else content = m_editor->text(); @@ -152,7 +152,7 @@ bool KNotesPart::openFile() // public KNotes DCOP interface implementation -QString KNotesPart::newNote( const QString& name, const QString& text ) +TQString KNotesPart::newNote( const TQString& name, const TQString& text ) { // create the new note KCal::Journal *journal = new KCal::Journal(); @@ -161,7 +161,7 @@ QString KNotesPart::newNote( const QString& name, const QString& text ) if ( !name.isEmpty() ) journal->setSummary( name ); else - journal->setSummary( KGlobal::locale()->formatDateTime( QDateTime::currentDateTime() ) ); + journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); // the body of the note journal->setDescription( text ); @@ -177,7 +177,7 @@ QString KNotesPart::newNote( const QString& name, const QString& text ) mNoteEditDlg->setTitle( journal->summary() ); mNoteEditDlg->setText( journal->description() ); - if ( mNoteEditDlg->exec() == QDialog::Accepted ) + if ( mNoteEditDlg->exec() == TQDialog::Accepted ) { journal->setSummary( mNoteEditDlg->title() ); journal->setDescription( mNoteEditDlg->text() ); @@ -199,18 +199,18 @@ QString KNotesPart::newNote( const QString& name, const QString& text ) return journal->uid(); } -QString KNotesPart::newNoteFromClipboard( const QString& name ) +TQString KNotesPart::newNoteFromClipboard( const TQString& name ) { - const QString& text = KApplication::clipboard()->text(); + const TQString& text = KApplication::clipboard()->text(); return newNote( name, text ); } -void KNotesPart::killNote( const QString& id ) +void KNotesPart::killNote( const TQString& id ) { killNote( id, false ); } -void KNotesPart::killNote( const QString& id, bool force ) +void KNotesPart::killNote( const TQString& id, bool force ) { KNotesIconViewItem *note = mNoteList[ id ]; @@ -227,25 +227,25 @@ void KNotesPart::killNote( const QString& id, bool force ) } } -QString KNotesPart::name( const QString& id ) const +TQString KNotesPart::name( const TQString& id ) const { KNotesIconViewItem *note = mNoteList[ id ]; if ( note ) return note->text(); else - return QString::null; + return TQString::null; } -QString KNotesPart::text( const QString& id ) const +TQString KNotesPart::text( const TQString& id ) const { KNotesIconViewItem *note = mNoteList[id]; if ( note ) return note->journal()->description(); else - return QString::null; + return TQString::null; } -void KNotesPart::setName( const QString& id, const QString& newName ) +void KNotesPart::setName( const TQString& id, const TQString& newName ) { KNotesIconViewItem *note = mNoteList[ id ]; if ( note ) { @@ -254,7 +254,7 @@ void KNotesPart::setName( const QString& id, const QString& newName ) } } -void KNotesPart::setText( const QString& id, const QString& newText ) +void KNotesPart::setText( const TQString& id, const TQString& newText ) { KNotesIconViewItem *note = mNoteList[ id ]; if ( note ) { @@ -263,10 +263,10 @@ void KNotesPart::setText( const QString& id, const QString& newText ) } } -QMap KNotesPart::notes() const +TQMap KNotesPart::notes() const { - QMap notes; - QDictIterator it( mNoteList ); + TQMap notes; + TQDictIterator it( mNoteList ); for ( ; it.current(); ++it ) notes.insert( (*it)->journal()->uid(), (*it)->journal()->summary() ); @@ -279,11 +279,11 @@ QMap KNotesPart::notes() const void KNotesPart::killSelectedNotes() { - QPtrList items; - QStringList notes; + TQPtrList items; + TQStringList notes; KNotesIconViewItem *knivi; - for ( QIconViewItem *it = mNotesView->firstItem(); it; it = it->nextItem() ) { + for ( TQIconViewItem *it = mNotesView->firstItem(); it; it = it->nextItem() ) { if ( it->isSelected() ) { knivi = static_cast( it ); items.append( knivi ); @@ -301,7 +301,7 @@ void KNotesPart::killSelectedNotes() KStdGuiItem::del() ); if ( ret == KMessageBox::Continue ) { - QPtrListIterator kniviIt( items ); + TQPtrListIterator kniviIt( items ); while ( (knivi = *kniviIt) ) { ++kniviIt; mManager->deleteNote( knivi->journal() ); @@ -311,14 +311,14 @@ void KNotesPart::killSelectedNotes() } } -void KNotesPart::popupRMB( QIconViewItem *item, const QPoint& pos ) +void KNotesPart::popupRMB( TQIconViewItem *item, const TQPoint& pos ) { - QPopupMenu *contextMenu = NULL; + TQPopupMenu *contextMenu = NULL; if ( item ) - contextMenu = static_cast( factory()->container( "note_context", this ) ); + contextMenu = static_cast( factory()->container( "note_context", this ) ); else - contextMenu = static_cast( factory()->container( "notepart_context", this ) ); + contextMenu = static_cast( factory()->container( "notepart_context", this ) ); if ( !contextMenu ) return; @@ -326,9 +326,9 @@ void KNotesPart::popupRMB( QIconViewItem *item, const QPoint& pos ) contextMenu->popup( pos ); } -void KNotesPart::slotOnItem( QIconViewItem *i ) +void KNotesPart::slotOnItem( TQIconViewItem *i ) { - // TODO: disable (i.e. setNote( QString::null )) when mouse button pressed + // TODO: disable (i.e. setNote( TQString::null )) when mouse button pressed KNotesIconViewItem *item = static_cast( i ); mNoteTip->setNote( item ); @@ -346,7 +346,7 @@ void KNotesPart::slotOnViewport() void KNotesPart::createNote( KCal::Journal *journal ) { // make sure all fields are existent, initialize them with default values - QString property = journal->customProperty( "KNotes", "BgColor" ); + TQString property = journal->customProperty( "KNotes", "BgColor" ); if ( property.isNull() ) journal->setCustomProperty( "KNotes", "BgColor", "#ffff00" ); @@ -366,7 +366,7 @@ void KNotesPart::killNote( KCal::Journal *journal ) mNoteList.remove( journal->uid() ); } -void KNotesPart::editNote( QIconViewItem *item ) +void KNotesPart::editNote( TQIconViewItem *item ) { if ( !mNoteEditDlg ) mNoteEditDlg = new KNoteEditDlg( widget() ); @@ -377,7 +377,7 @@ void KNotesPart::editNote( QIconViewItem *item ) mNoteEditDlg->setTitle( journal->summary() ); mNoteEditDlg->setText( journal->description() ); - if ( mNoteEditDlg->exec() == QDialog::Accepted ) { + if ( mNoteEditDlg->exec() == TQDialog::Accepted ) { item->setText( mNoteEditDlg->title() ); journal->setDescription( mNoteEditDlg->text() ); mManager->save(); @@ -389,12 +389,12 @@ void KNotesPart::renameNote() mNotesView->currentItem()->rename(); } -void KNotesPart::renamedNote( QIconViewItem* ) +void KNotesPart::renamedNote( TQIconViewItem* ) { mManager->save(); } -void KNotesPart::slotOnCurrentChanged( QIconViewItem* ) +void KNotesPart::slotOnCurrentChanged( TQIconViewItem* ) { KAction *renameAction = actionCollection()->action( "edit_rename" ); KAction *deleteAction = actionCollection()->action( "edit_delete" ); diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h index c034d04f..b737ddf8 100644 --- a/kontact/plugins/knotes/knotes_part.h +++ b/kontact/plugins/knotes/knotes_part.h @@ -22,7 +22,7 @@ #ifndef KNOTES_PART_H #define KNOTES_PART_H -#include +#include #include #include @@ -49,42 +49,42 @@ class KNotesPart : public KParts::ReadOnlyPart, virtual public KNotesIface Q_OBJECT public: - KNotesPart( QObject *parent = 0, const char *name = 0 ); + KNotesPart( TQObject *parent = 0, const char *name = 0 ); ~KNotesPart(); bool openFile(); public slots: - QString newNote( const QString& name = QString::null, - const QString& text = QString::null ); - QString newNoteFromClipboard( const QString& name = QString::null ); + TQString newNote( const TQString& name = TQString::null, + const TQString& text = TQString::null ); + TQString newNoteFromClipboard( const TQString& name = TQString::null ); public: - void killNote( const QString& id ); - void killNote( const QString& id, bool force ); + void killNote( const TQString& id ); + void killNote( const TQString& id, bool force ); - QString name( const QString& id ) const; - QString text( const QString& id ) const; + TQString name( const TQString& id ) const; + TQString text( const TQString& id ) const; - void setName( const QString& id, const QString& newName ); - void setText( const QString& id, const QString& newText ); + void setName( const TQString& id, const TQString& newName ); + void setText( const TQString& id, const TQString& newText ); - QMap notes() const; + TQMap notes() const; private slots: void createNote( KCal::Journal *journal ); void killNote( KCal::Journal *journal ); - void editNote( QIconViewItem *item ); + void editNote( TQIconViewItem *item ); void renameNote(); - void renamedNote( QIconViewItem *item ); + void renamedNote( TQIconViewItem *item ); - void slotOnItem( QIconViewItem *item ); + void slotOnItem( TQIconViewItem *item ); void slotOnViewport(); - void slotOnCurrentChanged( QIconViewItem *item ); + void slotOnCurrentChanged( TQIconViewItem *item ); - void popupRMB( QIconViewItem *item, const QPoint& pos ); + void popupRMB( TQIconViewItem *item, const TQPoint& pos ); void killSelectedNotes(); void printSelectedNotes(); @@ -95,7 +95,7 @@ class KNotesPart : public KParts::ReadOnlyPart, virtual public KNotesIface KNoteEditDlg *mNoteEditDlg; KNotesResourceManager *mManager; - QDict mNoteList; + TQDict mNoteList; }; #endif diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h index 55a0374b..0bf073f3 100644 --- a/kontact/plugins/knotes/knotes_part_p.h +++ b/kontact/plugins/knotes/knotes_part_p.h @@ -32,8 +32,8 @@ #ifndef KNOTES_PART_P_H #define KNOTES_PART_P_H -#include -#include +#include +#include #include #include @@ -67,8 +67,8 @@ class KNotesIconViewItem : public KIconViewItem setRenameEnabled( true ); KIconEffect effect; - QColor color( journal->customProperty( "KNotes", "BgColor" ) ); - QPixmap icon = KGlobal::iconLoader()->loadIcon( "knotes", KIcon::Desktop ); + TQColor color( journal->customProperty( "KNotes", "BgColor" ) ); + TQPixmap icon = KGlobal::iconLoader()->loadIcon( "knotes", KIcon::Desktop ); icon = effect.apply( icon, KIconEffect::Colorize, 1, color, false ); setPixmap( icon ); setText( journal->summary() ); @@ -79,7 +79,7 @@ class KNotesIconViewItem : public KIconViewItem return mJournal; } - virtual void setText( const QString& text ) + virtual void setText( const TQString& text ) { KIconViewItem::setText( text ); mJournal->setSummary( text ); @@ -93,10 +93,10 @@ class KNotesIconViewItem : public KIconViewItem class KNotesIconView : public KIconView { protected: - QDragObject* dragObject() + TQDragObject* dragObject() { - QValueList selectedItems; - for ( QIconViewItem *it = firstItem(); it; it = it->nextItem() ) { + TQValueList selectedItems; + for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() ) { if ( it->isSelected() ) selectedItems.append( static_cast( it ) ); } @@ -117,7 +117,7 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient Q_OBJECT public: - KNoteEditDlg( QWidget *parent = 0, const char *name = 0 ) + KNoteEditDlg( TQWidget *parent = 0, const char *name = 0 ) : KDialogBase( Plain, i18n( "Edit Note" ), Ok | Cancel, Ok, parent, name, true, true ) { @@ -128,11 +128,11 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient setXMLFile( "knotesui.rc" ); actionCollection()->setWidget( this ); - QWidget *page = plainPage(); - QVBoxLayout *layout = new QVBoxLayout( page ); + TQWidget *page = plainPage(); + TQVBoxLayout *layout = new TQVBoxLayout( page ); - QHBoxLayout *hbl = new QHBoxLayout( layout, marginHint() ); - QLabel *label = new QLabel( page); + TQHBoxLayout *hbl = new TQHBoxLayout( layout, marginHint() ); + TQLabel *label = new TQLabel( page); label->setText( i18n( "Name:" ) ); hbl->addWidget( label,0 ); mTitleEdit= new KLineEdit( page, "name" ); @@ -152,22 +152,22 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient layout->addWidget( mNoteEdit ); } - QString text() const + TQString text() const { return mNoteEdit->text(); } - void setText( const QString& text ) + void setText( const TQString& text ) { mNoteEdit->setText( text ); } - QString title() const + TQString title() const { return mTitleEdit->text(); } - void setTitle( const QString& text ) + void setTitle( const TQString& text ) { mTitleEdit->setText( text ); } diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp index beaaa633..1a94fdea 100644 --- a/kontact/plugins/knotes/knotes_plugin.cpp +++ b/kontact/plugins/knotes/knotes_plugin.cpp @@ -38,16 +38,16 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_knotesplugin, KNotesPluginFactory( "kontact_knotesplugin" ) ) -KNotesPlugin::KNotesPlugin( Kontact::Core *core, const char *, const QStringList & ) +KNotesPlugin::KNotesPlugin( Kontact::Core *core, const char *, const TQStringList & ) : Kontact::Plugin( core, core, "knotes" ), mAboutData( 0 ) { setInstance( KNotesPluginFactory::instance() ); insertNewAction( new KAction( i18n( "New Note..." ), "knotes", CTRL+SHIFT+Key_N, - this, SLOT( slotNewNote() ), actionCollection(), "new_note" ) ); + this, TQT_SLOT( slotNewNote() ), actionCollection(), "new_note" ) ); insertSyncAction( new KAction( i18n( "Synchronize Notes" ), "reload", 0, - this, SLOT( slotSyncNotes() ), actionCollection(), "knotes_sync" ) ); + this, TQT_SLOT( slotSyncNotes() ), actionCollection(), "knotes_sync" ) ); } KNotesPlugin::~KNotesPlugin() @@ -59,7 +59,7 @@ KParts::ReadOnlyPart* KNotesPlugin::createPart() return new KNotesPart( this, "notes" ); } -Kontact::Summary *KNotesPlugin::createSummaryWidget( QWidget *parentWidget ) +Kontact::Summary *KNotesPlugin::createSummaryWidget( TQWidget *parentWidget ) { return new KNotesSummaryWidget( this, parentWidget ); } @@ -90,7 +90,7 @@ void KNotesPlugin::slotNewNote() void KNotesPlugin::slotSyncNotes() { DCOPRef ref( "kmail", "KMailICalIface" ); - ref.send( "triggerSync", QString("Note") ); + ref.send( "triggerSync", TQString("Note") ); } #include "knotes_plugin.moc" diff --git a/kontact/plugins/knotes/knotes_plugin.h b/kontact/plugins/knotes/knotes_plugin.h index d4d58cb0..a9449458 100644 --- a/kontact/plugins/knotes/knotes_plugin.h +++ b/kontact/plugins/knotes/knotes_plugin.h @@ -34,10 +34,10 @@ class KNotesPlugin : public Kontact::Plugin Q_OBJECT public: - KNotesPlugin( Kontact::Core *core, const char *name, const QStringList& ); + KNotesPlugin( Kontact::Core *core, const char *name, const TQStringList& ); ~KNotesPlugin(); - virtual Kontact::Summary *createSummaryWidget( QWidget *parentWidget ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget ); int weight() const { return 600; } diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp index 6e2c998d..64db3a33 100644 --- a/kontact/plugins/knotes/knotetip.cpp +++ b/kontact/plugins/knotes/knotetip.cpp @@ -29,9 +29,9 @@ your version. */ -#include -#include -#include +#include +#include +#include #include #include @@ -41,23 +41,23 @@ KNoteTip::KNoteTip( KIconView *parent ) - : QFrame( 0, 0, WX11BypassWM | // this will make Seli happy >:-P + : TQFrame( 0, 0, WX11BypassWM | // this will make Seli happy >:-P WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop ), mFilter( false ), mView( parent ), mNoteIVI( 0 ), - mPreview( new QTextEdit( this ) ) + mPreview( new TQTextEdit( this ) ) { mPreview->setReadOnly( true ); - mPreview->setHScrollBarMode( QScrollView::AlwaysOff ); - mPreview->setVScrollBarMode( QScrollView::AlwaysOff ); + mPreview->setHScrollBarMode( TQScrollView::AlwaysOff ); + mPreview->setVScrollBarMode( TQScrollView::AlwaysOff ); - QBoxLayout *layout = new QVBoxLayout( this ); + TQBoxLayout *layout = new TQVBoxLayout( this ); layout->addWidget( mPreview ); - setPalette( QToolTip::palette() ); + setPalette( TQToolTip::palette() ); setMargin( 1 ); - setFrameStyle( QFrame::Plain | QFrame::Box ); + setFrameStyle( TQFrame::Plain | TQFrame::Box ); hide(); } @@ -87,8 +87,8 @@ void KNoteTip::setNote( KNotesIconViewItem *item ) else mPreview->setTextFormat( Qt::PlainText ); - QColor fg( journal->customProperty( "KNotes", "FgColor" ) ); - QColor bg( journal->customProperty( "KNotes", "BgColor" ) ); + TQColor fg( journal->customProperty( "KNotes", "FgColor" ) ); + TQColor bg( journal->customProperty( "KNotes", "BgColor" ) ); setColor( fg, bg ); mPreview->setText( journal->description() ); @@ -100,7 +100,7 @@ void KNoteTip::setNote( KNotesIconViewItem *item ) while ( w > 60 && h == mPreview->heightForWidth( w - 20 ) ) w -= 20; - QRect desk = KGlobalSettings::desktopGeometry( mNoteIVI->rect().center() ); + TQRect desk = KGlobalSettings::desktopGeometry( mNoteIVI->rect().center() ); resize( w, QMIN( h, desk.height() / 2 - 20 ) ); hide(); @@ -113,13 +113,13 @@ void KNoteTip::setNote( KNotesIconViewItem *item ) // protected, virtual methods -void KNoteTip::resizeEvent( QResizeEvent *ev ) +void KNoteTip::resizeEvent( TQResizeEvent *ev ) { - QFrame::resizeEvent( ev ); + TQFrame::resizeEvent( ev ); reposition(); } -void KNoteTip::timerEvent( QTimerEvent * ) +void KNoteTip::timerEvent( TQTimerEvent * ) { killTimers(); @@ -133,17 +133,17 @@ void KNoteTip::timerEvent( QTimerEvent * ) } } -bool KNoteTip::eventFilter( QObject *, QEvent *e ) +bool KNoteTip::eventFilter( TQObject *, TQEvent *e ) { switch ( e->type() ) { - case QEvent::Leave: - case QEvent::MouseButtonPress: - case QEvent::MouseButtonRelease: - case QEvent::KeyPress: - case QEvent::KeyRelease: - case QEvent::FocusIn: - case QEvent::FocusOut: - case QEvent::Wheel: + case TQEvent::Leave: + case TQEvent::MouseButtonPress: + case TQEvent::MouseButtonRelease: + case TQEvent::KeyPress: + case TQEvent::KeyRelease: + case TQEvent::FocusIn: + case TQEvent::FocusOut: + case TQEvent::Wheel: killTimers(); setFilter( false ); hide(); @@ -157,20 +157,20 @@ bool KNoteTip::eventFilter( QObject *, QEvent *e ) // private stuff -void KNoteTip::setColor( const QColor &fg, const QColor &bg ) +void KNoteTip::setColor( const TQColor &fg, const TQColor &bg ) { - QPalette newpalette = palette(); - newpalette.setColor( QColorGroup::Background, bg ); - newpalette.setColor( QColorGroup::Foreground, fg ); - newpalette.setColor( QColorGroup::Base, bg ); // text background - newpalette.setColor( QColorGroup::Text, fg ); // text color - newpalette.setColor( QColorGroup::Button, bg ); + TQPalette newpalette = palette(); + newpalette.setColor( TQColorGroup::Background, bg ); + newpalette.setColor( TQColorGroup::Foreground, fg ); + newpalette.setColor( TQColorGroup::Base, bg ); // text background + newpalette.setColor( TQColorGroup::Text, fg ); // text color + newpalette.setColor( TQColorGroup::Button, bg ); // the shadow - newpalette.setColor( QColorGroup::Midlight, bg.light(110) ); - newpalette.setColor( QColorGroup::Shadow, bg.dark(116) ); - newpalette.setColor( QColorGroup::Light, bg.light(180) ); - newpalette.setColor( QColorGroup::Dark, bg.dark(108) ); + newpalette.setColor( TQColorGroup::Midlight, bg.light(110) ); + newpalette.setColor( TQColorGroup::Shadow, bg.dark(116) ); + newpalette.setColor( TQColorGroup::Light, bg.light(180) ); + newpalette.setColor( TQColorGroup::Dark, bg.dark(108) ); setPalette( newpalette ); // set the text color @@ -185,9 +185,9 @@ void KNoteTip::setFilter( bool enable ) if ( enable ) { kapp->installEventFilter( this ); - QApplication::setGlobalMouseTracking( true ); + TQApplication::setGlobalMouseTracking( true ); } else { - QApplication::setGlobalMouseTracking( false ); + TQApplication::setGlobalMouseTracking( false ); kapp->removeEventFilter( this ); } @@ -199,14 +199,14 @@ void KNoteTip::reposition() if ( !mNoteIVI ) return; - QRect rect = mNoteIVI->rect(); - QPoint off = mView->mapToGlobal( mView->contentsToViewport( QPoint( 0, 0 ) ) ); + TQRect rect = mNoteIVI->rect(); + TQPoint off = mView->mapToGlobal( mView->contentsToViewport( TQPoint( 0, 0 ) ) ); rect.moveBy( off.x(), off.y() ); - QPoint pos = rect.center(); + TQPoint pos = rect.center(); // should the tooltip be shown to the left or to the right of the ivi? - QRect desk = KGlobalSettings::desktopGeometry( pos ); + TQRect desk = KGlobalSettings::desktopGeometry( pos ); if ( rect.center().x() + width() > desk.right() ) { // to the left if ( pos.x() - width() < 0 ) diff --git a/kontact/plugins/knotes/knotetip.h b/kontact/plugins/knotes/knotetip.h index f07b75f0..a9739196 100644 --- a/kontact/plugins/knotes/knotetip.h +++ b/kontact/plugins/knotes/knotetip.h @@ -32,7 +32,7 @@ #ifndef KNOTETIP_H #define KNOTETIP_H -#include +#include class QTextEdit; class KIconView; @@ -47,12 +47,12 @@ class KNoteTip : public QFrame void setNote( KNotesIconViewItem *item ); protected: - virtual bool eventFilter( QObject *, QEvent *e ); - virtual void timerEvent( QTimerEvent * ); - virtual void resizeEvent( QResizeEvent * ); + virtual bool eventFilter( TQObject *, TQEvent *e ); + virtual void timerEvent( TQTimerEvent * ); + virtual void resizeEvent( TQResizeEvent * ); private: - void setColor( const QColor &fg, const QColor &bg ); + void setColor( const TQColor &fg, const TQColor &bg ); void setFilter( bool enable ); void reposition(); @@ -62,7 +62,7 @@ class KNoteTip : public QFrame KIconView *mView; KNotesIconViewItem *mNoteIVI; - QTextEdit *mPreview; + TQTextEdit *mPreview; }; #endif diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp index 3045ede5..012e6ae8 100644 --- a/kontact/plugins/knotes/summarywidget.cpp +++ b/kontact/plugins/knotes/summarywidget.cpp @@ -21,10 +21,10 @@ without including the source code for Qt in the source distribution. */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -45,26 +45,26 @@ #include "summarywidget.h" KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin, - QWidget *parent, const char *name ) + TQWidget *parent, const char *name ) : Kontact::Summary( parent, name ), mLayout( 0 ), mPlugin( plugin ) { - QVBoxLayout *mainLayout = new QVBoxLayout( this, 3, 3 ); + TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); - QPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_notes", + TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_notes", KIcon::Desktop, KIcon::SizeMedium ); - QWidget* header = createHeader( this, icon, i18n( "Notes" ) ); + TQWidget* header = createHeader( this, icon, i18n( "Notes" ) ); mainLayout->addWidget( header ); - mLayout = new QGridLayout( mainLayout, 7, 3, 3 ); + mLayout = new TQGridLayout( mainLayout, 7, 3, 3 ); mLayout->setRowStretch( 6, 1 ); - mCalendar = new KCal::CalendarLocal( QString::fromLatin1("UTC") ); + mCalendar = new KCal::CalendarLocal( TQString::fromLatin1("UTC") ); KNotesResourceManager *manager = new KNotesResourceManager(); - QObject::connect( manager, SIGNAL( sigRegisteredNote( KCal::Journal* ) ), - this, SLOT( addNote( KCal::Journal* ) ) ); - QObject::connect( manager, SIGNAL( sigDeregisteredNote( KCal::Journal* ) ), - this, SLOT( removeNote( KCal::Journal* ) ) ); + TQObject::connect( manager, TQT_SIGNAL( sigRegisteredNote( KCal::Journal* ) ), + this, TQT_SLOT( addNote( KCal::Journal* ) ) ); + TQObject::connect( manager, TQT_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ), + this, TQT_SLOT( removeNote( KCal::Journal* ) ) ); manager->load(); @@ -74,7 +74,7 @@ KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin, void KNotesSummaryWidget::updateView() { mNotes = mCalendar->journals(); - QLabel *label; + TQLabel *label; for ( label = mLabels.first(); label; label = mLabels.next() ) label->deleteLater(); @@ -83,14 +83,14 @@ void KNotesSummaryWidget::updateView() KIconLoader loader( "knotes" ); int counter = 0; - QPixmap pm = loader.loadIcon( "knotes", KIcon::Small ); + TQPixmap pm = loader.loadIcon( "knotes", KIcon::Small ); KCal::Journal::List::Iterator it; if ( mNotes.count() ) { for (it = mNotes.begin(); it != mNotes.end(); ++it) { // Fill Note Pixmap Field - label = new QLabel( this ); + label = new TQLabel( this ); label->setPixmap( pm ); label->setMaximumWidth( label->minimumSizeHint().width() ); label->setAlignment( AlignVCenter ); @@ -98,7 +98,7 @@ void KNotesSummaryWidget::updateView() mLabels.append( label ); // File Note Summary Field - QString newtext = (*it)->summary(); + TQString newtext = (*it)->summary(); KURLLabel *urlLabel = new KURLLabel( (*it)->uid(), newtext, this ); urlLabel->installEventFilter( this ); @@ -108,16 +108,16 @@ void KNotesSummaryWidget::updateView() mLabels.append( urlLabel ); if ( !(*it)->description().isEmpty() ) { - QToolTip::add( urlLabel, (*it)->description().left( 80 ) ); + TQToolTip::add( urlLabel, (*it)->description().left( 80 ) ); } - connect( urlLabel, SIGNAL( leftClickedURL( const QString& ) ), - this, SLOT( urlClicked( const QString& ) ) ); + connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQT_SLOT( urlClicked( const TQString& ) ) ); counter++; } } else { - QLabel *noNotes = new QLabel( i18n( "No Notes Available" ), this ); + TQLabel *noNotes = new TQLabel( i18n( "No Notes Available" ), this ); noNotes->setAlignment( AlignHCenter | AlignVCenter ); mLayout->addWidget( noNotes, 0, 1 ); mLabels.append( noNotes ); @@ -127,7 +127,7 @@ void KNotesSummaryWidget::updateView() label->show(); } -void KNotesSummaryWidget::urlClicked( const QString &/*uid*/ ) +void KNotesSummaryWidget::urlClicked( const TQString &/*uid*/ ) { if ( !mPlugin->isRunningStandalone() ) mPlugin->core()->selectPlugin( mPlugin ); @@ -135,14 +135,14 @@ void KNotesSummaryWidget::urlClicked( const QString &/*uid*/ ) mPlugin->bringToForeground(); } -bool KNotesSummaryWidget::eventFilter( QObject *obj, QEvent* e ) +bool KNotesSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) { if ( obj->inherits( "KURLLabel" ) ) { KURLLabel* label = static_cast( obj ); - if ( e->type() == QEvent::Enter ) + if ( e->type() == TQEvent::Enter ) emit message( i18n( "Read Note: \"%1\"" ).arg( label->text() ) ); - if ( e->type() == QEvent::Leave ) - emit message( QString::null ); + if ( e->type() == TQEvent::Leave ) + emit message( TQString::null ); } return Kontact::Summary::eventFilter( obj, e ); diff --git a/kontact/plugins/knotes/summarywidget.h b/kontact/plugins/knotes/summarywidget.h index f21d829f..dff4319a 100644 --- a/kontact/plugins/knotes/summarywidget.h +++ b/kontact/plugins/knotes/summarywidget.h @@ -26,9 +26,9 @@ #include "summary.h" -#include -#include -#include +#include +#include +#include #include #include @@ -45,15 +45,15 @@ class KNotesSummaryWidget : public Kontact::Summary Q_OBJECT public: - KNotesSummaryWidget( Kontact::Plugin *plugin, QWidget *parent, const char *name = 0 ); + KNotesSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name = 0 ); void updateSummary( bool force = false ) { Q_UNUSED( force ); updateView(); } protected: - virtual bool eventFilter( QObject *obj, QEvent* e ); + virtual bool eventFilter( TQObject *obj, TQEvent* e ); protected slots: - void urlClicked( const QString& ); + void urlClicked( const TQString& ); void updateView(); void addNote( KCal::Journal* ); void removeNote( KCal::Journal* ); @@ -62,9 +62,9 @@ class KNotesSummaryWidget : public Kontact::Summary KCal::CalendarLocal *mCalendar; KCal::Journal::List mNotes; - QGridLayout *mLayout; + TQGridLayout *mLayout; - QPtrList mLabels; + TQPtrList mLabels; Kontact::Plugin *mPlugin; }; diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp index 178901b4..789762d5 100644 --- a/kontact/plugins/korganizer/journalplugin.cpp +++ b/kontact/plugins/korganizer/journalplugin.cpp @@ -22,7 +22,7 @@ without including the source code for Qt in the source distribution. */ -#include +#include #include #include @@ -42,7 +42,7 @@ typedef KGenericFactory< JournalPlugin, Kontact::Core > JournalPluginFactory; K_EXPORT_COMPONENT_FACTORY( libkontact_journalplugin, JournalPluginFactory( "kontact_journalplugin" ) ) -JournalPlugin::JournalPlugin( Kontact::Core *core, const char *, const QStringList& ) +JournalPlugin::JournalPlugin( Kontact::Core *core, const char *, const TQStringList& ) : Kontact::Plugin( core, core, "korganizer" ), mIface( 0 ) { @@ -50,10 +50,10 @@ JournalPlugin::JournalPlugin( Kontact::Core *core, const char *, const QStringLi instance()->iconLoader()->addAppDir("kdepim"); insertNewAction( new KAction( i18n( "New Journal..." ), "newjournal", - CTRL+SHIFT+Key_J, this, SLOT( slotNewJournal() ), actionCollection(), + CTRL+SHIFT+Key_J, this, TQT_SLOT( slotNewJournal() ), actionCollection(), "new_journal" ) ); insertSyncAction( new KAction( i18n( "Synchronize Journal" ), "reload", - 0, this, SLOT( slotSyncJournal() ), actionCollection(), + 0, this, TQT_SLOT( slotSyncJournal() ), actionCollection(), "journal_sync" ) ); @@ -83,9 +83,9 @@ void JournalPlugin::select() interface()->showJournalView(); } -QStringList JournalPlugin::invisibleToolbarActions() const +TQStringList JournalPlugin::invisibleToolbarActions() const { - QStringList invisible; + TQStringList invisible; invisible += "new_event"; invisible += "new_todo"; invisible += "new_journal"; @@ -117,10 +117,10 @@ void JournalPlugin::slotNewJournal() void JournalPlugin::slotSyncJournal() { DCOPRef ref( "kmail", "KMailICalIface" ); - ref.send( "triggerSync", QString("Journal") ); + ref.send( "triggerSync", TQString("Journal") ); } -bool JournalPlugin::createDCOPInterface( const QString& serviceType ) +bool JournalPlugin::createDCOPInterface( const TQString& serviceType ) { kdDebug(5602) << k_funcinfo << serviceType << endl; if ( serviceType == "DCOP/Organizer" || serviceType == "DCOP/Calendar" ) { diff --git a/kontact/plugins/korganizer/journalplugin.h b/kontact/plugins/korganizer/journalplugin.h index 668c2b28..2aeca354 100644 --- a/kontact/plugins/korganizer/journalplugin.h +++ b/kontact/plugins/korganizer/journalplugin.h @@ -35,14 +35,14 @@ class JournalPlugin : public Kontact::Plugin { Q_OBJECT public: - JournalPlugin( Kontact::Core *core, const char *name, const QStringList& ); + JournalPlugin( Kontact::Core *core, const char *name, const TQStringList& ); ~JournalPlugin(); - virtual bool createDCOPInterface( const QString& serviceType ); + virtual bool createDCOPInterface( const TQString& serviceType ); virtual bool isRunningStandalone(); int weight() const { return 500; } - virtual QStringList invisibleToolbarActions() const; + virtual TQStringList invisibleToolbarActions() const; void select(); diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index 9ab0b683..2a4b6a3e 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -21,11 +21,11 @@ without including the source code for Qt in the source distribution. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -41,24 +41,24 @@ extern "C" { - KDE_EXPORT KCModule *create_korgsummary( QWidget *parent, const char * ) + KDE_EXPORT KCModule *create_korgsummary( TQWidget *parent, const char * ) { return new KCMKOrgSummary( parent, "kcmkorgsummary" ); } } -KCMKOrgSummary::KCMKOrgSummary( QWidget *parent, const char *name ) +KCMKOrgSummary::KCMKOrgSummary( TQWidget *parent, const char *name ) : KCModule( parent, name ) { initGUI(); customDaysChanged( 1 ); - connect( mCalendarGroup, SIGNAL( clicked( int ) ), SLOT( modified() ) ); - connect( mCalendarGroup, SIGNAL( clicked( int ) ), SLOT( buttonClicked( int ) ) ); - connect( mTodoGroup, SIGNAL( clicked( int ) ), SLOT( modified() ) ); - connect( mCustomDays, SIGNAL( valueChanged( int ) ), SLOT( modified() ) ); - connect( mCustomDays, SIGNAL( valueChanged( int ) ), SLOT( customDaysChanged( int ) ) ); + connect( mCalendarGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) ); + connect( mCalendarGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) ); + connect( mTodoGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) ); + connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) ); + connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( customDaysChanged( int ) ) ); KAcceleratorManager::manage( this ); @@ -90,33 +90,33 @@ void KCMKOrgSummary::customDaysChanged( int value ) void KCMKOrgSummary::initGUI() { - QVBoxLayout *layout = new QVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); - mCalendarGroup = new QButtonGroup( 0, Vertical, i18n( "Appointments" ), this ); - QVBoxLayout *boxLayout = new QVBoxLayout( mCalendarGroup->layout(), + mCalendarGroup = new TQButtonGroup( 0, Vertical, i18n( "Appointments" ), this ); + TQVBoxLayout *boxLayout = new TQVBoxLayout( mCalendarGroup->layout(), KDialog::spacingHint() ); - QLabel *label = new QLabel( i18n( "How many days should the calendar show at once?" ), mCalendarGroup ); + TQLabel *label = new TQLabel( i18n( "How many days should the calendar show at once?" ), mCalendarGroup ); boxLayout->addWidget( label ); - QRadioButton *button = new QRadioButton( i18n( "One day" ), mCalendarGroup ); + TQRadioButton *button = new TQRadioButton( i18n( "One day" ), mCalendarGroup ); boxLayout->addWidget( button ); - button = new QRadioButton( i18n( "Five days" ), mCalendarGroup ); + button = new TQRadioButton( i18n( "Five days" ), mCalendarGroup ); boxLayout->addWidget( button ); - button = new QRadioButton( i18n( "One week" ), mCalendarGroup ); + button = new TQRadioButton( i18n( "One week" ), mCalendarGroup ); boxLayout->addWidget( button ); - button = new QRadioButton( i18n( "One month" ), mCalendarGroup ); + button = new TQRadioButton( i18n( "One month" ), mCalendarGroup ); boxLayout->addWidget( button ); - QHBoxLayout *hbox = new QHBoxLayout( boxLayout, KDialog::spacingHint() ); + TQHBoxLayout *hbox = new TQHBoxLayout( boxLayout, KDialog::spacingHint() ); - button = new QRadioButton( "", mCalendarGroup ); + button = new TQRadioButton( "", mCalendarGroup ); hbox->addWidget( button ); - mCustomDays = new QSpinBox( 1, 365, 1, mCalendarGroup ); + mCustomDays = new TQSpinBox( 1, 365, 1, mCalendarGroup ); mCustomDays->setEnabled( false ); hbox->addWidget( mCustomDays ); @@ -124,9 +124,9 @@ void KCMKOrgSummary::initGUI() layout->addWidget( mCalendarGroup ); - mTodoGroup = new QButtonGroup( 2, Horizontal, i18n( "To-dos" ), this ); - new QRadioButton( i18n( "Show all to-dos" ), mTodoGroup ); - new QRadioButton( i18n( "Show today's to-dos only" ), mTodoGroup ); + mTodoGroup = new TQButtonGroup( 2, Horizontal, i18n( "To-dos" ), this ); + new TQRadioButton( i18n( "Show all to-dos" ), mTodoGroup ); + new TQRadioButton( i18n( "Show today's to-dos only" ), mTodoGroup ); layout->addWidget( mTodoGroup ); diff --git a/kontact/plugins/korganizer/kcmkorgsummary.h b/kontact/plugins/korganizer/kcmkorgsummary.h index cf484e56..9ae0ac58 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.h +++ b/kontact/plugins/korganizer/kcmkorgsummary.h @@ -34,7 +34,7 @@ class KCMKOrgSummary : public KCModule Q_OBJECT public: - KCMKOrgSummary( QWidget *parent = 0, const char *name = 0 ); + KCMKOrgSummary( TQWidget *parent = 0, const char *name = 0 ); virtual void load(); virtual void save(); @@ -48,9 +48,9 @@ class KCMKOrgSummary : public KCModule private: void initGUI(); - QButtonGroup *mCalendarGroup; - QButtonGroup *mTodoGroup; - QSpinBox *mCustomDays; + TQButtonGroup *mCalendarGroup; + TQButtonGroup *mTodoGroup; + TQSpinBox *mCustomDays; }; #endif diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index f4a3dfe1..a73e551e 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -22,10 +22,10 @@ without including the source code for Qt in the source distribution. */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -52,7 +52,7 @@ typedef KGenericFactory< KOrganizerPlugin, Kontact::Core > KOrganizerPluginFacto K_EXPORT_COMPONENT_FACTORY( libkontact_korganizerplugin, KOrganizerPluginFactory( "kontact_korganizerplugin" ) ) -KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const QStringList& ) +KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const TQStringList& ) : Kontact::Plugin( core, core, "korganizer" ), mIface( 0 ) { @@ -61,11 +61,11 @@ KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const QSt instance()->iconLoader()->addAppDir("kdepim"); insertNewAction( new KAction( i18n( "New Event..." ), "newappointment", - CTRL+SHIFT+Key_E, this, SLOT( slotNewEvent() ), actionCollection(), + CTRL+SHIFT+Key_E, this, TQT_SLOT( slotNewEvent() ), actionCollection(), "new_event" ) ); insertSyncAction( new KAction( i18n( "Synchronize Calendar" ), "reload", - 0, this, SLOT( slotSyncEvents() ), actionCollection(), + 0, this, TQT_SLOT( slotSyncEvents() ), actionCollection(), "korganizer_sync" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( @@ -76,7 +76,7 @@ KOrganizerPlugin::~KOrganizerPlugin() { } -Kontact::Summary *KOrganizerPlugin::createSummaryWidget( QWidget *parent ) +Kontact::Summary *KOrganizerPlugin::createSummaryWidget( TQWidget *parent ) { return new SummaryWidget( this, parent ); } @@ -93,15 +93,15 @@ KParts::ReadOnlyPart *KOrganizerPlugin::createPart() return part; } -QString KOrganizerPlugin::tipFile() const +TQString KOrganizerPlugin::tipFile() const { - QString file = ::locate("data", "korganizer/tips"); + TQString file = ::locate("data", "korganizer/tips"); return file; } -QStringList KOrganizerPlugin::invisibleToolbarActions() const +TQStringList KOrganizerPlugin::invisibleToolbarActions() const { - QStringList invisible; + TQStringList invisible; invisible += "new_event"; invisible += "new_todo"; invisible += "new_journal"; @@ -133,10 +133,10 @@ void KOrganizerPlugin::slotNewEvent() void KOrganizerPlugin::slotSyncEvents() { DCOPRef ref( "kmail", "KMailICalIface" ); - ref.send( "triggerSync", QString("Calendar") ); + ref.send( "triggerSync", TQString("Calendar") ); } -bool KOrganizerPlugin::createDCOPInterface( const QString& serviceType ) +bool KOrganizerPlugin::createDCOPInterface( const TQString& serviceType ) { kdDebug(5602) << k_funcinfo << serviceType << endl; if ( serviceType == "DCOP/Organizer" || serviceType == "DCOP/Calendar" ) { @@ -152,36 +152,36 @@ bool KOrganizerPlugin::isRunningStandalone() return mUniqueAppWatcher->isRunningStandalone(); } -bool KOrganizerPlugin::canDecodeDrag( QMimeSource *mimeSource ) +bool KOrganizerPlugin::canDecodeDrag( TQMimeSource *mimeSource ) { - return QTextDrag::canDecode( mimeSource ) || + return TQTextDrag::canDecode( mimeSource ) || KPIM::MailListDrag::canDecode( mimeSource ); } -void KOrganizerPlugin::processDropEvent( QDropEvent *event ) +void KOrganizerPlugin::processDropEvent( TQDropEvent *event ) { - QString text; + TQString text; KABC::VCardConverter converter; if ( KVCardDrag::canDecode( event ) && KVCardDrag::decode( event, text ) ) { KABC::Addressee::List contacts = converter.parseVCards( text ); KABC::Addressee::List::Iterator it; - QStringList attendees; + TQStringList attendees; for ( it = contacts.begin(); it != contacts.end(); ++it ) { - QString email = (*it).fullEmail(); + TQString email = (*it).fullEmail(); if ( email.isEmpty() ) attendees.append( (*it).realName() + "<>" ); else attendees.append( email ); } - interface()->openEventEditor( i18n( "Meeting" ), QString::null, QString::null, + interface()->openEventEditor( i18n( "Meeting" ), TQString::null, TQString::null, attendees ); return; } - if ( QTextDrag::decode( event, text ) ) { + if ( TQTextDrag::decode( event, text ) ) { kdDebug(5602) << "DROP:" << text << endl; interface()->openEventEditor( text ); return; @@ -194,16 +194,16 @@ void KOrganizerPlugin::processDropEvent( QDropEvent *event ) i18n("Drops of multiple mails are not supported." ) ); } else { KPIM::MailSummary mail = mails.first(); - QString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( mail.from() ) + TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( mail.from() ) .arg( mail.to() ).arg( mail.subject() ); KTempFile tf; tf.setAutoDelete( true ); - QString uri = QString::fromLatin1("kmail:") + QString::number( mail.serialNumber() ); + TQString uri = TQString::fromLatin1("kmail:") + TQString::number( mail.serialNumber() ); tf.file()->writeBlock( event->encodedData( "message/rfc822" ) ); tf.close(); interface()->openEventEditor( i18n("Mail: %1").arg( mail.subject() ), txt, - uri, tf.name(), QStringList(), "message/rfc822" ); + uri, tf.name(), TQStringList(), "message/rfc822" ); } return; } @@ -218,13 +218,13 @@ bool KOrganizerPlugin::queryClose() const { return (!canClose); } -void KOrganizerPlugin::loadProfile( const QString& directory ) +void KOrganizerPlugin::loadProfile( const TQString& directory ) { DCOPRef ref( "korganizer", "KOrganizerIface" ); ref.send( "loadProfile", directory ); } -void KOrganizerPlugin::saveToProfile( const QString& directory ) const +void KOrganizerPlugin::saveToProfile( const TQString& directory ) const { DCOPRef ref( "korganizer", "KOrganizerIface" ); ref.send( "saveToProfile", directory ); diff --git a/kontact/plugins/korganizer/korganizerplugin.h b/kontact/plugins/korganizer/korganizerplugin.h index 7d74c830..1343464e 100644 --- a/kontact/plugins/korganizer/korganizerplugin.h +++ b/kontact/plugins/korganizer/korganizerplugin.h @@ -38,30 +38,30 @@ class KOrganizerPlugin : public Kontact::Plugin Q_OBJECT public: - KOrganizerPlugin( Kontact::Core *core, const char *name, const QStringList& ); + KOrganizerPlugin( Kontact::Core *core, const char *name, const TQStringList& ); ~KOrganizerPlugin(); - virtual bool createDCOPInterface( const QString& serviceType ); + virtual bool createDCOPInterface( const TQString& serviceType ); virtual bool isRunningStandalone(); int weight() const { return 400; } virtual bool queryClose() const; - bool canDecodeDrag( QMimeSource * ); - void processDropEvent( QDropEvent * ); + bool canDecodeDrag( TQMimeSource * ); + void processDropEvent( TQDropEvent * ); - virtual Kontact::Summary *createSummaryWidget( QWidget *parent ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parent ); - virtual QString tipFile() const; - virtual QStringList invisibleToolbarActions() const; + virtual TQString tipFile() const; + virtual TQStringList invisibleToolbarActions() const; void select(); KCalendarIface_stub *interface(); - void loadProfile( const QString& path ); - void saveToProfile( const QString& path ) const; + void loadProfile( const TQString& path ); + void saveToProfile( const TQString& path ) const; protected: KParts::ReadOnlyPart *createPart(); diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index 68742248..ff3d5da9 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -21,10 +21,10 @@ without including the source code for Qt in the source distribution. */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -50,26 +50,26 @@ #include "summarywidget.h" -SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, QWidget *parent, +SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent, const char *name ) : Kontact::Summary( parent, name ), mPlugin( plugin ), mCalendar( 0 ) { - QVBoxLayout *mainLayout = new QVBoxLayout( this, 3, 3 ); + TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); - QPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_date", + TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_date", KIcon::Desktop, KIcon::SizeMedium ); - QWidget *header = createHeader( this, icon, i18n( "Calendar" ) ); + TQWidget *header = createHeader( this, icon, i18n( "Calendar" ) ); mainLayout->addWidget( header ); - mLayout = new QGridLayout( mainLayout, 7, 5, 3 ); + mLayout = new TQGridLayout( mainLayout, 7, 5, 3 ); mLayout->setRowStretch( 6, 1 ); mCalendar = KOrg::StdCalendar::self(); mCalendar->load(); - connect( mCalendar, SIGNAL( calendarChanged() ), SLOT( updateView() ) ); - connect( mPlugin->core(), SIGNAL( dayChanged( const QDate& ) ), - SLOT( updateView() ) ); + connect( mCalendar, TQT_SIGNAL( calendarChanged() ), TQT_SLOT( updateView() ) ); + connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ), + TQT_SLOT( updateView() ) ); updateView(); } @@ -91,12 +91,12 @@ void SummaryWidget::updateView() config.setGroup( "Calendar" ); int days = config.readNumEntry( "DaysToShow", 1 ); - QLabel *label = 0; + TQLabel *label = 0; int counter = 0; - QPixmap pm = loader.loadIcon( "appointment", KIcon::Small ); + TQPixmap pm = loader.loadIcon( "appointment", KIcon::Small ); - QDate dt; - QDate currentDate = QDate::currentDate(); + TQDate dt; + TQDate currentDate = TQDate::currentDate(); for ( dt=currentDate; dt<=currentDate.addDays( days - 1 ); dt=dt.addDays(1) ) { @@ -108,10 +108,10 @@ void SummaryWidget::updateView() KCal::Event::List events; events.setAutoDelete( true ); - QDateTime qdt; + TQDateTime qdt; // prevent implicitely sharing while finding recurring events - // replacing the QDate with the currentDate + // replacing the TQDate with the currentDate for ( ; it != events_orig.end(); ++it ) { ev = (*it)->clone(); if ( ev->recursOn( dt ) ) { @@ -137,7 +137,7 @@ void SummaryWidget::updateView() // Count number of days remaining in multiday event int span=1; int dayof=1; if ( ev->isMultiDay() ) { - QDate d = ev->dtStart().date(); + TQDate d = ev->dtStart().date(); if ( d < currentDate ) { d = currentDate; } @@ -155,7 +155,7 @@ void SummaryWidget::updateView() if ( ev->isMultiDay() && ev->doesFloat() && dayof != 1 ) continue; // Fill Appointment Pixmap Field - label = new QLabel( this ); + label = new TQLabel( this ); label->setPixmap( pm ); label->setMaximumWidth( label->minimumSizeHint().width() ); label->setAlignment( AlignVCenter ); @@ -164,10 +164,10 @@ void SummaryWidget::updateView() // Fill Event Date Field bool makeBold = false; - QString datestr; + TQString datestr; // Modify event date for printing - QDate sD = QDate::QDate( dt.year(), dt.month(), dt.day() ); + TQDate sD = TQDate::TQDate( dt.year(), dt.month(), dt.day() ); if ( ( sD.month() == currentDate.month() ) && ( sD.day() == currentDate.day() ) ) { datestr = i18n( "Today" ); @@ -187,10 +187,10 @@ void SummaryWidget::updateView() KGlobal::locale()->formatDate( sD.addDays( span-1 ) ); } - label = new QLabel( datestr, this ); + label = new TQLabel( datestr, this ); label->setAlignment( AlignLeft | AlignVCenter ); if ( makeBold ) { - QFont font = label->font(); + TQFont font = label->font(); font.setBold( true ); label->setFont( font ); } @@ -198,9 +198,9 @@ void SummaryWidget::updateView() mLabels.append( label ); // Fill Event Summary Field - QString newtext = ev->summary(); + TQString newtext = ev->summary(); if ( ev->isMultiDay() && !ev->doesFloat() ) { - newtext.append( QString(" (%1/%2)").arg( dayof ).arg( span ) ); + newtext.append( TQString(" (%1/%2)").arg( dayof ).arg( span ) ); } KURLLabel *urlLabel = new KURLLabel( this ); @@ -211,32 +211,32 @@ void SummaryWidget::updateView() mLayout->addWidget( urlLabel, counter, 2 ); mLabels.append( urlLabel ); - connect( urlLabel, SIGNAL( leftClickedURL( const QString& ) ), - this, SLOT( viewEvent( const QString& ) ) ); - connect( urlLabel, SIGNAL( rightClickedURL( const QString& ) ), - this, SLOT( popupMenu( const QString& ) ) ); + connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQT_SLOT( viewEvent( const TQString& ) ) ); + connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ), + this, TQT_SLOT( popupMenu( const TQString& ) ) ); - QString tipText( KCal::IncidenceFormatter::toolTipString( ev, true ) ); + TQString tipText( KCal::IncidenceFormatter::toolTipString( ev, true ) ); if ( !tipText.isEmpty() ) { - QToolTip::add( urlLabel, tipText ); + TQToolTip::add( urlLabel, tipText ); } // Fill Event Time Range Field (only for non-floating Events) if ( !ev->doesFloat() ) { - QTime sST = ev->dtStart().time(); - QTime sET = ev->dtEnd().time(); + TQTime sST = ev->dtStart().time(); + TQTime sET = ev->dtEnd().time(); if ( ev->isMultiDay() ) { if ( ev->dtStart().date() < dt ) { - sST = QTime::QTime( 0, 0 ); + sST = TQTime::TQTime( 0, 0 ); } if ( ev->dtEnd().date() > dt ) { - sET = QTime::QTime( 23, 59 ); + sET = TQTime::TQTime( 23, 59 ); } } datestr = i18n( "Time from - to", "%1 - %2" ) .arg( KGlobal::locale()->formatTime( sST ) ) .arg( KGlobal::locale()->formatTime( sET ) ); - label = new QLabel( datestr, this ); + label = new TQLabel( datestr, this ); label->setAlignment( AlignLeft | AlignVCenter ); mLayout->addWidget( label, counter, 3 ); mLabels.append( label ); @@ -247,7 +247,7 @@ void SummaryWidget::updateView() } if ( !counter ) { - QLabel *noEvents = new QLabel( + TQLabel *noEvents = new TQLabel( i18n( "No appointments pending within the next day", "No appointments pending within the next %n days", days ), this, "nothing to see" ); @@ -260,29 +260,29 @@ void SummaryWidget::updateView() label->show(); } -void SummaryWidget::viewEvent( const QString &uid ) +void SummaryWidget::viewEvent( const TQString &uid ) { mPlugin->core()->selectPlugin( "kontact_korganizerplugin" ); //ensure loaded KOrganizerIface_stub iface( "korganizer", "KOrganizerIface" ); iface.editIncidence( uid ); } -void SummaryWidget::removeEvent( const QString &uid ) +void SummaryWidget::removeEvent( const TQString &uid ) { mPlugin->core()->selectPlugin( "kontact_korganizerplugin" ); //ensure loaded KOrganizerIface_stub iface( "korganizer", "KOrganizerIface" ); iface.deleteIncidence( uid, false ); } -void SummaryWidget::popupMenu( const QString &uid ) +void SummaryWidget::popupMenu( const TQString &uid ) { KPopupMenu popup( this ); - QToolTip::remove( this ); + TQToolTip::remove( this ); popup.insertItem( i18n( "&Edit Appointment..." ), 0 ); popup.insertItem( KGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small), i18n( "&Delete Appointment" ), 1 ); - switch ( popup.exec( QCursor::pos() ) ) { + switch ( popup.exec( TQCursor::pos() ) ) { case 0: viewEvent( uid ); break; @@ -292,22 +292,22 @@ void SummaryWidget::popupMenu( const QString &uid ) } } -bool SummaryWidget::eventFilter( QObject *obj, QEvent* e ) +bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) { if ( obj->inherits( "KURLLabel" ) ) { KURLLabel* label = static_cast( obj ); - if ( e->type() == QEvent::Enter ) + if ( e->type() == TQEvent::Enter ) emit message( i18n( "Edit Appointment: \"%1\"" ).arg( label->text() ) ); - if ( e->type() == QEvent::Leave ) - emit message( QString::null ); + if ( e->type() == TQEvent::Leave ) + emit message( TQString::null ); } return Kontact::Summary::eventFilter( obj, e ); } -QStringList SummaryWidget::configModules() const +TQStringList SummaryWidget::configModules() const { - return QStringList( "kcmkorgsummary.desktop" ); + return TQStringList( "kcmkorgsummary.desktop" ); } #include "summarywidget.moc" diff --git a/kontact/plugins/korganizer/summarywidget.h b/kontact/plugins/korganizer/summarywidget.h index c9c572ec..a88d50dd 100644 --- a/kontact/plugins/korganizer/summarywidget.h +++ b/kontact/plugins/korganizer/summarywidget.h @@ -24,8 +24,8 @@ #ifndef SUMMARYWIDGET_H #define SUMMARYWIDGET_H -#include -#include +#include +#include #include @@ -41,29 +41,29 @@ class SummaryWidget : public Kontact::Summary Q_OBJECT public: - SummaryWidget( KOrganizerPlugin *plugin, QWidget *parent, + SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent, const char *name = 0 ); ~SummaryWidget(); int summaryHeight() const { return 3; } - QStringList configModules() const; + TQStringList configModules() const; public slots: void updateSummary( bool force = false ) { Q_UNUSED( force ); updateView(); } protected: - virtual bool eventFilter( QObject *obj, QEvent* e ); + virtual bool eventFilter( TQObject *obj, TQEvent* e ); private slots: void updateView(); - void popupMenu( const QString &uid ); - void viewEvent( const QString &uid ); - void removeEvent( const QString &uid ); + void popupMenu( const TQString &uid ); + void viewEvent( const TQString &uid ); + void removeEvent( const TQString &uid ); private: KOrganizerPlugin *mPlugin; - QGridLayout *mLayout; + TQGridLayout *mLayout; - QPtrList mLabels; + TQPtrList mLabels; KCal::CalendarResources *mCalendar; }; diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp index 4cb281b8..3b6ab214 100644 --- a/kontact/plugins/korganizer/todoplugin.cpp +++ b/kontact/plugins/korganizer/todoplugin.cpp @@ -22,9 +22,9 @@ without including the source code for Qt in the source distribution. */ -#include -#include -#include +#include +#include +#include #include #include @@ -54,7 +54,7 @@ typedef KGenericFactory< TodoPlugin, Kontact::Core > TodoPluginFactory; K_EXPORT_COMPONENT_FACTORY( libkontact_todoplugin, TodoPluginFactory( "kontact_todoplugin" ) ) -TodoPlugin::TodoPlugin( Kontact::Core *core, const char *, const QStringList& ) +TodoPlugin::TodoPlugin( Kontact::Core *core, const char *, const TQStringList& ) : Kontact::Plugin( core, core, "korganizer" ), mIface( 0 ) { @@ -62,11 +62,11 @@ TodoPlugin::TodoPlugin( Kontact::Core *core, const char *, const QStringList& ) instance()->iconLoader()->addAppDir("kdepim"); insertNewAction( new KAction( i18n( "New To-do..." ), "newtodo", - CTRL+SHIFT+Key_T, this, SLOT( slotNewTodo() ), actionCollection(), + CTRL+SHIFT+Key_T, this, TQT_SLOT( slotNewTodo() ), actionCollection(), "new_todo" ) ); insertSyncAction( new KAction( i18n( "Synchronize To-do List" ), "reload", - 0, this, SLOT( slotSyncTodos() ), actionCollection(), + 0, this, TQT_SLOT( slotSyncTodos() ), actionCollection(), "todo_sync" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( @@ -77,7 +77,7 @@ TodoPlugin::~TodoPlugin() { } -Kontact::Summary *TodoPlugin::createSummaryWidget( QWidget *parent ) +Kontact::Summary *TodoPlugin::createSummaryWidget( TQWidget *parent ) { return new TodoSummaryWidget( this, parent ); } @@ -100,9 +100,9 @@ void TodoPlugin::select() interface()->showTodoView(); } -QStringList TodoPlugin::invisibleToolbarActions() const +TQStringList TodoPlugin::invisibleToolbarActions() const { - QStringList invisible; + TQStringList invisible; invisible += "new_event"; invisible += "new_todo"; invisible += "new_journal"; @@ -134,10 +134,10 @@ void TodoPlugin::slotNewTodo() void TodoPlugin::slotSyncTodos() { DCOPRef ref( "kmail", "KMailICalIface" ); - ref.send( "triggerSync", QString("Todo") ); + ref.send( "triggerSync", TQString("Todo") ); } -bool TodoPlugin::createDCOPInterface( const QString& serviceType ) +bool TodoPlugin::createDCOPInterface( const TQString& serviceType ) { kdDebug(5602) << k_funcinfo << serviceType << endl; if ( serviceType == "DCOP/Organizer" || serviceType == "DCOP/Calendar" ) { @@ -148,9 +148,9 @@ bool TodoPlugin::createDCOPInterface( const QString& serviceType ) return false; } -bool TodoPlugin::canDecodeDrag( QMimeSource *mimeSource ) +bool TodoPlugin::canDecodeDrag( TQMimeSource *mimeSource ) { - return QTextDrag::canDecode( mimeSource ) || + return TQTextDrag::canDecode( mimeSource ) || KPIM::MailListDrag::canDecode( mimeSource ); } @@ -159,25 +159,25 @@ bool TodoPlugin::isRunningStandalone() return mUniqueAppWatcher->isRunningStandalone(); } -void TodoPlugin::processDropEvent( QDropEvent *event ) +void TodoPlugin::processDropEvent( TQDropEvent *event ) { - QString text; + TQString text; KABC::VCardConverter converter; if ( KVCardDrag::canDecode( event ) && KVCardDrag::decode( event, text ) ) { KABC::Addressee::List contacts = converter.parseVCards( text ); KABC::Addressee::List::Iterator it; - QStringList attendees; + TQStringList attendees; for ( it = contacts.begin(); it != contacts.end(); ++it ) { - QString email = (*it).fullEmail(); + TQString email = (*it).fullEmail(); if ( email.isEmpty() ) attendees.append( (*it).realName() + "<>" ); else attendees.append( email ); } - interface()->openTodoEditor( i18n( "Meeting" ), QString::null, QString::null, + interface()->openTodoEditor( i18n( "Meeting" ), TQString::null, TQString::null, attendees ); return; } @@ -189,14 +189,14 @@ void TodoPlugin::processDropEvent( QDropEvent *event ) if ( !journals.isEmpty() ) { event->accept(); KCal::Journal *j = journals.first(); - interface()->openTodoEditor( i18n("Note: %1").arg( j->summary() ), j->description(), QString() ); + interface()->openTodoEditor( i18n("Note: %1").arg( j->summary() ), j->description(), TQString() ); return; } // else fall through to text decoding } } - if ( QTextDrag::decode( event, text ) ) { + if ( TQTextDrag::decode( event, text ) ) { interface()->openTodoEditor( text ); return; } @@ -208,17 +208,17 @@ void TodoPlugin::processDropEvent( QDropEvent *event ) i18n("Drops of multiple mails are not supported." ) ); } else { KPIM::MailSummary mail = mails.first(); - QString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( mail.from() ) + TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( mail.from() ) .arg( mail.to() ).arg( mail.subject() ); KTempFile tf; tf.setAutoDelete( true ); - QString uri = "kmail:" + QString::number( mail.serialNumber() ) + "/" + + TQString uri = "kmail:" + TQString::number( mail.serialNumber() ) + "/" + mail.messageId(); tf.file()->writeBlock( event->encodedData( "message/rfc822" ) ); tf.close(); interface()->openTodoEditor( i18n("Mail: %1").arg( mail.subject() ), txt, - uri, tf.name(), QStringList(), "message/rfc822" ); + uri, tf.name(), TQStringList(), "message/rfc822" ); } return; } diff --git a/kontact/plugins/korganizer/todoplugin.h b/kontact/plugins/korganizer/todoplugin.h index ce0cb582..5fc13316 100644 --- a/kontact/plugins/korganizer/todoplugin.h +++ b/kontact/plugins/korganizer/todoplugin.h @@ -35,19 +35,19 @@ class TodoPlugin : public Kontact::Plugin { Q_OBJECT public: - TodoPlugin( Kontact::Core *core, const char *name, const QStringList& ); + TodoPlugin( Kontact::Core *core, const char *name, const TQStringList& ); ~TodoPlugin(); - virtual bool createDCOPInterface( const QString& serviceType ); + virtual bool createDCOPInterface( const TQString& serviceType ); virtual bool isRunningStandalone(); int weight() const { return 450; } - bool canDecodeDrag( QMimeSource * ); - void processDropEvent( QDropEvent * ); + bool canDecodeDrag( TQMimeSource * ); + void processDropEvent( TQDropEvent * ); - virtual QStringList invisibleToolbarActions() const; + virtual TQStringList invisibleToolbarActions() const; - virtual Kontact::Summary *createSummaryWidget( QWidget *parent ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parent ); void select(); diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index d52941ee..e58ee6aa 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -21,10 +21,10 @@ without including the source code for Qt in the source distribution. */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -53,25 +53,25 @@ #include "todosummarywidget.h" TodoSummaryWidget::TodoSummaryWidget( TodoPlugin *plugin, - QWidget *parent, const char *name ) + TQWidget *parent, const char *name ) : Kontact::Summary( parent, name ), mPlugin( plugin ) { - QVBoxLayout *mainLayout = new QVBoxLayout( this, 3, 3 ); + TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); - QPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_todo", + TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_todo", KIcon::Desktop, KIcon::SizeMedium ); - QWidget *header = createHeader( this, icon, i18n( "To-do" ) ); + TQWidget *header = createHeader( this, icon, i18n( "To-do" ) ); mainLayout->addWidget( header ); - mLayout = new QGridLayout( mainLayout, 7, 4, 3 ); + mLayout = new TQGridLayout( mainLayout, 7, 4, 3 ); mLayout->setRowStretch( 6, 1 ); mCalendar = KOrg::StdCalendar::self(); mCalendar->load(); - connect( mCalendar, SIGNAL( calendarChanged() ), SLOT( updateView() ) ); - connect( mPlugin->core(), SIGNAL( dayChanged( const QDate& ) ), - SLOT( updateView() ) ); + connect( mCalendar, TQT_SIGNAL( calendarChanged() ), TQT_SLOT( updateView() ) ); + connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ), + TQT_SLOT( updateView() ) ); updateView(); } @@ -92,19 +92,19 @@ void TodoSummaryWidget::updateView() KIconLoader loader( "kdepim" ); - QLabel *label = 0; + TQLabel *label = 0; int counter = 0; - QDate currentDate = QDate::currentDate(); + TQDate currentDate = TQDate::currentDate(); KCal::Todo::List todos = mCalendar->todos(); if ( todos.count() > 0 ) { - QPixmap pm = loader.loadIcon( "todo", KIcon::Small ); + TQPixmap pm = loader.loadIcon( "todo", KIcon::Small ); KCal::Todo::List::ConstIterator it; for ( it = todos.begin(); it != todos.end(); ++it ) { KCal::Todo *todo = *it; bool accepted = false; - QString stateText; + TQString stateText; // show all incomplete todos if ( showAllTodos && !todo->isCompleted()) @@ -140,19 +140,19 @@ void TodoSummaryWidget::updateView() if ( !accepted ) continue; - label = new QLabel( this ); + label = new TQLabel( this ); label->setPixmap( pm ); - label->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Maximum ); + label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); mLayout->addWidget( label, counter, 0 ); mLabels.append( label ); - label = new QLabel( QString::number( todo->percentComplete() ) + "%", this ); + label = new TQLabel( TQString::number( todo->percentComplete() ) + "%", this ); label->setAlignment( AlignHCenter | AlignVCenter ); - label->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Maximum ); + label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); mLayout->addWidget( label, counter, 1 ); mLabels.append( label ); - QString sSummary = todo->summary(); + TQString sSummary = todo->summary(); if ( todo->relatedTo() ) { // show parent only, not entire ancestry sSummary = todo->relatedTo()->summary() + ":" + todo->summary(); } @@ -164,19 +164,19 @@ void TodoSummaryWidget::updateView() mLayout->addWidget( urlLabel, counter, 2 ); mLabels.append( urlLabel ); - connect( urlLabel, SIGNAL( leftClickedURL( const QString& ) ), - this, SLOT( viewTodo( const QString& ) ) ); - connect( urlLabel, SIGNAL( rightClickedURL( const QString& ) ), - this, SLOT( popupMenu( const QString& ) ) ); + connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQT_SLOT( viewTodo( const TQString& ) ) ); + connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ), + this, TQT_SLOT( popupMenu( const TQString& ) ) ); - QString tipText( KCal::IncidenceFormatter::toolTipString( todo, true ) ); + TQString tipText( KCal::IncidenceFormatter::toolTipString( todo, true ) ); if ( !tipText.isEmpty() ) { - QToolTip::add( urlLabel, tipText ); + TQToolTip::add( urlLabel, tipText ); } - label = new QLabel( stateText, this ); + label = new TQLabel( stateText, this ); label->setAlignment( AlignLeft | AlignVCenter ); - label->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Maximum ); + label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); mLayout->addWidget( label, counter, 3 ); mLabels.append( label ); @@ -185,7 +185,7 @@ void TodoSummaryWidget::updateView() } if ( counter == 0 ) { - QLabel *noTodos = new QLabel( i18n( "No to-dos pending" ), this ); + TQLabel *noTodos = new TQLabel( i18n( "No to-dos pending" ), this ); noTodos->setAlignment( AlignHCenter | AlignVCenter ); mLayout->addWidget( noTodos, 0, 1 ); mLabels.append( noTodos ); @@ -195,27 +195,27 @@ void TodoSummaryWidget::updateView() label->show(); } -void TodoSummaryWidget::viewTodo( const QString &uid ) +void TodoSummaryWidget::viewTodo( const TQString &uid ) { mPlugin->core()->selectPlugin( "kontact_todoplugin" );//ensure loaded KOrganizerIface_stub iface( "korganizer", "KOrganizerIface" ); iface.editIncidence( uid ); } -void TodoSummaryWidget::removeTodo( const QString &uid ) +void TodoSummaryWidget::removeTodo( const TQString &uid ) { mPlugin->core()->selectPlugin( "kontact_todoplugin" );//ensure loaded KOrganizerIface_stub iface( "korganizer", "KOrganizerIface" ); iface.deleteIncidence( uid, false ); } -void TodoSummaryWidget::completeTodo( const QString &uid ) +void TodoSummaryWidget::completeTodo( const TQString &uid ) { KCal::Todo *todo = mCalendar->todo( uid ); IncidenceChanger *changer = new IncidenceChanger( mCalendar, this ); if ( !todo->isReadOnly() && changer->beginChange( todo ) ) { KCal::Todo *oldTodo = todo->clone(); - todo->setCompleted( QDateTime::currentDateTime() ); + todo->setCompleted( TQDateTime::currentDateTime() ); changer->changeIncidence( oldTodo, todo, KOGlobals::COMPLETION_MODIFIED ); changer->endChange( todo ); delete oldTodo; @@ -223,10 +223,10 @@ void TodoSummaryWidget::completeTodo( const QString &uid ) } } -void TodoSummaryWidget::popupMenu( const QString &uid ) +void TodoSummaryWidget::popupMenu( const TQString &uid ) { KPopupMenu popup( this ); - QToolTip::remove( this ); + TQToolTip::remove( this ); popup.insertItem( i18n( "&Edit To-do..." ), 0 ); popup.insertItem( KGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small), i18n( "&Delete To-do" ), 1 ); @@ -236,7 +236,7 @@ void TodoSummaryWidget::popupMenu( const QString &uid ) i18n( "&Mark To-do Completed" ), 2 ); } - switch ( popup.exec( QCursor::pos() ) ) { + switch ( popup.exec( TQCursor::pos() ) ) { case 0: viewTodo( uid ); break; @@ -249,22 +249,22 @@ void TodoSummaryWidget::popupMenu( const QString &uid ) } } -bool TodoSummaryWidget::eventFilter( QObject *obj, QEvent* e ) +bool TodoSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) { if ( obj->inherits( "KURLLabel" ) ) { KURLLabel* label = static_cast( obj ); - if ( e->type() == QEvent::Enter ) + if ( e->type() == TQEvent::Enter ) emit message( i18n( "Edit To-do: \"%1\"" ).arg( label->text() ) ); - if ( e->type() == QEvent::Leave ) - emit message( QString::null ); + if ( e->type() == TQEvent::Leave ) + emit message( TQString::null ); } return Kontact::Summary::eventFilter( obj, e ); } -QStringList TodoSummaryWidget::configModules() const +TQStringList TodoSummaryWidget::configModules() const { - return QStringList( "kcmtodosummary.desktop" ); + return TQStringList( "kcmtodosummary.desktop" ); } #include "todosummarywidget.moc" diff --git a/kontact/plugins/korganizer/todosummarywidget.h b/kontact/plugins/korganizer/todosummarywidget.h index d5aca429..029dec9a 100644 --- a/kontact/plugins/korganizer/todosummarywidget.h +++ b/kontact/plugins/korganizer/todosummarywidget.h @@ -24,8 +24,8 @@ #ifndef TODO_SUMMARYWIDGET_H #define TODO_SUMMARYWIDGET_H -#include -#include +#include +#include #include @@ -41,31 +41,31 @@ class TodoSummaryWidget : public Kontact::Summary Q_OBJECT public: - TodoSummaryWidget( TodoPlugin *plugin, QWidget *parent, + TodoSummaryWidget( TodoPlugin *plugin, TQWidget *parent, const char *name = 0 ); ~TodoSummaryWidget(); int summaryHeight() const { return 3; } - QStringList configModules() const; + TQStringList configModules() const; public slots: void updateSummary( bool force = false ) { Q_UNUSED( force ); updateView(); } protected: - virtual bool eventFilter( QObject *obj, QEvent* e ); + virtual bool eventFilter( TQObject *obj, TQEvent* e ); private slots: void updateView(); - void popupMenu( const QString &uid ); - void viewTodo( const QString &uid ); - void removeTodo( const QString &uid ); - void completeTodo( const QString &uid ); + void popupMenu( const TQString &uid ); + void viewTodo( const TQString &uid ); + void removeTodo( const TQString &uid ); + void completeTodo( const TQString &uid ); private: TodoPlugin *mPlugin; - QGridLayout *mLayout; + TQGridLayout *mLayout; - QPtrList mLabels; + TQPtrList mLabels; KCal::CalendarResources *mCalendar; }; diff --git a/kontact/plugins/kpilot/kpilot_plugin.cpp b/kontact/plugins/kpilot/kpilot_plugin.cpp index ed6104bd..953c5f25 100644 --- a/kontact/plugins/kpilot/kpilot_plugin.cpp +++ b/kontact/plugins/kpilot/kpilot_plugin.cpp @@ -34,7 +34,7 @@ typedef KGenericFactory< KPilotPlugin, Kontact::Core > KPilotPluginFactory; K_EXPORT_COMPONENT_FACTORY( libkontact_kpilotplugin, KPilotPluginFactory( "kontact_kpilotplugin" ) ) -KPilotPlugin::KPilotPlugin( Kontact::Core *core, const char *name, const QStringList& ) +KPilotPlugin::KPilotPlugin( Kontact::Core *core, const char *name, const TQStringList& ) : Kontact::Plugin( core, core, "kpilot" ), mAboutData( 0 ) { setInstance( KPilotPluginFactory::instance() ); @@ -43,7 +43,7 @@ KPilotPlugin::KPilotPlugin( Kontact::Core *core, const char *name, const QString } -Kontact::Summary *KPilotPlugin::createSummaryWidget( QWidget *parentWidget ) +Kontact::Summary *KPilotPlugin::createSummaryWidget( TQWidget *parentWidget ) { return new SummaryWidget( parentWidget ); } diff --git a/kontact/plugins/kpilot/kpilot_plugin.h b/kontact/plugins/kpilot/kpilot_plugin.h index 9b76bd64..5695d260 100644 --- a/kontact/plugins/kpilot/kpilot_plugin.h +++ b/kontact/plugins/kpilot/kpilot_plugin.h @@ -30,13 +30,13 @@ class SummaryWidget; class KPilotPlugin : public Kontact::Plugin { public: - KPilotPlugin( Kontact::Core *core, const char *name, const QStringList& ); + KPilotPlugin( Kontact::Core *core, const char *name, const TQStringList& ); KPilotPlugin(); - virtual Kontact::Summary *createSummaryWidget( QWidget *parentWidget ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget ); virtual bool showInSideBar() const { return false; } -// virtual QStringList configModules() const; +// virtual TQStringList configModules() const; const KAboutData *aboutData(); diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp index 4230e647..779a55c1 100644 --- a/kontact/plugins/kpilot/summarywidget.cpp +++ b/kontact/plugins/kpilot/summarywidget.cpp @@ -22,14 +22,14 @@ without including the source code for Qt in the source distribution. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -49,77 +49,77 @@ #include "summarywidget.h" -SummaryWidget::SummaryWidget( QWidget *parent, const char *name ) +SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) : Kontact::Summary( parent, name ), DCOPObject( "KPilotSummaryWidget" ), mDCOPSuccess( false ), mStartedDaemon( false ), mShouldStopDaemon( true ) { - mLayout = new QGridLayout( this, 2, 3, 3, 3 ); + mLayout = new TQGridLayout( this, 2, 3, 3, 3 ); int row=0; - QPixmap icon = KGlobal::iconLoader()->loadIcon( "kpilot", KIcon::Desktop, KIcon::SizeMedium ); - QWidget *header = createHeader( this, icon, i18n( "KPilot Configuration" ) ); + TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kpilot", KIcon::Desktop, KIcon::SizeMedium ); + TQWidget *header = createHeader( this, icon, i18n( "KPilot Configuration" ) ); mLayout->addMultiCellWidget( header, row,row, 0,3 ); // Last sync information row++; - mSyncTimeTextLabel = new QLabel( i18n( "Last sync:" ), this); + mSyncTimeTextLabel = new TQLabel( i18n( "Last sync:" ), this); mLayout->addWidget( mSyncTimeTextLabel, row, 0 ); - mSyncTimeLabel = new QLabel( i18n( "No information available" ), this ); + mSyncTimeLabel = new TQLabel( i18n( "No information available" ), this ); mLayout->addWidget( mSyncTimeLabel, row, 1 ); mShowSyncLogLabel = new KURLLabel( "", i18n( "[View Sync Log]" ), this ); mLayout->addWidget( mShowSyncLogLabel, row, 3 ); - connect( mShowSyncLogLabel, SIGNAL( leftClickedURL( const QString& ) ), - this, SLOT( showSyncLog( const QString& ) ) ); + connect( mShowSyncLogLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQT_SLOT( showSyncLog( const TQString& ) ) ); // User row++; - mPilotUserTextLabel = new QLabel( i18n( "User:" ), this); + mPilotUserTextLabel = new TQLabel( i18n( "User:" ), this); mLayout->addWidget( mPilotUserTextLabel, row, 0); - mPilotUserLabel = new QLabel( i18n( "Unknown" ), this ); + mPilotUserLabel = new TQLabel( i18n( "Unknown" ), this ); mLayout->addMultiCellWidget( mPilotUserLabel, row, row, 1, 3 ); // Device information row++; - mPilotDeviceTextLabel = new QLabel( i18n( "Device:" ), this); + mPilotDeviceTextLabel = new TQLabel( i18n( "Device:" ), this); mLayout->addWidget( mPilotDeviceTextLabel, row, 0 ); - mPilotDeviceLabel = new QLabel( i18n( "Unknown" ), this ); + mPilotDeviceLabel = new TQLabel( i18n( "Unknown" ), this ); mLayout->addMultiCellWidget( mPilotDeviceLabel, row, row, 1, 3 ); // Status row++; - mDaemonStatusTextLabel = new QLabel( i18n( "Status:" ), this); + mDaemonStatusTextLabel = new TQLabel( i18n( "Status:" ), this); mLayout->addWidget( mDaemonStatusTextLabel, row, 0 ); - mDaemonStatusLabel = new QLabel( i18n( "No communication with the daemon possible" ), this ); + mDaemonStatusLabel = new TQLabel( i18n( "No communication with the daemon possible" ), this ); mLayout->addMultiCellWidget( mDaemonStatusLabel, row, row, 1, 3 ); // Conduits: row++; - mConduitsTextLabel = new QLabel( i18n( "Conduits:" ), this ); + mConduitsTextLabel = new TQLabel( i18n( "Conduits:" ), this ); mConduitsTextLabel->setAlignment( AlignAuto | AlignTop | ExpandTabs ); mLayout->addWidget( mConduitsTextLabel, row, 0 ); - mConduitsLabel = new QLabel( i18n( "No information available" ), this ); + mConduitsLabel = new TQLabel( i18n( "No information available" ), this ); mConduitsLabel->setAlignment( mConduitsLabel->alignment() | Qt::WordBreak ); mLayout->addMultiCellWidget( mConduitsLabel, row, row, 1, 3 ); // widgets shown if kpilotDaemon is not running row++; - mNoConnectionLabel = new QLabel( i18n( "KPilot is currently not running." ), this ); + mNoConnectionLabel = new TQLabel( i18n( "KPilot is currently not running." ), this ); mLayout->addMultiCellWidget( mNoConnectionLabel, row, row, 1, 2 ); mNoConnectionStartLabel = new KURLLabel( "", i18n( "[Start KPilot]" ), this ); mLayout->addWidget( mNoConnectionStartLabel, row, 3 ); - connect( mNoConnectionStartLabel, SIGNAL( leftClickedURL( const QString& ) ), - this, SLOT( startKPilot() ) ); + connect( mNoConnectionStartLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQT_SLOT( startKPilot() ) ); if ( !kapp->dcopClient()->isApplicationRegistered( "kpilotDaemon" ) ) { startKPilot(); } - connectDCOPSignal( 0, 0, "kpilotDaemonStatusDetails(QDateTime,QString,QStringList,QString,QString,QString,bool)", - "receiveDaemonStatusDetails(QDateTime,QString,QStringList,QString,QString,QString,bool)", false ); - connect( kapp->dcopClient(), SIGNAL( applicationRemoved( const QCString & ) ), SLOT( slotAppRemoved( const QCString& ) ) ); + connectDCOPSignal( 0, 0, "kpilotDaemonStatusDetails(TQDateTime,TQString,TQStringList,TQString,TQString,TQString,bool)", + "receiveDaemonStatusDetails(TQDateTime,TQString,TQStringList,TQString,TQString,TQString,bool)", false ); + connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString & ) ), TQT_SLOT( slotAppRemoved( const TQCString& ) ) ); } SummaryWidget::~SummaryWidget() @@ -130,14 +130,14 @@ SummaryWidget::~SummaryWidget() } } -QStringList SummaryWidget::configModules() const +TQStringList SummaryWidget::configModules() const { - QStringList modules; + TQStringList modules; modules << "kpilot_config.desktop"; return modules; } -void SummaryWidget::receiveDaemonStatusDetails(QDateTime lastSyncTime, QString status, QStringList conduits, QString logFileName, QString userName, QString pilotDevice, bool killOnExit ) +void SummaryWidget::receiveDaemonStatusDetails(TQDateTime lastSyncTime, TQString status, TQStringList conduits, TQString logFileName, TQString userName, TQString pilotDevice, bool killOnExit ) { mDCOPSuccess = true; mLastSyncTime = lastSyncTime; @@ -192,43 +192,43 @@ void SummaryWidget::updateView() mNoConnectionStartLabel->setShown( !mDCOPSuccess ); } -void SummaryWidget::showSyncLog( const QString &filename ) +void SummaryWidget::showSyncLog( const TQString &filename ) { - KDialogBase dlg( this, 0, true, QString::null, KDialogBase::Ok, KDialogBase::Ok ); + KDialogBase dlg( this, 0, true, TQString::null, KDialogBase::Ok, KDialogBase::Ok ); dlg.setCaption( i18n( "KPilot HotSync Log" ) ); - QTextEdit *edit = new QTextEdit( dlg.makeVBoxMainWidget() ); + TQTextEdit *edit = new TQTextEdit( dlg.makeVBoxMainWidget() ); edit->setReadOnly( true ); - QFile f(filename); + TQFile f(filename); if ( !f.open( IO_ReadOnly ) ) { KMessageBox::error( this, i18n( "Unable to open Hotsync log %1." ).arg( filename ) ); return; } - QTextStream s( &f ); + TQTextStream s( &f ); while ( !s.eof() ) edit->append( s.readLine() ); - edit->moveCursor( QTextEdit::MoveHome, false ); + edit->moveCursor( TQTextEdit::MoveHome, false ); f.close(); - dlg.setInitialSize( QSize( 400, 350 ) ); + dlg.setInitialSize( TQSize( 400, 350 ) ); dlg.exec(); } void SummaryWidget::startKPilot() { - QString error; - QCString appID; - if ( !KApplication::kdeinitExec( "kpilotDaemon", QString( "--fail-silently" ) ) ) { + TQString error; + TQCString appID; + if ( !KApplication::kdeinitExec( "kpilotDaemon", TQString( "--fail-silently" ) ) ) { kdDebug(5602) << "No service available..." << endl; mStartedDaemon = true; } } -void SummaryWidget::slotAppRemoved( const QCString & appId ) +void SummaryWidget::slotAppRemoved( const TQCString & appId ) { if ( appId == "kpilotDaemon" ) { diff --git a/kontact/plugins/kpilot/summarywidget.h b/kontact/plugins/kpilot/summarywidget.h index 94fda7e5..ab221b4c 100644 --- a/kontact/plugins/kpilot/summarywidget.h +++ b/kontact/plugins/kpilot/summarywidget.h @@ -30,13 +30,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include class QGridLayout; class QLabel; @@ -48,47 +48,47 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject K_DCOP public: - SummaryWidget( QWidget *parent, const char *name = 0 ); + SummaryWidget( TQWidget *parent, const char *name = 0 ); virtual ~SummaryWidget(); int summaryHeight() const { return 1; } - QStringList configModules() const; + TQStringList configModules() const; k_dcop: // all the information is pushed to Kontact by the daemon, to remove the chance of Kontact calling a daemon // that is blocked for some reason, and blocking itself. - void receiveDaemonStatusDetails( QDateTime, QString, QStringList, QString, QString, QString, bool ); + void receiveDaemonStatusDetails( TQDateTime, TQString, TQStringList, TQString, TQString, TQString, bool ); private slots: void updateView(); - void showSyncLog( const QString &filename ); + void showSyncLog( const TQString &filename ); void startKPilot(); - void slotAppRemoved( const QCString & ); + void slotAppRemoved( const TQCString & ); private: - QTimer mTimer; + TQTimer mTimer; - QLabel*mSyncTimeTextLabel; - QLabel*mSyncTimeLabel; + TQLabel*mSyncTimeTextLabel; + TQLabel*mSyncTimeLabel; KURLLabel*mShowSyncLogLabel; - QLabel*mPilotUserTextLabel; - QLabel*mPilotUserLabel; - QLabel*mPilotDeviceTextLabel; - QLabel*mPilotDeviceLabel; - QLabel*mDaemonStatusTextLabel; - QLabel*mDaemonStatusLabel; - QLabel*mConduitsTextLabel; - QLabel*mConduitsLabel; - QLabel*mNoConnectionLabel; + TQLabel*mPilotUserTextLabel; + TQLabel*mPilotUserLabel; + TQLabel*mPilotDeviceTextLabel; + TQLabel*mPilotDeviceLabel; + TQLabel*mDaemonStatusTextLabel; + TQLabel*mDaemonStatusLabel; + TQLabel*mConduitsTextLabel; + TQLabel*mConduitsLabel; + TQLabel*mNoConnectionLabel; KURLLabel*mNoConnectionStartLabel; - QGridLayout *mLayout; + TQGridLayout *mLayout; - QDateTime mLastSyncTime; - QString mDaemonStatus; - QStringList mConduits; - QString mSyncLog; - QString mUserName; - QString mPilotDevice; + TQDateTime mLastSyncTime; + TQString mDaemonStatus; + TQStringList mConduits; + TQString mSyncLog; + TQString mUserName; + TQString mPilotDevice; bool mDCOPSuccess; bool mStartedDaemon; // Record whether the daemon was started by kontact diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index 18f439c8..13734a8a 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -21,12 +21,12 @@ without including the source code for Qt in the source distribution. */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -49,41 +49,41 @@ extern "C" { - KDE_EXPORT KCModule *create_kontactknt( QWidget *parent, const char * ) + KDE_EXPORT KCModule *create_kontactknt( TQWidget *parent, const char * ) { return new KCMKontactKNT( parent, "kcmkontactknt" ); } } -NewsEditDialog::NewsEditDialog( const QString& title, const QString& url, QWidget *parent ) +NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWidget *parent ) : KDialogBase( Plain, i18n( "New News Feed" ), Ok | Cancel, Ok, parent, 0, true, true ) { - QWidget *page = plainPage(); - QGridLayout *layout = new QGridLayout( page, 2, 3, marginHint(), + TQWidget *page = plainPage(); + TQGridLayout *layout = new TQGridLayout( page, 2, 3, marginHint(), spacingHint() ); - QLabel *label = new QLabel( i18n( "Name:" ), page ); + TQLabel *label = new TQLabel( i18n( "Name:" ), page ); layout->addWidget( label, 0, 0 ); - mTitle = new QLineEdit( page ); + mTitle = new TQLineEdit( page ); label->setBuddy( mTitle ); layout->addMultiCellWidget( mTitle, 0, 0, 1, 2 ); - label = new QLabel( i18n( "URL:" ), page ); + label = new TQLabel( i18n( "URL:" ), page ); layout->addWidget( label, 1, 0 ); - mURL = new QLineEdit( page ); + mURL = new TQLineEdit( page ); label->setBuddy( mURL ); layout->addMultiCellWidget( mURL, 1, 1, 1, 2 ); mTitle->setText( title ); mURL->setText( url ); mTitle->setFocus(); - connect( mTitle, SIGNAL( textChanged( const QString& ) ), - this, SLOT( modified() ) ); - connect( mURL, SIGNAL( textChanged( const QString& ) ), - this, SLOT( modified() ) ); + connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ), + this, TQT_SLOT( modified() ) ); + connect( mURL, TQT_SIGNAL( textChanged( const TQString& ) ), + this, TQT_SLOT( modified() ) ); modified(); } @@ -93,12 +93,12 @@ void NewsEditDialog::modified() enableButton( KDialogBase::Ok, !title().isEmpty() && !url().isEmpty() ); } -QString NewsEditDialog::title() const +TQString NewsEditDialog::title() const { return mTitle->text(); } -QString NewsEditDialog::url() const +TQString NewsEditDialog::url() const { return mURL->text(); } @@ -106,45 +106,45 @@ QString NewsEditDialog::url() const class NewsItem : public QListViewItem { public: - NewsItem( QListView *parent, const QString& title, const QString& url, bool custom ) - : QListViewItem( parent ), mTitle( title ), mUrl( url ), mCustom( custom ) + NewsItem( TQListView *parent, const TQString& title, const TQString& url, bool custom ) + : TQListViewItem( parent ), mTitle( title ), mUrl( url ), mCustom( custom ) { setText( 0, mTitle ); } - NewsItem( QListViewItem *parent, const QString& title, const QString& url, bool custom ) - : QListViewItem( parent ), mTitle( title ), mUrl( url ), mCustom( custom ) + NewsItem( TQListViewItem *parent, const TQString& title, const TQString& url, bool custom ) + : TQListViewItem( parent ), mTitle( title ), mUrl( url ), mCustom( custom ) { setText( 0, mTitle ); } - QString title() const { return mTitle; } - QString url() const { return mUrl; } + TQString title() const { return mTitle; } + TQString url() const { return mUrl; } bool custom() const { return mCustom; } private: - QString mTitle; - QString mUrl; + TQString mTitle; + TQString mUrl; bool mCustom; }; -KCMKontactKNT::KCMKontactKNT( QWidget *parent, const char *name ) +KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name ) : KCModule( parent, name ) { initGUI(); - connect( mAllNews, SIGNAL( currentChanged( QListViewItem* ) ), - this, SLOT( allCurrentChanged( QListViewItem* ) ) ); - connect( mSelectedNews, SIGNAL( selectionChanged( QListViewItem* ) ), - this, SLOT( selectedChanged( QListViewItem* ) ) ); + connect( mAllNews, TQT_SIGNAL( currentChanged( TQListViewItem* ) ), + this, TQT_SLOT( allCurrentChanged( TQListViewItem* ) ) ); + connect( mSelectedNews, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQT_SLOT( selectedChanged( TQListViewItem* ) ) ); - connect( mUpdateInterval, SIGNAL( valueChanged( int ) ), SLOT( modified() ) ); - connect( mArticleCount, SIGNAL( valueChanged( int ) ), SLOT( modified() ) ); + connect( mUpdateInterval, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) ); + connect( mArticleCount, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) ); - connect( mAddButton, SIGNAL( clicked() ), this, SLOT( addNews() ) ); - connect( mRemoveButton, SIGNAL( clicked() ), this, SLOT( removeNews() ) ); - connect( mNewButton, SIGNAL( clicked() ), this, SLOT( newFeed() ) ); - connect( mDeleteButton, SIGNAL( clicked() ), this, SLOT( deleteFeed() ) ); + connect( mAddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addNews() ) ); + connect( mRemoveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeNews() ) ); + connect( mNewButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( newFeed() ) ); + connect( mDeleteButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteFeed() ) ); KAcceleratorManager::manage( this ); @@ -153,15 +153,15 @@ KCMKontactKNT::KCMKontactKNT( QWidget *parent, const char *name ) void KCMKontactKNT::loadNews() { - QValueVector parents; - QValueVector::Iterator it; + TQValueVector parents; + TQValueVector::Iterator it; - parents.append( new QListViewItem( mAllNews, i18n( "Arts" ) ) ); - parents.append( new QListViewItem( mAllNews, i18n( "Business" ) ) ); - parents.append( new QListViewItem( mAllNews, i18n( "Computers" ) ) ); - parents.append( new QListViewItem( mAllNews, i18n( "Misc" ) ) ); - parents.append( new QListViewItem( mAllNews, i18n( "Recreation" ) ) ); - parents.append( new QListViewItem( mAllNews, i18n( "Society" ) ) ); + parents.append( new TQListViewItem( mAllNews, i18n( "Arts" ) ) ); + parents.append( new TQListViewItem( mAllNews, i18n( "Business" ) ) ); + parents.append( new TQListViewItem( mAllNews, i18n( "Computers" ) ) ); + parents.append( new TQListViewItem( mAllNews, i18n( "Misc" ) ) ); + parents.append( new TQListViewItem( mAllNews, i18n( "Recreation" ) ) ); + parents.append( new TQListViewItem( mAllNews, i18n( "Society" ) ) ); for ( it = parents.begin(); it != parents.end(); ++it ) (*it)->setSelectable( false ); @@ -176,18 +176,18 @@ void KCMKontactKNT::loadNews() void KCMKontactKNT::loadCustomNews() { KConfig config( "kcmkontactkntrc" ); - QMap customFeeds = config.entryMap( "CustomFeeds" ); + TQMap customFeeds = config.entryMap( "CustomFeeds" ); config.setGroup( "CustomFeeds" ); - mCustomItem = new QListViewItem( mAllNews, i18n( "Custom" ) ); + mCustomItem = new TQListViewItem( mAllNews, i18n( "Custom" ) ); mCustomItem->setSelectable( false ); if ( customFeeds.count() == 0 ) mCustomItem->setVisible( false ); - QMap::Iterator it; + TQMap::Iterator it; for ( it = customFeeds.begin(); it != customFeeds.end(); ++it ) { - QStringList value = config.readListEntry( it.key() ); + TQStringList value = config.readListEntry( it.key() ); mCustomFeeds.append( new NewsItem( mCustomItem, value[ 0 ], value[ 1 ], true ) ); mFeedMap.insert( value[ 1 ], value[ 0 ] ); mCustomItem->setVisible( true ); @@ -201,11 +201,11 @@ void KCMKontactKNT::storeCustomNews() config.setGroup( "CustomFeeds" ); int counter = 0; - QValueList::Iterator it; + TQValueList::Iterator it; for ( it = mCustomFeeds.begin(); it != mCustomFeeds.end(); ++it ) { - QStringList value; + TQStringList value; value << (*it)->title() << (*it)->url(); - config.writeEntry( QString::number( counter ), value ); + config.writeEntry( TQString::number( counter ), value ); ++counter; } @@ -223,7 +223,7 @@ void KCMKontactKNT::addNews() return; DCOPRef service( "rssservice", "RSSService" ); - service.send( "add(QString)", item->url() ); + service.send( "add(TQString)", item->url() ); scanNews(); @@ -240,7 +240,7 @@ void KCMKontactKNT::removeNews() return; DCOPRef service( "rssservice", "RSSService" ); - service.send( "remove(QString)", item->url() ); + service.send( "remove(TQString)", item->url() ); scanNews(); @@ -292,24 +292,24 @@ void KCMKontactKNT::scanNews() mSelectedNews->clear(); DCOPRef service( "rssservice", "RSSService" ); - QStringList urls = service.call( "list()" ); + TQStringList urls = service.call( "list()" ); for ( uint i = 0; i < urls.count(); ++i ) { - QString url = urls[ i ]; - QString feedName = mFeedMap[ url ]; + TQString url = urls[ i ]; + TQString feedName = mFeedMap[ url ]; if ( feedName.isEmpty() ) feedName = url; new NewsItem( mSelectedNews, feedName, url, false ); } } -void KCMKontactKNT::selectedChanged( QListViewItem *item ) +void KCMKontactKNT::selectedChanged( TQListViewItem *item ) { mRemoveButton->setEnabled( item && item->isSelected() ); } -void KCMKontactKNT::allCurrentChanged( QListViewItem *item ) +void KCMKontactKNT::allCurrentChanged( TQListViewItem *item ) { NewsItem *newsItem = dynamic_cast( item ); @@ -331,7 +331,7 @@ void KCMKontactKNT::modified() void KCMKontactKNT::initGUI() { - QGridLayout *layout = new QGridLayout( this, 2, 3, KDialog::marginHint(), + TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); mAllNews = new KListView( this ); @@ -340,7 +340,7 @@ void KCMKontactKNT::initGUI() mAllNews->setFullWidth( true ); layout->addWidget( mAllNews, 0, 0 ); - QVBoxLayout *vbox = new QVBoxLayout( layout, KDialog::spacingHint() ); + TQVBoxLayout *vbox = new TQVBoxLayout( layout, KDialog::spacingHint() ); vbox->addStretch(); mAddButton = new KPushButton( i18n( "Add" ), this ); @@ -356,24 +356,24 @@ void KCMKontactKNT::initGUI() mSelectedNews->setFullWidth( true ); layout->addWidget( mSelectedNews, 0, 2 ); - QGroupBox *box = new QGroupBox( 0, Qt::Vertical, + TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, i18n( "News Feed Settings" ), this ); - QGridLayout *boxLayout = new QGridLayout( box->layout(), 2, 3, + TQGridLayout *boxLayout = new TQGridLayout( box->layout(), 2, 3, KDialog::spacingHint() ); - QLabel *label = new QLabel( i18n( "Refresh time:" ), box ); + TQLabel *label = new TQLabel( i18n( "Refresh time:" ), box ); boxLayout->addWidget( label, 0, 0 ); - mUpdateInterval = new QSpinBox( 1, 3600, 1, box ); + mUpdateInterval = new TQSpinBox( 1, 3600, 1, box ); mUpdateInterval->setSuffix( " sec." ); label->setBuddy( mUpdateInterval ); boxLayout->addWidget( mUpdateInterval, 0, 1 ); - label = new QLabel( i18n( "Number of items shown:" ), box ); + label = new TQLabel( i18n( "Number of items shown:" ), box ); boxLayout->addWidget( label, 1, 0 ); - mArticleCount = new QSpinBox( box ); + mArticleCount = new TQSpinBox( box ); label->setBuddy( mArticleCount ); boxLayout->addWidget( mArticleCount, 1, 1 ); @@ -389,12 +389,12 @@ void KCMKontactKNT::initGUI() bool KCMKontactKNT::dcopActive() const { - QString error; - QCString appID; + TQString error; + TQCString appID; bool isGood = true; DCOPClient *client = kapp->dcopClient(); if ( !client->isApplicationRegistered( "rssservice" ) ) { - if ( KApplication::startServiceByDesktopName( "rssservice", QStringList(), &error, &appID ) ) + if ( KApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) ) isGood = false; } diff --git a/kontact/plugins/newsticker/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h index 7463cf00..c88c94e2 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.h +++ b/kontact/plugins/newsticker/kcmkontactknt.h @@ -40,7 +40,7 @@ class KCMKontactKNT : public KCModule Q_OBJECT public: - KCMKontactKNT( QWidget *parent = 0, const char *name = 0 ); + KCMKontactKNT( TQWidget *parent = 0, const char *name = 0 ); virtual void load(); virtual void save(); @@ -53,8 +53,8 @@ class KCMKontactKNT : public KCModule void newFeed(); void deleteFeed(); - void selectedChanged( QListViewItem *item ); - void allCurrentChanged( QListViewItem *item ); + void selectedChanged( TQListViewItem *item ); + void allCurrentChanged( TQListViewItem *item ); void modified(); @@ -69,17 +69,17 @@ class KCMKontactKNT : public KCModule KListView *mAllNews; KListView *mSelectedNews; - QListViewItem *mCustomItem; + TQListViewItem *mCustomItem; KPushButton *mAddButton; KPushButton *mRemoveButton; KPushButton *mNewButton; KPushButton *mDeleteButton; - QSpinBox *mUpdateInterval; - QSpinBox *mArticleCount; + TQSpinBox *mUpdateInterval; + TQSpinBox *mArticleCount; - QMap mFeedMap; - QValueList mCustomFeeds; + TQMap mFeedMap; + TQValueList mCustomFeeds; }; class NewsEditDialog : public KDialogBase @@ -87,16 +87,16 @@ class NewsEditDialog : public KDialogBase Q_OBJECT public: - NewsEditDialog( const QString&, const QString&, QWidget *parent ); - QString title() const; - QString url() const; + NewsEditDialog( const TQString&, const TQString&, TQWidget *parent ); + TQString title() const; + TQString url() const; private slots: void modified(); private: - QLineEdit *mTitle; - QLineEdit *mURL; + TQLineEdit *mTitle; + TQLineEdit *mURL; }; #endif diff --git a/kontact/plugins/newsticker/newsfeeds.h b/kontact/plugins/newsticker/newsfeeds.h index fb5ef409..66555d4f 100644 --- a/kontact/plugins/newsticker/newsfeeds.h +++ b/kontact/plugins/newsticker/newsfeeds.h @@ -24,291 +24,291 @@ #ifndef NEWSFEEDS_H #define NEWSFEEDS_H -#include +#include #define DEFAULT_NEWSSOURCES 60 class NewsSourceData { public: - typedef QValueList List; + typedef TQValueList List; enum Category { Arts, Business, Computers, Misc, Recreation, Society }; - NewsSourceData( const QString &name = I18N_NOOP( "Unknown" ), - const QString &url = QString::null, - const QString &icon = QString::null, + NewsSourceData( const TQString &name = I18N_NOOP( "Unknown" ), + const TQString &url = TQString::null, + const TQString &icon = TQString::null, const Category category= Computers ) : mName( name ), mURL( url ), mIcon( icon ), mCategory( category ) { } - QString name() const { return mName; } - QString url() const { return mURL; } - QString icon() const { return mIcon; } + TQString name() const { return mName; } + TQString url() const { return mURL; } + TQString icon() const { return mIcon; } Category category() const { return mCategory; } - QString mName; - QString mURL; - QString mIcon; + TQString mName; + TQString mURL; + TQString mIcon; Category mCategory; }; static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = { // Arts --------------- NewsSourceData( - QString::fromLatin1("Bureau 42"), - QString::fromLatin1("http://www.bureau42.com/rdf/"), - QString::fromLatin1("http://www.bureau42.com/favicon.ico"), + TQString::fromLatin1("Bureau 42"), + TQString::fromLatin1("http://www.bureau42.com/rdf/"), + TQString::fromLatin1("http://www.bureau42.com/favicon.ico"), NewsSourceData::Arts ), NewsSourceData( - QString::fromLatin1("eFilmCritic"), - QString::fromLatin1("http://efilmcritic.com/fo.rdf"), - QString::fromLatin1("http://efilmcritic.com/favicon.ico"), + TQString::fromLatin1("eFilmCritic"), + TQString::fromLatin1("http://efilmcritic.com/fo.rdf"), + TQString::fromLatin1("http://efilmcritic.com/favicon.ico"), NewsSourceData::Arts ), // Business ----------- NewsSourceData( - QString::fromLatin1("Internet.com Business"), - QString::fromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"), - QString::null, + TQString::fromLatin1("Internet.com Business"), + TQString::fromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"), + TQString::null, NewsSourceData::Business ), NewsSourceData( - QString::fromLatin1("TradeSims"), - QString::fromLatin1("http://www.tradesims.com/AEX.rdf"), - QString::null, + TQString::fromLatin1("TradeSims"), + TQString::fromLatin1("http://www.tradesims.com/AEX.rdf"), + TQString::null, NewsSourceData::Business ), // Computers ---------- NewsSourceData( - QString::fromLatin1("KDE Deutschland"), - QString::fromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"), - QString::fromLatin1("http://www.kde.de/favicon.ico"), + TQString::fromLatin1("KDE Deutschland"), + TQString::fromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"), + TQString::fromLatin1("http://www.kde.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("KDE France"), - QString::fromLatin1("http://www.kde-france.org/backend-breves.php3"), - QString::null, + TQString::fromLatin1("KDE France"), + TQString::fromLatin1("http://www.kde-france.org/backend-breves.php3"), + TQString::null, NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("FreeBSD Project News"), - QString::fromLatin1("http://www.freebsd.org/news/news.rdf"), - QString::fromLatin1("http://www.freebsd.org/favicon.ico"), + TQString::fromLatin1("FreeBSD Project News"), + TQString::fromLatin1("http://www.freebsd.org/news/news.rdf"), + TQString::fromLatin1("http://www.freebsd.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("dot.kde.org"), - QString::fromLatin1("http://www.kde.org/dotkdeorg.rdf"), - QString::fromLatin1("http://www.kde.org/favicon.ico"), + TQString::fromLatin1("dot.kde.org"), + TQString::fromLatin1("http://www.kde.org/dotkdeorg.rdf"), + TQString::fromLatin1("http://www.kde.org/favicon.ico"), NewsSourceData::Computers ), - NewsSourceData( QString::fromLatin1("KDE-Look.org"), - QString::fromLatin1("http://www.kde.org/kde-look-content.rdf"), - QString::fromLatin1("http://kde-look.org/img/favicon-1-1.ico"), + NewsSourceData( TQString::fromLatin1("KDE-Look.org"), + TQString::fromLatin1("http://www.kde.org/kde-look-content.rdf"), + TQString::fromLatin1("http://kde-look.org/img/favicon-1-1.ico"), NewsSourceData::Computers ), - NewsSourceData( QString::fromLatin1("KDE-Apps.org"), - QString::fromLatin1("http://www.kde.org/dot/kde-apps-content.rdf"), - QString::fromLatin1("http://kde-apps.org/img/favicon-1-1.ico"), + NewsSourceData( TQString::fromLatin1("KDE-Apps.org"), + TQString::fromLatin1("http://www.kde.org/dot/kde-apps-content.rdf"), + TQString::fromLatin1("http://kde-apps.org/img/favicon-1-1.ico"), NewsSourceData::Computers ), - NewsSourceData( QString::fromLatin1("DesktopLinux"), - QString::fromLatin1("http://www.desktoplinux.com/backend/index.html"), - QString::fromLatin1("http://www.desktoplinux.com/images/favicon.ico"), + NewsSourceData( TQString::fromLatin1("DesktopLinux"), + TQString::fromLatin1("http://www.desktoplinux.com/backend/index.html"), + TQString::fromLatin1("http://www.desktoplinux.com/images/favicon.ico"), NewsSourceData::Computers ), - NewsSourceData( QString::fromLatin1("DistroWatch"), - QString::fromLatin1("http://distrowatch.com/news/dw.xml"), - QString::fromLatin1("http://distrowatch.com/favicon.ico"), + NewsSourceData( TQString::fromLatin1("DistroWatch"), + TQString::fromLatin1("http://distrowatch.com/news/dw.xml"), + TQString::fromLatin1("http://distrowatch.com/favicon.ico"), NewsSourceData::Computers ), /*URL changed*/ NewsSourceData( - QString::fromLatin1("GNOME News"), - QString::fromLatin1("http://www.gnomedesktop.org/node/feed"), - QString::null, + TQString::fromLatin1("GNOME News"), + TQString::fromLatin1("http://www.gnomedesktop.org/node/feed"), + TQString::null, NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("Slashdot"), - QString::fromLatin1("http://slashdot.org/slashdot.rdf"), - QString::fromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot"), + TQString::fromLatin1("http://slashdot.org/slashdot.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("Ask Slashdot"), - QString::fromLatin1("http://slashdot.org/askslashdot.rdf"), - QString::fromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Ask Slashdot"), + TQString::fromLatin1("http://slashdot.org/askslashdot.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("Slashdot: Features"), - QString::fromLatin1("http://slashdot.org/features.rdf"), - QString::fromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot: Features"), + TQString::fromLatin1("http://slashdot.org/features.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("Slashdot: Apache"), - QString::fromLatin1("http://slashdot.org/apache.rdf"), - QString::fromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot: Apache"), + TQString::fromLatin1("http://slashdot.org/apache.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("Slashdot: Books"), - QString::fromLatin1("http://slashdot.org/books.rdf"), - QString::fromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot: Books"), + TQString::fromLatin1("http://slashdot.org/books.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("Jabber News"), - QString::fromLatin1("http://www.jabber.org/news/rss.xml"), - QString::null, + TQString::fromLatin1("Jabber News"), + TQString::fromLatin1("http://www.jabber.org/news/rss.xml"), + TQString::null, NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("Freshmeat"), - QString::fromLatin1("http://freshmeat.net/backend/fm.rdf"), - QString::fromLatin1("http://freshmeat.net/favicon.ico"), + TQString::fromLatin1("Freshmeat"), + TQString::fromLatin1("http://freshmeat.net/backend/fm.rdf"), + TQString::fromLatin1("http://freshmeat.net/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("Linux Weekly News"), - QString::fromLatin1("http://www.lwn.net/headlines/rss"), - QString::fromLatin1("http://www.lwn.net/favicon.ico"), + TQString::fromLatin1("Linux Weekly News"), + TQString::fromLatin1("http://www.lwn.net/headlines/rss"), + TQString::fromLatin1("http://www.lwn.net/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("heise online news"), - QString::fromLatin1("http://www.heise.de/newsticker/heise.rdf"), - QString::fromLatin1("http://www.heise.de/favicon.ico"), + TQString::fromLatin1("heise online news"), + TQString::fromLatin1("http://www.heise.de/newsticker/heise.rdf"), + TQString::fromLatin1("http://www.heise.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("RUS-CERT Ticker"), - QString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert.rdf"), - QString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), + TQString::fromLatin1("RUS-CERT Ticker"), + TQString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert.rdf"), + TQString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("RUS-CERT Elsewhere"), - QString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert-elsewhere.rdf"), - QString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), + TQString::fromLatin1("RUS-CERT Elsewhere"), + TQString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert-elsewhere.rdf"), + TQString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("Kuro5hin"), - QString::fromLatin1("http://kuro5hin.org/backend.rdf"), - QString::fromLatin1("http://kuro5hin.org/favicon.ico"), + TQString::fromLatin1("Kuro5hin"), + TQString::fromLatin1("http://kuro5hin.org/backend.rdf"), + TQString::fromLatin1("http://kuro5hin.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("Prolinux"), - QString::fromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"), - QString::fromLatin1("http://www.prolinux.de/favicon.ico"), + TQString::fromLatin1("Prolinux"), + TQString::fromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"), + TQString::fromLatin1("http://www.prolinux.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("LinuxSecurity.com"), - QString::fromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"), - QString::fromLatin1("http://www.linuxsecurity.com/favicon.ico"), + TQString::fromLatin1("LinuxSecurity.com"), + TQString::fromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"), + TQString::fromLatin1("http://www.linuxsecurity.com/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("Linux Game Tome"), - QString::fromLatin1("http://happypenguin.org/html/news.rdf"), - QString::null, + TQString::fromLatin1("Linux Game Tome"), + TQString::fromLatin1("http://happypenguin.org/html/news.rdf"), + TQString::null, NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("Mozilla"), - QString::fromLatin1("http://www.mozilla.org/news.rdf"), - QString::fromLatin1("http://www.mozillazine.org/favicon.ico"), + TQString::fromLatin1("Mozilla"), + TQString::fromLatin1("http://www.mozilla.org/news.rdf"), + TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("MozillaZine"), - QString::fromLatin1("http://www.mozillazine.org/contents.rdf"), - QString::fromLatin1("http://www.mozillazine.org/favicon.ico"), + TQString::fromLatin1("MozillaZine"), + TQString::fromLatin1("http://www.mozillazine.org/contents.rdf"), + TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("Daemon News"), - QString::fromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"), - QString::null, + TQString::fromLatin1("Daemon News"), + TQString::fromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"), + TQString::null, NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("use Perl;"), - QString::fromLatin1("http://use.perl.org/useperl.rdf"), - QString::null, + TQString::fromLatin1("use Perl;"), + TQString::fromLatin1("http://use.perl.org/useperl.rdf"), + TQString::null, NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("Root prompt"), - QString::fromLatin1("http://www.rootprompt.org/rss/"), - QString::fromLatin1("http://www.rootprompt.org/favicon.ico"), + TQString::fromLatin1("Root prompt"), + TQString::fromLatin1("http://www.rootprompt.org/rss/"), + TQString::fromLatin1("http://www.rootprompt.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("SecurityFocus"), - QString::fromLatin1("http://www.securityfocus.com/topnews-rdf.html"), - QString::fromLatin1("http://www.securityfocus.com/favicon.ico"), + TQString::fromLatin1("SecurityFocus"), + TQString::fromLatin1("http://www.securityfocus.com/topnews-rdf.html"), + TQString::fromLatin1("http://www.securityfocus.com/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("Arstechnica"), - QString::fromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"), - QString::fromLatin1("http://arstechnica.com/favicon.ico"), + TQString::fromLatin1("Arstechnica"), + TQString::fromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"), + TQString::fromLatin1("http://arstechnica.com/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("amiga-news.de - deutschsprachige Amiga Nachrichten"), - QString::fromLatin1("http://www.amiga-news.de/de/backends/news/index.rss"), - QString::fromLatin1("http://www.amiga-news.de/favicon.ico"), + TQString::fromLatin1("amiga-news.de - deutschsprachige Amiga Nachrichten"), + TQString::fromLatin1("http://www.amiga-news.de/de/backends/news/index.rss"), + TQString::fromLatin1("http://www.amiga-news.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("amiga-news.de - english Amiga news"), - QString::fromLatin1("http://www.amiga-news.de/en/backends/news/index.rss"), - QString::fromLatin1("http://www.amiga-news.de/favicon.ico"), + TQString::fromLatin1("amiga-news.de - english Amiga news"), + TQString::fromLatin1("http://www.amiga-news.de/en/backends/news/index.rss"), + TQString::fromLatin1("http://www.amiga-news.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("FreshPorts - the place for ports"), - QString::fromLatin1("http://www.freshports.org/news.php3"), - QString::fromLatin1("http://www.freshports.org/favicon.ico"), + TQString::fromLatin1("FreshPorts - the place for ports"), + TQString::fromLatin1("http://www.freshports.org/news.php3"), + TQString::fromLatin1("http://www.freshports.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("zez.org - about code "), - QString::fromLatin1("http://zez.org/article/rssheadlines"), - QString::null, + TQString::fromLatin1("zez.org - about code "), + TQString::fromLatin1("http://zez.org/article/rssheadlines"), + TQString::null, NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("BSDatwork.com"), - QString::fromLatin1("http://BSDatwork.com/backend.php"), - QString::fromLatin1("http://BSDatwork.com/favicon.ico"), + TQString::fromLatin1("BSDatwork.com"), + TQString::fromLatin1("http://BSDatwork.com/backend.php"), + TQString::fromLatin1("http://BSDatwork.com/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("FreshSource - the place for source"), - QString::fromLatin1("http://www.freshsource.org/news.php"), - QString::fromLatin1("http://www.freshsource.org/favicon.ico"), + TQString::fromLatin1("FreshSource - the place for source"), + TQString::fromLatin1("http://www.freshsource.org/news.php"), + TQString::fromLatin1("http://www.freshsource.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - QString::fromLatin1("The FreeBSD Diary"), - QString::fromLatin1("http://www.freebsddiary.org/news.php"), - QString::fromLatin1("http://www.freebsddiary.org/favicon.ico"), + TQString::fromLatin1("The FreeBSD Diary"), + TQString::fromLatin1("http://www.freebsddiary.org/news.php"), + TQString::fromLatin1("http://www.freebsddiary.org/favicon.ico"), NewsSourceData::Computers ), // Miscellaneous ------ NewsSourceData( - QString::fromLatin1("tagesschau.de"), - QString::fromLatin1("http://www.tagesschau.de/newsticker.rdf"), - QString::fromLatin1("http://www.tagesschau.de/favicon.ico"), + TQString::fromLatin1("tagesschau.de"), + TQString::fromLatin1("http://www.tagesschau.de/newsticker.rdf"), + TQString::fromLatin1("http://www.tagesschau.de/favicon.ico"), NewsSourceData::Misc ), NewsSourceData( - QString::fromLatin1("CNN Top Stories"), - QString::fromLatin1("http://rss.cnn.com/rss/cnn_topstories.rss"), - QString::fromLatin1("http://www.cnn.com/favicon.ico"), + TQString::fromLatin1("CNN Top Stories"), + TQString::fromLatin1("http://rss.cnn.com/rss/cnn_topstories.rss"), + TQString::fromLatin1("http://www.cnn.com/favicon.ico"), NewsSourceData::Misc ), /*feed URL changed*/ NewsSourceData( - QString::fromLatin1("HotWired"), - QString::fromLatin1("http://www.wired.com/news/feeds/rss2/0,2610,,00.xml"), - QString::fromLatin1("http://www.hotwired.com/favicon.ico"), + TQString::fromLatin1("HotWired"), + TQString::fromLatin1("http://www.wired.com/news/feeds/rss2/0,2610,,00.xml"), + TQString::fromLatin1("http://www.hotwired.com/favicon.ico"), NewsSourceData::Misc ), NewsSourceData( - QString::fromLatin1("The Register"), - QString::fromLatin1("http://www.theregister.co.uk/headlines.rss"), - QString::fromLatin1("http://www.theregister.co.uk/favicon.ico"), + TQString::fromLatin1("The Register"), + TQString::fromLatin1("http://www.theregister.co.uk/headlines.rss"), + TQString::fromLatin1("http://www.theregister.co.uk/favicon.ico"), NewsSourceData::Misc ), NewsSourceData( - QString::fromLatin1( "Christian Science Monitor" ), - QString::fromLatin1( "http://www.csmonitor.com/rss/csm.rss"), - QString::fromLatin1( "http://www.csmonitor.com/favicon.ico"), + TQString::fromLatin1( "Christian Science Monitor" ), + TQString::fromLatin1( "http://www.csmonitor.com/rss/csm.rss"), + TQString::fromLatin1( "http://www.csmonitor.com/favicon.ico"), NewsSourceData::Misc ), // Recreation // Society NewsSourceData( - QString::fromLatin1("nippon.it"), - QString::fromLatin1("http://www.nippon.it/backend.it.php"), - QString::fromLatin1("http://www.nippon.it/favicon.ico"), + TQString::fromLatin1("nippon.it"), + TQString::fromLatin1("http://www.nippon.it/backend.it.php"), + TQString::fromLatin1("http://www.nippon.it/favicon.ico"), NewsSourceData::Society ), NewsSourceData( - QString::fromLatin1( "gflash" ), - QString::fromLatin1( "http://www.gflash.de/backend.php"), - QString::fromLatin1( "http://www.gflash.de/favicon.ico"), + TQString::fromLatin1( "gflash" ), + TQString::fromLatin1( "http://www.gflash.de/backend.php"), + TQString::fromLatin1( "http://www.gflash.de/favicon.ico"), NewsSourceData::Society ), NewsSourceData( - QString::fromLatin1( "Quintessenz" ), - QString::fromLatin1( "http://quintessenz.at/cgi-bin/rdf"), - QString::fromLatin1( "http://quintessenz.at/favicon.ico"), + TQString::fromLatin1( "Quintessenz" ), + TQString::fromLatin1( "http://quintessenz.at/cgi-bin/rdf"), + TQString::fromLatin1( "http://quintessenz.at/favicon.ico"), NewsSourceData::Society ) }; diff --git a/kontact/plugins/newsticker/newsticker_plugin.cpp b/kontact/plugins/newsticker/newsticker_plugin.cpp index 0bc42bd1..4afb0350 100644 --- a/kontact/plugins/newsticker/newsticker_plugin.cpp +++ b/kontact/plugins/newsticker/newsticker_plugin.cpp @@ -31,13 +31,13 @@ typedef KGenericFactory< NewsTickerPlugin, Kontact::Core > NewsTickerPluginFacto K_EXPORT_COMPONENT_FACTORY( libkontact_newstickerplugin, NewsTickerPluginFactory( "kontact_newstickerplugin" ) ) -NewsTickerPlugin::NewsTickerPlugin( Kontact::Core *core, const char *name, const QStringList& ) +NewsTickerPlugin::NewsTickerPlugin( Kontact::Core *core, const char *name, const TQStringList& ) : Kontact::Plugin( core, core, name ) { setInstance( NewsTickerPluginFactory::instance() ); } -Kontact::Summary *NewsTickerPlugin::createSummaryWidget( QWidget* parentWidget ) +Kontact::Summary *NewsTickerPlugin::createSummaryWidget( TQWidget* parentWidget ) { return new SummaryWidget( parentWidget ); } diff --git a/kontact/plugins/newsticker/newsticker_plugin.h b/kontact/plugins/newsticker/newsticker_plugin.h index d912da79..b3c0b651 100644 --- a/kontact/plugins/newsticker/newsticker_plugin.h +++ b/kontact/plugins/newsticker/newsticker_plugin.h @@ -28,10 +28,10 @@ class SummaryWidget; class NewsTickerPlugin : public Kontact::Plugin { public: - NewsTickerPlugin( Kontact::Core *core, const char *name, const QStringList& ); + NewsTickerPlugin( Kontact::Core *core, const char *name, const TQStringList& ); NewsTickerPlugin(); - virtual Kontact::Summary *createSummaryWidget( QWidget* parentWidget ); + virtual Kontact::Summary *createSummaryWidget( TQWidget* parentWidget ); protected: virtual KParts::ReadOnlyPart* createPart() { return 0L; } diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp index 14b7bc27..b45f8c7b 100644 --- a/kontact/plugins/newsticker/summarywidget.cpp +++ b/kontact/plugins/newsticker/summarywidget.cpp @@ -21,13 +21,13 @@ without including the source code for Qt in the source distribution. */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -41,34 +41,34 @@ #include "summarywidget.h" -SummaryWidget::SummaryWidget( QWidget *parent, const char *name ) +SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) : Kontact::Summary( parent, name ), DCOPObject( "NewsTickerPlugin" ), mLayout( 0 ), mFeedCounter( 0 ) { - QVBoxLayout *vlay = new QVBoxLayout( this, 3, 3 ); + TQVBoxLayout *vlay = new TQVBoxLayout( this, 3, 3 ); - QPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_news", + TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_news", KIcon::Desktop, KIcon::SizeMedium ); - QWidget *header = createHeader( this, icon, i18n( "News Feeds" ) ); + TQWidget *header = createHeader( this, icon, i18n( "News Feeds" ) ); vlay->addWidget( header ); - QString error; - QCString appID; + TQString error; + TQCString appID; bool dcopAvailable = true; if ( !kapp->dcopClient()->isApplicationRegistered( "rssservice" ) ) { - if ( KApplication::startServiceByDesktopName( "rssservice", QStringList(), &error, &appID ) ) { - QLabel *label = new QLabel( i18n( "No rss dcop service available.\nYou need rssservice to use this plugin." ), this ); + if ( KApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) ) { + TQLabel *label = new TQLabel( i18n( "No rss dcop service available.\nYou need rssservice to use this plugin." ), this ); vlay->addWidget( label, Qt::AlignHCenter ); dcopAvailable = false; } } - mBaseWidget = new QWidget( this, "baseWidget" ); + mBaseWidget = new TQWidget( this, "baseWidget" ); vlay->addWidget( mBaseWidget ); - connect( &mTimer, SIGNAL( timeout() ), this, SLOT( updateDocuments() ) ); + connect( &mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateDocuments() ) ); readConfig(); @@ -77,8 +77,8 @@ SummaryWidget::SummaryWidget( QWidget *parent, const char *name ) if ( dcopAvailable ) initDocuments(); - connectDCOPSignal( 0, 0, "added(QString)", "documentAdded(QString)", false ); - connectDCOPSignal( 0, 0, "removed(QString)", "documentRemoved(QString)", false ); + connectDCOPSignal( 0, 0, "added(TQString)", "documentAdded(TQString)", false ); + connectDCOPSignal( 0, 0, "removed(TQString)", "documentRemoved(TQString)", false ); } int SummaryWidget::summaryHeight() const @@ -86,12 +86,12 @@ int SummaryWidget::summaryHeight() const return ( mFeeds.count() == 0 ? 1 : mFeeds.count() ); } -void SummaryWidget::documentAdded( QString ) +void SummaryWidget::documentAdded( TQString ) { initDocuments(); } -void SummaryWidget::documentRemoved( QString ) +void SummaryWidget::documentRemoved( TQString ) { initDocuments(); } @@ -117,17 +117,17 @@ void SummaryWidget::initDocuments() mFeeds.clear(); DCOPRef dcopCall( "rssservice", "RSSService" ); - QStringList urls; + TQStringList urls; dcopCall.call( "list()" ).get( urls ); if ( urls.isEmpty() ) { // add default urls.append( "http://www.kde.org/dotkdeorg.rdf" ); - dcopCall.send( "add(QString)", urls[ 0 ] ); + dcopCall.send( "add(TQString)", urls[ 0 ] ); } - QStringList::Iterator it; + TQStringList::Iterator it; for ( it = urls.begin(); it != urls.end(); ++it ) { - DCOPRef feedRef = dcopCall.call( "document(QString)", *it ); + DCOPRef feedRef = dcopCall.call( "document(TQString)", *it ); Feed feed; feed.ref = feedRef; @@ -141,8 +141,8 @@ void SummaryWidget::initDocuments() "documentUpdated(DCOPRef)", false ); if ( qApp ) - qApp->eventLoop()->processEvents( QEventLoop::ExcludeUserInput | - QEventLoop::ExcludeSocketNotifiers ); + qApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | + TQEventLoop::ExcludeSocketNotifiers ); } updateDocuments(); @@ -166,16 +166,16 @@ void SummaryWidget::documentUpdated( DCOPRef feedRef ) int numArticles = feedRef.call( "count()" ); for ( int i = 0; i < numArticles; ++i ) { DCOPRef artRef = feedRef.call( "article(int)", i ); - QString title, url; + TQString title, url; if ( qApp ) - qApp->eventLoop()->processEvents( QEventLoop::ExcludeUserInput | - QEventLoop::ExcludeSocketNotifiers ); + qApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | + TQEventLoop::ExcludeSocketNotifiers ); artRef.call( "title()" ).get( title ); artRef.call( "link()" ).get( url ); - QPair article(title, KURL( url )); + QPair article(title, KURL( url )); map.append( article ); } @@ -205,15 +205,15 @@ void SummaryWidget::updateView() mLabels.setAutoDelete( false ); delete mLayout; - mLayout = new QVBoxLayout( mBaseWidget, 3 ); + mLayout = new TQVBoxLayout( mBaseWidget, 3 ); - QFont boldFont; + TQFont boldFont; boldFont.setBold( true ); boldFont.setPointSize( boldFont.pointSize() + 2 ); FeedList::Iterator it; for ( it = mFeeds.begin(); it != mFeeds.end(); ++it ) { - QHBox *hbox = new QHBox( mBaseWidget ); + TQHBox *hbox = new TQHBox( mBaseWidget ); mLayout->addWidget( hbox ); // icon @@ -223,13 +223,13 @@ void SummaryWidget::updateView() urlLabel->setMaximumSize( urlLabel->minimumSizeHint() ); mLabels.append( urlLabel ); - connect( urlLabel, SIGNAL( leftClickedURL( const QString& ) ), - kapp, SLOT( invokeBrowser( const QString& ) ) ); - connect( urlLabel, SIGNAL( rightClickedURL( const QString& ) ), - this, SLOT( rmbMenu( const QString& ) ) ); + connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), + kapp, TQT_SLOT( invokeBrowser( const TQString& ) ) ); + connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ), + this, TQT_SLOT( rmbMenu( const TQString& ) ) ); // header - QLabel *label = new QLabel( hbox ); + TQLabel *label = new TQLabel( hbox ); label->setText( KCharsets::resolveEntities( (*it).title ) ); label->setAlignment( AlignLeft|AlignVCenter ); label->setFont( boldFont ); @@ -252,17 +252,17 @@ void SummaryWidget::updateView() mLabels.append( urlLabel ); mLayout->addWidget( urlLabel ); - connect( urlLabel, SIGNAL( leftClickedURL( const QString& ) ), - kapp, SLOT( invokeBrowser( const QString& ) ) ); - connect( urlLabel, SIGNAL( rightClickedURL( const QString& ) ), - this, SLOT( rmbMenu( const QString& ) ) ); + connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), + kapp, TQT_SLOT( invokeBrowser( const TQString& ) ) ); + connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ), + this, TQT_SLOT( rmbMenu( const TQString& ) ) ); numArticles++; } } - for ( QLabel *label = mLabels.first(); label; label = mLabels.next() ) + for ( TQLabel *label = mLabels.first(); label; label = mLabels.next() ) label->show(); } @@ -284,7 +284,7 @@ void SummaryWidget::documentUpdateError( DCOPRef feedRef, int errorCode ) } -QStringList SummaryWidget::configModules() const +TQStringList SummaryWidget::configModules() const { return "kcmkontactknt.desktop"; } @@ -294,23 +294,23 @@ void SummaryWidget::updateSummary( bool ) updateDocuments(); } -void SummaryWidget::rmbMenu( const QString& url ) +void SummaryWidget::rmbMenu( const TQString& url ) { - QPopupMenu menu; + TQPopupMenu menu; menu.insertItem( i18n( "Copy URL to Clipboard" ) ); - int id = menu.exec( QCursor::pos() ); + int id = menu.exec( TQCursor::pos() ); if ( id != -1 ) kapp->clipboard()->setText( url, QClipboard::Clipboard ); } -bool SummaryWidget::eventFilter( QObject *obj, QEvent* e ) +bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) { if ( obj->inherits( "KURLLabel" ) ) { KURLLabel* label = static_cast( obj ); - if ( e->type() == QEvent::Enter ) + if ( e->type() == TQEvent::Enter ) emit message( label->url() ); - if ( e->type() == QEvent::Leave ) - emit message( QString::null ); + if ( e->type() == TQEvent::Leave ) + emit message( TQString::null ); } return Kontact::Summary::eventFilter( obj, e ); diff --git a/kontact/plugins/newsticker/summarywidget.h b/kontact/plugins/newsticker/summarywidget.h index ad914334..d6cdefa0 100644 --- a/kontact/plugins/newsticker/summarywidget.h +++ b/kontact/plugins/newsticker/summarywidget.h @@ -27,10 +27,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "summary.h" #include @@ -41,17 +41,17 @@ class QLabel; class DCOPRef; class KURLLabel; -typedef QValueList< QPair > ArticleMap; +typedef TQValueList< QPair > ArticleMap; typedef struct { DCOPRef ref; - QString title; - QString url; - QPixmap logo; + TQString title; + TQString url; + TQPixmap logo; ArticleMap map; } Feed; -typedef QValueList FeedList; +typedef TQValueList FeedList; class SummaryWidget : public Kontact::Summary, public DCOPObject { @@ -59,10 +59,10 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject K_DCOP public: - SummaryWidget( QWidget *parent, const char *name = 0 ); + SummaryWidget( TQWidget *parent, const char *name = 0 ); int summaryHeight() const; - QStringList configModules() const; + TQStringList configModules() const; k_dcop: /** @@ -72,11 +72,11 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject /** * Inform the newsticker summary widget that a feed has been added. */ - void documentAdded( QString ); + void documentAdded( TQString ); /** * Inform the newsticker summary widget that a feed has been removed. */ - void documentRemoved( QString ); + void documentRemoved( TQString ); /** * Inform the newsticker summary widget that an error occurred while updating a feed. * @param ref DCOPRef to the failing RSSDocument. @@ -90,23 +90,23 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject protected slots: void updateDocuments(); - void rmbMenu( const QString& ); + void rmbMenu( const TQString& ); protected: - virtual bool eventFilter( QObject *obj, QEvent *e ); + virtual bool eventFilter( TQObject *obj, TQEvent *e ); void initDocuments(); void updateView(); void readConfig(); private: - QVBoxLayout *mLayout; - QWidget* mBaseWidget; + TQVBoxLayout *mLayout; + TQWidget* mBaseWidget; - QPtrList mLabels; + TQPtrList mLabels; FeedList mFeeds; - QTimer mTimer; + TQTimer mTimer; int mUpdateInterval; int mArticleCount; uint mFeedCounter; diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index 9bb0211a..32605585 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -22,12 +22,12 @@ without including the source code for Qt in the source distribution. */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -43,25 +43,25 @@ extern "C" { - KDE_EXPORT KCModule *create_sdsummary( QWidget *parent, const char * ) + KDE_EXPORT KCModule *create_sdsummary( TQWidget *parent, const char * ) { return new KCMSDSummary( parent, "kcmsdsummary" ); } } -KCMSDSummary::KCMSDSummary( QWidget *parent, const char *name ) +KCMSDSummary::KCMSDSummary( TQWidget *parent, const char *name ) : KCModule( parent, name ) { initGUI(); customDaysChanged( 1 ); - connect( mDaysGroup, SIGNAL( clicked( int ) ), SLOT( modified() ) ); - connect( mDaysGroup, SIGNAL( clicked( int ) ), SLOT( buttonClicked( int ) ) ); - connect( mCalendarGroup, SIGNAL( clicked( int ) ), SLOT( modified() ) ); - connect( mContactGroup, SIGNAL( clicked( int ) ), SLOT( modified() ) ); - connect( mCustomDays, SIGNAL( valueChanged( int ) ), SLOT( modified() ) ); - connect( mCustomDays, SIGNAL( valueChanged( int ) ), SLOT( customDaysChanged( int ) ) ); + connect( mDaysGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) ); + connect( mDaysGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) ); + connect( mCalendarGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) ); + connect( mContactGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) ); + connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) ); + connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( customDaysChanged( int ) ) ); KAcceleratorManager::manage( this ); @@ -85,33 +85,33 @@ void KCMSDSummary::customDaysChanged( int value ) void KCMSDSummary::initGUI() { - QGridLayout *layout = new QGridLayout( this, 3, 2, KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 3, 2, KDialog::spacingHint() ); - mDaysGroup = new QButtonGroup( 0, Vertical, i18n( "Special Dates Summary" ), this ); - QVBoxLayout *boxLayout = new QVBoxLayout( mDaysGroup->layout(), + mDaysGroup = new TQButtonGroup( 0, Vertical, i18n( "Special Dates Summary" ), this ); + TQVBoxLayout *boxLayout = new TQVBoxLayout( mDaysGroup->layout(), KDialog::spacingHint() ); - QLabel *label = new QLabel( i18n( "How many days should the special dates summary show at once?" ), mDaysGroup ); + TQLabel *label = new TQLabel( i18n( "How many days should the special dates summary show at once?" ), mDaysGroup ); boxLayout->addWidget( label ); - QRadioButton *button = new QRadioButton( i18n( "One day" ), mDaysGroup ); + TQRadioButton *button = new TQRadioButton( i18n( "One day" ), mDaysGroup ); boxLayout->addWidget( button ); - button = new QRadioButton( i18n( "Five days" ), mDaysGroup ); + button = new TQRadioButton( i18n( "Five days" ), mDaysGroup ); boxLayout->addWidget( button ); - button = new QRadioButton( i18n( "One week" ), mDaysGroup ); + button = new TQRadioButton( i18n( "One week" ), mDaysGroup ); boxLayout->addWidget( button ); - button = new QRadioButton( i18n( "One month" ), mDaysGroup ); + button = new TQRadioButton( i18n( "One month" ), mDaysGroup ); boxLayout->addWidget( button ); - QHBoxLayout *hbox = new QHBoxLayout( boxLayout, KDialog::spacingHint() ); + TQHBoxLayout *hbox = new TQHBoxLayout( boxLayout, KDialog::spacingHint() ); - button = new QRadioButton( "", mDaysGroup ); + button = new TQRadioButton( "", mDaysGroup ); hbox->addWidget( button ); - mCustomDays = new QSpinBox( 1, 365, 1, mDaysGroup ); + mCustomDays = new TQSpinBox( 1, 365, 1, mDaysGroup ); mCustomDays->setEnabled( false ); hbox->addWidget( mCustomDays ); @@ -119,18 +119,18 @@ void KCMSDSummary::initGUI() layout->addMultiCellWidget( mDaysGroup, 0, 0, 0, 1 ); - mCalendarGroup = new QButtonGroup( 1, Horizontal, i18n( "Special Dates From Calendar" ), this ); + mCalendarGroup = new TQButtonGroup( 1, Horizontal, i18n( "Special Dates From Calendar" ), this ); - mShowBirthdaysFromCal = new QCheckBox( i18n( "Show birthdays" ), mCalendarGroup ); - mShowAnniversariesFromCal = new QCheckBox( i18n( "Show anniversaries" ), mCalendarGroup ); - mShowHolidays = new QCheckBox( i18n( "Show holidays" ), mCalendarGroup ); + mShowBirthdaysFromCal = new TQCheckBox( i18n( "Show birthdays" ), mCalendarGroup ); + mShowAnniversariesFromCal = new TQCheckBox( i18n( "Show anniversaries" ), mCalendarGroup ); + mShowHolidays = new TQCheckBox( i18n( "Show holidays" ), mCalendarGroup ); - mShowSpecialsFromCal = new QCheckBox( i18n( "Show special occasions" ), mCalendarGroup ); + mShowSpecialsFromCal = new TQCheckBox( i18n( "Show special occasions" ), mCalendarGroup ); - mContactGroup = new QButtonGroup( 1, Horizontal, i18n( "Special Dates From Contact List" ), this ); + mContactGroup = new TQButtonGroup( 1, Horizontal, i18n( "Special Dates From Contact List" ), this ); - mShowBirthdaysFromKAB = new QCheckBox( i18n( "Show birthdays" ), mContactGroup ); - mShowAnniversariesFromKAB = new QCheckBox( i18n( "Show anniversaries" ), mContactGroup ); + mShowBirthdaysFromKAB = new TQCheckBox( i18n( "Show birthdays" ), mContactGroup ); + mShowAnniversariesFromKAB = new TQCheckBox( i18n( "Show anniversaries" ), mContactGroup ); layout->addWidget( mCalendarGroup, 1, 0 ); layout->addWidget( mContactGroup, 1, 1 ); diff --git a/kontact/plugins/specialdates/kcmsdsummary.h b/kontact/plugins/specialdates/kcmsdsummary.h index 60b2ea08..589c1d91 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.h +++ b/kontact/plugins/specialdates/kcmsdsummary.h @@ -38,7 +38,7 @@ class KCMSDSummary : public KCModule Q_OBJECT public: - KCMSDSummary( QWidget *parent = 0, const char *name = 0 ); + KCMSDSummary( TQWidget *parent = 0, const char *name = 0 ); virtual void load(); virtual void save(); @@ -53,17 +53,17 @@ class KCMSDSummary : public KCModule private: void initGUI(); - QButtonGroup *mDaysGroup; - QButtonGroup *mCalendarGroup; - QButtonGroup *mContactGroup; - QCheckBox *mShowBirthdaysFromKAB; - QCheckBox *mShowBirthdaysFromCal; - QCheckBox *mShowAnniversariesFromKAB; - QCheckBox *mShowAnniversariesFromCal; - QCheckBox *mShowHolidays; - QCheckBox *mShowHolidaysFromCal; - QCheckBox *mShowSpecialsFromCal; - QSpinBox *mCustomDays; + TQButtonGroup *mDaysGroup; + TQButtonGroup *mCalendarGroup; + TQButtonGroup *mContactGroup; + TQCheckBox *mShowBirthdaysFromKAB; + TQCheckBox *mShowBirthdaysFromCal; + TQCheckBox *mShowAnniversariesFromKAB; + TQCheckBox *mShowAnniversariesFromCal; + TQCheckBox *mShowHolidays; + TQCheckBox *mShowHolidaysFromCal; + TQCheckBox *mShowSpecialsFromCal; + TQSpinBox *mCustomDays; }; #endif diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index 72107349..44c67155 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -22,11 +22,11 @@ without including the source code for Qt in the source distribution. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -65,9 +65,9 @@ class SDEntry SDCategory category; int yearsOld; int daysTo; - QDate date; - QString summary; - QString desc; + TQDate date; + TQString summary; + TQString desc; int span; // #days in the special occassion. KABC::Addressee addressee; @@ -77,28 +77,28 @@ class SDEntry } }; -SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, QWidget *parent, +SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name ) : Kontact::Summary( parent, name ), mPlugin( plugin ), mCalendar( 0 ), mHolidays( 0 ) { // Create the Summary Layout - QVBoxLayout *mainLayout = new QVBoxLayout( this, 3, 3 ); + TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); - QPixmap icon = KGlobal::iconLoader()->loadIcon( "cookie", + TQPixmap icon = KGlobal::iconLoader()->loadIcon( "cookie", KIcon::Desktop, KIcon::SizeMedium ); - QWidget *header = createHeader( this, icon, i18n( "Special Dates" ) ); + TQWidget *header = createHeader( this, icon, i18n( "Special Dates" ) ); mainLayout->addWidget(header); - mLayout = new QGridLayout( mainLayout, 7, 6, 3 ); + mLayout = new TQGridLayout( mainLayout, 7, 6, 3 ); mLayout->setRowStretch( 6, 1 ); // Setup the Addressbook KABC::StdAddressBook *ab = KABC::StdAddressBook::self( true ); - connect( ab, SIGNAL( addressBookChanged( AddressBook* ) ), - this, SLOT( updateView() ) ); - connect( mPlugin->core(), SIGNAL( dayChanged( const QDate& ) ), - this, SLOT( updateView() ) ); + connect( ab, TQT_SIGNAL( addressBookChanged( AddressBook* ) ), + this, TQT_SLOT( updateView() ) ); + connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ), + this, TQT_SLOT( updateView() ) ); // Setup the Calendar mCalendar = new KCal::CalendarResources( KPimPrefs::timezone() ); @@ -108,9 +108,9 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, QWidget *parent, if ( manager->isEmpty() ) { KConfig config( "korganizerrc" ); config.setGroup( "General" ); - QString fileName = config.readPathEntry( "Active Calendar" ); + TQString fileName = config.readPathEntry( "Active Calendar" ); - QString resourceName; + TQString resourceName; if ( fileName.isEmpty() ) { fileName = locateLocal( "data", "korganizer/std.ics" ); resourceName = i18n( "Default KOrganizer resource" ); @@ -129,10 +129,10 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, QWidget *parent, mCalendar = KOrg::StdCalendar::self(); mCalendar->load(); - connect( mCalendar, SIGNAL( calendarChanged() ), - this, SLOT( updateView() ) ); - connect( mPlugin->core(), SIGNAL( dayChanged( const QDate& ) ), - this, SLOT( updateView() ) ); + connect( mCalendar, TQT_SIGNAL( calendarChanged() ), + this, TQT_SLOT( updateView() ) ); + connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ), + this, TQT_SLOT( updateView() ) ); // Update Configuration configUpdated(); @@ -169,7 +169,7 @@ bool SDSummaryWidget::initHolidays() { KConfig hconfig( "korganizerrc" ); hconfig.setGroup( "Time & Date" ); - QString location = hconfig.readEntry( "Holidays" ); + TQString location = hconfig.readEntry( "Holidays" ); if ( !location.isEmpty() ) { if ( mHolidays ) delete mHolidays; mHolidays = new KHolidays( location ); @@ -183,9 +183,9 @@ int SDSummaryWidget::span( KCal::Event *event ) { int span=1; if ( event->isMultiDay() && event->doesFloat() ) { - QDate d = event->dtStart().date(); - if ( d < QDate::currentDate() ) { - d = QDate::currentDate(); + TQDate d = event->dtStart().date(); + if ( d < TQDate::currentDate() ) { + d = TQDate::currentDate(); } while ( d < event->dtEnd().date() ) { span++; @@ -196,12 +196,12 @@ int SDSummaryWidget::span( KCal::Event *event ) } // day of a multiday Event -int SDSummaryWidget::dayof( KCal::Event *event, const QDate& date ) +int SDSummaryWidget::dayof( KCal::Event *event, const TQDate& date ) { int dayof=1; - QDate d = event->dtStart().date(); - if ( d < QDate::currentDate() ) { - d = QDate::currentDate(); + TQDate d = event->dtStart().date(); + if ( d < TQDate::currentDate() ) { + d = TQDate::currentDate(); } while ( d < event->dtEnd().date() ) { if ( d < date ) { @@ -221,18 +221,18 @@ void SDSummaryWidget::updateView() mLabels.setAutoDelete( false ); KABC::StdAddressBook *ab = KABC::StdAddressBook::self( true ); - QValueList dates; - QLabel *label = 0; + TQValueList dates; + TQLabel *label = 0; // No reason to show the date year - QString savefmt = KGlobal::locale()->dateFormat(); + TQString savefmt = KGlobal::locale()->dateFormat(); KGlobal::locale()->setDateFormat( KGlobal::locale()-> dateFormat().replace( 'Y', ' ' ) ); // Search for Birthdays and Anniversaries in the Addressbook KABC::AddressBook::Iterator it; for ( it = ab->begin(); it != ab->end(); ++it ) { - QDate birthday = (*it).birthday().date(); + TQDate birthday = (*it).birthday().date(); if ( birthday.isValid() && mShowBirthdaysFromKAB ) { SDEntry entry; entry.type = IncidenceTypeContact; @@ -246,10 +246,10 @@ void SDSummaryWidget::updateView() dates.append( entry ); } - QString anniversaryAsString = + TQString anniversaryAsString = (*it).custom( "KADDRESSBOOK" , "X-Anniversary" ); if ( !anniversaryAsString.isEmpty() ) { - QDate anniversary = QDate::fromString( anniversaryAsString, Qt::ISODate ); + TQDate anniversary = TQDate::fromString( anniversaryAsString, Qt::ISODate ); if ( anniversary.isValid() && mShowAnniversariesFromKAB ) { SDEntry entry; entry.type = IncidenceTypeContact; @@ -267,8 +267,8 @@ void SDSummaryWidget::updateView() // Search for Birthdays, Anniversaries, Holidays, and Special Occasions // in the Calendar - QDate dt; - QDate currentDate = QDate::currentDate(); + TQDate dt; + TQDate currentDate = TQDate::currentDate(); for ( dt=currentDate; dt<=currentDate.addDays( mDaysAhead - 1 ); dt=dt.addDays(1) ) { @@ -280,8 +280,8 @@ void SDSummaryWidget::updateView() for ( it=events.begin(); it!=events.end(); ++it ) { ev = *it; if ( !ev->categoriesStr().isEmpty() ) { - QStringList::ConstIterator it2; - QStringList c = ev->categories(); + TQStringList::ConstIterator it2; + TQStringList c = ev->categories(); for ( it2=c.begin(); it2!=c.end(); ++it2 ) { // Append Birthday Event? @@ -360,8 +360,8 @@ void SDSummaryWidget::updateView() for ( dt=currentDate; dt<=currentDate.addDays( mDaysAhead - 1 ); dt=dt.addDays(1) ) { - QValueList holidays = mHolidays->getHolidays( dt ); - QValueList::ConstIterator it = holidays.begin(); + TQValueList holidays = mHolidays->getHolidays( dt ); + TQValueList::ConstIterator it = holidays.begin(); for ( ; it != holidays.end(); ++it ) { SDEntry entry; entry.type = IncidenceTypeEvent; @@ -382,21 +382,21 @@ void SDSummaryWidget::updateView() if ( !dates.isEmpty() ) { int counter = 0; - QValueList::Iterator addrIt; - QString lines; + TQValueList::Iterator addrIt; + TQString lines; for ( addrIt = dates.begin(); addrIt != dates.end(); ++addrIt ) { bool makeBold = (*addrIt).daysTo == 0; // i.e., today // Pixmap - QImage icon_img; - QString icon_name; + TQImage icon_img; + TQString icon_name; KABC::Picture pic; switch( (*addrIt).category ) { // TODO: better icons case CategoryBirthday: icon_name = "cookie"; pic = (*addrIt).addressee.photo(); if ( pic.isIntern() && !pic.data().isNull() ) { - QImage img = pic.data(); + TQImage img = pic.data(); if ( img.width() > img.height() ) { icon_img = img.scaleWidth( 32 ); } else { @@ -408,7 +408,7 @@ void SDSummaryWidget::updateView() icon_name = "kdmconfig"; pic = (*addrIt).addressee.photo(); if ( pic.isIntern() && !pic.data().isNull() ) { - QImage img = pic.data(); + TQImage img = pic.data(); if ( img.width() > img.height() ) { icon_img = img.scaleWidth( 32 ); } else { @@ -421,7 +421,7 @@ void SDSummaryWidget::updateView() case CategoryOther: icon_name = "cookie"; break; } - label = new QLabel( this ); + label = new TQLabel( this ); if ( icon_img.isNull() ) { label->setPixmap( KGlobal::iconLoader()->loadIcon( icon_name, KIcon::Small ) ); @@ -434,11 +434,11 @@ void SDSummaryWidget::updateView() mLabels.append( label ); // Event date - QString datestr; + TQString datestr; //Muck with the year -- change to the year 'daysTo' days away int year = currentDate.addDays( (*addrIt).daysTo ).year(); - QDate sD = QDate::QDate( year, + TQDate sD = TQDate::TQDate( year, (*addrIt).date.month(), (*addrIt).date.day() ); if ( (*addrIt).daysTo == 0 ) { @@ -451,23 +451,23 @@ void SDSummaryWidget::updateView() // Print the date span for multiday, floating events, for the // first day of the event only. if ( (*addrIt).span > 1 ) { - QString endstr = + TQString endstr = KGlobal::locale()->formatDate( sD.addDays( (*addrIt).span - 1 ) ); datestr += " -\n " + endstr; } - label = new QLabel( datestr, this ); + label = new TQLabel( datestr, this ); label->setAlignment( AlignLeft | AlignVCenter ); mLayout->addWidget( label, counter, 1 ); mLabels.append( label ); if ( makeBold ) { - QFont font = label->font(); + TQFont font = label->font(); font.setBold( true ); label->setFont( font ); } // Countdown - label = new QLabel( this ); + label = new TQLabel( this ); if ( (*addrIt).daysTo == 0 ) { label->setText( i18n( "now" ) ); } else { @@ -479,7 +479,7 @@ void SDSummaryWidget::updateView() mLabels.append( label ); // What - QString what; + TQString what; switch( (*addrIt).category ) { case CategoryBirthday: what = i18n( "Birthday" ); break; @@ -490,7 +490,7 @@ void SDSummaryWidget::updateView() case CategoryOther: what = i18n( "Special Occasion" ); break; } - label = new QLabel( this ); + label = new TQLabel( this ); label->setText( what ); label->setAlignment( AlignLeft | AlignVCenter ); mLayout->addWidget( label, counter, 3 ); @@ -506,25 +506,25 @@ void SDSummaryWidget::updateView() mLayout->addWidget( urlLabel, counter, 4 ); mLabels.append( urlLabel ); - connect( urlLabel, SIGNAL( leftClickedURL( const QString& ) ), - this, SLOT( mailContact( const QString& ) ) ); - connect( urlLabel, SIGNAL( rightClickedURL( const QString& ) ), - this, SLOT( popupMenu( const QString& ) ) ); + connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQT_SLOT( mailContact( const TQString& ) ) ); + connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ), + this, TQT_SLOT( popupMenu( const TQString& ) ) ); } else { - label = new QLabel( this ); + label = new TQLabel( this ); label->setText( (*addrIt).summary ); label->setTextFormat( Qt::RichText ); mLayout->addWidget( label, counter, 4 ); mLabels.append( label ); if ( !(*addrIt).desc.isEmpty() ) { - QToolTip::add( label, (*addrIt).desc ); + TQToolTip::add( label, (*addrIt).desc ); } } // Age if ( (*addrIt).category == CategoryBirthday || (*addrIt).category == CategoryAnniversary ) { - label = new QLabel( this ); + label = new TQLabel( this ); if ( (*addrIt).yearsOld <= 0 ) { label->setText( "" ); } else { @@ -538,7 +538,7 @@ void SDSummaryWidget::updateView() counter++; } } else { - label = new QLabel( + label = new TQLabel( i18n( "No special dates within the next 1 day", "No special dates pending within the next %n days", mDaysAhead ), this, "nothing to see" ); @@ -553,15 +553,15 @@ void SDSummaryWidget::updateView() KGlobal::locale()->setDateFormat( savefmt ); } -void SDSummaryWidget::mailContact( const QString &uid ) +void SDSummaryWidget::mailContact( const TQString &uid ) { KABC::StdAddressBook *ab = KABC::StdAddressBook::self( true ); - QString email = ab->findByUid( uid ).fullEmail(); + TQString email = ab->findByUid( uid ).fullEmail(); - kapp->invokeMailer( email, QString::null ); + kapp->invokeMailer( email, TQString::null ); } -void SDSummaryWidget::viewContact( const QString &uid ) +void SDSummaryWidget::viewContact( const TQString &uid ) { if ( !mPlugin->isRunningStandalone() ) mPlugin->core()->selectPlugin( "kontact_kaddressbookplugin" ); @@ -569,10 +569,10 @@ void SDSummaryWidget::viewContact( const QString &uid ) mPlugin->bringToForeground(); DCOPRef dcopCall( "kaddressbook", "KAddressBookIface" ); - dcopCall.send( "showContactEditor(QString)", uid ); + dcopCall.send( "showContactEditor(TQString)", uid ); } -void SDSummaryWidget::popupMenu( const QString &uid ) +void SDSummaryWidget::popupMenu( const TQString &uid ) { KPopupMenu popup( this ); popup.insertItem( KGlobal::iconLoader()->loadIcon( "kmail", KIcon::Small ), @@ -580,7 +580,7 @@ void SDSummaryWidget::popupMenu( const QString &uid ) popup.insertItem( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Small ), i18n( "View &Contact" ), 1 ); - switch ( popup.exec( QCursor::pos() ) ) { + switch ( popup.exec( TQCursor::pos() ) ) { case 0: mailContact( uid ); break; @@ -590,48 +590,48 @@ void SDSummaryWidget::popupMenu( const QString &uid ) } } -bool SDSummaryWidget::eventFilter( QObject *obj, QEvent* e ) +bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) { if ( obj->inherits( "KURLLabel" ) ) { KURLLabel* label = static_cast( obj ); - if ( e->type() == QEvent::Enter ) + if ( e->type() == TQEvent::Enter ) emit message( i18n( "Mail to:\"%1\"" ).arg( label->text() ) ); - if ( e->type() == QEvent::Leave ) - emit message( QString::null ); + if ( e->type() == TQEvent::Leave ) + emit message( TQString::null ); } return Kontact::Summary::eventFilter( obj, e ); } -void SDSummaryWidget::dateDiff( const QDate &date, int &days, int &years ) +void SDSummaryWidget::dateDiff( const TQDate &date, int &days, int &years ) { - QDate currentDate; - QDate eventDate; + TQDate currentDate; + TQDate eventDate; - if ( QDate::leapYear( date.year() ) && date.month() == 2 && date.day() == 29 ) { - currentDate = QDate( date.year(), QDate::currentDate().month(), QDate::currentDate().day() ); - if ( !QDate::leapYear( QDate::currentDate().year() ) ) - eventDate = QDate( date.year(), date.month(), 28 ); // celebrate one day earlier ;) + if ( TQDate::leapYear( date.year() ) && date.month() == 2 && date.day() == 29 ) { + currentDate = TQDate( date.year(), TQDate::currentDate().month(), TQDate::currentDate().day() ); + if ( !TQDate::leapYear( TQDate::currentDate().year() ) ) + eventDate = TQDate( date.year(), date.month(), 28 ); // celebrate one day earlier ;) else - eventDate = QDate( date.year(), date.month(), date.day() ); + eventDate = TQDate( date.year(), date.month(), date.day() ); } else { - currentDate = QDate( 0, QDate::currentDate().month(), QDate::currentDate().day() ); - eventDate = QDate( 0, date.month(), date.day() ); + currentDate = TQDate( 0, TQDate::currentDate().month(), TQDate::currentDate().day() ); + eventDate = TQDate( 0, date.month(), date.day() ); } int offset = currentDate.daysTo( eventDate ); if ( offset < 0 ) { days = 365 + offset; - years = QDate::currentDate().year() + 1 - date.year(); + years = TQDate::currentDate().year() + 1 - date.year(); } else { days = offset; - years = QDate::currentDate().year() - date.year(); + years = TQDate::currentDate().year() - date.year(); } } -QStringList SDSummaryWidget::configModules() const +TQStringList SDSummaryWidget::configModules() const { - return QStringList( "kcmsdsummary.desktop" ); + return TQStringList( "kcmsdsummary.desktop" ); } #include "sdsummarywidget.moc" diff --git a/kontact/plugins/specialdates/sdsummarywidget.h b/kontact/plugins/specialdates/sdsummarywidget.h index 74cd0894..00e4da22 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.h +++ b/kontact/plugins/specialdates/sdsummarywidget.h @@ -25,8 +25,8 @@ #ifndef SDSUMMARYWIDGET_H #define SDSUMMARYWIDGET_H -#include -#include +#include +#include #include #include @@ -45,29 +45,29 @@ class SDSummaryWidget : public Kontact::Summary Q_OBJECT public: - SDSummaryWidget( Kontact::Plugin *plugin, QWidget *parent, + SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name = 0 ); - QStringList configModules() const; + TQStringList configModules() const; void configUpdated(); void updateSummary( bool force = false ) { Q_UNUSED( force ); updateView(); } protected: - virtual bool eventFilter( QObject *obj, QEvent* e ); + virtual bool eventFilter( TQObject *obj, TQEvent* e ); private slots: void updateView(); - void popupMenu( const QString &uid ); - void mailContact( const QString &uid ); - void viewContact( const QString &uid ); + void popupMenu( const TQString &uid ); + void mailContact( const TQString &uid ); + void viewContact( const TQString &uid ); private: int span( KCal::Event *event ); - int dayof( KCal::Event *event, const QDate &date ); + int dayof( KCal::Event *event, const TQDate &date ); bool initHolidays(); - void dateDiff( const QDate &date, int &days, int &years ); - QGridLayout *mLayout; - QPtrList mLabels; + void dateDiff( const TQDate &date, int &days, int &years ); + TQGridLayout *mLayout; + TQPtrList mLabels; Kontact::Plugin *mPlugin; KCal::CalendarResources *mCalendar; int mDaysAhead; diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp index f0149fd9..9f78de3f 100644 --- a/kontact/plugins/specialdates/specialdates_plugin.cpp +++ b/kontact/plugins/specialdates/specialdates_plugin.cpp @@ -36,7 +36,7 @@ typedef KGenericFactory< SpecialdatesPlugin, Kontact::Core > SpecialdatesPluginF K_EXPORT_COMPONENT_FACTORY( libkontact_specialdatesplugin, SpecialdatesPluginFactory( "kontact_specialdatesplugin" ) ) -SpecialdatesPlugin::SpecialdatesPlugin( Kontact::Core *core, const char *name, const QStringList& ) +SpecialdatesPlugin::SpecialdatesPlugin( Kontact::Core *core, const char *name, const TQStringList& ) : Kontact::Plugin( core, core, name ), mAboutData( 0 ) { @@ -47,7 +47,7 @@ SpecialdatesPlugin::~SpecialdatesPlugin() { } -Kontact::Summary *SpecialdatesPlugin::createSummaryWidget( QWidget *parentWidget ) +Kontact::Summary *SpecialdatesPlugin::createSummaryWidget( TQWidget *parentWidget ) { return new SDSummaryWidget( this, parentWidget ); } diff --git a/kontact/plugins/specialdates/specialdates_plugin.h b/kontact/plugins/specialdates/specialdates_plugin.h index 6534afb5..59fc8dbb 100644 --- a/kontact/plugins/specialdates/specialdates_plugin.h +++ b/kontact/plugins/specialdates/specialdates_plugin.h @@ -32,14 +32,14 @@ class SDSummaryWidget; class SpecialdatesPlugin : public Kontact::Plugin { public: - SpecialdatesPlugin( Kontact::Core *core, const char *name, const QStringList& ); + SpecialdatesPlugin( Kontact::Core *core, const char *name, const TQStringList& ); ~SpecialdatesPlugin(); int weight() const { return 310; } const KAboutData *aboutData(); - virtual Kontact::Summary *createSummaryWidget( QWidget *parentWidget ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget ); protected: virtual KParts::ReadOnlyPart *createPart() { return false; } diff --git a/kontact/plugins/summary/dropwidget.cpp b/kontact/plugins/summary/dropwidget.cpp index 0d6aa530..341c37d8 100644 --- a/kontact/plugins/summary/dropwidget.cpp +++ b/kontact/plugins/summary/dropwidget.cpp @@ -19,22 +19,22 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include "dropwidget.h" -DropWidget::DropWidget( QWidget *parent, const char *name ) - : QWidget( parent, name ) +DropWidget::DropWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { setAcceptDrops( true ); } -void DropWidget::dragEnterEvent( QDragEnterEvent *event ) +void DropWidget::dragEnterEvent( TQDragEnterEvent *event ) { - event->accept( QTextDrag::canDecode( event ) ); + event->accept( TQTextDrag::canDecode( event ) ); } -void DropWidget::dropEvent( QDropEvent *event ) +void DropWidget::dropEvent( TQDropEvent *event ) { int alignment = ( event->pos().x() < (width() / 2) ? Qt::AlignLeft : Qt::AlignRight ); alignment |= ( event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom ); diff --git a/kontact/plugins/summary/dropwidget.h b/kontact/plugins/summary/dropwidget.h index 7cde7f5e..ade7b6c1 100644 --- a/kontact/plugins/summary/dropwidget.h +++ b/kontact/plugins/summary/dropwidget.h @@ -22,21 +22,21 @@ #ifndef DROP_WIDGET_H #define DROP_WIDGET_H -#include +#include class DropWidget : public QWidget { Q_OBJECT public: - DropWidget( QWidget *parent, const char *name = 0 ); + DropWidget( TQWidget *parent, const char *name = 0 ); signals: - void summaryWidgetDropped( QWidget *target, QWidget *widget, int alignment ); + void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment ); protected: - virtual void dragEnterEvent( QDragEnterEvent* ); - virtual void dropEvent( QDropEvent* ); + virtual void dragEnterEvent( TQDragEnterEvent* ); + virtual void dropEvent( TQDropEvent* ); }; #endif diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index d52d991f..cf815416 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -33,9 +33,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "kcmkontactsummary.h" @@ -43,7 +43,7 @@ extern "C" { - KDE_EXPORT KCModule *create_kontactsummary( QWidget *parent, const char * ) { + KDE_EXPORT KCModule *create_kontactsummary( TQWidget *parent, const char * ) { return new KCMKontactSummary( parent, "kcmkontactsummary" ); } } @@ -52,10 +52,10 @@ class PluginItem : public QCheckListItem { public: PluginItem( KPluginInfo *info, KListView *parent ) - : QCheckListItem( parent, QString::null, QCheckListItem::CheckBox ), + : TQCheckListItem( parent, TQString::null, TQCheckListItem::CheckBox ), mInfo( info ) { - QPixmap pm = KGlobal::iconLoader()->loadIcon( mInfo->icon(), KIcon::Small ); + TQPixmap pm = KGlobal::iconLoader()->loadIcon( mInfo->icon(), KIcon::Small ); setPixmap( 0, pm ); } @@ -64,21 +64,21 @@ class PluginItem : public QCheckListItem return mInfo; } - virtual QString text( int column ) const + virtual TQString text( int column ) const { if ( column == 0 ) return mInfo->name(); else if ( column == 1 ) return mInfo->comment(); else - return QString::null; + return TQString::null; } private: KPluginInfo *mInfo; }; -PluginView::PluginView( QWidget *parent, const char *name ) +PluginView::PluginView( TQWidget *parent, const char *name ) : KListView( parent, name ) { addColumn( i18n( "Name" ) ); @@ -90,12 +90,12 @@ PluginView::~PluginView() { } -KCMKontactSummary::KCMKontactSummary( QWidget *parent, const char *name ) +KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name ) : KCModule( parent, name ) { - QVBoxLayout *layout = new QVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); - QLabel *label = new QLabel( i18n( "Here you can select which summary plugins to have visible in your summary view." ), this ); + TQLabel *label = new TQLabel( i18n( "Here you can select which summary plugins to have visible in your summary view." ), this ); layout->addWidget( label ); mPluginView = new PluginView( this ); @@ -103,8 +103,8 @@ KCMKontactSummary::KCMKontactSummary( QWidget *parent, const char *name ) layout->setStretchFactor( mPluginView, 1 ); - connect( mPluginView, SIGNAL( clicked( QListViewItem* ) ), - this, SLOT( itemClicked( QListViewItem* ) ) ); + connect( mPluginView, TQT_SIGNAL( clicked( TQListViewItem* ) ), + this, TQT_SLOT( itemClicked( TQListViewItem* ) ) ); load(); KAboutData *about = new KAboutData( I18N_NOOP( "kontactsummary" ), @@ -119,10 +119,10 @@ KCMKontactSummary::KCMKontactSummary( QWidget *parent, const char *name ) void KCMKontactSummary::load() { KTrader::OfferList offers = KTrader::self()->query( - QString::fromLatin1( "Kontact/Plugin" ), - QString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); + TQString::fromLatin1( "Kontact/Plugin" ), + TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); - QStringList activeSummaries; + TQStringList activeSummaries; KConfig config( "kontact_summaryrc" ); if ( !config.hasKey( "ActiveSummaries" ) ) { @@ -148,7 +148,7 @@ void KCMKontactSummary::load() if ( !(*it)->isPluginEnabled() ) continue; - QVariant var = (*it)->property( "X-KDE-KontactPluginHasSummary" ); + TQVariant var = (*it)->property( "X-KDE-KontactPluginHasSummary" ); if ( !var.isValid() ) continue; @@ -163,9 +163,9 @@ void KCMKontactSummary::load() void KCMKontactSummary::save() { - QStringList activeSummaries; + TQStringList activeSummaries; - QListViewItemIterator it( mPluginView, QListViewItemIterator::Checked ); + TQListViewItemIterator it( mPluginView, TQListViewItemIterator::Checked ); while ( it.current() ) { PluginItem *item = static_cast( it.current() ); activeSummaries.append( item->pluginInfo()->pluginName() ); @@ -181,7 +181,7 @@ void KCMKontactSummary::defaults() emit changed( true ); } -void KCMKontactSummary::itemClicked( QListViewItem* ) +void KCMKontactSummary::itemClicked( TQListViewItem* ) { emit changed( true ); } diff --git a/kontact/plugins/summary/kcmkontactsummary.h b/kontact/plugins/summary/kcmkontactsummary.h index 3c6c6d05..fd1f983d 100644 --- a/kontact/plugins/summary/kcmkontactsummary.h +++ b/kontact/plugins/summary/kcmkontactsummary.h @@ -35,7 +35,7 @@ class PluginView : public KListView Q_OBJECT public: - PluginView( QWidget *parent, const char *name = 0 ); + PluginView( TQWidget *parent, const char *name = 0 ); ~PluginView(); }; @@ -44,14 +44,14 @@ class KCMKontactSummary : public KCModule Q_OBJECT public: - KCMKontactSummary( QWidget *parent = 0, const char *name = 0 ); + KCMKontactSummary( TQWidget *parent = 0, const char *name = 0 ); virtual void load(); virtual void save(); virtual void defaults(); private slots: - void itemClicked( QListViewItem* ); + void itemClicked( TQListViewItem* ); private: PluginView *mPluginView; diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index 9597de67..0b22f853 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -21,10 +21,10 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include @@ -67,7 +67,7 @@ namespace Kontact SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*, const KAboutData *aboutData, - QObject *parent, const char *name ) + TQObject *parent, const char *name ) : KParts::ReadOnlyPart( parent, name ), mCore( core ), mFrame( 0 ), mConfigAction( 0 ) { @@ -77,25 +77,25 @@ SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*, initGUI( core ); - connect( kapp, SIGNAL( kdisplayPaletteChanged() ), SLOT( slotAdjustPalette() ) ); + connect( kapp, TQT_SIGNAL( kdisplayPaletteChanged() ), TQT_SLOT( slotAdjustPalette() ) ); slotAdjustPalette(); - setDate( QDate::currentDate() ); - connect( mCore, SIGNAL( dayChanged( const QDate& ) ), - SLOT( setDate( const QDate& ) ) ); + setDate( TQDate::currentDate() ); + connect( mCore, TQT_SIGNAL( dayChanged( const TQDate& ) ), + TQT_SLOT( setDate( const TQDate& ) ) ); KParts::InfoExtension *info = new KParts::InfoExtension( this, "Summary" ); - connect( this, SIGNAL( textChanged( const QString& ) ), - info, SIGNAL( textChanged( const QString& ) ) ); + connect( this, TQT_SIGNAL( textChanged( const TQString& ) ), + info, TQT_SIGNAL( textChanged( const TQString& ) ) ); mConfigAction = new KAction( i18n( "&Configure Summary View..." ), "configure", 0, this, - SLOT( slotConfigure() ), actionCollection(), + TQT_SLOT( slotConfigure() ), actionCollection(), "summaryview_configure" ); setXMLFile( "kontactsummary_part.rc" ); - QTimer::singleShot( 0, this, SLOT( slotTextChanged() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotTextChanged() ) ); } SummaryViewPart::~SummaryViewPart() @@ -122,7 +122,7 @@ void SummaryViewPart::partActivateEvent( KParts::PartActivateEvent *event ) void SummaryViewPart::updateSummaries() { - QMap::Iterator it; + TQMap::Iterator it; for ( it = mSummaries.begin(); it != mSummaries.end(); ++it ) it.data()->updateSummary( false ); } @@ -136,18 +136,18 @@ void SummaryViewPart::updateWidgets() KPIM::IdentityManager idm( true, this ); const KPIM::Identity &id = idm.defaultIdentity(); - QString currentUser = i18n( "Summary for %1" ).arg( id.fullName() ); - mUsernameLabel->setText( QString::fromLatin1( "%1" ).arg( currentUser ) ); + TQString currentUser = i18n( "Summary for %1" ).arg( id.fullName() ); + mUsernameLabel->setText( TQString::fromLatin1( "%1" ).arg( currentUser ) ); mSummaries.clear(); mFrame = new DropWidget( mMainWidget ); - connect( mFrame, SIGNAL( summaryWidgetDropped( QWidget*, QWidget*, int ) ), - this, SLOT( summaryWidgetMoved( QWidget*, QWidget*, int ) ) ); + connect( mFrame, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ), + this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) ); mMainLayout->insertWidget( 2, mFrame ); - QStringList activeSummaries; + TQStringList activeSummaries; KConfig config( "kontact_summaryrc" ); if ( !config.hasKey( "ActiveSummaries" ) ) { @@ -161,11 +161,11 @@ void SummaryViewPart::updateWidgets() } // Collect all summary widgets with a summaryHeight > 0 - QStringList loadedSummaries; + TQStringList loadedSummaries; - QValueList plugins = mCore->pluginList(); - QValueList::ConstIterator end = plugins.end(); - QValueList::ConstIterator it = plugins.begin(); + TQValueList plugins = mCore->pluginList(); + TQValueList::ConstIterator end = plugins.end(); + TQValueList::ConstIterator it = plugins.begin(); for ( ; it != end; ++it ) { Kontact::Plugin *plugin = *it; if ( activeSummaries.find( plugin->identifier() ) == activeSummaries.end() ) @@ -176,10 +176,10 @@ void SummaryViewPart::updateWidgets() if ( summary->summaryHeight() > 0 ) { mSummaries.insert( plugin->identifier(), summary ); - connect( summary, SIGNAL( message( const QString& ) ), - BroadcastStatus::instance(), SLOT( setStatusMsg( const QString& ) ) ); - connect( summary, SIGNAL( summaryWidgetDropped( QWidget*, QWidget*, int ) ), - this, SLOT( summaryWidgetMoved( QWidget*, QWidget*, int ) ) ); + connect( summary, TQT_SIGNAL( message( const TQString& ) ), + BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) ); + connect( summary, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ), + this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) ); if ( !mLeftColumnSummaries.contains( plugin->identifier() ) && !mRightColumnSummaries.contains( plugin->identifier() ) ) { @@ -195,7 +195,7 @@ void SummaryViewPart::updateWidgets() // Remove all unavailable summary widgets { - QStringList::Iterator strIt; + TQStringList::Iterator strIt; for ( strIt = mLeftColumnSummaries.begin(); strIt != mLeftColumnSummaries.end(); ++strIt ) { if ( loadedSummaries.find( *strIt ) == loadedSummaries.end() ) { strIt = mLeftColumnSummaries.remove( strIt ); @@ -211,17 +211,17 @@ void SummaryViewPart::updateWidgets() } // Add vertical line between the two rows of summary widgets. - QFrame *vline = new QFrame( mFrame ); - vline->setFrameStyle( QFrame::VLine | QFrame::Plain ); + TQFrame *vline = new TQFrame( mFrame ); + vline->setFrameStyle( TQFrame::VLine | TQFrame::Plain ); - QHBoxLayout *layout = new QHBoxLayout( mFrame ); + TQHBoxLayout *layout = new TQHBoxLayout( mFrame ); - mLeftColumn = new QVBoxLayout( layout, KDialog::spacingHint() ); + mLeftColumn = new TQVBoxLayout( layout, KDialog::spacingHint() ); layout->addWidget( vline ); - mRightColumn = new QVBoxLayout( layout, KDialog::spacingHint() ); + mRightColumn = new TQVBoxLayout( layout, KDialog::spacingHint() ); - QStringList::Iterator strIt; + TQStringList::Iterator strIt; for ( strIt = mLeftColumnSummaries.begin(); strIt != mLeftColumnSummaries.end(); ++strIt ) { if ( mSummaries.find( *strIt ) != mSummaries.end() ) mLeftColumn->addWidget( mSummaries[ *strIt ] ); @@ -241,7 +241,7 @@ void SummaryViewPart::updateWidgets() mRightColumn->addStretch(); } -void SummaryViewPart::summaryWidgetMoved( QWidget *target, QWidget *widget, int alignment ) +void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment ) { if ( target == widget ) return; @@ -314,9 +314,9 @@ void SummaryViewPart::slotAdjustPalette() mMainWidget->setPaletteBackgroundColor( kapp->palette().active().base() ); } -void SummaryViewPart::setDate( const QDate& newDate ) +void SummaryViewPart::setDate( const TQDate& newDate ) { - QString date( "%1" ); + TQString date( "%1" ); date = date.arg( KGlobal::locale()->formatDate( newDate ) ); mDateLabel->setText( date ); } @@ -325,26 +325,26 @@ void SummaryViewPart::slotConfigure() { KCMultiDialog dlg( mMainWidget, "ConfigDialog", true ); - QStringList modules = configModules(); + TQStringList modules = configModules(); modules.prepend( "kcmkontactsummary.desktop" ); - connect( &dlg, SIGNAL( configCommitted() ), - this, SLOT( updateWidgets() ) ); + connect( &dlg, TQT_SIGNAL( configCommitted() ), + this, TQT_SLOT( updateWidgets() ) ); - QStringList::ConstIterator strIt; + TQStringList::ConstIterator strIt; for ( strIt = modules.begin(); strIt != modules.end(); ++strIt ) dlg.addModule( *strIt ); dlg.exec(); } -QStringList SummaryViewPart::configModules() const +TQStringList SummaryViewPart::configModules() const { - QStringList modules; + TQStringList modules; - QMap::ConstIterator it; + TQMap::ConstIterator it; for ( it = mSummaries.begin(); it != mSummaries.end(); ++it ) { - QStringList cm = it.data()->configModules(); - QStringList::ConstIterator strIt; + TQStringList cm = it.data()->configModules(); + TQStringList::ConstIterator strIt; for ( strIt = cm.begin(); strIt != cm.end(); ++strIt ) if ( !(*strIt).isEmpty() && !modules.contains( *strIt ) ) modules.append( *strIt ); @@ -355,37 +355,37 @@ QStringList SummaryViewPart::configModules() const void SummaryViewPart::initGUI( Kontact::Core *core ) { - QScrollView *sv = new QScrollView( core ); + TQScrollView *sv = new TQScrollView( core ); - sv->setResizePolicy( QScrollView::AutoOneFit ); - sv->setFrameStyle( QFrame::NoFrame | QFrame::Plain ); - sv->setHScrollBarMode( QScrollView::AlwaysOff ); + sv->setResizePolicy( TQScrollView::AutoOneFit ); + sv->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain ); + sv->setHScrollBarMode( TQScrollView::AlwaysOff ); - mMainWidget = new QFrame( sv->viewport() ); + mMainWidget = new TQFrame( sv->viewport() ); sv->addChild( mMainWidget ); - mMainWidget->setFrameStyle( QFrame::Panel | QFrame::Sunken ); - sv->setFocusPolicy( QWidget::StrongFocus ); + mMainWidget->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); + sv->setFocusPolicy( TQWidget::StrongFocus ); setWidget( sv ); - mMainLayout = new QVBoxLayout( mMainWidget,KDialog::marginHint(), + mMainLayout = new TQVBoxLayout( mMainWidget,KDialog::marginHint(), KDialog::spacingHint() ); - QHBoxLayout *hbl = new QHBoxLayout( mMainLayout ); - mUsernameLabel = new QLabel( mMainWidget ); + TQHBoxLayout *hbl = new TQHBoxLayout( mMainLayout ); + mUsernameLabel = new TQLabel( mMainWidget ); hbl->addWidget( mUsernameLabel ); - mDateLabel = new QLabel( mMainWidget ); + mDateLabel = new TQLabel( mMainWidget ); mDateLabel->setAlignment( AlignRight ); hbl->addWidget( mDateLabel ); - QFrame *hline = new QFrame( mMainWidget ); - hline->setFrameStyle( QFrame::HLine | QFrame::Plain ); + TQFrame *hline = new TQFrame( mMainWidget ); + hline->setFrameStyle( TQFrame::HLine | TQFrame::Plain ); mMainLayout->insertWidget( 1, hline ); mFrame = new DropWidget( mMainWidget ); mMainLayout->insertWidget( 2, mFrame ); - connect( mFrame, SIGNAL( summaryWidgetDropped( QWidget*, QWidget*, int ) ), - this, SLOT( summaryWidgetMoved( QWidget*, QWidget*, int ) ) ); + connect( mFrame, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ), + this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) ); updateWidgets(); } @@ -420,15 +420,15 @@ void SummaryViewPart::saveLayout() config.sync(); } -QString SummaryViewPart::widgetName( QWidget *widget ) const +TQString SummaryViewPart::widgetName( TQWidget *widget ) const { - QMap::ConstIterator it; + TQMap::ConstIterator it; for ( it = mSummaries.begin(); it != mSummaries.end(); ++it ) { if ( it.data() == widget ) return it.key(); } - return QString::null; + return TQString::null; } #include "summaryview_part.moc" diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h index f98d7d06..0868b13c 100644 --- a/kontact/plugins/summary/summaryview_part.h +++ b/kontact/plugins/summary/summaryview_part.h @@ -24,8 +24,8 @@ #ifndef SUMMARYVIEW_PART_H #define SUMMARYVIEW_PART_H -#include -#include +#include +#include #include @@ -56,17 +56,17 @@ class SummaryViewPart : public KParts::ReadOnlyPart public: SummaryViewPart( Kontact::Core *core, const char *widgetName, const KAboutData *aboutData, - QObject *parent = 0, const char *name = 0 ); + TQObject *parent = 0, const char *name = 0 ); ~SummaryViewPart(); public slots: void slotTextChanged(); void slotAdjustPalette(); - void setDate( const QDate& newDate ); + void setDate( const TQDate& newDate ); void updateSummaries(); signals: - void textChanged( const QString& ); + void textChanged( const TQString& ); protected: virtual bool openFile(); @@ -75,29 +75,29 @@ class SummaryViewPart : public KParts::ReadOnlyPart protected slots: void slotConfigure(); void updateWidgets(); - void summaryWidgetMoved( QWidget *target, QWidget *widget, int alignment ); + void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment ); private: void initGUI( Kontact::Core *core ); void loadLayout(); void saveLayout(); - QString widgetName( QWidget* ) const; + TQString widgetName( TQWidget* ) const; - QStringList configModules() const; + TQStringList configModules() const; - QMap mSummaries; + TQMap mSummaries; Kontact::Core *mCore; DropWidget *mFrame; - QFrame *mMainWidget; - QVBoxLayout *mMainLayout; - QVBoxLayout *mLeftColumn; - QVBoxLayout *mRightColumn; - QLabel *mUsernameLabel; - QLabel *mDateLabel; + TQFrame *mMainWidget; + TQVBoxLayout *mMainLayout; + TQVBoxLayout *mLeftColumn; + TQVBoxLayout *mRightColumn; + TQLabel *mUsernameLabel; + TQLabel *mDateLabel; KAction *mConfigAction; - QStringList mLeftColumnSummaries; - QStringList mRightColumnSummaries; + TQStringList mLeftColumnSummaries; + TQStringList mRightColumnSummaries; }; #endif diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp index a73faf7e..9f907380 100644 --- a/kontact/plugins/summary/summaryview_plugin.cpp +++ b/kontact/plugins/summary/summaryview_plugin.cpp @@ -27,23 +27,23 @@ #include #include -#include +#include typedef KGenericFactory< SummaryView, Kontact::Core > SummaryViewFactory; K_EXPORT_COMPONENT_FACTORY( libkontact_summaryplugin, SummaryViewFactory( "kontact_summaryplugin" ) ) -SummaryView::SummaryView( Kontact::Core *core, const char *name, const QStringList& ) +SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringList& ) : Kontact::Plugin( core, core, name), mAboutData( 0 ), mPart( 0 ) { setInstance( SummaryViewFactory::instance() ); mSyncAction = new KSelectAction( i18n( "Synchronize All" ), "reload", 0, this, - SLOT( doSync() ), actionCollection(), + TQT_SLOT( doSync() ), actionCollection(), "kontact_summary_sync" ); - connect( mSyncAction, SIGNAL( activated( const QString& ) ), this, SLOT( syncAccount( const QString& ) ) ); - connect( mSyncAction->popupMenu(), SIGNAL( aboutToShow() ), this, SLOT( fillSyncActionSubEntries() ) ); + connect( mSyncAction, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( syncAccount( const TQString& ) ) ); + connect( mSyncAction->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fillSyncActionSubEntries() ) ); insertSyncAction( mSyncAction ); fillSyncActionSubEntries(); @@ -51,7 +51,7 @@ SummaryView::SummaryView( Kontact::Core *core, const char *name, const QStringLi void SummaryView::fillSyncActionSubEntries() { - QStringList menuItems; + TQStringList menuItems; menuItems.append( i18n("All") ); DCOPRef ref( "kmail", "KMailIface" ); @@ -59,16 +59,16 @@ void SummaryView::fillSyncActionSubEntries() if ( reply.isValid() ) { - const QStringList accounts = reply; + const TQStringList accounts = reply; menuItems += accounts; } mSyncAction->clear(); mSyncAction->setItems( menuItems ); } -void SummaryView::syncAccount( const QString& account ) +void SummaryView::syncAccount( const TQString& account ) { - const QString acc = account == i18n("All") ? QString() : account; + const TQString acc = account == i18n("All") ? TQString() : account; DCOPRef ref( "kmail", "KMailIface" ); ref.send( "checkAccount", acc ); fillSyncActionSubEntries(); @@ -83,12 +83,12 @@ void SummaryView::doSync() if ( mPart ) mPart->updateSummaries(); - const QValueList pluginList = core()->pluginList(); - for ( QValueList::ConstIterator it = pluginList.begin(), end = pluginList.end(); + const TQValueList pluginList = core()->pluginList(); + for ( TQValueList::ConstIterator it = pluginList.begin(), end = pluginList.end(); it != end; ++it ) { // execute all sync actions but our own - QPtrList *actions = (*it)->syncActions(); - for ( QPtrList::Iterator jt = actions->begin(), end = actions->end(); jt != end; ++jt ) { + TQPtrList *actions = (*it)->syncActions(); + for ( TQPtrList::Iterator jt = actions->begin(), end = actions->end(); jt != end; ++jt ) { if ( *jt != mSyncAction ) (*jt)->activate(); } diff --git a/kontact/plugins/summary/summaryview_plugin.h b/kontact/plugins/summary/summaryview_plugin.h index 9093a1b3..82e3db96 100644 --- a/kontact/plugins/summary/summaryview_plugin.h +++ b/kontact/plugins/summary/summaryview_plugin.h @@ -26,7 +26,7 @@ #include #include -#include +#include class KSelectAction; @@ -37,7 +37,7 @@ class SummaryView : public Kontact::Plugin Q_OBJECT public: - SummaryView( Kontact::Core *core, const char *name, const QStringList& ); + SummaryView( Kontact::Core *core, const char *name, const TQStringList& ); ~SummaryView(); int weight() const { return 100; } @@ -50,7 +50,7 @@ class SummaryView : public Kontact::Plugin private slots: void doSync(); - void syncAccount( const QString& account ); + void syncAccount( const TQString& account ); void fillSyncActionSubEntries(); private: diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp index 6477d142..a32e734f 100644 --- a/kontact/plugins/test/test_part.cpp +++ b/kontact/plugins/test/test_part.cpp @@ -25,8 +25,8 @@ #include "test_part.h" #include "kaddressbookiface_stub.h" -#include -#include +#include +#include #include "sidebarextension.h" @@ -41,21 +41,21 @@ #include -TestPart::TestPart(QObject *parent, const char *name) // ## parentWidget +TestPart::TestPart(TQObject *parent, const char *name) // ## parentWidget : KParts::ReadOnlyPart(parent, name) { setInstance( new KInstance("testpart") ); // ## memleak m_edit = new QTextEdit; setWidget(m_edit); setXMLFile("testpartui.rc"); - new KAction( "new contact (test)", 0, this, SLOT( newContact() ), actionCollection(), "test_deleteevent" ); + new KAction( "new contact (test)", 0, this, TQT_SLOT( newContact() ), actionCollection(), "test_deleteevent" ); m_kab_stub = 0L; - new KParts::SideBarExtension(new QComboBox(this), this, "sbe"); + new KParts::SideBarExtension(new TQComboBox(this), this, "sbe"); kapp->dcopClient()->setNotifications( true ); - connect( kapp->dcopClient(), SIGNAL( applicationRemoved( const QCString&)), - this, SLOT( unregisteredFromDCOP( const QCString& )) ); + connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString&)), + this, TQT_SLOT( unregisteredFromDCOP( const TQCString& )) ); } TestPart::~TestPart() @@ -83,21 +83,21 @@ bool TestPart::connectToAddressBook() { if ( !m_kab_stub ) { - QString error; - QCString dcopService; - int result = KDCOPServiceStarter::self()->findServiceFor( "DCOP/AddressBook", QString::null, QString::null, &error, &dcopService ); + TQString error; + TQCString dcopService; + int result = KDCOPServiceStarter::self()->findServiceFor( "DCOP/AddressBook", TQString::null, TQString::null, &error, &dcopService ); if ( result != 0 ) { // You might want to show "error" (if not empty) here, using e.g. KMessageBox return false; } // TODO document the required named for the dcop interfaces e.g. "CalendarIface". - QCString dcopObjectId = "KAddressBookIface"; + TQCString dcopObjectId = "KAddressBookIface"; m_kab_stub = new KAddressBookIface_stub(kapp->dcopClient(), dcopService, dcopObjectId); } return m_kab_stub != 0L; } -void TestPart::unregisteredFromDCOP( const QCString& appId ) +void TestPart::unregisteredFromDCOP( const TQCString& appId ) { if ( m_kab_stub && m_kab_stub->app() == appId ) { diff --git a/kontact/plugins/test/test_part.h b/kontact/plugins/test/test_part.h index 8f2a927c..8d9c0ba7 100644 --- a/kontact/plugins/test/test_part.h +++ b/kontact/plugins/test/test_part.h @@ -37,7 +37,7 @@ class TestPart : public KParts::ReadOnlyPart public: - TestPart(QObject *parent=0, const char *name=0); + TestPart(TQObject *parent=0, const char *name=0); ~TestPart(); protected: @@ -48,11 +48,11 @@ protected: protected slots: void newContact(); - void unregisteredFromDCOP( const QCString& ); + void unregisteredFromDCOP( const TQCString& ); private: - QTextEdit *m_edit; + TQTextEdit *m_edit; KAddressBookIface_stub *m_kab_stub; }; diff --git a/kontact/plugins/test/test_plugin.cpp b/kontact/plugins/test/test_plugin.cpp index 62bd74bd..93001d2f 100644 --- a/kontact/plugins/test/test_plugin.cpp +++ b/kontact/plugins/test/test_plugin.cpp @@ -34,12 +34,12 @@ typedef KGenericFactory< TestPlugin, Kontact::Core > TestPluginFactory; K_EXPORT_COMPONENT_FACTORY( libkptestplugin, TestPluginFactory( "kptestplugin" ) ) -TestPlugin::TestPlugin(Kontact::Core *_core, const char *name, const QStringList &) +TestPlugin::TestPlugin(Kontact::Core *_core, const char *name, const TQStringList &) : Kontact::Plugin(_core, _core, name) { setInstance(TestPluginFactory::instance()); - insertNewAction(new KAction("Test", 0, this, SLOT(slotTestMenu()), actionCollection(), "edit_test")); + insertNewAction(new KAction("Test", 0, this, TQT_SLOT(slotTestMenu()), actionCollection(), "edit_test")); setXMLFile("kptestplugin.rc"); } diff --git a/kontact/plugins/test/test_plugin.h b/kontact/plugins/test/test_plugin.h index 35b60283..9d1a0e8e 100644 --- a/kontact/plugins/test/test_plugin.h +++ b/kontact/plugins/test/test_plugin.h @@ -37,7 +37,7 @@ class TestPlugin : public Kontact::Plugin public: - TestPlugin(Kontact::Core *core, const char *name, const QStringList &); + TestPlugin(Kontact::Core *core, const char *name, const TQStringList &); ~TestPlugin(); protected: diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp index 04a559ae..8c106409 100644 --- a/kontact/plugins/weather/summarywidget.cpp +++ b/kontact/plugins/weather/summarywidget.cpp @@ -20,10 +20,10 @@ with any edition of Qt, and distribute the resulting executable, without including the source code for Qt in the source distribution. */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -38,38 +38,38 @@ #include "summarywidget.h" -SummaryWidget::SummaryWidget( QWidget *parent, const char *name ) +SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) : Kontact::Summary( parent, name ), DCOPObject( "WeatherSummaryWidget" ), mProc( 0 ) { - mLayout = new QVBoxLayout( this, 3, 3 ); + mLayout = new TQVBoxLayout( this, 3, 3 ); mLayout->setAlignment( Qt::AlignTop ); - QPixmap icon = KGlobal::iconLoader()->loadIcon( "kweather", KIcon::Desktop, KIcon::SizeMedium ); - QWidget *header = createHeader( this, icon, i18n( "Weather Service" ) ); + TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kweather", KIcon::Desktop, KIcon::SizeMedium ); + TQWidget *header = createHeader( this, icon, i18n( "Weather Service" ) ); mLayout->addWidget( header ); - QString error; - QCString appID; + TQString error; + TQCString appID; bool serviceAvailable = true; if ( !kapp->dcopClient()->isApplicationRegistered( "KWeatherService" ) ) { - if ( KApplication::startServiceByDesktopName( "kweatherservice", QStringList(), &error, &appID ) ) { - QLabel *label = new QLabel( i18n( "No weather dcop service available;\nyou need KWeather to use this plugin." ), this ); + if ( KApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) ) { + TQLabel *label = new TQLabel( i18n( "No weather dcop service available;\nyou need KWeather to use this plugin." ), this ); mLayout->addWidget( label, Qt::AlignHCenter | AlignVCenter ); serviceAvailable = false; } } if ( serviceAvailable ) { - connectDCOPSignal( 0, 0, "fileUpdate(QString)", "refresh(QString)", false ); - connectDCOPSignal( 0, 0, "stationRemoved(QString)", "stationRemoved(QString)", false ); + connectDCOPSignal( 0, 0, "fileUpdate(TQString)", "refresh(TQString)", false ); + connectDCOPSignal( 0, 0, "stationRemoved(TQString)", "stationRemoved(TQString)", false ); DCOPRef dcopCall( "KWeatherService", "WeatherService" ); DCOPReply reply = dcopCall.call( "listStations()", true ); if ( reply.isValid() ) { mStations = reply; - connect( &mTimer, SIGNAL( timeout() ), this, SLOT( timeout() ) ); + connect( &mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( timeout() ) ); mTimer.start( 0 ); } else { kdDebug(5602) << "ERROR: dcop reply not valid..." << endl; @@ -94,19 +94,19 @@ void SummaryWidget::updateView() } - QValueList dataList = mWeatherMap.values(); + TQValueList dataList = mWeatherMap.values(); qHeapSort( dataList ); - QValueList::Iterator it; + TQValueList::Iterator it; for ( it = dataList.begin(); it != dataList.end(); ++it ) { - QString cover; + TQString cover; for ( uint i = 0; i < (*it).cover().count(); ++i ) - cover += QString( "- %1\n" ).arg( (*it).cover()[ i ] ); + cover += TQString( "- %1\n" ).arg( (*it).cover()[ i ] ); - QImage img; + TQImage img; img = (*it).icon(); - QGridLayout *layout = new QGridLayout( mLayout, 3, 3, 3 ); + TQGridLayout *layout = new TQGridLayout( mLayout, 3, 3, 3 ); mLayouts.append( layout ); KURLLabel* urlLabel = new KURLLabel( this ); @@ -117,20 +117,20 @@ void SummaryWidget::updateView() urlLabel->setAlignment( AlignTop ); layout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 ); mLabels.append( urlLabel ); - connect ( urlLabel, SIGNAL( leftClickedURL( const QString& ) ), - this, SLOT( showReport( const QString& ) ) ); + connect ( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQT_SLOT( showReport( const TQString& ) ) ); - QLabel* label = new QLabel( this ); - label->setText( QString( "%1 (%2)" ).arg( (*it).name() ).arg( (*it).temperature() ) ); - QFont font = label->font(); + TQLabel* label = new TQLabel( this ); + label->setText( TQString( "%1 (%2)" ).arg( (*it).name() ).arg( (*it).temperature() ) ); + TQFont font = label->font(); font.setBold( true ); label->setFont( font ); label->setAlignment( AlignLeft ); layout->addMultiCellWidget( label, 0, 0, 1, 2 ); mLabels.append( label ); - QString labelText; - labelText = QString( "%1: %2
" + TQString labelText; + labelText = TQString( "%1: %2
" "%3: %4
" "%5: %6" ) .arg( i18n( "Last updated on" ) ) @@ -140,15 +140,15 @@ void SummaryWidget::updateView() .arg( i18n( "Rel. Humidity" ) ) .arg( (*it).relativeHumidity() ); - QToolTip::add( label, labelText.replace( " ", " " ) ); + TQToolTip::add( label, labelText.replace( " ", " " ) ); - label = new QLabel( cover, this ); + label = new TQLabel( cover, this ); label->setAlignment( AlignLeft ); layout->addMultiCellWidget( label, 1, 1, 1, 2 ); mLabels.append( label ); } - for ( QLabel *label = mLabels.first(); label; label = mLabels.next() ) + for ( TQLabel *label = mLabels.first(); label; label = mLabels.next() ) label->show(); } @@ -162,44 +162,44 @@ void SummaryWidget::timeout() mTimer.start( 15 * 60000 ); } -void SummaryWidget::refresh( QString station ) +void SummaryWidget::refresh( TQString station ) { DCOPRef dcopCall( "KWeatherService", "WeatherService" ); - mWeatherMap[ station ].setIcon( dcopCall.call( "currentIcon(QString)", station, true ) ); - mWeatherMap[ station ].setName( dcopCall.call( "stationName(QString)", station, true ) ); - mWeatherMap[ station ].setCover( dcopCall.call( "cover(QString)", station, true ) ); - mWeatherMap[ station ].setDate( dcopCall.call( "date(QString)", station, true ) ); - mWeatherMap[ station ].setTemperature( dcopCall.call( "temperature(QString)", station, true ) ); - mWeatherMap[ station ].setWindSpeed( dcopCall.call( "wind(QString)", station, true ) ); - mWeatherMap[ station ].setRelativeHumidity( dcopCall.call( "relativeHumidity(QString)", station, true ) ); + mWeatherMap[ station ].setIcon( dcopCall.call( "currentIcon(TQString)", station, true ) ); + mWeatherMap[ station ].setName( dcopCall.call( "stationName(TQString)", station, true ) ); + mWeatherMap[ station ].setCover( dcopCall.call( "cover(TQString)", station, true ) ); + mWeatherMap[ station ].setDate( dcopCall.call( "date(TQString)", station, true ) ); + mWeatherMap[ station ].setTemperature( dcopCall.call( "temperature(TQString)", station, true ) ); + mWeatherMap[ station ].setWindSpeed( dcopCall.call( "wind(TQString)", station, true ) ); + mWeatherMap[ station ].setRelativeHumidity( dcopCall.call( "relativeHumidity(TQString)", station, true ) ); mWeatherMap[ station ].setStationID(station); updateView(); } -void SummaryWidget::stationRemoved( QString station ) +void SummaryWidget::stationRemoved( TQString station ) { mWeatherMap.remove( station ); updateView(); } -bool SummaryWidget::eventFilter( QObject *obj, QEvent* e ) +bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) { if ( obj->inherits( "KURLLabel" ) ) { - if ( e->type() == QEvent::Enter ) + if ( e->type() == TQEvent::Enter ) emit message( i18n( "View Weather Report for Station" ) ); - if ( e->type() == QEvent::Leave ) - emit message( QString::null ); + if ( e->type() == TQEvent::Leave ) + emit message( TQString::null ); } return Kontact::Summary::eventFilter( obj, e ); } -QStringList SummaryWidget::configModules() const +TQStringList SummaryWidget::configModules() const { - return QStringList( "kcmweatherservice.desktop" ); + return TQStringList( "kcmweatherservice.desktop" ); } void SummaryWidget::updateSummary( bool ) @@ -207,11 +207,11 @@ void SummaryWidget::updateSummary( bool ) timeout(); } -void SummaryWidget::showReport( const QString &stationID ) +void SummaryWidget::showReport( const TQString &stationID ) { mProc = new KProcess; - QApplication::connect( mProc, SIGNAL( processExited( KProcess* ) ), - this, SLOT( reportFinished( KProcess* ) ) ); + TQApplication::connect( mProc, TQT_SIGNAL( processExited( KProcess* ) ), + this, TQT_SLOT( reportFinished( KProcess* ) ) ); *mProc << "kweatherreport"; *mProc << stationID; diff --git a/kontact/plugins/weather/summarywidget.h b/kontact/plugins/weather/summarywidget.h index 40e0bb70..9af47690 100644 --- a/kontact/plugins/weather/summarywidget.h +++ b/kontact/plugins/weather/summarywidget.h @@ -28,12 +28,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include class KProcess; @@ -44,44 +44,44 @@ class QVBoxLayout; class WeatherData { public: - void setIcon( const QPixmap &icon ) { mIcon = icon; } - QPixmap icon() const { return mIcon; } + void setIcon( const TQPixmap &icon ) { mIcon = icon; } + TQPixmap icon() const { return mIcon; } - void setName( const QString &name ) { mName = name; } - QString name() const { return mName; } + void setName( const TQString &name ) { mName = name; } + TQString name() const { return mName; } - void setCover( const QStringList& cover ) { mCover = cover; } - QStringList cover() const { return mCover; } + void setCover( const TQStringList& cover ) { mCover = cover; } + TQStringList cover() const { return mCover; } - void setDate( const QString &date ) { mDate = date; } - QString date() const { return mDate; } + void setDate( const TQString &date ) { mDate = date; } + TQString date() const { return mDate; } - void setTemperature( const QString &temperature ) { mTemperature = temperature; } - QString temperature() const { return mTemperature; } + void setTemperature( const TQString &temperature ) { mTemperature = temperature; } + TQString temperature() const { return mTemperature; } - void setWindSpeed( const QString &windSpeed ) { mWindSpeed = windSpeed; } - QString windSpeed() const { return mWindSpeed; } + void setWindSpeed( const TQString &windSpeed ) { mWindSpeed = windSpeed; } + TQString windSpeed() const { return mWindSpeed; } - void setRelativeHumidity( const QString &relativeHumidity ) { mRelativeHumidity = relativeHumidity; } - QString relativeHumidity() const { return mRelativeHumidity; } + void setRelativeHumidity( const TQString &relativeHumidity ) { mRelativeHumidity = relativeHumidity; } + TQString relativeHumidity() const { return mRelativeHumidity; } - void setStationID( const QString &station ) { mStationID = station;} - QString stationID() { return mStationID; } + void setStationID( const TQString &station ) { mStationID = station;} + TQString stationID() { return mStationID; } bool operator< ( const WeatherData &data ) { - return ( QString::localeAwareCompare( mName, data.mName ) < 0 ); + return ( TQString::localeAwareCompare( mName, data.mName ) < 0 ); } private: - QPixmap mIcon; - QString mName; - QStringList mCover; - QString mDate; - QString mTemperature; - QString mWindSpeed; - QString mRelativeHumidity; - QString mStationID; + TQPixmap mIcon; + TQString mName; + TQStringList mCover; + TQString mDate; + TQString mTemperature; + TQString mWindSpeed; + TQString mRelativeHumidity; + TQString mStationID; }; class SummaryWidget : public Kontact::Summary, public DCOPObject @@ -89,33 +89,33 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject Q_OBJECT K_DCOP public: - SummaryWidget( QWidget *parent, const char *name = 0 ); + SummaryWidget( TQWidget *parent, const char *name = 0 ); - QStringList configModules() const; + TQStringList configModules() const; void updateSummary( bool force = false ); k_dcop: - virtual void refresh( QString ); - virtual void stationRemoved( QString ); + virtual void refresh( TQString ); + virtual void stationRemoved( TQString ); protected: - virtual bool eventFilter( QObject *obj, QEvent *e ); + virtual bool eventFilter( TQObject *obj, TQEvent *e ); private slots: void updateView(); void timeout(); - void showReport( const QString& ); + void showReport( const TQString& ); void reportFinished( KProcess* ); private: - QStringList mStations; - QMap mWeatherMap; - QTimer mTimer; + TQStringList mStations; + TQMap mWeatherMap; + TQTimer mTimer; - QPtrList mLabels; - QPtrList mLayouts; - QVBoxLayout *mLayout; + TQPtrList mLabels; + TQPtrList mLayouts; + TQVBoxLayout *mLayout; KProcess* mProc; }; diff --git a/kontact/plugins/weather/weather_plugin.cpp b/kontact/plugins/weather/weather_plugin.cpp index 4c1a91e6..a3ea74d1 100644 --- a/kontact/plugins/weather/weather_plugin.cpp +++ b/kontact/plugins/weather/weather_plugin.cpp @@ -31,13 +31,13 @@ typedef KGenericFactory< WeatherPlugin, Kontact::Core > WeatherPluginFactory; K_EXPORT_COMPONENT_FACTORY( libkontact_weatherplugin, WeatherPluginFactory( "kontact_weatherplugin" ) ) -WeatherPlugin::WeatherPlugin( Kontact::Core *core, const char *name, const QStringList& ) +WeatherPlugin::WeatherPlugin( Kontact::Core *core, const char *name, const TQStringList& ) : Kontact::Plugin( core, core, name ), mAboutData( 0 ) { setInstance( WeatherPluginFactory::instance() ); } -Kontact::Summary *WeatherPlugin::createSummaryWidget( QWidget *parentWidget ) +Kontact::Summary *WeatherPlugin::createSummaryWidget( TQWidget *parentWidget ) { return new SummaryWidget( parentWidget ); } diff --git a/kontact/plugins/weather/weather_plugin.h b/kontact/plugins/weather/weather_plugin.h index 637ebea9..4ab01964 100644 --- a/kontact/plugins/weather/weather_plugin.h +++ b/kontact/plugins/weather/weather_plugin.h @@ -28,10 +28,10 @@ class SummaryWidget; class WeatherPlugin : public Kontact::Plugin { public: - WeatherPlugin( Kontact::Core *core, const char *name, const QStringList& ); + WeatherPlugin( Kontact::Core *core, const char *name, const TQStringList& ); WeatherPlugin(); - virtual Kontact::Summary *createSummaryWidget( QWidget *parentWidget ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget ); const KAboutData *aboutData(); diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp index d0a43721..19e9d9ea 100644 --- a/kontact/src/aboutdialog.cpp +++ b/kontact/src/aboutdialog.cpp @@ -33,8 +33,8 @@ #include #include -#include -#include +#include +#include #include @@ -45,12 +45,12 @@ AboutDialog::AboutDialog( Kontact::Core *core, const char *name ) true ), mCore( core ) { - addAboutData( i18n( "Kontact Container" ), QString( "kontact" ), + addAboutData( i18n( "Kontact Container" ), TQString( "kontact" ), KGlobal::instance()->aboutData() ); - QValueList plugins = mCore->pluginList(); - QValueList::ConstIterator end = plugins.end(); - QValueList::ConstIterator it = plugins.begin(); + TQValueList plugins = mCore->pluginList(); + TQValueList::ConstIterator end = plugins.end(); + TQValueList::ConstIterator it = plugins.begin(); for ( ; it != end; ++it ) addAboutPlugin( *it ); @@ -62,22 +62,22 @@ void AboutDialog::addAboutPlugin( Kontact::Plugin *plugin ) addAboutData( plugin->title(), plugin->icon(), plugin->aboutData() ); } -void AboutDialog::addAboutData( const QString &title, const QString &icon, +void AboutDialog::addAboutData( const TQString &title, const TQString &icon, const KAboutData *about ) { - QPixmap pixmap = KGlobal::iconLoader()->loadIcon( icon, + TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( icon, KIcon::Desktop, 48 ); - QFrame *topFrame = addPage( title, QString::null, pixmap ); + TQFrame *topFrame = addPage( title, TQString::null, pixmap ); - QBoxLayout *topLayout = new QVBoxLayout( topFrame ); + TQBoxLayout *topLayout = new TQVBoxLayout( topFrame ); if ( !about ) { - QLabel *label = new QLabel( i18n( "No about information available." ), + TQLabel *label = new TQLabel( i18n( "No about information available." ), topFrame ); topLayout->addWidget( label ); } else { - QString text; + TQString text; text += "

" + about->programName() + "
"; @@ -88,7 +88,7 @@ void AboutDialog::addAboutData( const QString &title, const QString &icon, about->copyrightStatement() + "

"; } - QString home = about->homepage(); + TQString home = about->homepage(); if ( !home.isEmpty() ) { text += "" + home + "
"; } @@ -100,17 +100,17 @@ void AboutDialog::addAboutData( const QString &title, const QString &icon, topLayout->addWidget( label ); - QTextEdit *personView = new QTextEdit( topFrame ); + TQTextEdit *personView = new TQTextEdit( topFrame ); personView->setReadOnly( true ); topLayout->addWidget( personView, 1 ); text = ""; - const QValueList authors = about->authors(); + const TQValueList authors = about->authors(); if ( !authors.isEmpty() ) { text += i18n( "

Authors:

" ); - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for ( it = authors.begin(); it != authors.end(); ++it ) { text += formatPerson( (*it).name(), (*it).emailAddress() ); if ( !(*it).task().isEmpty() ) @@ -118,11 +118,11 @@ void AboutDialog::addAboutData( const QString &title, const QString &icon, } } - const QValueList credits = about->credits(); + const TQValueList credits = about->credits(); if ( !credits.isEmpty() ) { text += i18n( "

Thanks to:

" ); - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for ( it = credits.begin(); it != credits.end(); ++it ) { text += formatPerson( (*it).name(), (*it).emailAddress() ); if ( !(*it).task().isEmpty() ) @@ -130,11 +130,11 @@ void AboutDialog::addAboutData( const QString &title, const QString &icon, } } - const QValueList translators = about->translators(); + const TQValueList translators = about->translators(); if ( !translators.isEmpty() ) { text += i18n("

Translators:

"); - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for ( it = translators.begin(); it != translators.end(); ++it ) { text += formatPerson( (*it).name(), (*it).emailAddress() ); } @@ -144,9 +144,9 @@ void AboutDialog::addAboutData( const QString &title, const QString &icon, } } -QString AboutDialog::formatPerson( const QString &name, const QString &email ) +TQString AboutDialog::formatPerson( const TQString &name, const TQString &email ) { - QString text = name; + TQString text = name; if ( !email.isEmpty() ) { text += " <" + email + ">"; } @@ -160,16 +160,16 @@ void AboutDialog::addLicenseText( const KAboutData *about ) if ( !about || about->license().isEmpty() ) return; - QPixmap pixmap = KGlobal::iconLoader()->loadIcon( "signature", + TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( "signature", KIcon::Desktop, 48 ); - QString title = i18n( "%1 License" ).arg( about->programName() ); + TQString title = i18n( "%1 License" ).arg( about->programName() ); - QFrame *topFrame = addPage( title, QString::null, pixmap ); - QBoxLayout *topLayout = new QVBoxLayout( topFrame ); + TQFrame *topFrame = addPage( title, TQString::null, pixmap ); + TQBoxLayout *topLayout = new TQVBoxLayout( topFrame ); KTextBrowser *textBrowser = new KTextBrowser( topFrame ); - textBrowser->setText( QString( "
%1
" ).arg( about->license() ) ); + textBrowser->setText( TQString( "
%1
" ).arg( about->license() ) ); topLayout->addWidget( textBrowser ); } diff --git a/kontact/src/aboutdialog.h b/kontact/src/aboutdialog.h index 9697c527..ab8ab1a8 100644 --- a/kontact/src/aboutdialog.h +++ b/kontact/src/aboutdialog.h @@ -41,12 +41,12 @@ class AboutDialog : public KDialogBase protected: void addAboutPlugin( Kontact::Plugin *plugin ); - void addAboutData( const QString &title, const QString &icon, + void addAboutData( const TQString &title, const TQString &icon, const KAboutData *about ); void addLicenseText( const KAboutData *about ); - QString formatPerson( const QString &name, const QString &email ); + TQString formatPerson( const TQString &name, const TQString &email ); private: Core *mCore; diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index c7e9c84a..d56513ae 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -19,22 +19,22 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -93,7 +93,7 @@ class PluginProxy using namespace Kontact; EntryItem::EntryItem( Navigator *parent, Kontact::Plugin *plugin ) - : QListBoxItem( parent ), + : TQListBoxItem( parent ), mPlugin( plugin ), mHasHover( false ), mPaintActive( false ) @@ -117,7 +117,7 @@ void EntryItem::reloadPixmap() KIcon::DisabledState : KIcon::DefaultState); else - mPixmap = QPixmap(); + mPixmap = TQPixmap(); } Navigator* EntryItem::navigator() const @@ -125,7 +125,7 @@ Navigator* EntryItem::navigator() const return static_cast( listBox() ); } -int EntryItem::width( const QListBox *listbox ) const +int EntryItem::width( const TQListBox *listbox ) const { int w = 0; if( navigator()->showIcons() ) { @@ -142,7 +142,7 @@ int EntryItem::width( const QListBox *listbox ) const return w + ( KDialog::marginHint() * 2 ); } -int EntryItem::height( const QListBox *listbox ) const +int EntryItem::height( const TQListBox *listbox ) const { int h = 0; if ( navigator()->showIcons() ) @@ -156,11 +156,11 @@ int EntryItem::height( const QListBox *listbox ) const return h; } -void EntryItem::paint( QPainter *p ) +void EntryItem::paint( TQPainter *p ) { reloadPixmap(); - QListBox *box = listBox(); + TQListBox *box = listBox(); bool iconAboveText = ( navigator()->viewMode() > SmallIcons ) && navigator()->showIcons(); int w = box->viewport()->width(); @@ -171,14 +171,14 @@ void EntryItem::paint( QPainter *p ) if ( isCurrent() || isSelected() || mHasHover || mPaintActive ) { int h = height( box ); - QBrush brush; + TQBrush brush; if ( isCurrent() || isSelected() || mPaintActive ) - brush = box->colorGroup().brush( QColorGroup::Highlight ); + brush = box->colorGroup().brush( TQColorGroup::Highlight ); else brush = box->colorGroup().highlight().light( 115 ); p->fillRect( 1, 0, w - 2, h - 1, brush ); - QPen pen = p->pen(); - QPen oldPen = pen; + TQPen pen = p->pen(); + TQPen oldPen = pen; pen.setColor( box->colorGroup().mid() ); p->setPen( pen ); @@ -196,13 +196,13 @@ void EntryItem::paint( QPainter *p ) p->drawPixmap( x, y, mPixmap ); } - QColor shadowColor = listBox()->colorGroup().background().dark(115); + TQColor shadowColor = listBox()->colorGroup().background().dark(115); if ( isCurrent() || isSelected() ) { p->setPen( box->colorGroup().highlightedText() ); } if ( !text().isEmpty() && navigator()->showText() ) { - QFontMetrics fm = p->fontMetrics(); + TQFontMetrics fm = p->fontMetrics(); int x = 0; if ( iconAboveText ) { @@ -226,7 +226,7 @@ void EntryItem::paint( QPainter *p ) p->setPen( box->palette().disabled().text( ) ); } else if ( isCurrent() || isSelected() || mHasHover ) { p->setPen( box->colorGroup().highlight().dark(115) ); - p->drawText( x + ( QApplication::reverseLayout() ? -1 : 1), + p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1), y + 1, text() ); p->setPen( box->colorGroup().highlightedText() ); } @@ -261,32 +261,32 @@ Navigator::Navigator( SidePaneBase *parent, const char *name ) mShowText = Prefs::self()->sidePaneShowText(); setSelectionMode( KListBox::Single ); viewport()->setBackgroundMode( PaletteBackground ); - setFrameStyle( QFrame::NoFrame ); - setHScrollBarMode( QScrollView::AlwaysOff ); + setFrameStyle( TQFrame::NoFrame ); + setHScrollBarMode( TQScrollView::AlwaysOff ); setAcceptDrops( true ); setFocusPolicy( NoFocus ); - connect( this, SIGNAL( selectionChanged( QListBoxItem* ) ), - SLOT( slotExecuted( QListBoxItem* ) ) ); - connect( this, SIGNAL( rightButtonPressed( QListBoxItem*, const QPoint& ) ), - SLOT( slotShowRMBMenu( QListBoxItem*, const QPoint& ) ) ); - connect( this, SIGNAL( onItem( QListBoxItem * ) ), - SLOT( slotMouseOn( QListBoxItem * ) ) ); - connect( this, SIGNAL( onViewport() ), SLOT( slotMouseOff() ) ); + connect( this, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ), + TQT_SLOT( slotExecuted( TQListBoxItem* ) ) ); + connect( this, TQT_SIGNAL( rightButtonPressed( TQListBoxItem*, const TQPoint& ) ), + TQT_SLOT( slotShowRMBMenu( TQListBoxItem*, const TQPoint& ) ) ); + connect( this, TQT_SIGNAL( onItem( TQListBoxItem * ) ), + TQT_SLOT( slotMouseOn( TQListBoxItem * ) ) ); + connect( this, TQT_SIGNAL( onViewport() ), TQT_SLOT( slotMouseOff() ) ); - mMapper = new QSignalMapper( this ); - connect( mMapper, SIGNAL( mapped( int ) ), SLOT( shortCutSelected( int ) ) ); + mMapper = new TQSignalMapper( this ); + connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( shortCutSelected( int ) ) ); - QToolTip::remove( this ); + TQToolTip::remove( this ); if ( !mShowText ) new EntryItemToolTip( this ); } -QSize Navigator::sizeHint() const +TQSize Navigator::sizeHint() const { - return QSize( 100, 100 ); + return TQSize( 100, 100 ); } void Navigator::highlightItem( EntryItem * item ) @@ -295,7 +295,7 @@ void Navigator::highlightItem( EntryItem * item ) setPaintActiveItem( mHighlightItem, true ); - QTimer::singleShot( 2000, this, SLOT( slotStopHighlight() ) ); + TQTimer::singleShot( 2000, this, TQT_SLOT( slotStopHighlight() ) ); } void Navigator::slotStopHighlight() @@ -303,7 +303,7 @@ void Navigator::slotStopHighlight() setPaintActiveItem( mHighlightItem, false ); } -void Navigator::setSelected( QListBoxItem *item, bool selected ) +void Navigator::setSelected( TQListBoxItem *item, bool selected ) { // Reimplemented to avoid the immediate activation of // the item. might turn out it doesn't work, we check that @@ -314,11 +314,11 @@ void Navigator::setSelected( QListBoxItem *item, bool selected ) } } -void Navigator::updatePlugins( QValueList plugins_ ) +void Navigator::updatePlugins( TQValueList plugins_ ) { - QValueList plugins; - QValueList::ConstIterator end_ = plugins_.end(); - QValueList::ConstIterator it_ = plugins_.begin(); + TQValueList plugins; + TQValueList::ConstIterator end_ = plugins_.end(); + TQValueList::ConstIterator it_ = plugins_.begin(); for ( ; it_ != end_; ++it_ ) plugins += PluginProxy( *it_ ); @@ -331,8 +331,8 @@ void Navigator::updatePlugins( QValueList plugins_ ) int counter = 0; int minWidth = 0; qBubbleSort( plugins ); - QValueList::ConstIterator end = plugins.end(); - QValueList::ConstIterator it = plugins.begin(); + TQValueList::ConstIterator end = plugins.end(); + TQValueList::ConstIterator it = plugins.begin(); for ( ; it != end; ++it ) { Kontact::Plugin *plugin = ( *it ).plugin(); if ( !plugin->showInSideBar() ) @@ -344,9 +344,9 @@ void Navigator::updatePlugins( QValueList plugins_ ) if ( item->width( this ) > minWidth ) minWidth = item->width( this ); - QString name = QString( "CTRL+%1" ).arg( counter + 1 ); + TQString name = TQString( "CTRL+%1" ).arg( counter + 1 ); KAction *action = new KAction( plugin->title(), plugin->icon(), KShortcut( name ), - mMapper, SLOT( map() ), + mMapper, TQT_SLOT( map() ), mSidePane->actionCollection(), name.latin1() ); mActions.append( action ); mMapper->setMapping( action, counter ); @@ -356,20 +356,20 @@ void Navigator::updatePlugins( QValueList plugins_ ) parentWidget()->setFixedWidth( minWidth ); } -void Navigator::dragEnterEvent( QDragEnterEvent *event ) +void Navigator::dragEnterEvent( TQDragEnterEvent *event ) { kdDebug(5600) << "Navigator::dragEnterEvent()" << endl; dragMoveEvent( event ); } -void Navigator::dragMoveEvent( QDragMoveEvent *event ) +void Navigator::dragMoveEvent( TQDragMoveEvent *event ) { kdDebug(5600) << "Navigator::dragEnterEvent()" << endl; kdDebug(5600) << " Format: " << event->format() << endl; - QListBoxItem *item = itemAt( event->pos() ); + TQListBoxItem *item = itemAt( event->pos() ); if ( !item ) { event->accept( false ); @@ -383,11 +383,11 @@ void Navigator::dragMoveEvent( QDragMoveEvent *event ) event->accept( entry->plugin()->canDecodeDrag( event ) ); } -void Navigator::dropEvent( QDropEvent *event ) +void Navigator::dropEvent( TQDropEvent *event ) { kdDebug(5600) << "Navigator::dropEvent()" << endl; - QListBoxItem *item = itemAt( event->pos() ); + TQListBoxItem *item = itemAt( event->pos() ); if ( !item ) { return; @@ -400,27 +400,27 @@ void Navigator::dropEvent( QDropEvent *event ) entry->plugin()->processDropEvent( event ); } -void Navigator::resizeEvent( QResizeEvent *event ) +void Navigator::resizeEvent( TQResizeEvent *event ) { - QListBox::resizeEvent( event ); + TQListBox::resizeEvent( event ); triggerUpdate( true ); } -void Navigator::enterEvent( QEvent *event ) +void Navigator::enterEvent( TQEvent *event ) { // work around Qt behaviour: onItem is not emmitted in enterEvent() KListBox::enterEvent( event ); - emit onItem( itemAt( mapFromGlobal( QCursor::pos() ) ) ); + emit onItem( itemAt( mapFromGlobal( TQCursor::pos() ) ) ); } -void Navigator::leaveEvent( QEvent *event ) +void Navigator::leaveEvent( TQEvent *event ) { KListBox::leaveEvent( event ); slotMouseOn( 0 ); mMouseOn = 0; } -void Navigator::slotExecuted( QListBoxItem *item ) +void Navigator::slotExecuted( TQListBoxItem *item ) { if ( !item ) return; @@ -450,7 +450,7 @@ IconViewMode Navigator::sizeIntToEnum(int size) const } } -void Navigator::slotShowRMBMenu( QListBoxItem *, const QPoint &pos ) +void Navigator::slotShowRMBMenu( TQListBoxItem *, const TQPoint &pos ) { KPopupMenu menu; menu.insertTitle( i18n( "Icon Size" ) ); @@ -483,17 +483,17 @@ void Navigator::slotShowRMBMenu( QListBoxItem *, const QPoint &pos ) if ( choice == ShowIcons ) { mShowIcons = !mShowIcons; Prefs::self()->setSidePaneShowIcons( mShowIcons ); - QToolTip::remove( this ); + TQToolTip::remove( this ); if ( !mShowText ) new EntryItemToolTip( this ); } else { mShowText = !mShowText; Prefs::self()->setSidePaneShowText( mShowText ); - QToolTip::remove( this ); + TQToolTip::remove( this ); } } int maxWidth = 0; - QListBoxItem* it = 0; + TQListBoxItem* it = 0; for (int i = 0; (it = item(i)) != 0; ++i) { int width = it->width(this); @@ -510,21 +510,21 @@ void Navigator::shortCutSelected( int pos ) setCurrentItem( pos ); } -void Navigator::setHoverItem( QListBoxItem* item, bool hover ) +void Navigator::setHoverItem( TQListBoxItem* item, bool hover ) { static_cast( item )->setHover( hover ); updateItem( item ); } -void Navigator::setPaintActiveItem( QListBoxItem* item, bool paintActive ) +void Navigator::setPaintActiveItem( TQListBoxItem* item, bool paintActive ) { static_cast( item )->setPaintActive( paintActive ); updateItem( item ); } -void Navigator::slotMouseOn( QListBoxItem* newItem ) +void Navigator::slotMouseOn( TQListBoxItem* newItem ) { - QListBoxItem* oldItem = mMouseOn; + TQListBoxItem* oldItem = mMouseOn; if ( oldItem == newItem ) return; if ( oldItem && !oldItem->isCurrent() && !oldItem->isSelected() ) @@ -544,12 +544,12 @@ void Navigator::slotMouseOff() slotMouseOn( 0 ); } -IconSidePane::IconSidePane( Core *core, QWidget *parent, const char *name ) +IconSidePane::IconSidePane( Core *core, TQWidget *parent, const char *name ) : SidePaneBase( core, parent, name ) { mNavigator = new Navigator( this ); - connect( mNavigator, SIGNAL( pluginActivated( Kontact::Plugin* ) ), - SIGNAL( pluginSelected( Kontact::Plugin* ) ) ); + connect( mNavigator, TQT_SIGNAL( pluginActivated( Kontact::Plugin* ) ), + TQT_SIGNAL( pluginSelected( Kontact::Plugin* ) ) ); setAcceptDrops( true ); } @@ -579,7 +579,7 @@ void IconSidePane::selectPlugin( Kontact::Plugin *plugin ) blockSignals( blocked ); } -void IconSidePane::selectPlugin( const QString &name ) +void IconSidePane::selectPlugin( const TQString &name ) { bool blocked = signalsBlocked(); blockSignals( true ); diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h index 281d25ae..89fb002a 100644 --- a/kontact/src/iconsidepane.h +++ b/kontact/src/iconsidepane.h @@ -21,7 +21,7 @@ #ifndef KONTACT_ICONSIDEPANEBASE_H #define KONTACT_ICONSIDEPANEBASE_H -#include +#include #include @@ -44,7 +44,7 @@ enum IconViewMode { LargeIcons = 48, NormalIcons = 32, SmallIcons = 22, ShowText /** - A QListBoxPixmap Square Box with an optional icon and a text + A TQListBoxPixmap Square Box with an optional icon and a text underneath. */ class EntryItem : public QListBoxItem @@ -55,7 +55,7 @@ class EntryItem : public QListBoxItem Kontact::Plugin *plugin() const { return mPlugin; } - const QPixmap *pixmap() const { return &mPixmap; } + const TQPixmap *pixmap() const { return &mPixmap; } Navigator* navigator() const; @@ -65,20 +65,20 @@ class EntryItem : public QListBoxItem /** returns the width of this item. */ - virtual int width( const QListBox * ) const; + virtual int width( const TQListBox * ) const; /** returns the height of this item. */ - virtual int height( const QListBox * ) const; + virtual int height( const TQListBox * ) const; protected: void reloadPixmap(); - virtual void paint( QPainter *p ); + virtual void paint( TQPainter *p ); private: Kontact::Plugin *mPlugin; - QPixmap mPixmap; + TQPixmap mPixmap; bool mHasHover; bool mPaintActive; }; @@ -90,25 +90,25 @@ class EntryItem : public QListBoxItem class EntryItemToolTip : public QToolTip { public: - EntryItemToolTip( QListBox* parent ) - : QToolTip( parent->viewport() ), mListBox( parent ) + EntryItemToolTip( TQListBox* parent ) + : TQToolTip( parent->viewport() ), mListBox( parent ) {} protected: - void maybeTip( const QPoint& p ) { + void maybeTip( const TQPoint& p ) { // We only show tooltips when there are no texts shown if ( Prefs::self()->sidePaneShowText() ) return; if ( !mListBox ) return; - QListBoxItem* item = mListBox->itemAt( p ); + TQListBoxItem* item = mListBox->itemAt( p ); if ( !item ) return; - const QRect itemRect = mListBox->itemRect( item ); + const TQRect itemRect = mListBox->itemRect( item ); if ( !itemRect.isValid() ) return; const EntryItem *entryItem = static_cast( item ); - QString tipStr = entryItem->text(); + TQString tipStr = entryItem->text(); tip( itemRect, tipStr ); } private: - QListBox* mListBox; + TQListBox* mListBox; }; /** @@ -120,38 +120,38 @@ class Navigator : public KListBox public: Navigator( SidePaneBase *parent = 0, const char *name = 0 ); - virtual void setSelected( QListBoxItem *, bool ); + virtual void setSelected( TQListBoxItem *, bool ); - void updatePlugins( QValueList plugins ); + void updatePlugins( TQValueList plugins ); - QSize sizeHint() const; + TQSize sizeHint() const; void highlightItem( EntryItem* item ); IconViewMode viewMode() { return mViewMode; } IconViewMode sizeIntToEnum(int size) const; - const QPtrList & actions() { return mActions; } + const TQPtrList & actions() { return mActions; } bool showIcons() const { return mShowIcons; } bool showText() const { return mShowText; } signals: void pluginActivated( Kontact::Plugin * ); protected: - void dragEnterEvent( QDragEnterEvent * ); - void dragMoveEvent ( QDragMoveEvent * ); - void dropEvent( QDropEvent * ); - void resizeEvent( QResizeEvent * ); - void enterEvent( QEvent* ); - void leaveEvent( QEvent* ); + void dragEnterEvent( TQDragEnterEvent * ); + void dragMoveEvent ( TQDragMoveEvent * ); + void dropEvent( TQDropEvent * ); + void resizeEvent( TQResizeEvent * ); + void enterEvent( TQEvent* ); + void leaveEvent( TQEvent* ); - void setHoverItem( QListBoxItem*, bool ); - void setPaintActiveItem( QListBoxItem*, bool ); + void setHoverItem( TQListBoxItem*, bool ); + void setPaintActiveItem( TQListBoxItem*, bool ); protected slots: - void slotExecuted( QListBoxItem * ); - void slotMouseOn( QListBoxItem *item ); + void slotExecuted( TQListBoxItem * ); + void slotMouseOn( TQListBoxItem *item ); void slotMouseOff(); - void slotShowRMBMenu( QListBoxItem *, const QPoint& ); + void slotShowRMBMenu( TQListBoxItem *, const TQPoint& ); void shortCutSelected( int ); void slotStopHighlight(); @@ -159,12 +159,12 @@ class Navigator : public KListBox SidePaneBase *mSidePane; IconViewMode mViewMode; - QListBoxItem* mMouseOn; + TQListBoxItem* mMouseOn; EntryItem* mHighlightItem; - QSignalMapper *mMapper; - QPtrList mActions; + TQSignalMapper *mMapper; + TQPtrList mActions; bool mShowIcons; bool mShowText; }; @@ -173,7 +173,7 @@ class IconSidePane : public SidePaneBase { Q_OBJECT public: - IconSidePane( Core *core, QWidget *parent, const char *name = 0 ); + IconSidePane( Core *core, TQWidget *parent, const char *name = 0 ); ~IconSidePane(); virtual void indicateForegrunding( Kontact::Plugin* ); @@ -181,8 +181,8 @@ class IconSidePane : public SidePaneBase public slots: virtual void updatePlugins(); virtual void selectPlugin( Kontact::Plugin* ); - virtual void selectPlugin( const QString &name ); - const QPtrList & actions() { return mNavigator->actions(); } + virtual void selectPlugin( const TQString &name ); + const TQPtrList & actions() { return mNavigator->actions(); } private: Navigator *mNavigator; diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index 0c518d5c..c14669ff 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -32,17 +32,17 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include extern "C" { - KDE_EXPORT KCModule *create_kontactconfig( QWidget *parent, const char * ) { + KDE_EXPORT KCModule *create_kontactconfig( TQWidget *parent, const char * ) { return new KcmKontact( parent, "kcmkontact" ); } } @@ -50,8 +50,8 @@ extern "C" class PluginItem : public QListViewItem { public: - PluginItem( QListView *parent, const KService::Ptr &ptr ) - : QListViewItem( parent, ptr->name(), ptr->comment(), ptr->library() ), + PluginItem( TQListView *parent, const KService::Ptr &ptr ) + : TQListViewItem( parent, ptr->name(), ptr->comment(), ptr->library() ), mPtr( ptr ) { } @@ -65,11 +65,11 @@ class PluginItem : public QListViewItem KService::Ptr mPtr; }; -KcmKontact::KcmKontact( QWidget *parent, const char *name ) +KcmKontact::KcmKontact( TQWidget *parent, const char *name ) : KPrefsModule( Kontact::Prefs::self(), parent, name ) { - QBoxLayout *topLayout = new QVBoxLayout( this ); - QBoxLayout *pluginStartupLayout = new QHBoxLayout( topLayout ); + TQBoxLayout *topLayout = new TQVBoxLayout( this ); + TQBoxLayout *pluginStartupLayout = new TQHBoxLayout( topLayout ); topLayout->addStretch(); KPrefsWidBool *forceStartupPlugin = addWidBool( Kontact::Prefs::self()->forceStartupPluginItem(), this ); @@ -81,8 +81,8 @@ KcmKontact::KcmKontact( QWidget *parent, const char *name ) pluginStartupLayout->addWidget( selection->comboBox() ); selection->comboBox()->setEnabled( false ); - connect( forceStartupPlugin->checkBox(), SIGNAL( toggled( bool ) ), - selection->comboBox(), SLOT( setEnabled( bool ) ) ); + connect( forceStartupPlugin->checkBox(), TQT_SIGNAL( toggled( bool ) ), + selection->comboBox(), TQT_SLOT( setEnabled( bool ) ) ); load(); } @@ -100,11 +100,11 @@ const KAboutData* KcmKontact::aboutData() const } -PluginSelection::PluginSelection( KConfigSkeleton::ItemString *item, QWidget *parent ) +PluginSelection::PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *parent ) { mItem = item; - mPluginCombo = new QComboBox( parent ); - connect( mPluginCombo, SIGNAL( activated( int ) ), SIGNAL( changed() ) ); + mPluginCombo = new TQComboBox( parent ); + connect( mPluginCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) ); } PluginSelection::~PluginSelection() @@ -114,15 +114,15 @@ PluginSelection::~PluginSelection() void PluginSelection::readConfig() { const KTrader::OfferList offers = KTrader::self()->query( - QString::fromLatin1( "Kontact/Plugin" ), - QString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); + TQString::fromLatin1( "Kontact/Plugin" ), + TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); int activeComponent = 0; mPluginCombo->clear(); for ( KService::List::ConstIterator it = offers.begin(); it != offers.end(); ++it ) { KService::Ptr service = *it; // skip summary only plugins - QVariant var = service->property( "X-KDE-KontactPluginHasPart" ); + TQVariant var = service->property( "X-KDE-KontactPluginHasPart" ); if ( var.isValid() && var.toBool() == false ) continue; mPluginCombo->insertItem( service->name() ); @@ -141,9 +141,9 @@ void PluginSelection::writeConfig() mItem->setValue( ptr->property("X-KDE-PluginInfo-Name").toString() ); } -QValueList PluginSelection::widgets() const +TQValueList PluginSelection::widgets() const { - QValueList widgets; + TQValueList widgets; widgets.append( mPluginCombo ); return widgets; diff --git a/kontact/src/kcmkontact.h b/kontact/src/kcmkontact.h index 3b37f68f..d914bd35 100644 --- a/kontact/src/kcmkontact.h +++ b/kontact/src/kcmkontact.h @@ -41,7 +41,7 @@ class KcmKontact : public KPrefsModule Q_OBJECT public: - KcmKontact( QWidget *parent = 0, const char *name = 0 ); + KcmKontact( TQWidget *parent = 0, const char *name = 0 ); virtual const KAboutData* aboutData() const; }; @@ -51,18 +51,18 @@ class PluginSelection : public KPrefsWid Q_OBJECT public: - PluginSelection( KConfigSkeleton::ItemString *item, QWidget *parent ); + PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *parent ); ~PluginSelection(); void readConfig(); void writeConfig(); - QValueList widgets() const; - QComboBox *comboBox() const { return mPluginCombo; } + TQValueList widgets() const; + TQComboBox *comboBox() const { return mPluginCombo; } private: - QComboBox *mPluginCombo; - QValueList mPluginList; + TQComboBox *mPluginCombo; + TQValueList mPluginList; KConfigSkeleton::ItemString *mItem; }; diff --git a/kontact/src/kontactiface.h b/kontact/src/kontactiface.h index 7af3e8a5..6251b3b8 100644 --- a/kontact/src/kontactiface.h +++ b/kontact/src/kontactiface.h @@ -29,7 +29,7 @@ class KontactIface : public DCOPObject KontactIface() : DCOPObject("KontactIface") {} k_dcop: - virtual void selectPlugin( const QString &name ) = 0; + virtual void selectPlugin( const TQString &name ) = 0; }; diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index ee29ce9d..c1987235 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -34,7 +34,7 @@ #include #include "plugin.h" -#include +#include #include "prefs.h" #include "alarmclient.h" @@ -72,12 +72,12 @@ static void listPlugins() { KInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options KTrader::OfferList offers = KTrader::self()->query( - QString::fromLatin1( "Kontact/Plugin" ), - QString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); + TQString::fromLatin1( "Kontact/Plugin" ), + TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); for ( KService::List::Iterator it = offers.begin(); it != offers.end(); ++it ) { KService::Ptr service = (*it); // skip summary only plugins - QVariant var = service->property( "X-KDE-KontactPluginHasPart" ); + TQVariant var = service->property( "X-KDE-KontactPluginHasPart" ); if ( var.isValid() && var.toBool() == false ) continue; cout << service->library().remove( "libkontact_" ).latin1() << endl; @@ -87,12 +87,12 @@ static void listPlugins() int KontactApp::newInstance() { KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); - QString moduleName; + TQString moduleName; if ( Kontact::Prefs::self()->forceStartupPlugin() ) { moduleName = Kontact::Prefs::self()->forcedStartupPlugin(); } if ( args->isSet( "module" ) ) { - moduleName = QString::fromLocal8Bit( args->getOption( "module" ) ); + moduleName = TQString::fromLocal8Bit( args->getOption( "module" ) ); } if ( !mSessionRestored ) { diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index a9608528..541742bb 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -20,17 +20,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -86,16 +86,16 @@ using namespace Kontact; class SettingsDialogWrapper : public KSettings::Dialog { public: - SettingsDialogWrapper( ContentInListView content, QWidget * parent = 0 ) + SettingsDialogWrapper( ContentInListView content, TQWidget * parent = 0 ) : KSettings::Dialog( content, parent, 0 ) { } - void fixButtonLabel( QWidget *widget ) + void fixButtonLabel( TQWidget *widget ) { - QObject *object = widget->child( "KJanusWidget::buttonBelowList" ); - QPushButton *button = static_cast( object ); + TQObject *object = widget->child( "KJanusWidget::buttonBelowList" ); + TQPushButton *button = static_cast( object ); if ( button ) button->setText( i18n( "Select Components ..." ) ); } @@ -119,11 +119,11 @@ void MainWindow::initGUI() setupActions(); setHelpMenuEnabled( false ); KHelpMenu *helpMenu = new KHelpMenu( this, 0, true, actionCollection() ); - connect( helpMenu, SIGNAL( showAboutApplication() ), - SLOT( showAboutDialog() ) ); + connect( helpMenu, TQT_SIGNAL( showAboutApplication() ), + TQT_SLOT( showAboutDialog() ) ); - KStdAction::keyBindings( this, SLOT( configureShortcuts() ), actionCollection() ); - KStdAction::configureToolbars( this, SLOT( configureToolbars() ), actionCollection() ); + KStdAction::keyBindings( this, TQT_SLOT( configureShortcuts() ), actionCollection() ); + KStdAction::configureToolbars( this, TQT_SLOT( configureToolbars() ), actionCollection() ); setXMLFile( "kontactui.rc" ); setStandardToolBarMenuEnabled( true ); @@ -133,18 +133,18 @@ void MainWindow::initGUI() resize( 700, 520 ); // initial size to prevent a scrollbar in sidepane setAutoSaveSettings(); - connect( Kontact::ProfileManager::self(), SIGNAL( profileLoaded( const QString& ) ), - this, SLOT( slotLoadProfile( const QString& ) ) ); - connect( Kontact::ProfileManager::self(), SIGNAL( saveToProfileRequested( const QString& ) ), - this, SLOT( slotSaveToProfile( const QString& ) ) ); + connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileLoaded( const TQString& ) ), + this, TQT_SLOT( slotLoadProfile( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQT_SIGNAL( saveToProfileRequested( const TQString& ) ), + this, TQT_SLOT( slotSaveToProfile( const TQString& ) ) ); } void MainWindow::initObject() { KTrader::OfferList offers = KTrader::self()->query( - QString::fromLatin1( "Kontact/Plugin" ), - QString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); + TQString::fromLatin1( "Kontact/Plugin" ), + TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" ); KPluginInfo::List::Iterator it; @@ -154,8 +154,8 @@ void MainWindow::initObject() // prepare the part manager mPartManager = new KParts::PartManager( this ); - connect( mPartManager, SIGNAL( activePartChanged( KParts::Part* ) ), - this, SLOT( slotActivePartChanged( KParts::Part* ) ) ); + connect( mPartManager, TQT_SIGNAL( activePartChanged( KParts::Part* ) ), + this, TQT_SLOT( slotActivePartChanged( KParts::Part* ) ) ); loadPlugins(); @@ -165,7 +165,7 @@ void MainWindow::initObject() } KSettings::Dispatcher::self()->registerInstance( instance(), this, - SLOT( updateConfig() ) ); + TQT_SLOT( updateConfig() ) ); loadSettings(); @@ -174,10 +174,10 @@ void MainWindow::initObject() showTip( false ); // done initializing - slotShowStatusMsg( QString::null ); + slotShowStatusMsg( TQString::null ); - connect( KPIM::BroadcastStatus::instance(), SIGNAL( statusMsg( const QString& ) ), - this, SLOT( slotShowStatusMsg( const QString& ) ) ); + connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ), + this, TQT_SLOT( slotShowStatusMsg( const TQString& ) ) ); // launch commandline specified module if any activatePluginModule(); @@ -194,7 +194,7 @@ MainWindow::~MainWindow() { saveSettings(); - QPtrList parts = *mPartManager->parts(); + TQPtrList parts = *mPartManager->parts(); for ( KParts::Part *p = parts.last(); p; p = parts.prev() ) { delete p; @@ -204,7 +204,7 @@ MainWindow::~MainWindow() Prefs::self()->writeConfig(); } -void MainWindow::setActivePluginModule( const QString &module ) +void MainWindow::setActivePluginModule( const TQString &module ) { mActiveModule = module; activatePluginModule(); @@ -225,39 +225,39 @@ void MainWindow::activatePluginModule() void MainWindow::initWidgets() { // includes sidebar and part stack - mTopWidget = new QHBox( this ); - mTopWidget->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + mTopWidget = new TQHBox( this ); + mTopWidget->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); setCentralWidget( mTopWidget ); - QHBox *mBox = 0; - mSplitter = new QSplitter( mTopWidget ); - mBox = new QHBox( mTopWidget ); + TQHBox *mBox = 0; + mSplitter = new TQSplitter( mTopWidget ); + mBox = new TQHBox( mTopWidget ); mSidePane = new IconSidePane( this, mSplitter ); - mSidePane->setSizePolicy( QSizePolicy( QSizePolicy::Maximum, - QSizePolicy::Preferred ) ); + mSidePane->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, + TQSizePolicy::Preferred ) ); // donÄt occupy screen estate on load - QValueList sizes; + TQValueList sizes; sizes << 0; mSplitter->setSizes(sizes); mSidePane->setActionCollection( actionCollection() ); - connect( mSidePane, SIGNAL( pluginSelected( Kontact::Plugin * ) ), - SLOT( selectPlugin( Kontact::Plugin * ) ) ); + connect( mSidePane, TQT_SIGNAL( pluginSelected( Kontact::Plugin * ) ), + TQT_SLOT( selectPlugin( Kontact::Plugin * ) ) ); - QVBox *vBox; + TQVBox *vBox; if ( mSplitter ) { - vBox = new QVBox( mSplitter ); + vBox = new TQVBox( mSplitter ); } else { - vBox = new QVBox( mBox ); + vBox = new TQVBox( mBox ); } vBox->setSpacing( 0 ); - mPartsStack = new QWidgetStack( vBox ); + mPartsStack = new TQWidgetStack( vBox ); initAboutScreen(); - QString loading = i18n( "

%1

" ) + TQString loading = i18n( "

%1

" ) .arg( i18n("Loading Kontact...") ); paintAboutScreen( loading ); @@ -277,10 +277,10 @@ void MainWindow::initWidgets() } -void MainWindow::paintAboutScreen( const QString& msg ) +void MainWindow::paintAboutScreen( const TQString& msg ) { - QString location = locate( "data", "kontact/about/main.html" ); - QString content = KPIM::kFileToString( location ); + TQString location = locate( "data", "kontact/about/main.html" ); + TQString content = KPIM::kFileToString( location ); content = content.arg( locate( "data", "libkdepim/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) ); @@ -289,18 +289,18 @@ void MainWindow::paintAboutScreen( const QString& msg ) mIntroPart->begin( KURL( location ) ); - QString appName( i18n( "KDE Kontact" ) ); - QString catchPhrase( i18n( "Get Organized!" ) ); - QString quickDescription( i18n( "The KDE Personal Information Management Suite" ) ); + TQString appName( i18n( "KDE Kontact" ) ); + TQString catchPhrase( i18n( "Get Organized!" ) ); + TQString quickDescription( i18n( "The KDE Personal Information Management Suite" ) ); - mIntroPart->write( content.arg( QFont().pointSize() + 2 ).arg( appName ) + mIntroPart->write( content.arg( TQFont().pointSize() + 2 ).arg( appName ) .arg( catchPhrase ).arg( quickDescription ).arg( msg ) ); mIntroPart->end(); } void MainWindow::initAboutScreen() { - QHBox *introbox = new QHBox( mPartsStack ); + TQHBox *introbox = new TQHBox( mPartsStack ); mPartsStack->addWidget( introbox ); mPartsStack->raiseWidget( introbox ); mIntroPart = new KHTMLPart( introbox ); @@ -314,19 +314,19 @@ void MainWindow::initAboutScreen() mIntroPart->view()->setLineWidth( 0 ); connect( mIntroPart->browserExtension(), - SIGNAL( openURLRequest( const KURL&, const KParts::URLArgs& ) ), - SLOT( slotOpenUrl( const KURL& ) ) ); + TQT_SIGNAL( openURLRequest( const KURL&, const KParts::URLArgs& ) ), + TQT_SLOT( slotOpenUrl( const KURL& ) ) ); connect( mIntroPart->browserExtension(), - SIGNAL( createNewWindow( const KURL&, const KParts::URLArgs& ) ), - SLOT( slotOpenUrl( const KURL& ) ) ); + TQT_SIGNAL( createNewWindow( const KURL&, const KParts::URLArgs& ) ), + TQT_SLOT( slotOpenUrl( const KURL& ) ) ); } void MainWindow::setupActions() { - KStdAction::quit( this, SLOT( slotQuit() ), actionCollection() ); + KStdAction::quit( this, TQT_SLOT( slotQuit() ), actionCollection() ); mNewActions = new KToolBarPopupAction( KGuiItem( i18n( "New" ), "" ), - KStdAccel::shortcut(KStdAccel::New), this, SLOT( slotNewClicked() ), + KStdAccel::shortcut(KStdAccel::New), this, TQT_SLOT( slotNewClicked() ), actionCollection(), "action_new" ); KConfig* const cfg = Prefs::self()->config(); @@ -335,36 +335,36 @@ void MainWindow::setupActions() if ( mSyncActionsEnabled ) { mSyncActions = new KToolBarPopupAction( KGuiItem( i18n( "Synchronize" ), "kitchensync" ), - KStdAccel::shortcut(KStdAccel::Reload), this, SLOT( slotSyncClicked() ), + KStdAccel::shortcut(KStdAccel::Reload), this, TQT_SLOT( slotSyncClicked() ), actionCollection(), "action_sync" ); } - new KAction( i18n( "Configure Kontact..." ), "configure", 0, this, SLOT( slotPreferences() ), + new KAction( i18n( "Configure Kontact..." ), "configure", 0, this, TQT_SLOT( slotPreferences() ), actionCollection(), "settings_configure_kontact" ); - new KAction( i18n( "Configure &Profiles..." ), 0, this, SLOT( slotConfigureProfiles() ), + new KAction( i18n( "Configure &Profiles..." ), 0, this, TQT_SLOT( slotConfigureProfiles() ), actionCollection(), "settings_configure_kontact_profiles" ); - new KAction( i18n( "&Kontact Introduction" ), 0, this, SLOT( slotShowIntroduction() ), + new KAction( i18n( "&Kontact Introduction" ), 0, this, TQT_SLOT( slotShowIntroduction() ), actionCollection(), "help_introduction" ); - new KAction( i18n( "&Tip of the Day" ), 0, this, SLOT( slotShowTip() ), + new KAction( i18n( "&Tip of the Day" ), 0, this, TQT_SLOT( slotShowTip() ), actionCollection(), "help_tipofday" ); - new KAction( i18n( "&Request Feature..." ), 0, this, SLOT( slotRequestFeature() ), + new KAction( i18n( "&Request Feature..." ), 0, this, TQT_SLOT( slotRequestFeature() ), actionCollection(), "help_requestfeature" ); - KWidgetAction* spacerAction = new KWidgetAction( new QWidget( this ), "SpacerAction", "", 0, 0, actionCollection(), "navigator_spacer_item" ); + KWidgetAction* spacerAction = new KWidgetAction( new TQWidget( this ), "SpacerAction", "", 0, 0, actionCollection(), "navigator_spacer_item" ); spacerAction->setAutoSized( true ); } void MainWindow::slotConfigureProfiles() { - QGuardedPtr dlg = new Kontact::ProfileDialog( this ); + TQGuardedPtr dlg = new Kontact::ProfileDialog( this ); dlg->setModal( true ); dlg->exec(); delete dlg; } namespace { - void copyConfigEntry( KConfig* source, KConfig* dest, const QString& group, const QString& key, const QString& defaultValue=QString() ) + void copyConfigEntry( KConfig* source, KConfig* dest, const TQString& group, const TQString& key, const TQString& defaultValue=TQString() ) { source->setGroup( group ); dest->setGroup( group ); @@ -372,9 +372,9 @@ namespace { } } -void MainWindow::slotSaveToProfile( const QString& id ) +void MainWindow::slotSaveToProfile( const TQString& id ) { - const QString path = Kontact::ProfileManager::self()->profileById( id ).saveLocation(); + const TQString path = Kontact::ProfileManager::self()->profileById( id ).saveLocation(); if ( path.isNull() ) return; @@ -396,9 +396,9 @@ void MainWindow::slotSaveToProfile( const QString& id ) } } -void MainWindow::slotLoadProfile( const QString& id ) +void MainWindow::slotLoadProfile( const TQString& id ) { - const QString path = Kontact::ProfileManager::self()->profileById( id ).saveLocation(); + const TQString path = Kontact::ProfileManager::self()->profileById( id ).saveLocation(); if ( path.isNull() ) return; @@ -408,11 +408,11 @@ void MainWindow::slotLoadProfile( const QString& id ) saveSettings(); const KConfig profile( path+"/kontactrc", /*read-only=*/false, /*useglobals=*/false ); - const QStringList groups = profile.groupList(); - for ( QStringList::ConstIterator it = groups.begin(), end = groups.end(); it != end; ++it ) + const TQStringList groups = profile.groupList(); + for ( TQStringList::ConstIterator it = groups.begin(), end = groups.end(); it != end; ++it ) { cfg->setGroup( *it ); - typedef QMap StringMap; + typedef TQMap StringMap; const StringMap entries = profile.entryMap( *it ); for ( StringMap::ConstIterator it2 = entries.begin(), end = entries.end(); it2 != end; ++it2 ) { @@ -463,8 +463,8 @@ Plugin *MainWindow::pluginFromInfo( const KPluginInfo *info ) void MainWindow::loadPlugins() { - QPtrList plugins; - QPtrList loadDelayed; + TQPtrList plugins; + TQPtrList loadDelayed; uint i; KPluginInfo::List::ConstIterator it; @@ -490,10 +490,10 @@ void MainWindow::loadPlugins() plugin->setTitle( (*it)->name() ); plugin->setIcon( (*it)->icon() ); - QVariant libNameProp = (*it)->property( "X-KDE-KontactPartLibraryName" ); - QVariant exeNameProp = (*it)->property( "X-KDE-KontactPartExecutableName" ); - QVariant loadOnStart = (*it)->property( "X-KDE-KontactPartLoadOnStart" ); - QVariant hasPartProp = (*it)->property( "X-KDE-KontactPluginHasPart" ); + TQVariant libNameProp = (*it)->property( "X-KDE-KontactPartLibraryName" ); + TQVariant exeNameProp = (*it)->property( "X-KDE-KontactPartExecutableName" ); + TQVariant loadOnStart = (*it)->property( "X-KDE-KontactPartLoadOnStart" ); + TQVariant hasPartProp = (*it)->property( "X-KDE-KontactPluginHasPart" ); if ( !loadOnStart.isNull() && loadOnStart.toBool() ) mDelayedPreload.append( plugin ); @@ -518,7 +518,7 @@ void MainWindow::loadPlugins() Plugin *plugin = plugins.at( i ); KAction *action; - QPtrList *actionList = plugin->newActions(); + TQPtrList *actionList = plugin->newActions(); for ( action = actionList->first(); action; action = actionList->next() ) { kdDebug(5600) << "Plugging " << action->name() << endl; @@ -558,7 +558,7 @@ bool MainWindow::removePlugin( const KPluginInfo *info ) Plugin *plugin = *it; KAction *action; - QPtrList *actionList = plugin->newActions(); + TQPtrList *actionList = plugin->newActions(); for ( action = actionList->first(); action; action = actionList->next() ) { kdDebug(5600) << "Unplugging " << action->name() << endl; @@ -686,7 +686,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) return; } - KApplication::setOverrideCursor( QCursor( Qt::WaitCursor ) ); + KApplication::setOverrideCursor( TQCursor( Qt::WaitCursor ) ); KParts::Part *part = plugin->part(); @@ -701,13 +701,13 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) } // store old focus widget - QWidget *focusWidget = kapp->focusWidget(); + TQWidget *focusWidget = kapp->focusWidget(); if ( mCurrentPlugin && focusWidget ) { // save the focus widget only when it belongs to the activated part - QWidget *parent = focusWidget->parentWidget(); + TQWidget *parent = focusWidget->parentWidget(); while ( parent ) { if ( parent == mCurrentPlugin->part()->widget() ) - mFocusWidgets.insert( mCurrentPlugin->identifier(), QGuardedPtr( focusWidget ) ); + mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr( focusWidget ) ); parent = parent->parentWidget(); } @@ -719,7 +719,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) plugin->select(); mPartManager->setActivePart( part ); - QWidget *view = part->widget(); + TQWidget *view = part->widget(); Q_ASSERT( view ); if ( view ) { @@ -779,13 +779,13 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) } } } - QStringList invisibleActions = plugin->invisibleToolbarActions(); + TQStringList invisibleActions = plugin->invisibleToolbarActions(); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = invisibleActions.begin(); it != invisibleActions.end(); ++it ) { KAction *action = part->actionCollection()->action( (*it).latin1() ); if ( action ) { - QPtrListIterator it( toolBarIterator() ); + TQPtrListIterator it( toolBarIterator() ); for ( ; it.current() ; ++it ) { action->unplug( it.current() ); } @@ -795,7 +795,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) KApplication::restoreOverrideCursor(); } -void MainWindow::selectPlugin( const QString &pluginName ) +void MainWindow::selectPlugin( const TQString &pluginName ) { PluginList::ConstIterator end = mPlugins.end(); for ( PluginList::ConstIterator it = mPlugins.begin(); it != end; ++it ) @@ -845,10 +845,10 @@ void MainWindow::slotShowIntroduction() void MainWindow::showTip( bool force ) { - QStringList tips; + TQStringList tips; PluginList::ConstIterator end = mPlugins.end(); for ( PluginList::ConstIterator it = mPlugins.begin(); it != end; ++it ) { - QString file = (*it)->tipFile(); + TQString file = (*it)->tipFile(); if ( !file.isEmpty() ) tips.append( file ); } @@ -867,11 +867,11 @@ void MainWindow::slotPreferences() static SettingsDialogWrapper *dlg = 0; if ( !dlg ) { // do not show settings of components running standalone - QValueList filteredPlugins = mPluginInfos; + TQValueList filteredPlugins = mPluginInfos; PluginList::ConstIterator it; for ( it = mPlugins.begin(); it != mPlugins.end(); ++it ) if ( (*it)->isRunningStandalone() ) { - QValueList::ConstIterator infoIt; + TQValueList::ConstIterator infoIt; for ( infoIt = filteredPlugins.begin(); infoIt != filteredPlugins.end(); ++infoIt ) { if ( (*infoIt)->pluginName() == (*it)->identifier() ) { filteredPlugins.remove( *infoIt ); @@ -881,18 +881,18 @@ void MainWindow::slotPreferences() } dlg = new SettingsDialogWrapper( KSettings::Dialog::Configurable, this ); dlg->addPluginInfos( filteredPlugins ); - connect( dlg, SIGNAL( pluginSelectionChanged() ), - SLOT( pluginsChanged() ) ); + connect( dlg, TQT_SIGNAL( pluginSelectionChanged() ), + TQT_SLOT( pluginsChanged() ) ); } dlg->show(); dlg->fixButtonLabel( this ); } -int MainWindow::startServiceFor( const QString& serviceType, - const QString& constraint, - const QString& preferences, - QString *error, QCString* dcopService, +int MainWindow::startServiceFor( const TQString& serviceType, + const TQString& constraint, + const TQString& preferences, + TQString *error, TQCString* dcopService, int flags ) { PluginList::ConstIterator end = mPlugins.end(); @@ -932,7 +932,7 @@ void MainWindow::updateConfig() void MainWindow::showAboutDialog() { - KApplication::setOverrideCursor( QCursor( Qt::WaitCursor ) ); + KApplication::setOverrideCursor( TQCursor( Qt::WaitCursor ) ); if ( !mAboutDialog ) mAboutDialog = new AboutDialog( this ); @@ -958,8 +958,8 @@ void MainWindow::configureToolbars() saveMainWindowSettings( KGlobal::config(), "MainWindow" ); KEditToolbar edit( factory() ); - connect( &edit, SIGNAL( newToolbarConfig() ), - this, SLOT( slotNewToolbarConfig() ) ); + connect( &edit, TQT_SIGNAL( newToolbarConfig() ), + this, TQT_SLOT( slotNewToolbarConfig() ) ); edit.exec(); } @@ -988,13 +988,13 @@ void MainWindow::readProperties( KConfig *config ) { Core::readProperties( config ); - QStringList activePlugins = config->readListEntry( "ActivePlugins" ); - QValueList::ConstIterator it = mPlugins.begin(); - QValueList::ConstIterator end = mPlugins.end(); + TQStringList activePlugins = config->readListEntry( "ActivePlugins" ); + TQValueList::ConstIterator it = mPlugins.begin(); + TQValueList::ConstIterator end = mPlugins.end(); for ( ; it != end; ++it ) { Plugin *plugin = *it; if ( !plugin->isRunningStandalone() ) { - QStringList::ConstIterator activePlugin = activePlugins.find( plugin->identifier() ); + TQStringList::ConstIterator activePlugin = activePlugins.find( plugin->identifier() ); if ( activePlugin != activePlugins.end() ) { plugin->readProperties( config ); } @@ -1006,7 +1006,7 @@ void MainWindow::saveProperties( KConfig *config ) { Core::saveProperties( config ); - QStringList activePlugins; + TQStringList activePlugins; KPluginInfo::List::Iterator it = mPluginInfos.begin(); KPluginInfo::List::Iterator end = mPluginInfos.end(); @@ -1031,8 +1031,8 @@ bool MainWindow::queryClose() return true; bool localClose = true; - QValueList::ConstIterator end = mPlugins.end(); - QValueList::ConstIterator it = mPlugins.begin(); + TQValueList::ConstIterator end = mPlugins.end(); + TQValueList::ConstIterator it = mPlugins.begin(); for ( ; it != end; ++it ) { Plugin *plugin = *it; if ( !plugin->isRunningStandalone() ) @@ -1043,7 +1043,7 @@ bool MainWindow::queryClose() return localClose; } -void MainWindow::slotShowStatusMsg( const QString &msg ) +void MainWindow::slotShowStatusMsg( const TQString &msg ) { if ( !statusBar() || !mStatusMsgLabel ) return; @@ -1051,16 +1051,16 @@ void MainWindow::slotShowStatusMsg( const QString &msg ) mStatusMsgLabel->setText( msg ); } -QString MainWindow::introductionString() +TQString MainWindow::introductionString() { KIconLoader *iconloader = KGlobal::iconLoader(); int iconSize = iconloader->currentSize( KIcon::Desktop ); - QString handbook_icon_path = iconloader->iconPath( "contents2", KIcon::Desktop ); - QString html_icon_path = iconloader->iconPath( "html", KIcon::Desktop ); - QString wizard_icon_path = iconloader->iconPath( "wizard", KIcon::Desktop ); + TQString handbook_icon_path = iconloader->iconPath( "contents2", KIcon::Desktop ); + TQString html_icon_path = iconloader->iconPath( "html", KIcon::Desktop ); + TQString wizard_icon_path = iconloader->iconPath( "wizard", KIcon::Desktop ); - QString info = i18n( "

Welcome to Kontact %1

" + TQString info = i18n( "

Welcome to Kontact %1

" "

%1

" "" "" diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h index a96d5bf6..5fe50a22 100644 --- a/kontact/src/mainwindow.h +++ b/kontact/src/mainwindow.h @@ -24,9 +24,9 @@ #ifndef KONTACT_MAINWINDOW_H #define KONTACT_MAINWINDOW_H -#include -#include -#include +#include +#include +#include #include #include @@ -60,7 +60,7 @@ class Plugin; class SidePaneBase; class AboutDialog; -typedef QValueList PluginList; +typedef TQValueList PluginList; class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public KontactIface { @@ -71,18 +71,18 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont ~MainWindow(); // KDCOPServiceStarter interface - virtual int startServiceFor( const QString& serviceType, - const QString& constraint = QString::null, - const QString& preferences = QString::null, - QString *error = 0, QCString* dcopService = 0, + virtual int startServiceFor( const TQString& serviceType, + const TQString& constraint = TQString::null, + const TQString& preferences = TQString::null, + TQString *error = 0, TQCString* dcopService = 0, int flags = 0 ); virtual PluginList pluginList() const { return mPlugins; } - void setActivePluginModule( const QString & ); + void setActivePluginModule( const TQString & ); public slots: virtual void selectPlugin( Kontact::Plugin *plugin ); - virtual void selectPlugin( const QString &pluginName ); + virtual void selectPlugin( const TQString &pluginName ); void updateConfig(); @@ -97,12 +97,12 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont void slotShowTip(); void slotRequestFeature(); void slotConfigureProfiles(); - void slotLoadProfile( const QString& id ); - void slotSaveToProfile( const QString& id ); + void slotLoadProfile( const TQString& id ); + void slotSaveToProfile( const TQString& id ); void slotNewToolbarConfig(); void slotShowIntroduction(); void showAboutDialog(); - void slotShowStatusMsg( const QString& ); + void slotShowStatusMsg( const TQString& ); void activatePluginModule(); void slotOpenUrl( const KURL &url ); @@ -124,8 +124,8 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont virtual bool queryClose(); virtual void readProperties( KConfig *config ); virtual void saveProperties( KConfig *config ); - void paintAboutScreen( const QString& msg ); - static QString introductionString(); + void paintAboutScreen( const TQString& msg ); + static TQString introductionString(); KToolBar* findToolBar(const char* name); private slots: @@ -135,27 +135,27 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont void configureToolbars(); private: - QFrame *mTopWidget; + TQFrame *mTopWidget; - QSplitter *mSplitter; + TQSplitter *mSplitter; KToolBarPopupAction *mNewActions; KToolBarPopupAction *mSyncActions; SidePaneBase *mSidePane; - QWidgetStack *mPartsStack; + TQWidgetStack *mPartsStack; Plugin *mCurrentPlugin; KParts::PartManager *mPartManager; PluginList mPlugins; PluginList mDelayedPreload; - QValueList mPluginInfos; + TQValueList mPluginInfos; KHTMLPart *mIntroPart; KRSqueezedTextLabel* mStatusMsgLabel; KPIM::StatusbarProgressWidget *mLittleProgress; - QString mActiveModule; + TQString mActiveModule; - QMap > mFocusWidgets; + TQMap > mFocusWidgets; AboutDialog *mAboutDialog; bool mReallyClose; diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp index 9525c968..5d440e5f 100644 --- a/kontact/src/profiledialog.cpp +++ b/kontact/src/profiledialog.cpp @@ -30,86 +30,86 @@ #include #include -#include -#include -#include +#include +#include +#include -Kontact::ProfileDialog::ProfileDialog( QWidget* parent, WFlags flags ) : KDialogBase( parent, /*name=*/0, /*modal=*/true, /*caption=*/QString(), /*buttonMask=*/KDialogBase::Ok|KDialogBase::Close ) +Kontact::ProfileDialog::ProfileDialog( TQWidget* parent, WFlags flags ) : KDialogBase( parent, /*name=*/0, /*modal=*/true, /*caption=*/TQString(), /*buttonMask=*/KDialogBase::Ok|KDialogBase::Close ) { setWFlags( flags ); setCaption( i18n("Configure Profiles") ); setButtonOK( i18n("Load Profile") ); - QWidget* mainWidget = new QWidget( this ); + TQWidget* mainWidget = new TQWidget( this ); - QHBoxLayout* horizontalLayout = new QHBoxLayout( mainWidget ); + TQHBoxLayout* horizontalLayout = new TQHBoxLayout( mainWidget ); horizontalLayout->setSpacing( 5 ); m_list = new KListView( mainWidget ); m_list->addColumn( i18n("Name") ); m_list->addColumn( i18n("Description") ); - m_list->setSelectionMode( QListView::Single ); + m_list->setSelectionMode( TQListView::Single ); m_list->setItemsRenameable( true ); m_list->setRenameable( NameColumn, true ); m_list->setRenameable( DescriptionColumn, true ); - connect( m_list, SIGNAL( selectionChanged() ), - this, SLOT( listSelectionChanged() ) ); - connect( m_list, SIGNAL( itemRenamed( QListViewItem*, const QString&, int ) ), - this, SLOT( listItemRenamed( QListViewItem*, const QString&, int ) ) ); + connect( m_list, TQT_SIGNAL( selectionChanged() ), + this, TQT_SLOT( listSelectionChanged() ) ); + connect( m_list, TQT_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), + this, TQT_SLOT( listItemRenamed( TQListViewItem*, const TQString&, int ) ) ); horizontalLayout->addWidget( m_list ); - QVBoxLayout* buttonLayout = new QVBoxLayout( horizontalLayout ); + TQVBoxLayout* buttonLayout = new TQVBoxLayout( horizontalLayout ); buttonLayout->setSpacing( 5 ); - m_newProfileButton = new QPushButton( mainWidget ); + m_newProfileButton = new TQPushButton( mainWidget ); m_newProfileButton->setText( i18n("New Profile") ); - connect( m_newProfileButton, SIGNAL( clicked() ), - this, SLOT( addNewProfile() ) ); + connect( m_newProfileButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( addNewProfile() ) ); buttonLayout->addWidget( m_newProfileButton ); - m_deleteProfileButton = new QPushButton( mainWidget ); + m_deleteProfileButton = new TQPushButton( mainWidget ); m_deleteProfileButton->setText( i18n("Delete Profile") ); m_deleteProfileButton->setEnabled( false ); - connect( m_deleteProfileButton, SIGNAL( clicked() ), - this, SLOT( deleteSelectedProfile() ) ); + connect( m_deleteProfileButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( deleteSelectedProfile() ) ); buttonLayout->addWidget( m_deleteProfileButton ); - m_saveProfileButton = new QPushButton( mainWidget ); + m_saveProfileButton = new TQPushButton( mainWidget ); m_saveProfileButton->setText( i18n("Save Profile") ); m_saveProfileButton->setEnabled( false ); - connect( m_saveProfileButton, SIGNAL( clicked() ), - this, SLOT( saveToSelectedProfile() ) ); + connect( m_saveProfileButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( saveToSelectedProfile() ) ); buttonLayout->addWidget( m_saveProfileButton ); buttonLayout->addStretch(); - m_importProfileButton = new QPushButton( mainWidget ); + m_importProfileButton = new TQPushButton( mainWidget ); m_importProfileButton->setText( i18n("Import Profile") ); - connect( m_importProfileButton, SIGNAL( clicked() ), - this, SLOT( importProfile() ) ); + connect( m_importProfileButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( importProfile() ) ); buttonLayout->addWidget( m_importProfileButton ); - m_exportProfileButton = new QPushButton( mainWidget ); + m_exportProfileButton = new TQPushButton( mainWidget ); m_exportProfileButton->setText( i18n("Export Profile") ); m_exportProfileButton->setEnabled( false ); - connect( m_exportProfileButton, SIGNAL( clicked() ), - this, SLOT( exportSelectedProfile() ) ); + connect( m_exportProfileButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( exportSelectedProfile() ) ); buttonLayout->addWidget( m_exportProfileButton ); setMainWidget( mainWidget ); - connect( Kontact::ProfileManager::self(), SIGNAL( profileAdded( const QString& ) ), - this, SLOT( profileAdded( const QString& ) ) ); - connect( Kontact::ProfileManager::self(), SIGNAL( profileRemoved( const QString& ) ), - this, SLOT( profileRemoved( const QString& ) ) ); - connect( Kontact::ProfileManager::self(), SIGNAL( profileLoaded( const QString& ) ), - this, SLOT( profileLoaded( const QString& ) ) ); - connect( Kontact::ProfileManager::self(), SIGNAL( profileUpdated( const QString& ) ), - this, SLOT( profileUpdated( const QString& ) ) ); - - const QValueList profiles = Kontact::ProfileManager::self()->profiles(); - for ( QValueList::ConstIterator it = profiles.begin(), end = profiles.end(); it != end; ++it ) + connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileAdded( const TQString& ) ), + this, TQT_SLOT( profileAdded( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileRemoved( const TQString& ) ), + this, TQT_SLOT( profileRemoved( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileLoaded( const TQString& ) ), + this, TQT_SLOT( profileLoaded( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileUpdated( const TQString& ) ), + this, TQT_SLOT( profileUpdated( const TQString& ) ) ); + + const TQValueList profiles = Kontact::ProfileManager::self()->profiles(); + for ( TQValueList::ConstIterator it = profiles.begin(), end = profiles.end(); it != end; ++it ) { profileAdded( (*it).id() ); } @@ -122,7 +122,7 @@ void Kontact::ProfileDialog::slotOk() KDialogBase::slotOk(); } -QString Kontact::ProfileDialog::selectedProfile() const +TQString Kontact::ProfileDialog::selectedProfile() const { return m_itemToProfile[m_list->selectedItem()]; } @@ -135,7 +135,7 @@ void Kontact::ProfileDialog::loadSelectedProfile() Kontact::ProfileManager::self()->loadProfile( profile.id() ); } -void Kontact::ProfileDialog::profileLoaded( const QString& id ) +void Kontact::ProfileDialog::profileLoaded( const TQString& id ) { const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( id ); if ( profile.isNull() ) @@ -165,11 +165,11 @@ void Kontact::ProfileDialog::deleteSelectedProfile() void Kontact::ProfileDialog::exportSelectedProfile() { - const QString id = selectedProfile(); + const TQString id = selectedProfile(); const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( id ); if ( profile.isNull() ) return; - const QString path = KFileDialog::getExistingDirectory( QString(), this, i18n("Select Profile Folder") ); + const TQString path = KFileDialog::getExistingDirectory( TQString(), this, i18n("Select Profile Folder") ); if ( path.isNull() ) return; const Kontact::ProfileManager::ExportError error = Kontact::ProfileManager::self()->exportProfileToDirectory( id, path ); @@ -185,7 +185,7 @@ void Kontact::ProfileDialog::exportSelectedProfile() void Kontact::ProfileDialog::importProfile() { - const QString path = KFileDialog::getExistingDirectory( QString(), this, i18n("Select Profile Folder") ); + const TQString path = KFileDialog::getExistingDirectory( TQString(), this, i18n("Select Profile Folder") ); if ( path.isNull() ) return; const Kontact::ProfileManager::ImportError error = Kontact::ProfileManager::self()->importProfileFromDirectory( path ); @@ -195,29 +195,29 @@ void Kontact::ProfileDialog::importProfile() } } -void Kontact::ProfileDialog::profileAdded( const QString& id ) +void Kontact::ProfileDialog::profileAdded( const TQString& id ) { Q_ASSERT( !m_profileToItem[id] ); const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( id ); Q_ASSERT( !profile.isNull() ); - QListViewItem* const item = new QListViewItem( m_list ); + TQListViewItem* const item = new TQListViewItem( m_list ); m_profileToItem[id] = item; m_itemToProfile[item] = id; profileUpdated( id ); } -void Kontact::ProfileDialog::profileRemoved( const QString& id ) +void Kontact::ProfileDialog::profileRemoved( const TQString& id ) { - QListViewItem* item = m_profileToItem[id]; + TQListViewItem* item = m_profileToItem[id]; Q_ASSERT( item ); m_profileToItem.remove( id ); m_itemToProfile.remove( item ); delete item; } -void Kontact::ProfileDialog::profileUpdated( const QString& id ) +void Kontact::ProfileDialog::profileUpdated( const TQString& id ) { - QListViewItem* item = m_profileToItem[id]; + TQListViewItem* item = m_profileToItem[id]; Q_ASSERT( item ); const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( id ); Q_ASSERT( !profile.isNull() ); @@ -233,7 +233,7 @@ void Kontact::ProfileDialog::addNewProfile() Kontact::ProfileManager::self()->addProfile( profile ); } -void Kontact::ProfileDialog::listItemRenamed( QListViewItem* item, const QString& text, int col ) +void Kontact::ProfileDialog::listItemRenamed( TQListViewItem* item, const TQString& text, int col ) { Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( m_itemToProfile[item] ); Q_ASSERT( !profile.isNull() ); diff --git a/kontact/src/profiledialog.h b/kontact/src/profiledialog.h index 7fa620e6..730b044f 100644 --- a/kontact/src/profiledialog.h +++ b/kontact/src/profiledialog.h @@ -27,8 +27,8 @@ #include -#include -#include +#include +#include class QListViewItem; @@ -42,7 +42,7 @@ class ProfileDialog : public KDialogBase Q_OBJECT public: - explicit ProfileDialog( QWidget* parent = 0, WFlags f = 0 ); + explicit ProfileDialog( TQWidget* parent = 0, WFlags f = 0 ); private: enum ListColumn { @@ -50,7 +50,7 @@ private: DescriptionColumn=1 }; - QString selectedProfile() const; + TQString selectedProfile() const; void updateButtonState(); protected slots: @@ -67,22 +67,22 @@ private slots: void exportSelectedProfile(); void addNewProfile(); void listSelectionChanged(); - void listItemRenamed( QListViewItem* item, const QString& text, int col ); + void listItemRenamed( TQListViewItem* item, const TQString& text, int col ); - void profileAdded( const QString& id ); - void profileRemoved( const QString& id ); - void profileUpdated( const QString& id ); - void profileLoaded( const QString& id ); + void profileAdded( const TQString& id ); + void profileRemoved( const TQString& id ); + void profileUpdated( const TQString& id ); + void profileLoaded( const TQString& id ); private: KListView* m_list; - QPushButton* m_newProfileButton; - QPushButton* m_deleteProfileButton; - QPushButton* m_saveProfileButton; - QPushButton* m_importProfileButton; - QPushButton* m_exportProfileButton; - QMap m_itemToProfile; - QMap m_profileToItem; + TQPushButton* m_newProfileButton; + TQPushButton* m_deleteProfileButton; + TQPushButton* m_saveProfileButton; + TQPushButton* m_importProfileButton; + TQPushButton* m_exportProfileButton; + TQMap m_itemToProfile; + TQMap m_profileToItem; }; } // Kontact diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp index 53419cc5..bb8d5095 100644 --- a/kontact/src/profilemanager.cpp +++ b/kontact/src/profilemanager.cpp @@ -33,11 +33,11 @@ #include #include -#include -#include -#include +#include +#include +#include -Kontact::Profile::Profile( const QString& id, bool isLocal ) : m_id( id ), m_local( isLocal ) +Kontact::Profile::Profile( const TQString& id, bool isLocal ) : m_id( id ), m_local( isLocal ) { } @@ -45,17 +45,17 @@ Kontact::Profile::Profile() : m_local( false ) { } -QString Kontact::Profile::id() const +TQString Kontact::Profile::id() const { return m_id; } -QString Kontact::Profile::name() const +TQString Kontact::Profile::name() const { return m_name; } -QString Kontact::Profile::description() const +TQString Kontact::Profile::description() const { return m_description; } @@ -65,17 +65,17 @@ bool Kontact::Profile::isNull() const return m_id.isNull(); } -void Kontact::Profile::setId( const QString& id ) +void Kontact::Profile::setId( const TQString& id ) { m_id = id; } -void Kontact::Profile::setDescription( const QString& description ) +void Kontact::Profile::setDescription( const TQString& description ) { m_description = description; } -void Kontact::Profile::setName( const QString& name ) +void Kontact::Profile::setName( const TQString& name ) { m_name = name; } @@ -96,18 +96,18 @@ bool Kontact::Profile::isLocal() const return m_local; } -void Kontact::Profile::setOriginalLocation( const QString& path ) +void Kontact::Profile::setOriginalLocation( const TQString& path ) { m_originalLocation = path; } -QString Kontact::Profile::localSaveLocation() const +TQString Kontact::Profile::localSaveLocation() const { - return m_id.isNull() ? QString() : locateLocal( "data", "kontact/profiles/" + m_id, /*create folder=*/true ); + return m_id.isNull() ? TQString() : locateLocal( "data", "kontact/profiles/" + m_id, /*create folder=*/true ); } -QString Kontact::Profile::saveLocation() const +TQString Kontact::Profile::saveLocation() const { return m_local ? localSaveLocation() : m_originalLocation; } @@ -131,7 +131,7 @@ Kontact::ProfileManager* Kontact::ProfileManager::self() return m_self; } -Kontact::ProfileManager::ProfileManager( QObject* parent ) : QObject( parent ) +Kontact::ProfileManager::ProfileManager( TQObject* parent ) : TQObject( parent ) { } @@ -142,19 +142,19 @@ Kontact::ProfileManager::~ProfileManager() void Kontact::ProfileManager::writeConfig() const { - const QValueList profiles = m_profiles.values(); - for ( QValueList::ConstIterator it = profiles.begin(), end = profiles.end(); it != end; ++it ) + const TQValueList profiles = m_profiles.values(); + for ( TQValueList::ConstIterator it = profiles.begin(), end = profiles.end(); it != end; ++it ) { writeProfileConfig( *it ); } } -Kontact::Profile Kontact::ProfileManager::readFromConfiguration( const QString& configFile, bool isLocal ) +Kontact::Profile Kontact::ProfileManager::readFromConfiguration( const TQString& configFile, bool isLocal ) { KConfig profileCfg( configFile, true /*read-only*/, false /*no KDE global*/ ); - const QString configDir = configFile.left( configFile.findRev( QDir::separator(), -1 ) ); + const TQString configDir = configFile.left( configFile.findRev( TQDir::separator(), -1 ) ); profileCfg.setGroup( "Kontact Profile" ); - const QString id = profileCfg.readEntry( "Identifier" ); + const TQString id = profileCfg.readEntry( "Identifier" ); Kontact::Profile profile( id ); profile.setName( profileCfg.readEntry( "Name" ) ); profile.setDescription( profileCfg.readEntry( "Description" ) ); @@ -166,8 +166,8 @@ Kontact::Profile Kontact::ProfileManager::readFromConfiguration( const QString& void Kontact::ProfileManager::writeProfileConfig( const Kontact::Profile& profile ) const { - const QString profileDir = profile.saveLocation(); - const QString cfgPath = profileDir + "/profile.cfg"; + const TQString profileDir = profile.saveLocation(); + const TQString cfgPath = profileDir + "/profile.cfg"; KConfig profileCfg( cfgPath, false /*read-only*/, false /*no KDE global*/ ); profileCfg.setGroup( "Kontact Profile" ); profileCfg.writeEntry( "Identifier", profile.id() ); @@ -178,14 +178,14 @@ void Kontact::ProfileManager::writeProfileConfig( const Kontact::Profile& profil void Kontact::ProfileManager::readConfig() { - const QStringList profilePaths = KGlobal::dirs()->findAllResources( "data", QString::fromLatin1( "kontact/profiles/*/profile.cfg" ) ); + const TQStringList profilePaths = KGlobal::dirs()->findAllResources( "data", TQString::fromLatin1( "kontact/profiles/*/profile.cfg" ) ); - typedef QMap ProfileMap; + typedef TQMap ProfileMap; ProfileMap profiles; ProfileMap globalProfiles; - const QString localPrefix = locateLocal( "data", "kontact/profiles/", /*createDir=*/false ); - for ( QStringList::ConstIterator it = profilePaths.begin(), end = profilePaths.end(); it != end; ++it ) + const TQString localPrefix = locateLocal( "data", "kontact/profiles/", /*createDir=*/false ); + for ( TQStringList::ConstIterator it = profilePaths.begin(), end = profilePaths.end(); it != end; ++it ) { const bool isLocal = (*it).startsWith( localPrefix ); const Kontact::Profile profile = readFromConfiguration( *it, isLocal ); @@ -209,19 +209,19 @@ void Kontact::ProfileManager::readConfig() } } -QValueList Kontact::ProfileManager::profiles() const +TQValueList Kontact::ProfileManager::profiles() const { return m_profiles.values(); } -Kontact::Profile Kontact::ProfileManager::profileById( const QString& id ) const +Kontact::Profile Kontact::ProfileManager::profileById( const TQString& id ) const { return m_profiles[id]; } void Kontact::ProfileManager::updateProfile( const Kontact::Profile& profile_ ) { - const QString id = profile_.id(); + const TQString id = profile_.id(); if ( id.isNull() || m_profiles[id] == profile_ ) return; Kontact::Profile profile( profile_ ); @@ -231,7 +231,7 @@ void Kontact::ProfileManager::updateProfile( const Kontact::Profile& profile_ ) emit profileUpdated( id ); } -void Kontact::Profile::copyConfigFiles( const QString& source_, const QString& dest_ ) +void Kontact::Profile::copyConfigFiles( const TQString& source_, const TQString& dest_ ) { const KURL source = KURL::fromPathOrURL( source_+"/*rc" ); const KURL dest = KURL::fromPathOrURL( dest_ ); @@ -239,7 +239,7 @@ void Kontact::Profile::copyConfigFiles( const QString& source_, const QString& d // TODO better check for the copy result } -void Kontact::ProfileManager::saveToProfile( const QString& id ) +void Kontact::ProfileManager::saveToProfile( const TQString& id ) { Kontact::Profile profile = profileById( id ); if ( profile.isNull() ) @@ -251,7 +251,7 @@ void Kontact::ProfileManager::saveToProfile( const QString& id ) bool Kontact::ProfileManager::addProfile( const Kontact::Profile& profile, bool syncConfig ) { - const QString id = profile.id(); + const TQString id = profile.id(); if ( m_profiles.contains( id ) ) return false; m_profiles[id] = profile; @@ -264,7 +264,7 @@ bool Kontact::ProfileManager::addProfile( const Kontact::Profile& profile, bool return true; } -void Kontact::ProfileManager::loadProfile( const QString& id ) +void Kontact::ProfileManager::loadProfile( const TQString& id ) { if ( !m_profiles.contains( id ) ) return; @@ -276,7 +276,7 @@ void Kontact::ProfileManager::removeProfile( const Kontact::Profile& profile ) removeProfile( profile.id() ); } -void Kontact::ProfileManager::removeProfile( const QString& id ) +void Kontact::ProfileManager::removeProfile( const TQString& id ) { if ( !m_profiles.contains( id ) ) return; @@ -290,17 +290,17 @@ void Kontact::ProfileManager::removeProfile( const QString& id ) emit profileRemoved( id ); } -Kontact::ProfileManager::ExportError Kontact::ProfileManager::exportProfileToDirectory( const QString& id, const QString& path ) +Kontact::ProfileManager::ExportError Kontact::ProfileManager::exportProfileToDirectory( const TQString& id, const TQString& path ) { if ( !m_profiles.contains( id ) ) return SuccessfulExport; - if ( !QDir( path ).exists() ) + if ( !TQDir( path ).exists() ) return DirectoryDoesNotExist; const Kontact::Profile profile = profileById( id ); const KURL source = KURL::fromPathOrURL( profile.saveLocation() ); - const KURL target = KURL::fromPathOrURL( path + QDir::separator() + profile.name() ); + const KURL target = KURL::fromPathOrURL( path + TQDir::separator() + profile.name() ); KIO::CopyJob* job = KIO::copy( source, target, /*showProgressInfo=*/false ); // TODO check result @@ -308,7 +308,7 @@ Kontact::ProfileManager::ExportError Kontact::ProfileManager::exportProfileToDir return SuccessfulExport; } -Kontact::ProfileManager::ImportError Kontact::ProfileManager::importProfileFromDirectory( const QString& path ) +Kontact::ProfileManager::ImportError Kontact::ProfileManager::importProfileFromDirectory( const TQString& path ) { Kontact::Profile profile = readFromConfiguration( path + "/profile.cfg", /*isLocal=*/ true ); if ( profile.isNull() ) @@ -327,11 +327,11 @@ Kontact::ProfileManager::ImportError Kontact::ProfileManager::importProfileFromD return SuccessfulImport; } -QString Kontact::ProfileManager::generateNewId() const +TQString Kontact::ProfileManager::generateNewId() const { while ( true ) { - const QString newId = KApplication::randomString( 10 ); + const TQString newId = KApplication::randomString( 10 ); if ( !m_profiles.contains( newId ) ) return newId; } diff --git a/kontact/src/profilemanager.h b/kontact/src/profilemanager.h index e8b10adb..ff6d6e1b 100644 --- a/kontact/src/profilemanager.h +++ b/kontact/src/profilemanager.h @@ -25,9 +25,9 @@ #ifndef KONTACT_PROFILEMANAGER_H #define KONTACT_PROFILEMANAGER_H -#include -#include -#include +#include +#include +#include template class QValueList; @@ -43,23 +43,23 @@ class Profile public: Profile(); - explicit Profile( const QString& id, bool isLocal = false ); + explicit Profile( const TQString& id, bool isLocal = false ); - QString id() const; + TQString id() const; - QString name() const; + TQString name() const; - QString description() const; + TQString description() const; bool isNull() const; - void setName( const QString& name ); + void setName( const TQString& name ); - void setDescription( const QString& description ); + void setDescription( const TQString& description ); bool operator==( const Kontact::Profile& other ) const; - QString saveLocation() const; + TQString saveLocation() const; private: // ProfileManager only @@ -69,21 +69,21 @@ private: // ProfileManager only }; void setLocal( SetLocalMode mode ); bool isLocal() const; - void setOriginalLocation( const QString& path ); - void setId( const QString& id ); + void setOriginalLocation( const TQString& path ); + void setId( const TQString& id ); private: - static void copyConfigFiles( const QString& source, const QString& dest ); + static void copyConfigFiles( const TQString& source, const TQString& dest ); - QString localSaveLocation() const; + TQString localSaveLocation() const; private: - QString m_id; - QString m_name; - QString m_description; + TQString m_id; + TQString m_name; + TQString m_description; bool m_local; - QString m_originalLocation; + TQString m_originalLocation; }; class ProfileManager : public QObject @@ -105,47 +105,47 @@ public: ~ProfileManager(); - Kontact::Profile profileById( const QString& id ) const; + Kontact::Profile profileById( const TQString& id ) const; bool addProfile( const Kontact::Profile& profile, bool syncConfig = true ); void removeProfile( const Kontact::Profile& profile ); - void removeProfile( const QString& id ); + void removeProfile( const TQString& id ); void updateProfile( const Kontact::Profile& profile ); - void loadProfile( const QString& id ); + void loadProfile( const TQString& id ); - void saveToProfile( const QString& id ); + void saveToProfile( const TQString& id ); - QValueList profiles() const; + TQValueList profiles() const; - ExportError exportProfileToDirectory( const QString& id, const QString& path ); + ExportError exportProfileToDirectory( const TQString& id, const TQString& path ); - ImportError importProfileFromDirectory( const QString& path ); + ImportError importProfileFromDirectory( const TQString& path ); - QString generateNewId() const; + TQString generateNewId() const; signals: - void profileAdded( const QString& id ); + void profileAdded( const TQString& id ); - void profileRemoved( const QString& id ); + void profileRemoved( const TQString& id ); - void profileUpdated( const QString& id ); + void profileUpdated( const TQString& id ); - void profileLoaded( const QString& id ); + void profileLoaded( const TQString& id ); - void saveToProfileRequested( const QString& id ); + void saveToProfileRequested( const TQString& id ); void profileImportFinished( ImportError status ); private: static ProfileManager* m_self; - static Kontact::Profile readFromConfiguration( const QString& configFile, bool isLocal ); + static Kontact::Profile readFromConfiguration( const TQString& configFile, bool isLocal ); - explicit ProfileManager( QObject* parent = 0 ); + explicit ProfileManager( TQObject* parent = 0 ); void readConfig(); @@ -154,7 +154,7 @@ private: void writeProfileConfig( const Kontact::Profile& profile ) const; private: - QMap m_profiles; + TQMap m_profiles; }; } diff --git a/kontact/src/sidepanebase.cpp b/kontact/src/sidepanebase.cpp index 78155608..28bae299 100644 --- a/kontact/src/sidepanebase.cpp +++ b/kontact/src/sidepanebase.cpp @@ -25,8 +25,8 @@ using namespace Kontact; -SidePaneBase::SidePaneBase( Core *core, QWidget *parent, const char *name ) - : QVBox( parent, name ), mCore( core ) +SidePaneBase::SidePaneBase( Core *core, TQWidget *parent, const char *name ) + : TQVBox( parent, name ), mCore( core ) { } diff --git a/kontact/src/sidepanebase.h b/kontact/src/sidepanebase.h index 95378f91..407d98de 100644 --- a/kontact/src/sidepanebase.h +++ b/kontact/src/sidepanebase.h @@ -21,7 +21,7 @@ #ifndef KONTACT_SIDEPANEBASE_H #define KONTACT_SIDEPANEBASE_H -#include +#include namespace KParts { class Part; } @@ -35,13 +35,13 @@ class SidePaneBase : public QVBox { Q_OBJECT public: - SidePaneBase( Core *core, QWidget *parent, const char *name = 0 ); + SidePaneBase( Core *core, TQWidget *parent, const char *name = 0 ); virtual ~SidePaneBase(); void setActionCollection( KActionCollection *actionCollection ); KActionCollection *actionCollection() const; - virtual const QPtrList & actions() = 0; + virtual const TQPtrList & actions() = 0; signals: void pluginSelected( Kontact::Plugin* ); @@ -63,7 +63,7 @@ class SidePaneBase : public QVBox This is an overloaded member function. It behaves essentially like the above function. */ - virtual void selectPlugin( const QString &name ) = 0; + virtual void selectPlugin( const TQString &name ) = 0; virtual void indicateForegrunding( Kontact::Plugin* ) = 0; protected: -- cgit v1.2.3