From 7346aee26bf190a7e70333c40fab4caca847cd27 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:22:56 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1157634 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../sidebar/delicious/bookmarkListItem.cpp | 16 +- konq-plugins/sidebar/delicious/bookmarkListItem.h | 16 +- konq-plugins/sidebar/delicious/mainWidget.cpp | 120 ++++----- konq-plugins/sidebar/delicious/mainWidget.h | 20 +- konq-plugins/sidebar/delicious/plugin.cpp | 28 +- konq-plugins/sidebar/delicious/plugin.h | 12 +- konq-plugins/sidebar/delicious/tagListItem.cpp | 20 +- konq-plugins/sidebar/delicious/tagListItem.h | 18 +- konq-plugins/sidebar/mediaplayer/controls.cpp | 38 +-- konq-plugins/sidebar/mediaplayer/controls.h | 34 +-- konq-plugins/sidebar/mediaplayer/engine.cpp | 10 +- konq-plugins/sidebar/mediaplayer/engine.h | 4 +- konq-plugins/sidebar/mediaplayer/mediaplayer.cpp | 12 +- konq-plugins/sidebar/mediaplayer/mediaplayer.h | 8 +- konq-plugins/sidebar/mediaplayer/mediawidget.cpp | 54 ++-- konq-plugins/sidebar/mediaplayer/mediawidget.h | 8 +- konq-plugins/sidebar/mediaplayer/player.cpp | 10 +- konq-plugins/sidebar/mediaplayer/player.h | 10 +- konq-plugins/sidebar/metabar/src/configdialog.cpp | 290 ++++++++++----------- konq-plugins/sidebar/metabar/src/configdialog.h | 38 +-- konq-plugins/sidebar/metabar/src/defaultplugin.cpp | 80 +++--- konq-plugins/sidebar/metabar/src/defaultplugin.h | 8 +- konq-plugins/sidebar/metabar/src/httpplugin.cpp | 8 +- konq-plugins/sidebar/metabar/src/metabar.cpp | 8 +- konq-plugins/sidebar/metabar/src/metabar.h | 8 +- .../sidebar/metabar/src/metabarfunctions.cpp | 24 +- .../sidebar/metabar/src/metabarfunctions.h | 10 +- konq-plugins/sidebar/metabar/src/metabarwidget.cpp | 128 ++++----- konq-plugins/sidebar/metabar/src/metabarwidget.h | 24 +- .../sidebar/metabar/src/protocolplugin.cpp | 12 +- konq-plugins/sidebar/metabar/src/serviceloader.cpp | 56 ++-- konq-plugins/sidebar/metabar/src/serviceloader.h | 18 +- .../sidebar/metabar/src/settingsplugin.cpp | 18 +- konq-plugins/sidebar/newsticker/configfeeds.cpp | 2 +- konq-plugins/sidebar/newsticker/configfeeds.h | 2 +- konq-plugins/sidebar/newsticker/norsswidget.cpp | 22 +- konq-plugins/sidebar/newsticker/norsswidget.h | 4 +- konq-plugins/sidebar/newsticker/nspanel.cpp | 48 ++-- konq-plugins/sidebar/newsticker/nspanel.h | 44 ++-- .../sidebar/newsticker/nsstacktabwidget.cpp | 110 ++++---- konq-plugins/sidebar/newsticker/nsstacktabwidget.h | 26 +- konq-plugins/sidebar/newsticker/sidebar_news.cpp | 80 +++--- konq-plugins/sidebar/newsticker/sidebar_news.h | 24 +- 43 files changed, 765 insertions(+), 765 deletions(-) (limited to 'konq-plugins/sidebar') diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp index 64e626d..5e3b0b3 100644 --- a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp +++ b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp @@ -24,18 +24,18 @@ #include #include -BookmarkListItem::BookmarkListItem( QListView *parent, const QString & url, const QString & desc, time_t time ) +BookmarkListItem::BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time ) : KListViewItem( parent ), m_desc( desc ) { m_url = KURL::fromPathOrURL( url ); m_dateTime.setTime_t( time ); } -int BookmarkListItem::compare( QListViewItem * i, int col, bool ascending ) const +int BookmarkListItem::compare( TQListViewItem * i, int col, bool ascending ) const { if ( col == 1 ) { - QDateTime them = static_cast( i )->date(); + TQDateTime them = static_cast( i )->date(); if ( m_dateTime < them ) return -1; else if ( m_dateTime > them ) @@ -43,17 +43,17 @@ int BookmarkListItem::compare( QListViewItem * i, int col, bool ascending ) cons else return 0; } - return QListViewItem::compare( i, col, ascending ); + return TQListViewItem::compare( i, col, ascending ); } -QString BookmarkListItem::text( int column ) const +TQString BookmarkListItem::text( int column ) const { if ( column == 0 ) return m_desc; else if ( column == 1 ) return KGlobal::locale()->formatDateTime( m_dateTime ); - return QString::null; + return TQString::null; } KURL BookmarkListItem::url() const @@ -61,12 +61,12 @@ KURL BookmarkListItem::url() const return m_url; } -QDateTime BookmarkListItem::date() const +TQDateTime BookmarkListItem::date() const { return m_dateTime; } -QString BookmarkListItem::desc() const +TQString BookmarkListItem::desc() const { return m_desc; } diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.h b/konq-plugins/sidebar/delicious/bookmarkListItem.h index 5e60022..392eab8 100644 --- a/konq-plugins/sidebar/delicious/bookmarkListItem.h +++ b/konq-plugins/sidebar/delicious/bookmarkListItem.h @@ -22,7 +22,7 @@ #ifndef _BOOKMARKLISTITEM_H_ #define _BOOKMARKLISTITEM_H_ -#include +#include #include #include @@ -34,18 +34,18 @@ class QString; class BookmarkListItem: public KListViewItem { public: - BookmarkListItem( QListView *parent, const QString & url, const QString & desc, time_t time ); + BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time ); KURL url() const; - QDateTime date() const; - QString desc() const; + TQDateTime date() const; + TQString desc() const; protected: - virtual int compare( QListViewItem * i, int col, bool ascending ) const; - virtual QString text( int column ) const; + virtual int compare( TQListViewItem * i, int col, bool ascending ) const; + virtual TQString text( int column ) const; KURL m_url; - QString m_desc; - QDateTime m_dateTime; + TQString m_desc; + TQDateTime m_dateTime; }; #endif diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp index 1b76c94..612be03 100644 --- a/konq-plugins/sidebar/delicious/mainWidget.cpp +++ b/konq-plugins/sidebar/delicious/mainWidget.cpp @@ -24,12 +24,12 @@ #include "tagListItem.h" #include "bookmarkListItem.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -42,7 +42,7 @@ #include #include -MainWidget::MainWidget( KConfig * config, QWidget * parent ) +MainWidget::MainWidget( KConfig * config, TQWidget * parent ) : MainWidget_base( parent ), m_config( config ) { loadTags(); @@ -53,28 +53,28 @@ MainWidget::MainWidget( KConfig * config, QWidget * parent ) btnRefreshBookmarks->setIconSet( il->loadIconSet( "reload", KIcon::Small ) ); btnNew->setIconSet( il->loadIconSet( "bookmark_add", KIcon::Small ) ); - connect( ( QWidget * ) btnRefreshTags, SIGNAL( clicked() ), - this, SLOT( slotGetTags() ) ); + connect( ( TQWidget * ) btnRefreshTags, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotGetTags() ) ); - connect( ( QWidget * ) btnRefreshBookmarks, SIGNAL( clicked() ), - this, SLOT( slotGetBookmarks() ) ); + connect( ( TQWidget * ) btnRefreshBookmarks, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotGetBookmarks() ) ); - connect( ( QWidget * ) btnNew, SIGNAL( clicked() ), - this, SLOT( slotNewBookmark() ) ); + connect( ( TQWidget * ) btnNew, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotNewBookmark() ) ); - connect( lvBookmarks, SIGNAL( executed( QListViewItem * ) ), - this, SLOT( slotBookmarkExecuted( QListViewItem * ) ) ); - connect( lvBookmarks, SIGNAL( mouseButtonClicked ( int, QListViewItem *, const QPoint &, int ) ), - this, SLOT( slotBookmarkClicked( int, QListViewItem *, const QPoint &, int ) ) ); + connect( lvBookmarks, TQT_SIGNAL( executed( TQListViewItem * ) ), + this, TQT_SLOT( slotBookmarkExecuted( TQListViewItem * ) ) ); + connect( lvBookmarks, TQT_SIGNAL( mouseButtonClicked ( int, TQListViewItem *, const TQPoint &, int ) ), + this, TQT_SLOT( slotBookmarkClicked( int, TQListViewItem *, const TQPoint &, int ) ) ); - connect( lvTags, SIGNAL( contextMenuRequested( QListViewItem *, const QPoint &, int ) ), - this, SLOT( slotTagsContextMenu( QListViewItem *, const QPoint &, int ) ) ); + connect( lvTags, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQT_SLOT( slotTagsContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); - connect( lvBookmarks, SIGNAL( contextMenuRequested( QListViewItem *, const QPoint &, int ) ), - this, SLOT( slotBookmarksContextMenu( QListViewItem *, const QPoint &, int ) ) ); + connect( lvBookmarks, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQT_SLOT( slotBookmarksContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); - m_updateTimer = new QTimer( this ); - connect( m_updateTimer, SIGNAL( timeout() ), SLOT( slotGetBookmarks() ) ); + m_updateTimer = new TQTimer( this ); + connect( m_updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotGetBookmarks() ) ); slotGetTags(); } @@ -94,8 +94,8 @@ void MainWidget::slotGetTags() kdDebug() << k_funcinfo << endl; KIO::StoredTransferJob * job = KIO::storedGet( "http://del.icio.us/api/tags/get" ); - connect( job, SIGNAL( result( KIO::Job * ) ), - this, SLOT( slotFillTags( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), + this, TQT_SLOT( slotFillTags( KIO::Job * ) ) ); } void MainWidget::slotFillTags( KIO::Job * job ) @@ -112,17 +112,17 @@ void MainWidget::slotFillTags( KIO::Job * job ) m_tags.clear(); // fill lvTags with job->data() - QDomDocument doc; + TQDomDocument doc; doc.setContent( static_cast( job )->data() ); - QDomNodeList tags = doc.elementsByTagName( "tag" ); + TQDomNodeList tags = doc.elementsByTagName( "tag" ); for ( uint i = 0; i < tags.length(); ++i ) { - QDomElement tag = tags.item( i ).toElement(); + TQDomElement tag = tags.item( i ).toElement(); if ( !tag.isNull() ) { TagListItem *item = new TagListItem( lvTags, tag.attribute( "tag" ), tag.attribute( "count" ).toInt() ); m_tags.append( tag.attribute( "tag" ) ); - connect( item, SIGNAL( signalItemChecked( TagListItem * ) ), SLOT( itemToggled() ) ); + connect( item, TQT_SIGNAL( signalItemChecked( TagListItem * ) ), TQT_SLOT( itemToggled() ) ); } } } @@ -135,8 +135,8 @@ void MainWidget::slotGetBookmarks() kdDebug() << k_funcinfo << url.url() << endl; KIO::StoredTransferJob * job = KIO::storedGet( url ); - connect( job, SIGNAL( result( KIO::Job * ) ), - this, SLOT( slotFillBookmarks( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), + this, TQT_SLOT( slotFillBookmarks( KIO::Job * ) ) ); } void MainWidget::slotFillBookmarks( KIO::Job * job ) @@ -152,13 +152,13 @@ void MainWidget::slotFillBookmarks( KIO::Job * job ) lvBookmarks->clear(); // fill lvBookmarks with job->data() - QDomDocument doc; + TQDomDocument doc; doc.setContent( static_cast( job )->data() ); - QDomNodeList posts = doc.elementsByTagName( "post" ); + TQDomNodeList posts = doc.elementsByTagName( "post" ); for ( uint i = 0; i < posts.length(); ++i ) { - QDomElement post = posts.item( i ).toElement(); + TQDomElement post = posts.item( i ).toElement(); if ( !post.isNull() ) { new BookmarkListItem( lvBookmarks, post.attribute( "href" ), post.attribute( "description" ), @@ -167,11 +167,11 @@ void MainWidget::slotFillBookmarks( KIO::Job * job ) } } -QStringList MainWidget::checkedTags() const +TQStringList MainWidget::checkedTags() const { - QListViewItemIterator it( lvTags, QListViewItemIterator::Visible | QListViewItemIterator::Checked ); + TQListViewItemIterator it( lvTags, TQListViewItemIterator::Visible | TQListViewItemIterator::Checked ); - QStringList tmp; + TQStringList tmp; while ( it.current() ) { @@ -182,7 +182,7 @@ QStringList MainWidget::checkedTags() const return tmp; } -void MainWidget::slotBookmarkExecuted( QListViewItem * item ) +void MainWidget::slotBookmarkExecuted( TQListViewItem * item ) { BookmarkListItem * bookmark = static_cast( item ); if ( bookmark ) @@ -192,7 +192,7 @@ void MainWidget::slotBookmarkExecuted( QListViewItem * item ) } } -void MainWidget::slotBookmarkClicked( int button, QListViewItem * item, const QPoint &, int ) +void MainWidget::slotBookmarkClicked( int button, TQListViewItem * item, const TQPoint &, int ) { BookmarkListItem * bookmark = static_cast( item ); if ( bookmark && button == Qt::MidButton ) // handle middle click @@ -202,16 +202,16 @@ void MainWidget::slotBookmarkClicked( int button, QListViewItem * item, const QP } } -QStringList MainWidget::tags() const +TQStringList MainWidget::tags() const { return m_tags; } -QStringList MainWidget::bookmarks() const +TQStringList MainWidget::bookmarks() const { - QListViewItemIterator it( lvBookmarks ); + TQListViewItemIterator it( lvBookmarks ); - QStringList tmp; + TQStringList tmp; while ( it.current() ) { @@ -222,30 +222,30 @@ QStringList MainWidget::bookmarks() const return tmp; } -void MainWidget::slotTagsContextMenu( QListViewItem *, const QPoint & pos, int ) +void MainWidget::slotTagsContextMenu( TQListViewItem *, const TQPoint & pos, int ) { if ( lvTags->childCount() == 0 ) return; - QPopupMenu * tagMenu = new QPopupMenu( this ); + TQPopupMenu * tagMenu = new TQPopupMenu( this ); Q_CHECK_PTR( tagMenu ); - tagMenu->insertItem( i18n( "Check All" ), this, SLOT( slotCheckAllTags() ) ); - tagMenu->insertItem( i18n( "Uncheck All" ), this, SLOT( slotUncheckAllTags() ) ); - tagMenu->insertItem( i18n( "Toggle All" ), this, SLOT( slotToggleTags() ) ); + tagMenu->insertItem( i18n( "Check All" ), this, TQT_SLOT( slotCheckAllTags() ) ); + tagMenu->insertItem( i18n( "Uncheck All" ), this, TQT_SLOT( slotUncheckAllTags() ) ); + tagMenu->insertItem( i18n( "Toggle All" ), this, TQT_SLOT( slotToggleTags() ) ); tagMenu->insertSeparator(); tagMenu->insertItem( KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small ), - i18n( "Rename Tag..." ), this, SLOT( slotRenameTag() ) ); + i18n( "Rename Tag..." ), this, TQT_SLOT( slotRenameTag() ) ); tagMenu->exec( pos ); } void MainWidget::slotCheckAllTags() { - QListViewItemIterator it( lvTags ); + TQListViewItemIterator it( lvTags ); while ( it.current() ) { - QCheckListItem * item = static_cast( *it ); + TQCheckListItem * item = static_cast( *it ); if ( item ) item->setOn( true ); ++it; @@ -254,10 +254,10 @@ void MainWidget::slotCheckAllTags() void MainWidget::slotUncheckAllTags() { - QListViewItemIterator it( lvTags ); + TQListViewItemIterator it( lvTags ); while ( it.current() ) { - QCheckListItem * item = static_cast( *it ); + TQCheckListItem * item = static_cast( *it ); if ( item ) item->setOn( false ); ++it; @@ -266,10 +266,10 @@ void MainWidget::slotUncheckAllTags() void MainWidget::slotToggleTags() { - QListViewItemIterator it( lvTags ); + TQListViewItemIterator it( lvTags ); while ( it.current() ) { - QCheckListItem * item = static_cast( *it ); + TQCheckListItem * item = static_cast( *it ); if ( item ) item->setOn( !item->isOn() ); ++it; @@ -301,8 +301,8 @@ void MainWidget::slotRenameTag() TagListItem * tag = static_cast( lvTags->currentItem() ); if ( tag ) { - QString oldName = tag->name(); - QString newName = KInputDialog::getText( i18n( "Rename Tag" ), i18n( "Provide a new name for tag '%1':" ).arg( oldName ) ); + TQString oldName = tag->name(); + TQString newName = KInputDialog::getText( i18n( "Rename Tag" ), i18n( "Provide a new name for tag '%1':" ).arg( oldName ) ); if ( !newName.isEmpty() ) { KURL url( "http://del.icio.us/api/tags/rename" ); @@ -315,16 +315,16 @@ void MainWidget::slotRenameTag() } } -void MainWidget::slotBookmarksContextMenu( QListViewItem *, const QPoint & pos, int ) +void MainWidget::slotBookmarksContextMenu( TQListViewItem *, const TQPoint & pos, int ) { if ( lvBookmarks->childCount() == 0 ) return; - QPopupMenu * menu = new QPopupMenu( this ); + TQPopupMenu * menu = new TQPopupMenu( this ); Q_CHECK_PTR( menu ); menu->insertItem( KGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small ), - i18n( "Delete Bookmark" ), this, SLOT( slotDeleteBookmark() ) ); + i18n( "Delete Bookmark" ), this, TQT_SLOT( slotDeleteBookmark() ) ); menu->exec( pos ); } diff --git a/konq-plugins/sidebar/delicious/mainWidget.h b/konq-plugins/sidebar/delicious/mainWidget.h index fdaa9ea..59be8d6 100644 --- a/konq-plugins/sidebar/delicious/mainWidget.h +++ b/konq-plugins/sidebar/delicious/mainWidget.h @@ -39,20 +39,20 @@ class MainWidget: public MainWidget_base { Q_OBJECT public: - MainWidget( KConfig * config, QWidget * parent ); + MainWidget( KConfig * config, TQWidget * parent ); ~MainWidget(); /** * @return all the tags user has * (used in the DCOP iface) */ - QStringList tags() const; + TQStringList tags() const; /** * @return all the (currently visible) bookmark (URLs) * (used in the DCOP iface) */ - QStringList bookmarks() const; + TQStringList bookmarks() const; /** * Set the internal URL to @p url @@ -92,22 +92,22 @@ private slots: /** * Handle clicking on a bookmark (KDE mode) */ - void slotBookmarkExecuted( QListViewItem * item ); + void slotBookmarkExecuted( TQListViewItem * item ); /** * Handle middle clicking a bookmark */ - void slotBookmarkClicked( int button, QListViewItem * item, const QPoint & pnt, int col ); + void slotBookmarkClicked( int button, TQListViewItem * item, const TQPoint & pnt, int col ); /** * Popup a tag context menu over @p item and position @pos */ - void slotTagsContextMenu( QListViewItem * item, const QPoint & pos, int col ); + void slotTagsContextMenu( TQListViewItem * item, const TQPoint & pos, int col ); /** * Popup a bookmark context menu over @p item and position @pos */ - void slotBookmarksContextMenu( QListViewItem * item, const QPoint & pos, int col ); + void slotBookmarksContextMenu( TQListViewItem * item, const TQPoint & pos, int col ); /** * Put a checkmark before all tags @@ -154,7 +154,7 @@ private: /** * @return list of checked tags */ - QStringList checkedTags() const; + TQStringList checkedTags() const; /** * Save the tag list to the config file @@ -166,9 +166,9 @@ private: */ void loadTags(); - QTimer *m_updateTimer; + TQTimer *m_updateTimer; KURL m_currentURL; - QStringList m_tags; + TQStringList m_tags; KConfig * m_config; }; diff --git a/konq-plugins/sidebar/delicious/plugin.cpp b/konq-plugins/sidebar/delicious/plugin.cpp index cc5759f..3ed6c09 100644 --- a/konq-plugins/sidebar/delicious/plugin.cpp +++ b/konq-plugins/sidebar/delicious/plugin.cpp @@ -21,24 +21,24 @@ #include "plugin.h" -#include +#include #include #include #include -KonqSidebarDelicious::KonqSidebarDelicious( KInstance *instance, QObject *parent, - QWidget *widgetParent, QString &desktopName_, +KonqSidebarDelicious::KonqSidebarDelicious( KInstance *instance, TQObject *parent, + TQWidget *widgetParent, TQString &desktopName_, const char* name ) : KonqSidebarPlugin( instance, parent, widgetParent, desktopName_, name ), DCOPObject( "sidebar-delicious" ) { m_widget = new MainWidget( instance->config(), widgetParent ); - connect( m_widget, SIGNAL( signalURLClicked( const KURL &, const KParts::URLArgs & ) ), - this, SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ) ); - connect( m_widget, SIGNAL( signalURLMidClicked( const KURL &, const KParts::URLArgs & ) ), - this, SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); + connect( m_widget, TQT_SIGNAL( signalURLClicked( const KURL &, const KParts::URLArgs & ) ), + this, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + connect( m_widget, TQT_SIGNAL( signalURLMidClicked( const KURL &, const KParts::URLArgs & ) ), + this, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); } KonqSidebarDelicious::~KonqSidebarDelicious() @@ -46,12 +46,12 @@ KonqSidebarDelicious::~KonqSidebarDelicious() } -void * KonqSidebarDelicious::provides( const QString & ) +void * KonqSidebarDelicious::provides( const TQString & ) { return 0; } -QWidget * KonqSidebarDelicious::getWidget() +TQWidget * KonqSidebarDelicious::getWidget() { return m_widget; } @@ -68,8 +68,8 @@ bool KonqSidebarDelicious::universalMode() extern "C" { - KDE_EXPORT void* create_konqsidebar_delicious( KInstance *instance, QObject *par, QWidget *widp, - QString &desktopname, const char *name ) + KDE_EXPORT void* create_konqsidebar_delicious( KInstance *instance, TQObject *par, TQWidget *widp, + TQString &desktopname, const char *name ) { KGlobal::locale()->insertCatalogue( "konqsidebar_delicious" ); return new KonqSidebarDelicious( instance, par, widp, desktopname, name ); @@ -78,7 +78,7 @@ extern "C" extern "C" { - KDE_EXPORT bool add_konqsidebar_delicious( QString* fn, QString* /*param*/, QMap *map ) + KDE_EXPORT bool add_konqsidebar_delicious( TQString* fn, TQString* /*param*/, TQMap *map ) { map->insert("Type", "Link"); map->insert("Icon", "konqsidebar_delicious"); @@ -90,12 +90,12 @@ extern "C" } } -QStringList KonqSidebarDelicious::tags() const +TQStringList KonqSidebarDelicious::tags() const { return m_widget->tags(); } -QStringList KonqSidebarDelicious::bookmarks() const +TQStringList KonqSidebarDelicious::bookmarks() const { return m_widget->bookmarks(); } diff --git a/konq-plugins/sidebar/delicious/plugin.h b/konq-plugins/sidebar/delicious/plugin.h index cc1479c..34d740f 100644 --- a/konq-plugins/sidebar/delicious/plugin.h +++ b/konq-plugins/sidebar/delicious/plugin.h @@ -42,18 +42,18 @@ class KonqSidebarDelicious: public KonqSidebarPlugin, DCOPObject Q_OBJECT K_DCOP public: - KonqSidebarDelicious( KInstance * instance, QObject * parent, QWidget * widgetParent, - QString & desktopName_, const char * name = 0 ); + KonqSidebarDelicious( KInstance * instance, TQObject * parent, TQWidget * widgetParent, + TQString & desktopName_, const char * name = 0 ); ~KonqSidebarDelicious(); - virtual void * provides( const QString & ); + virtual void * provides( const TQString & ); /** * @return the main widget */ - virtual QWidget * getWidget(); + virtual TQWidget * getWidget(); k_dcop: - QStringList tags() const; - QStringList bookmarks() const; + TQStringList tags() const; + TQStringList bookmarks() const; void newBookmark(); protected: diff --git a/konq-plugins/sidebar/delicious/tagListItem.cpp b/konq-plugins/sidebar/delicious/tagListItem.cpp index fcafca7..e7396a6 100644 --- a/konq-plugins/sidebar/delicious/tagListItem.cpp +++ b/konq-plugins/sidebar/delicious/tagListItem.cpp @@ -21,20 +21,20 @@ #include "tagListItem.h" -TagListItem::TagListItem( QListView * parent, const QString & tagName, int count ) - : QCheckListItem( parent, tagName, QCheckListItem::CheckBox ), m_name( tagName ), m_count( count ) +TagListItem::TagListItem( TQListView * parent, const TQString & tagName, int count ) + : TQCheckListItem( parent, tagName, TQCheckListItem::CheckBox ), m_name( tagName ), m_count( count ) { } // virtual void TagListItem::stateChange( bool state ) { - QCheckListItem::stateChange( state ); + TQCheckListItem::stateChange( state ); emit signalItemChecked( this ); } // virtual -int TagListItem::compare( QListViewItem * i, int col, bool ascending ) const +int TagListItem::compare( TQListViewItem * i, int col, bool ascending ) const { if ( col == 1 ) { @@ -46,7 +46,7 @@ int TagListItem::compare( QListViewItem * i, int col, bool ascending ) const else return 0; } - return QCheckListItem::compare( i, col, ascending ); + return TQCheckListItem::compare( i, col, ascending ); } int TagListItem::count() const @@ -55,22 +55,22 @@ int TagListItem::count() const } // virtual -QString TagListItem::text( int column ) const +TQString TagListItem::text( int column ) const { if ( column == 0 ) return m_name; else if ( column == 1 ) - return QString::number( m_count ); + return TQString::number( m_count ); else - return QString::null; + return TQString::null; } -QString TagListItem::name() const +TQString TagListItem::name() const { return m_name; } -void TagListItem::setName( const QString & name ) +void TagListItem::setName( const TQString & name ) { m_name = name; } diff --git a/konq-plugins/sidebar/delicious/tagListItem.h b/konq-plugins/sidebar/delicious/tagListItem.h index 40e4c31..fe557de 100644 --- a/konq-plugins/sidebar/delicious/tagListItem.h +++ b/konq-plugins/sidebar/delicious/tagListItem.h @@ -22,28 +22,28 @@ #ifndef _TAGLISTITEM_H_ #define _TAGLISTITEM_H_ -#include -#include +#include +#include -class TagListItem: public QObject, public QCheckListItem +class TagListItem: public TQObject, public QCheckListItem { Q_OBJECT public: - TagListItem( QListView * parent, const QString & tagName, int count = 1 ); + TagListItem( TQListView * parent, const TQString & tagName, int count = 1 ); int count() const; - QString name() const; - void setName( const QString & name ); + TQString name() const; + void setName( const TQString & name ); protected: virtual void stateChange( bool state ); - virtual int compare( QListViewItem * i, int col, bool ascending ) const; - virtual QString text( int column ) const; + virtual int compare( TQListViewItem * i, int col, bool ascending ) const; + virtual TQString text( int column ) const; signals: void signalItemChecked( TagListItem * ); private: - QString m_name; + TQString m_name; int m_count; }; diff --git a/konq-plugins/sidebar/mediaplayer/controls.cpp b/konq-plugins/sidebar/mediaplayer/controls.cpp index 76671d5..6c3be21 100644 --- a/konq-plugins/sidebar/mediaplayer/controls.cpp +++ b/konq-plugins/sidebar/mediaplayer/controls.cpp @@ -23,15 +23,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "controls.h" -L33tSlider::L33tSlider(QWidget * parent, const char * name) : - QSlider(parent,name), pressed(false) +L33tSlider::L33tSlider(TQWidget * parent, const char * name) : + TQSlider(parent,name), pressed(false) {} -L33tSlider::L33tSlider(Orientation o, QWidget * parent, const char * name) : - QSlider(o,parent,name), pressed(false) +L33tSlider::L33tSlider(Orientation o, TQWidget * parent, const char * name) : + TQSlider(o,parent,name), pressed(false) {} L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value, - Orientation o, QWidget * parent, const char * name) : - QSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) + Orientation o, TQWidget * parent, const char * name) : + TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) {} bool L33tSlider::currentlyPressed() const @@ -42,28 +42,28 @@ bool L33tSlider::currentlyPressed() const void L33tSlider::setValue(int i) { if (!pressed) - QSlider::setValue(i); + TQSlider::setValue(i); } -void L33tSlider::mousePressEvent(QMouseEvent*e) +void L33tSlider::mousePressEvent(TQMouseEvent*e) { if (e->button()!=RightButton) { pressed=true; - QSlider::mousePressEvent(e); + TQSlider::mousePressEvent(e); } } -void L33tSlider::mouseReleaseEvent(QMouseEvent*e) +void L33tSlider::mouseReleaseEvent(TQMouseEvent*e) { pressed=false; - QSlider::mouseReleaseEvent(e); + TQSlider::mouseReleaseEvent(e); emit userChanged(value()); } -void L33tSlider::wheelEvent(QWheelEvent *e) +void L33tSlider::wheelEvent(TQWheelEvent *e) { - QSlider::wheelEvent(e); + TQSlider::wheelEvent(e); int newValue = value(); if(newValue < minValue()) @@ -75,15 +75,15 @@ void L33tSlider::wheelEvent(QWheelEvent *e) emit userChanged(newValue); } -SliderAction::SliderAction(const QString& text, int accel, const QObject *receiver, - const char *member, QObject* parent, const char* name ) +SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver, + const char *member, TQObject* parent, const char* name ) : KAction( text, accel, parent, name ) { m_receiver = receiver; m_member = member; } -int SliderAction::plug( QWidget *w, int index ) +int SliderAction::plug( TQWidget *w, int index ) { if (!w->inherits("KToolBar")) return -1; @@ -97,11 +97,11 @@ int SliderAction::plug( QWidget *w, int index ) addContainer( toolBar, id ); - connect( toolBar, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) ); + connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); toolBar->setItemAutoSized( id, true ); if (w->inherits( "KToolBar" )) - connect(toolBar, SIGNAL(moved(KToolBar::BarPosition)), this, SLOT(toolbarMoved(KToolBar::BarPosition))); + connect(toolBar, TQT_SIGNAL(moved(KToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(KToolBar::BarPosition))); emit plugged(); @@ -126,7 +126,7 @@ return; */ } -void SliderAction::unplug( QWidget *w ) +void SliderAction::unplug( TQWidget *w ) { KToolBar *toolBar = (KToolBar *)w; int idx = findContainer( w ); diff --git a/konq-plugins/sidebar/mediaplayer/controls.h b/konq-plugins/sidebar/mediaplayer/controls.h index d05a977..37604eb 100644 --- a/konq-plugins/sidebar/mediaplayer/controls.h +++ b/konq-plugins/sidebar/mediaplayer/controls.h @@ -24,12 +24,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __CONTROLS_H #define __CONTROLS_H -#include +#include #include #include -#include -#include +#include +#include class QComboBox; class QLabel; @@ -42,10 +42,10 @@ class L33tSlider : public QSlider { Q_OBJECT public: - L33tSlider(QWidget * parent, const char * name=0); - L33tSlider(Orientation, QWidget * parent, const char * name=0); + L33tSlider(TQWidget * parent, const char * name=0); + L33tSlider(Orientation, TQWidget * parent, const char * name=0); L33tSlider(int minValue, int maxValue, int pageStep, int value, - Orientation, QWidget * parent, const char * name=0); + Orientation, TQWidget * parent, const char * name=0); bool currentlyPressed() const; signals: @@ -57,9 +57,9 @@ signals: public slots: virtual void setValue(int); protected: - virtual void mousePressEvent(QMouseEvent*); - virtual void mouseReleaseEvent(QMouseEvent*); - virtual void wheelEvent(QWheelEvent *e); + virtual void mousePressEvent(TQMouseEvent*); + virtual void mouseReleaseEvent(TQMouseEvent*); + virtual void wheelEvent(TQWheelEvent *e); private: bool pressed; @@ -72,11 +72,11 @@ class SliderAction : public KAction { Q_OBJECT public: - SliderAction(const QString& text, int accel, const QObject *receiver, - const char *member, QObject* parent, const char* name ); - virtual int plug( QWidget *w, int index = -1 ); - virtual void unplug( QWidget *w ); - QSlider* slider() const { return m_slider; } + SliderAction(const TQString& text, int accel, const TQObject *receiver, + const char *member, TQObject* parent, const char* name ); + virtual int plug( TQWidget *w, int index = -1 ); + virtual void unplug( TQWidget *w ); + TQSlider* slider() const { return m_slider; } signals: void plugged(); @@ -84,9 +84,9 @@ signals: public slots: void toolbarMoved(KToolBar::BarPosition pos); private: - QGuardedPtr m_slider; - QStringList m_items; - const QObject *m_receiver; + TQGuardedPtr m_slider; + TQStringList m_items; + const TQObject *m_receiver; const char *m_member; }; diff --git a/konq-plugins/sidebar/mediaplayer/engine.cpp b/konq-plugins/sidebar/mediaplayer/engine.cpp index cdb9486..e4590b6 100644 --- a/konq-plugins/sidebar/mediaplayer/engine.cpp +++ b/konq-plugins/sidebar/mediaplayer/engine.cpp @@ -33,9 +33,9 @@ extern "C" #include #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -71,8 +71,8 @@ public: KURL file; }; -Engine::Engine(QObject *parent) - : QObject(parent) +Engine::Engine(TQObject *parent) + : TQObject(parent) , d(new EnginePrivate) { } diff --git a/konq-plugins/sidebar/mediaplayer/engine.h b/konq-plugins/sidebar/mediaplayer/engine.h index 1a5638f..07e46f1 100644 --- a/konq-plugins/sidebar/mediaplayer/engine.h +++ b/konq-plugins/sidebar/mediaplayer/engine.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef _ENGINE_H #define _ENGINE_H -#include +#include #include #include #include @@ -45,7 +45,7 @@ class Engine : public QObject Q_OBJECT public: - Engine(QObject *parent=0); + Engine(TQObject *parent=0); ~Engine(); Arts::PlayObject playObject() const; diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp index ce8d1af..2de09af 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp @@ -27,7 +27,7 @@ #include #include "mediawidget.h" -KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,QObject *parent,QWidget *widgetParent, QString &desktopName_, const char* name): +KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name): KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name) { widget=new KSB_MediaWidget(widgetParent); @@ -36,11 +36,11 @@ KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,QObject *pa KonqSidebar_MediaPlayer::~KonqSidebar_MediaPlayer(){;} -void* KonqSidebar_MediaPlayer::provides(const QString &) {return 0;} +void* KonqSidebar_MediaPlayer::provides(const TQString &) {return 0;} -void KonqSidebar_MediaPlayer::emitStatusBarText (const QString &) {;} +void KonqSidebar_MediaPlayer::emitStatusBarText (const TQString &) {;} -QWidget *KonqSidebar_MediaPlayer::getWidget(){return widget;} +TQWidget *KonqSidebar_MediaPlayer::getWidget(){return widget;} void KonqSidebar_MediaPlayer::handleURL(const KURL &/*url*/) { @@ -51,7 +51,7 @@ void KonqSidebar_MediaPlayer::handleURL(const KURL &/*url*/) extern "C" { - KDE_EXPORT void* create_konqsidebar_mediaplayer(KInstance *instance,QObject *par,QWidget *widp,QString &desktopname,const char *name) + KDE_EXPORT void* create_konqsidebar_mediaplayer(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { KGlobal::locale()->insertCatalogue("konqsidebar_mediaplayer"); return new KonqSidebar_MediaPlayer(instance,par,widp,desktopname,name); @@ -60,7 +60,7 @@ extern "C" extern "C" { - KDE_EXPORT bool add_konqsidebar_mediaplayer(QString* fn, QString* /*param*/, QMap *map) + KDE_EXPORT bool add_konqsidebar_mediaplayer(TQString* fn, TQString* /*param*/, TQMap *map) { map->insert("Type","Link"); map->insert("Icon","konqsidebar_mediaplayer"); diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.h b/konq-plugins/sidebar/mediaplayer/mediaplayer.h index c563e20..0e74248 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.h +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.h @@ -28,11 +28,11 @@ class KonqSidebar_MediaPlayer: public KonqSidebarPlugin { Q_OBJECT public: - KonqSidebar_MediaPlayer(KInstance *instance,QObject *parent,QWidget *widgetParent, QString &desktopName_, const char* name=0); + KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_MediaPlayer(); - virtual void *provides(const QString &); - void emitStatusBarText (const QString &); - virtual QWidget *getWidget(); + virtual void *provides(const TQString &); + void emitStatusBarText (const TQString &); + virtual TQWidget *getWidget(); protected: virtual void handleURL(const KURL &url); private: diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp index c460c3c..ac37e9c 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp @@ -24,45 +24,45 @@ #include #include -#include -#include -#include -#include -#include -#include -#include - -KSB_MediaWidget::KSB_MediaWidget(QWidget *parent):KSB_MediaWidget_skel(parent) +#include +#include +#include +#include +#include +#include +#include + +KSB_MediaWidget::KSB_MediaWidget(TQWidget *parent):KSB_MediaWidget_skel(parent) { player = new Player(this); empty(); - QFont labelFont = time->font(); + TQFont labelFont = time->font(); labelFont.setPointSize(18); labelFont.setBold(true); time->setFont(labelFont); - connect(Play, SIGNAL(clicked()), player, SLOT(play())); - connect(Pause, SIGNAL(clicked()), player, SLOT(pause())); - connect(Stop, SIGNAL(clicked()), player, SLOT(stop())); + connect(Play, TQT_SIGNAL(clicked()), player, TQT_SLOT(play())); + connect(Pause, TQT_SIGNAL(clicked()), player, TQT_SLOT(pause())); + connect(Stop, TQT_SIGNAL(clicked()), player, TQT_SLOT(stop())); - connect(player, SIGNAL(timeout()), this, SLOT(playerTimeout())); - connect(player, SIGNAL(finished()), this, SLOT(playerFinished())); - connect(player, SIGNAL(playing()), this, SLOT(playing())); - connect(player, SIGNAL(paused()), this, SLOT(paused())); - connect(player, SIGNAL(stopped()), this, SLOT(stopped())); - connect(player, SIGNAL(empty()), this, SLOT(empty())); + connect(player, TQT_SIGNAL(timeout()), this, TQT_SLOT(playerTimeout())); + connect(player, TQT_SIGNAL(finished()), this, TQT_SLOT(playerFinished())); + connect(player, TQT_SIGNAL(playing()), this, TQT_SLOT(playing())); + connect(player, TQT_SIGNAL(paused()), this, TQT_SLOT(paused())); + connect(player, TQT_SIGNAL(stopped()), this, TQT_SLOT(stopped())); + connect(player, TQT_SIGNAL(empty()), this, TQT_SLOT(empty())); - connect(Position, SIGNAL(userChanged(int)), this, SLOT(skipToWrapper(int))); - connect(this, SIGNAL(skipTo(unsigned long)), player, SLOT(skipTo(unsigned long))); + connect(Position, TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int))); + connect(this, TQT_SIGNAL(skipTo(unsigned long)), player, TQT_SLOT(skipTo(unsigned long))); setAcceptDrops(true); pretty=""; needLengthUpdate=false; - QToolTip::add(Play,i18n("Play")); - QToolTip::add(Pause,i18n("Pause")); - QToolTip::add(Stop,i18n("Stop")); + TQToolTip::add(Play,i18n("Play")); + TQToolTip::add(Pause,i18n("Pause")); + TQToolTip::add(Stop,i18n("Stop")); } void KSB_MediaWidget::skipToWrapper(int second) @@ -70,12 +70,12 @@ void KSB_MediaWidget::skipToWrapper(int second) emit skipTo((unsigned long)(second*1000)); } -void KSB_MediaWidget::dragEnterEvent ( QDragEnterEvent * e) +void KSB_MediaWidget::dragEnterEvent ( TQDragEnterEvent * e) { e->accept(KURLDrag::canDecode(e)); } -void KSB_MediaWidget::dropEvent ( QDropEvent * e) +void KSB_MediaWidget::dropEvent ( TQDropEvent * e) { m_kuri_list.clear(); if (KURLDrag::decode(e, m_kuri_list)) @@ -101,7 +101,7 @@ void KSB_MediaWidget::playerTimeout() if (needLengthUpdate) { int counter = player->lengthString().length() - (player->lengthString().find("/")+1); - QString length=player->lengthString().right(counter); + TQString length=player->lengthString().right(counter); needLengthUpdate=false; } } diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.h b/konq-plugins/sidebar/mediaplayer/mediawidget.h index ff2137b..69fa0f2 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.h +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.h @@ -25,18 +25,18 @@ class KSB_MediaWidget: public KSB_MediaWidget_skel { Q_OBJECT public: - KSB_MediaWidget(QWidget *parent); + KSB_MediaWidget(TQWidget *parent); ~KSB_MediaWidget(){;} private: class Player *player; - QString pretty; + TQString pretty; bool needLengthUpdate; KURL::List m_kuri_list; protected: - virtual void dragEnterEvent ( QDragEnterEvent * ); - virtual void dropEvent ( QDropEvent * ); + virtual void dragEnterEvent ( TQDragEnterEvent * ); + virtual void dropEvent ( TQDropEvent * ); private slots: void playerTimeout(); diff --git a/konq-plugins/sidebar/mediaplayer/player.cpp b/konq-plugins/sidebar/mediaplayer/player.cpp index 360f8e8..741a6b6 100644 --- a/konq-plugins/sidebar/mediaplayer/player.cpp +++ b/konq-plugins/sidebar/mediaplayer/player.cpp @@ -29,14 +29,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "engine.h" #include "player.h" -Player::Player(QObject *parent) - : QObject(parent) +Player::Player(TQObject *parent) + : TQObject(parent) , position(0) , unfinished(false) { mEngine = new Engine; mLooping = false; - connect(&ticker, SIGNAL(timeout()), SLOT(tickerTimeout())); + connect(&ticker, TQT_SIGNAL(timeout()), TQT_SLOT(tickerTimeout())); ticker.start(500); stop(); } @@ -134,7 +134,7 @@ void Player::tickerTimeout() } -QString Player::lengthString(long _position) +TQString Player::lengthString(long _position) { if(_position == -1) _position = position; @@ -146,7 +146,7 @@ QString Player::lengthString(long _position) int totSeconds = totSecs % 60; int totMinutes = (totSecs - totSeconds) / 60; - QString result; + TQString result; result.sprintf("%.2d:%.2d/%.2d:%.2d", posMinutes, posSeconds, totMinutes, totSeconds); return result; } diff --git a/konq-plugins/sidebar/mediaplayer/player.h b/konq-plugins/sidebar/mediaplayer/player.h index 6acf146..c262ab6 100644 --- a/konq-plugins/sidebar/mediaplayer/player.h +++ b/konq-plugins/sidebar/mediaplayer/player.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef PLAYER_H #define PLAYER_H -#include -#include +#include +#include #include class Engine; @@ -39,7 +39,7 @@ Q_OBJECT friend class KaboodlePart; public: - Player(QObject *parent = 0); + Player(TQObject *parent = 0); ~Player(); /** @@ -47,7 +47,7 @@ public: * be used in the UI: * CC:CC/LL:LL (mm:ss) **/ - QString lengthString(long _position = -1); + TQString lengthString(long _position = -1); bool looping(void) const { return mLooping; } @@ -166,7 +166,7 @@ protected: private: Engine *mEngine; - QTimer ticker; + TQTimer ticker; long position; bool mLooping; unsigned long mLength; diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp index 13e1e27..047437e 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.cpp +++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp @@ -19,16 +19,16 @@ ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -44,19 +44,19 @@ #include "configdialog.h" -LinkEntry::LinkEntry(QString name, QString url, QString icon){ +LinkEntry::LinkEntry(TQString name, TQString url, TQString icon){ LinkEntry::name = name; LinkEntry::url = url; LinkEntry::icon = icon; } -ActionListItem::ActionListItem(QListBox *listbox, const QString &action, const QString &text, const QPixmap &pixmap) : QListBoxPixmap(listbox, pixmap) +ActionListItem::ActionListItem(TQListBox *listbox, const TQString &action, const TQString &text, const TQPixmap &pixmap) : TQListBoxPixmap(listbox, pixmap) { setAction(action); setText(text); } -ConfigDialog::ConfigDialog(QWidget *parent, const char *name) : QDialog(parent, name) +ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent, name) { topWidgetName = parent->topLevelWidget()->name(); config = new KConfig("metabarrc"); @@ -66,21 +66,21 @@ ConfigDialog::ConfigDialog(QWidget *parent, const char *name) : QDialog(parent, setIcon(SmallIcon("metabar")); ok = new KPushButton(KStdGuiItem::ok(), this); - connect(ok, SIGNAL(clicked()), this, SLOT(accept())); + connect(ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); cancel = new KPushButton(KStdGuiItem::cancel(), this); - connect(cancel, SIGNAL(clicked()), this, SLOT(reject())); + connect(cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); - QTabWidget *tab = new QTabWidget(this); + TQTabWidget *tab = new TQTabWidget(this); //general page config->setGroup("General"); - QWidget *general = new QWidget; + TQWidget *general = new QWidget; - QGroupBox *entries_group = new QGroupBox(2, Qt::Horizontal, i18n("Items"), general); - entries_group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + TQGroupBox *entries_group = new TQGroupBox(2, Qt::Horizontal, i18n("Items"), general); + entries_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); - QLabel *entries_label = new QLabel(i18n("Open with:"), entries_group); + TQLabel *entries_label = new TQLabel(i18n("Open with:"), entries_group); max_entries = new KIntSpinBox(entries_group); max_entries->setMinValue(1); max_entries->setMaxValue(99); @@ -88,7 +88,7 @@ ConfigDialog::ConfigDialog(QWidget *parent, const char *name) : QDialog(parent, max_entries->setValue(config->readNumEntry("MaxEntries", 3)); entries_label->setBuddy(max_entries); - QLabel *actions_label = new QLabel(i18n("Actions:"), entries_group); + TQLabel *actions_label = new TQLabel(i18n("Actions:"), entries_group); max_actions = new KIntSpinBox(entries_group); max_actions->setMinValue(1); max_actions->setMaxValue(99); @@ -97,62 +97,62 @@ ConfigDialog::ConfigDialog(QWidget *parent, const char *name) : QDialog(parent, actions_label->setBuddy(max_actions); - QGroupBox *appearance_group = new QGroupBox(1, Qt::Horizontal, i18n("Appearance"), general); - appearance_group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + TQGroupBox *appearance_group = new TQGroupBox(1, Qt::Horizontal, i18n("Appearance"), general); + appearance_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); - animate = new QCheckBox(i18n("Animate resize"), appearance_group); + animate = new TQCheckBox(i18n("Animate resize"), appearance_group); animate->setChecked(config->readBoolEntry("AnimateResize", false)); - servicemenus = new QCheckBox(i18n("Show service menus"), appearance_group); + servicemenus = new TQCheckBox(i18n("Show service menus"), appearance_group); servicemenus->setChecked(config->readBoolEntry("ShowServicemenus", true)); - showframe = new QCheckBox(i18n("Show frame"), appearance_group); + showframe = new TQCheckBox(i18n("Show frame"), appearance_group); showframe->setChecked(config->readBoolEntry("ShowFrame", true)); - QGroupBox *theme_group = new QGroupBox(2, Qt::Horizontal, i18n("Themes"), general); - theme_group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + TQGroupBox *theme_group = new TQGroupBox(2, Qt::Horizontal, i18n("Themes"), general); + theme_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); themes = new KComboBox(theme_group); - themes->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + themes->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); install_theme = new KPushButton(i18n("Install New Theme..."), theme_group); - install_theme->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); - connect(install_theme, SIGNAL(clicked()), this, SLOT(installTheme())); + install_theme->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); + connect(install_theme, TQT_SIGNAL(clicked()), this, TQT_SLOT(installTheme())); loadThemes(); //link page - QWidget *links = new QWidget; + TQWidget *links = new QWidget; link_create = new KPushButton(i18n("New..."), links); - connect(link_create, SIGNAL(clicked()), this, SLOT(createLink())); + connect(link_create, TQT_SIGNAL(clicked()), this, TQT_SLOT(createLink())); link_delete = new KPushButton(i18n("Delete"), links); - connect(link_delete, SIGNAL(clicked()), this, SLOT(deleteLink())); + connect(link_delete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteLink())); link_edit = new KPushButton(i18n("Edit..."), links); - connect(link_edit, SIGNAL(clicked()), this, SLOT(editLink())); + connect(link_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(editLink())); link_up = new KPushButton(links); link_up->setIconSet(SmallIconSet("up")); link_up->setEnabled(false); - connect(link_up, SIGNAL(clicked()), this, SLOT(moveLinkUp())); + connect(link_up, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkUp())); link_down = new KPushButton(links); link_down->setIconSet(SmallIconSet("down")); link_down->setEnabled(false); - connect(link_down, SIGNAL(clicked()), this, SLOT(moveLinkDown())); + connect(link_down, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkDown())); link_list = new KListView(links); - link_list->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + link_list->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); link_list->setSorting(-1); link_list->setItemsMovable(TRUE); link_list->addColumn(i18n("Name")); link_list->addColumn(i18n("Address")); - connect(link_list, SIGNAL(doubleClicked(QListViewItem*)), this, SLOT(editLink(QListViewItem*))); - connect(link_list, SIGNAL(selectionChanged()), SLOT(updateArrows())); + connect(link_list, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(editLink(TQListViewItem*))); + connect(link_list, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateArrows())); - QWidget *actionPage = new QWidget; + TQWidget *actionPage = new QWidget; actionSelector = new KActionSelector(actionPage); loadAvailableActions(); @@ -162,81 +162,81 @@ ConfigDialog::ConfigDialog(QWidget *parent, const char *name) : QDialog(parent, tab->addTab(links, i18n("Links")); //layout - QGridLayout *general_layout = new QGridLayout(general, 2, 2, 5, 5); + TQGridLayout *general_layout = new TQGridLayout(general, 2, 2, 5, 5); general_layout->addWidget(entries_group, 0, 0); general_layout->addWidget(appearance_group, 0, 1); general_layout->addMultiCellWidget(theme_group, 1, 1, 0, 1); - general_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding), 2, 0); - //general_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding), 0, 2); + general_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding), 2, 0); + //general_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding), 0, 2); - QVBoxLayout *link_button_layout = new QVBoxLayout(0, 0, 5); + TQVBoxLayout *link_button_layout = new TQVBoxLayout(0, 0, 5); link_button_layout->addWidget(link_create); link_button_layout->addWidget(link_edit); link_button_layout->addWidget(link_delete); - link_button_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding)); + link_button_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); link_button_layout->addWidget(link_up); link_button_layout->addWidget(link_down); - QHBoxLayout *link_layout = new QHBoxLayout(links, 5, 5); + TQHBoxLayout *link_layout = new TQHBoxLayout(links, 5, 5); link_layout->addWidget(link_list); link_layout->addLayout(link_button_layout); - QHBoxLayout *action_layout = new QHBoxLayout(actionPage, 5, 5); + TQHBoxLayout *action_layout = new TQHBoxLayout(actionPage, 5, 5); action_layout->addWidget(actionSelector); - QHBoxLayout *bottom_layout = new QHBoxLayout(0, 5, 5); - bottom_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum)); + TQHBoxLayout *bottom_layout = new TQHBoxLayout(0, 5, 5); + bottom_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); bottom_layout->addWidget(ok); bottom_layout->addWidget(cancel); - QVBoxLayout *main_layout = new QVBoxLayout(this, 5, 5); + TQVBoxLayout *main_layout = new TQVBoxLayout(this, 5, 5); main_layout->addWidget(tab); main_layout->addLayout(bottom_layout); //load config config->setGroup("General"); - QStringList _links = config->readListEntry("Links"); + TQStringList _links = config->readListEntry("Links"); - for(QStringList::Iterator it = _links.begin(); it != _links.end(); ++it){ + for(TQStringList::Iterator it = _links.begin(); it != _links.end(); ++it){ config->setGroup("Link_" + (*it)); - QString icon_str = config->readEntry("Icon", "folder"); - QPixmap icon(icon_str); + TQString icon_str = config->readEntry("Icon", "folder"); + TQPixmap icon(icon_str); if(icon.isNull()){ icon = SmallIcon(icon_str); } - QListViewItem *item = new QListViewItem(link_list, link_list->lastItem(), config->readEntry("Name"), config->readEntry("URL")); + TQListViewItem *item = new TQListViewItem(link_list, link_list->lastItem(), config->readEntry("Name"), config->readEntry("URL")); item->setPixmap(0, icon); linkList.insert(item, new LinkEntry(config->readEntry("Name"), config->readEntry("URL"), icon_str)); } config->setGroup("General"); - QStringList actions = config->readListEntry("Actions"); - for(QStringList::Iterator it = actions.begin(); it != actions.end(); ++it){ + TQStringList actions = config->readListEntry("Actions"); + for(TQStringList::Iterator it = actions.begin(); it != actions.end(); ++it){ if((*it).startsWith("metabar/")){ if((*it).right((*it).length() - 8) == "share"){ - QString text = i18n("Share"); + TQString text = i18n("Share"); ActionListItem *item = new ActionListItem(actionSelector->selectedListBox(), *it, text, SmallIcon("network")); - QListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, Qt::ExactMatch); + TQListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, Qt::ExactMatch); if(avItem){ delete avItem; } } } else{ - DCOPRef action(kapp->dcopClient()->appId(), QCString(topWidgetName).append("/action/").append((*it).utf8())); + DCOPRef action(kapp->dcopClient()->appId(), TQCString(topWidgetName).append("/action/").append((*it).utf8())); - QString text = action.call("plainText()"); - QString icon = iconConfig->readEntry(*it, action.call("icon()")); + TQString text = action.call("plainText()"); + TQString icon = iconConfig->readEntry(*it, action.call("icon()")); - ActionListItem *item = new ActionListItem(actionSelector->selectedListBox(), QString(*it), text, SmallIcon(icon)); + ActionListItem *item = new ActionListItem(actionSelector->selectedListBox(), TQString(*it), text, SmallIcon(icon)); - QListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, Qt::ExactMatch); + TQListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, Qt::ExactMatch); if(avItem){ delete avItem; } @@ -254,17 +254,17 @@ ConfigDialog::~ConfigDialog() void ConfigDialog::accept() { - QStringList groups = config->groupList(); - for(QStringList::Iterator it = groups.begin(); it != groups.end(); ++it){ + TQStringList groups = config->groupList(); + for(TQStringList::Iterator it = groups.begin(); it != groups.end(); ++it){ if((*it).startsWith("Link_")){ config->deleteGroup(*it); } } - QStringList links; - QPtrDictIterator it(linkList); + TQStringList links; + TQPtrDictIterator it(linkList); - QListViewItem *item = link_list->firstChild(); + TQListViewItem *item = link_list->firstChild(); while(item) { LinkEntry *entry = linkList[item]; config->setGroup("Link_" + entry->name); @@ -277,8 +277,8 @@ void ConfigDialog::accept() item = item->nextSibling(); } - QStringList actions; - QListBox *box = actionSelector->selectedListBox(); + TQStringList actions; + TQListBox *box = actionSelector->selectedListBox(); for(int i = 0; i < box->numRows(); i++){ ActionListItem *item = static_cast(box->item(i)); @@ -301,65 +301,65 @@ void ConfigDialog::accept() config->sync(); - QDialog::accept(); + TQDialog::accept(); } void ConfigDialog::createLink() { - QDialog *main = new QDialog(this); + TQDialog *main = new TQDialog(this); main->setCaption(i18n("Create Link")); main->setIcon(SmallIcon("metabar")); KPushButton *ok = new KPushButton(KStdGuiItem::ok(), main); - connect(ok, SIGNAL(clicked()), main, SLOT(accept())); + connect(ok, TQT_SIGNAL(clicked()), main, TQT_SLOT(accept())); KPushButton *cancel = new KPushButton(KStdGuiItem::cancel(), main); - connect(cancel, SIGNAL(clicked()), main, SLOT(reject())); + connect(cancel, TQT_SIGNAL(clicked()), main, TQT_SLOT(reject())); - QLineEdit *name = new QLineEdit(i18n("New link"), main); - QLineEdit *url = new QLineEdit("file:/", main); + TQLineEdit *name = new TQLineEdit(i18n("New link"), main); + TQLineEdit *url = new TQLineEdit("file:/", main); KIconButton *icon = new KIconButton(main); - icon->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); + icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); icon->setIconType(KIcon::Small, KIcon::Any); icon->setStrictIconSize(true); icon->setIcon("folder"); - QHBoxLayout *bottom_layout = new QHBoxLayout(0, 0, 5); - bottom_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum)); + TQHBoxLayout *bottom_layout = new TQHBoxLayout(0, 0, 5); + bottom_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); bottom_layout->addWidget(ok); bottom_layout->addWidget(cancel); - QGridLayout *layout = new QGridLayout(0, 2, 3, 0, 5); + TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5); layout->addMultiCellWidget(icon, 0, 1, 0, 0); - layout->addWidget(new QLabel(i18n("Name:"), main), 0, 1); + layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1); layout->addWidget(name, 0, 2); - layout->addWidget(new QLabel(i18n("URL:"), main), 1, 1); + layout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1); layout->addWidget(url, 1, 2); - QVBoxLayout *main_layout = new QVBoxLayout(main, 5, 5); + TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5); main_layout->addLayout(layout); - main_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding)); + main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); main_layout->addLayout(bottom_layout); main->resize(300, main->sizeHint().height()); - if(main->exec() == QDialog::Accepted){ - QString name_str = name->text(); - QString url_str = url->text(); - QString icon_str = icon->icon(); + if(main->exec() == TQDialog::Accepted){ + TQString name_str = name->text(); + TQString url_str = url->text(); + TQString icon_str = icon->icon(); if(!name_str.isEmpty() && !url_str.isEmpty()){ if(icon_str.isEmpty()){ icon_str = kapp->iconLoader()->iconPath("folder", KIcon::Small); } - QPixmap icon(icon_str); + TQPixmap icon(icon_str); if(icon.isNull()){ icon = SmallIcon(icon_str); } - QListViewItem *item = new QListViewItem(link_list, link_list->lastItem(), name_str, url_str); + TQListViewItem *item = new TQListViewItem(link_list, link_list->lastItem(), name_str, url_str); item->setPixmap(0, icon); linkList.insert(item, new LinkEntry(name_str, url_str, icon_str)); @@ -372,7 +372,7 @@ void ConfigDialog::createLink() void ConfigDialog::deleteLink() { - QListViewItem *item = link_list->selectedItem(); + TQListViewItem *item = link_list->selectedItem(); if(item){ linkList.remove(item); delete item; @@ -382,62 +382,62 @@ void ConfigDialog::deleteLink() void ConfigDialog::editLink() { - QListViewItem *item = link_list->selectedItem(); + TQListViewItem *item = link_list->selectedItem(); editLink(item); } -void ConfigDialog::editLink(QListViewItem *item) +void ConfigDialog::editLink(TQListViewItem *item) { if(item){ - QDialog *main = new QDialog(this); + TQDialog *main = new TQDialog(this); main->setCaption(i18n("Edit Link")); main->setIcon(SmallIcon("metabar")); KPushButton *ok = new KPushButton(KStdGuiItem::ok(), main); - connect(ok, SIGNAL(clicked()), main, SLOT(accept())); + connect(ok, TQT_SIGNAL(clicked()), main, TQT_SLOT(accept())); KPushButton *cancel = new KPushButton(KStdGuiItem::cancel(), main); - connect(cancel, SIGNAL(clicked()), main, SLOT(reject())); + connect(cancel, TQT_SIGNAL(clicked()), main, TQT_SLOT(reject())); - QLineEdit *name = new QLineEdit(linkList[item]->name, main); - QLineEdit *url = new QLineEdit(linkList[item]->url, main); + TQLineEdit *name = new TQLineEdit(linkList[item]->name, main); + TQLineEdit *url = new TQLineEdit(linkList[item]->url, main); KIconButton *icon = new KIconButton(main); - icon->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); + icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); icon->setIconType(KIcon::Small, KIcon::Any); icon->setStrictIconSize(true); icon->setIcon(linkList[item]->icon); - QHBoxLayout *bottom_layout = new QHBoxLayout(0, 0, 5); - bottom_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum)); + TQHBoxLayout *bottom_layout = new TQHBoxLayout(0, 0, 5); + bottom_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); bottom_layout->addWidget(ok); bottom_layout->addWidget(cancel); - QGridLayout *layout = new QGridLayout(0, 2, 3, 0, 5); + TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5); layout->addMultiCellWidget(icon, 0, 1, 0, 0); - layout->addWidget(new QLabel(i18n("Name:"), main), 0, 1); + layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1); layout->addWidget(name, 0, 2); - layout->addWidget(new QLabel(i18n("URL:"), main), 1, 1); + layout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1); layout->addWidget(url, 1, 2); - QVBoxLayout *main_layout = new QVBoxLayout(main, 5, 5); + TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5); main_layout->addLayout(layout); - main_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding)); + main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); main_layout->addLayout(bottom_layout); main->resize(300, main->sizeHint().height()); - if(main->exec() == QDialog::Accepted){ - QString name_str = name->text(); - QString url_str = url->text(); - QString icon_str = icon->icon(); + if(main->exec() == TQDialog::Accepted){ + TQString name_str = name->text(); + TQString url_str = url->text(); + TQString icon_str = icon->icon(); if(!name_str.isEmpty() && !url_str.isEmpty()){ if(icon_str.isEmpty()){ icon_str = kapp->iconLoader()->iconPath("folder", KIcon::Small); } - QPixmap icon(icon_str); + TQPixmap icon(icon_str); if(icon.isNull()){ icon = SmallIcon(icon_str); } @@ -458,21 +458,21 @@ void ConfigDialog::editLink(QListViewItem *item) void ConfigDialog::moveLinkUp() { - QListViewItem *item = link_list->selectedItem(); + TQListViewItem *item = link_list->selectedItem(); if(item){ if(link_list->itemIndex(item) > 0){ - QListViewItem *after; - QListViewItem *above = item->itemAbove(); + TQListViewItem *after; + TQListViewItem *above = item->itemAbove(); if(above){ after = above->itemAbove(); } - QString name = linkList[item]->name; - QString url = linkList[item]->url; - QString icon_str = linkList[item]->icon; + TQString name = linkList[item]->name; + TQString url = linkList[item]->url; + TQString icon_str = linkList[item]->icon; - QPixmap icon(icon_str); + TQPixmap icon(icon_str); if(icon.isNull()){ icon = SmallIcon(icon_str); } @@ -481,7 +481,7 @@ void ConfigDialog::moveLinkUp() linkList.remove(item); delete item; - QListViewItem *newItem = new QListViewItem(link_list, after, name, url); + TQListViewItem *newItem = new TQListViewItem(link_list, after, name, url); newItem->setPixmap(0, icon); link_list->setSelected(newItem, TRUE); @@ -493,17 +493,17 @@ void ConfigDialog::moveLinkUp() void ConfigDialog::moveLinkDown() { - QListViewItem *item = link_list->selectedItem(); + TQListViewItem *item = link_list->selectedItem(); if(item){ if(link_list->itemIndex(item) < linkList.count() - 1){ - QListViewItem *after = item->itemBelow(); + TQListViewItem *after = item->itemBelow(); - QString name = linkList[item]->name; - QString url = linkList[item]->url; - QString icon_str = linkList[item]->icon; + TQString name = linkList[item]->name; + TQString url = linkList[item]->url; + TQString icon_str = linkList[item]->icon; - QPixmap icon(icon_str); + TQPixmap icon(icon_str); if(icon.isNull()){ icon = SmallIcon(icon_str); } @@ -512,7 +512,7 @@ void ConfigDialog::moveLinkDown() linkList.remove(item); delete item; - QListViewItem *newItem = new QListViewItem(link_list, after, name, url); + TQListViewItem *newItem = new TQListViewItem(link_list, after, name, url); newItem->setPixmap(0, icon); link_list->setSelected(newItem, TRUE); @@ -524,29 +524,29 @@ void ConfigDialog::moveLinkDown() void ConfigDialog::loadAvailableActions() { - QListBox *box = actionSelector->availableListBox(); + TQListBox *box = actionSelector->availableListBox(); - QByteArray data, replyData; - QCString replyType; + TQByteArray data, replyData; + TQCString replyType; if(DCOPClient::mainClient()->call(kapp->dcopClient()->appId(), topWidgetName, "actionMap()", data, replyType, replyData)){ - if(replyType == "QMap"){ - QMap actionMap; + if(replyType == "TQMap"){ + TQMap actionMap; - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); reply >> actionMap; iconConfig->setGroup("Icons"); - QMap::Iterator it; + TQMap::Iterator it; for(it = actionMap.begin(); it != actionMap.end(); ++it){ DCOPRef action = it.data(); - QString text = action.call("plainText()"); - QCString cname = action.call("name()"); - QString icon = iconConfig->readEntry(QString(cname), action.call("icon()")); + TQString text = action.call("plainText()"); + TQCString cname = action.call("name()"); + TQString icon = iconConfig->readEntry(TQString(cname), action.call("icon()")); - ActionListItem *item = new ActionListItem(box, QString(cname), text, SmallIcon(icon)); + ActionListItem *item = new ActionListItem(box, TQString(cname), text, SmallIcon(icon)); } } } @@ -565,12 +565,12 @@ void ConfigDialog::loadThemes() { themes->clear(); - QString theme = config->readEntry("Theme", "default"); + TQString theme = config->readEntry("Theme", "default"); bool foundTheme = false; - QStringList dirs = kapp->dirs()->findDirs("data", "metabar/themes"); - for(QStringList::Iterator it = dirs.begin(); it != dirs.end(); ++it){ - QStringList theme_list = QDir(*it).entryList(QDir::Dirs); + TQStringList dirs = kapp->dirs()->findDirs("data", "metabar/themes"); + for(TQStringList::Iterator it = dirs.begin(); it != dirs.end(); ++it){ + TQStringList theme_list = TQDir(*it).entryList(TQDir::Dirs); theme_list.remove("."); theme_list.remove(".."); @@ -591,10 +591,10 @@ void ConfigDialog::loadThemes() void ConfigDialog::installTheme() { - QString file = KFileDialog::getOpenFileName(); + TQString file = KFileDialog::getOpenFileName(); if(file.isNull() && file.isEmpty()) return; - QString themedir = locateLocal("data", "metabar/themes"); + TQString themedir = locateLocal("data", "metabar/themes"); if(themedir.isNull()) return; KTar archive(file); diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h index 4153054..94f5fee 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.h +++ b/konq-plugins/sidebar/metabar/src/configdialog.h @@ -20,26 +20,26 @@ #ifndef _CONFIGDIALOG_H_ #define _CONFIGDIALOG_H_ -#include +#include #include #include #include #include -#include -#include +#include +#include #include -#include +#include #include class LinkEntry{ public: - LinkEntry(QString name, QString url, QString icon); + LinkEntry(TQString name, TQString url, TQString icon); ~LinkEntry(){} - QString name; - QString url; - QString icon; + TQString name; + TQString url; + TQString icon; }; class ConfigDialog : public QDialog @@ -47,7 +47,7 @@ class ConfigDialog : public QDialog Q_OBJECT public: - ConfigDialog(QWidget *parent = 0, const char *name = 0); + ConfigDialog(TQWidget *parent = 0, const char *name = 0); ~ConfigDialog(); protected: @@ -65,19 +65,19 @@ class ConfigDialog : public QDialog KIntSpinBox *max_entries; KIntSpinBox *max_actions; - QCheckBox *animate; - QCheckBox *servicemenus; - QCheckBox *showframe; + TQCheckBox *animate; + TQCheckBox *servicemenus; + TQCheckBox *showframe; KListView *link_list; KComboBox *themes; - QCString topWidgetName; + TQCString topWidgetName; KActionSelector *actionSelector; - QPtrDict linkList; + TQPtrDict linkList; KConfig *config; KConfig *iconConfig; @@ -87,7 +87,7 @@ class ConfigDialog : public QDialog void createLink(); void deleteLink(); void editLink(); - void editLink(QListViewItem *item); + void editLink(TQListViewItem *item); void moveLinkUp(); void moveLinkDown(); void updateArrows(); @@ -101,14 +101,14 @@ class ConfigDialog : public QDialog class ActionListItem : public QListBoxPixmap { public: - ActionListItem(QListBox *listbox, const QString &action, const QString &text, const QPixmap &pixmap); + ActionListItem(TQListBox *listbox, const TQString &action, const TQString &text, const TQPixmap &pixmap); ~ActionListItem(){} - const QString action() { return act; } - void setAction(const QString act){ ActionListItem::act = act; } + const TQString action() { return act; } + void setAction(const TQString act){ ActionListItem::act = act; } private: - QString act; + TQString act; }; #endif diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp index d6c44c1..6c3982e 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp @@ -41,11 +41,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -92,26 +92,26 @@ void DefaultPlugin::loadActions(DOM::HTMLElement node) DOM::DOMString innerHTML; - QStringList actions = config.readListEntry("Actions"); + TQStringList actions = config.readListEntry("Actions"); int maxActions = config.readNumEntry("MaxActions", 5); int actionCount = 0; - for(QStringList::Iterator it = actions.begin(); it != actions.end(); ++it){ + for(TQStringList::Iterator it = actions.begin(); it != actions.end(); ++it){ if((*it).startsWith("metabar/")){ if((*it).right((*it).length() - 8) == "share"){ - MetabarWidget::addEntry(innerHTML, i18n("Share"), "action://" + *it, "network", QString::null, actionCount < maxActions ? QString::null : QString("hiddenaction"), actionCount >= maxActions); + MetabarWidget::addEntry(innerHTML, i18n("Share"), "action://" + *it, "network", TQString::null, actionCount < maxActions ? TQString::null : TQString("hiddenaction"), actionCount >= maxActions); actionCount++; } } else{ - DCOPRef action(kapp->dcopClient()->appId(), QCString(m_html->view()->topLevelWidget()->name()).append("/action/").append((*it).utf8())); + DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->topLevelWidget()->name()).append("/action/").append((*it).utf8())); if(!action.isNull()){ if(action.call("enabled()")){ - QString text = action.call("plainText()"); - QString icon = iconConfig.readEntry(*it, action.call("icon()")); + TQString text = action.call("plainText()"); + TQString icon = iconConfig.readEntry(*it, action.call("icon()")); - MetabarWidget::addEntry(innerHTML, text, "action://" + *it, icon, QString::null, actionCount < maxActions ? QString::null : QString("hiddenaction"), actionCount >= maxActions); + MetabarWidget::addEntry(innerHTML, text, "action://" + *it, icon, TQString::null, actionCount < maxActions ? TQString::null : TQString("hiddenaction"), actionCount >= maxActions); actionCount++; } } @@ -142,7 +142,7 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node) KFileItem *item = m_items.getFirst(); KURL url = item->url(); - QDir dir(url.path()); + TQDir dir(url.path()); dir = dir.canonicalPath(); if(item->isDir() || dir.isRoot()){ @@ -180,11 +180,11 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node) KTrader::OfferList::ConstIterator it = offers.begin(); for(; it != offers.end(); it++){ - QString nam; + TQString nam; nam.setNum(id); bool hide = id >= max; - MetabarWidget::addEntry(innerHTML, (*it)->name(), "exec://" + nam, (*it)->icon(), QString::null, hide ? QString("hiddenapp") : QString::null, hide); + MetabarWidget::addEntry(innerHTML, (*it)->name(), "exec://" + nam, (*it)->icon(), TQString::null, hide ? TQString("hiddenapp") : TQString::null, hide); runMap.insert(id, *it); id++; @@ -241,21 +241,21 @@ void DefaultPlugin::loadInformation(DOM::HTMLElement node) if(!item->isDir()){ const KFileMetaInfo &metaInfo = item->metaInfo(); if(metaInfo.isValid()){ - QStringList groups = metaInfo.supportedGroups(); + TQStringList groups = metaInfo.supportedGroups(); int id = 0; - QString nam; + TQString nam; - for(QStringList::ConstIterator it = groups.begin(); it != groups.end(); ++it){ + for(TQStringList::ConstIterator it = groups.begin(); it != groups.end(); ++it){ KFileMetaInfoGroup group = metaInfo.group(*it); if(group.isValid()){ nam.setNum(id); innerHTML += ""; - QStringList keys = group.supportedKeys(); + TQStringList keys = group.supportedKeys(); - for(QStringList::ConstIterator it = keys.begin(); it != keys.end(); ++it){ + for(TQStringList::ConstIterator it = keys.begin(); it != keys.end(); ++it){ const KFileMetaInfoItem metaInfoItem = group.item(*it); if(metaInfoItem.isValid()){ @@ -294,11 +294,11 @@ void DefaultPlugin::loadInformation(DOM::HTMLElement node) innerHTML += "
    " + i18n("Size") + ": "; innerHTML += KIO::convertSize(size); innerHTML += "
    " + i18n("Files") + ": "; - innerHTML += QString().setNum(files); + innerHTML += TQString().setNum(files); innerHTML += "
    " + i18n("Folders") + ": "; - innerHTML += QString().setNum(dirs); + innerHTML += TQString().setNum(dirs); innerHTML += "
    " + i18n("Total Entries") + ": "; - innerHTML += QString().setNum(m_items.count()); + innerHTML += TQString().setNum(m_items.count()); innerHTML += "
"; node.setInnerHTML(innerHTML); } @@ -311,7 +311,7 @@ void DefaultPlugin::loadPreview(DOM::HTMLElement node) KFileItem *item = m_items.getFirst(); KURL url = item->url(); - QDir dir(url.path()); + TQDir dir(url.path()); dir = dir.canonicalPath(); if(item->isDir() || dir.isRoot()){ @@ -336,9 +336,9 @@ void DefaultPlugin::loadPreview(DOM::HTMLElement node) preview_job = KIO::filePreview(KURL::List(url), m_html->view()->width() - 30); - connect(preview_job, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)), this, SLOT(slotSetPreview(const KFileItem*, const QPixmap&))); - connect(preview_job, SIGNAL(failed(const KFileItem *)), this, SLOT(slotPreviewFailed(const KFileItem *))); - connect(preview_job, SIGNAL(result(KIO::Job *)), this, SLOT(slotJobFinished(KIO::Job *))); + connect(preview_job, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQT_SLOT(slotSetPreview(const KFileItem*, const TQPixmap&))); + connect(preview_job, TQT_SIGNAL(failed(const KFileItem *)), this, TQT_SLOT(slotPreviewFailed(const KFileItem *))); + connect(preview_job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobFinished(KIO::Job *))); } m_functions->show("preview"); @@ -354,22 +354,22 @@ void DefaultPlugin::loadBookmarks(DOM::HTMLElement node) m_functions->hide("bookmarks"); } -void DefaultPlugin::slotSetPreview(const KFileItem *item, const QPixmap &pix) +void DefaultPlugin::slotSetPreview(const KFileItem *item, const TQPixmap &pix) { DOM::HTMLDocument doc = m_html->htmlDocument(); DOM::HTMLElement node = doc.getElementById("preview"); - QByteArray data; - QBuffer buffer(data); + TQByteArray data; + TQBuffer buffer(data); buffer.open(IO_WriteOnly); pix.save(&buffer, "PNG"); - QString src = QString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); + TQString src = TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); bool media = item->mimetype().startsWith("video/"); DOM::DOMString innerHTML; - innerHTML += QString("
"; if(media){ @@ -413,12 +413,12 @@ void DefaultPlugin::slotJobFinished(KIO::Job *job) bool DefaultPlugin::handleRequest(const KURL &url) { - QString protocol = url.protocol(); + TQString protocol = url.protocol(); if(protocol == "exec"){ int id = url.host().toInt(); - QMap::Iterator it = runMap.find(id); + TQMap::Iterator it = runMap.find(id); if(it != runMap.end()){ KFileItem *item = m_items.getFirst(); @@ -430,21 +430,21 @@ bool DefaultPlugin::handleRequest(const KURL &url) } else if(protocol == "service"){ - QString name = url.url().right(url.url().length() - 10); + TQString name = url.url().right(url.url().length() - 10); services->runAction(name); return true; } else if(protocol == "servicepopup"){ - QString id = url.host(); + TQString id = url.host(); DOM::HTMLDocument doc = m_html->htmlDocument(); DOM::HTMLElement node = static_cast(doc.getElementById("popup" + id)); if(!node.isNull()){ - QRect rect = node.getRect(); - QPoint p = m_html->view()->mapToGlobal(rect.bottomLeft()); + TQRect rect = node.getRect(); + TQPoint p = m_html->view()->mapToGlobal(rect.bottomLeft()); services->showPopup(id, p); } diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.h b/konq-plugins/sidebar/metabar/src/defaultplugin.h index 36b0060..319d771 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.h +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.h @@ -26,8 +26,8 @@ #include -#include -#include +#include +#include class DefaultPlugin : public ProtocolPlugin { @@ -50,13 +50,13 @@ class DefaultPlugin : public ProtocolPlugin void loadBookmarks(DOM::HTMLElement node); private: - QMap runMap; + TQMap runMap; KIO::PreviewJob *preview_job; ServiceLoader *services; private slots: - void slotSetPreview(const KFileItem*, const QPixmap&); + void slotSetPreview(const KFileItem*, const TQPixmap&); void slotPreviewFailed(const KFileItem *item); void slotJobFinished(KIO::Job *item); }; diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp index d4b772b..bbfb9e2 100644 --- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp @@ -32,8 +32,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -100,8 +100,8 @@ void HTTPPlugin::loadBookmarks(DOM::HTMLElement node) bool HTTPPlugin::handleRequest(const KURL &url) { if(url.protocol() == "find"){ - QString keyword = url.queryItem("find"); - QString type = url.queryItem("type"); + TQString keyword = url.queryItem("find"); + TQString type = url.queryItem("type"); if(!keyword.isNull() && !keyword.isEmpty()){ KURL url("http://www.google.com/search"); diff --git a/konq-plugins/sidebar/metabar/src/metabar.cpp b/konq-plugins/sidebar/metabar/src/metabar.cpp index 8181a11..6a020f0 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.cpp +++ b/konq-plugins/sidebar/metabar/src/metabar.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include @@ -7,7 +7,7 @@ #include "metabar.h" #include "metabar.moc" -Metabar::Metabar(KInstance *inst,QObject *parent,QWidget *widgetParent, QString &desktopName, const char* name): +Metabar::Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { KImageIO::registerFormats(); @@ -37,7 +37,7 @@ void Metabar::handlePreview(const KFileItemList &items) extern "C" { - bool add_konqsidebar_metabar(QString* fn, QString* param, QMap *map) { + bool add_konqsidebar_metabar(TQString* fn, TQString* param, TQMap *map) { Q_UNUSED(param); map->insert("Type", "Link"); @@ -52,7 +52,7 @@ extern "C" { extern "C" { - void* create_konqsidebar_metabar(KInstance *instance,QObject *par,QWidget *widp,QString &desktopname,const char *name) + void* create_konqsidebar_metabar(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new Metabar(instance,par,widp,desktopname,name); } diff --git a/konq-plugins/sidebar/metabar/src/metabar.h b/konq-plugins/sidebar/metabar/src/metabar.h index 6d43592..d4bb63f 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.h +++ b/konq-plugins/sidebar/metabar/src/metabar.h @@ -6,7 +6,7 @@ #endif #include -#include +#include #include @@ -15,11 +15,11 @@ class Metabar : public KonqSidebarPlugin Q_OBJECT public: - Metabar(KInstance *inst,QObject *parent,QWidget *widgetParent, QString &desktopName, const char* name=0); + Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); ~Metabar(); - virtual QWidget *getWidget(){ return widget; } - virtual void *provides(const QString &) { return 0; } + virtual TQWidget *getWidget(){ return widget; } + virtual void *provides(const TQString &) { return 0; } protected: MetabarWidget *widget; diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp index 8c457de..1aaf9e8 100644 --- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp @@ -26,16 +26,16 @@ #include -#include +#include #define CSS_PRIORITY "important" #define RESIZE_SPEED 5 #define RESIZE_STEP 2 -MetabarFunctions::MetabarFunctions(KHTMLPart *html, QObject *parent, const char* name) : QObject(parent, name), m_html(html) +MetabarFunctions::MetabarFunctions(KHTMLPart *html, TQObject *parent, const char* name) : TQObject(parent, name), m_html(html) { - timer = new QTimer(this); - connect(timer, SIGNAL(timeout()), this, SLOT(animate())); + timer = new TQTimer(this); + connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate())); } MetabarFunctions::~MetabarFunctions() @@ -47,8 +47,8 @@ MetabarFunctions::~MetabarFunctions() void MetabarFunctions::handleRequest(const KURL &url) { - QString function = url.host(); - QStringList params = QStringList::split(',', url.filename()); + TQString function = url.host(); + TQStringList params = TQStringList::split(',', url.filename()); if(function == "toggle"){ if(params.size() == 1){ @@ -106,7 +106,7 @@ void MetabarFunctions::toggle(DOM::DOMString item) } } else{ - style.setProperty("height", QString("%1px").arg(height), CSS_PRIORITY); + style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY); } } } @@ -137,7 +137,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item) } } else{ - style.setProperty("height", QString("%1px").arg(height), CSS_PRIORITY); + style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY); } } } @@ -145,9 +145,9 @@ void MetabarFunctions::adjustSize(DOM::DOMString item) void MetabarFunctions::animate() { - QMap::Iterator it; + TQMap::Iterator it; for(it = resizeMap.begin(); it != resizeMap.end(); ++it ) { - QString id = it.key(); + TQString id = it.key(); int height = it.data(); int currentHeight = 0; @@ -155,7 +155,7 @@ void MetabarFunctions::animate() DOM::HTMLElement node = static_cast(doc.getElementById(id)); DOM::CSSStyleDeclaration style = node.style(); - QString currentHeightString = style.getPropertyValue("height").string(); + TQString currentHeightString = style.getPropertyValue("height").string(); if(currentHeightString.endsWith("px")){ currentHeight = currentHeightString.left(currentHeightString.length() - 2).toInt(); } @@ -176,7 +176,7 @@ void MetabarFunctions::animate() } int change = currentHeight < height ? changeValue : -changeValue; - style.setProperty("height", QString("%1px").arg(currentHeight + change), CSS_PRIORITY); + style.setProperty("height", TQString("%1px").arg(currentHeight + change), CSS_PRIORITY); doc.updateRendering(); } } diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.h b/konq-plugins/sidebar/metabar/src/metabarfunctions.h index aa5f110..1ccce3c 100644 --- a/konq-plugins/sidebar/metabar/src/metabarfunctions.h +++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.h @@ -23,8 +23,8 @@ #include -#include -#include +#include +#include #include #include @@ -34,7 +34,7 @@ class MetabarFunctions : public QObject Q_OBJECT public: - MetabarFunctions(KHTMLPart *html, QObject *parent = 0, const char* name=0); + MetabarFunctions(KHTMLPart *html, TQObject *parent = 0, const char* name=0); ~MetabarFunctions(); void toggle(DOM::DOMString item); @@ -47,9 +47,9 @@ class MetabarFunctions : public QObject KHTMLPart *m_html; private: - QTimer *timer; + TQTimer *timer; - QMap resizeMap; + TQMap resizeMap; int getHeight(DOM::HTMLElement &element); private slots: diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp index 07b010a..bf074e8 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp @@ -26,14 +26,14 @@ #include "remoteplugin.h" #include "httpplugin.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -73,7 +73,7 @@ #define EVENT_TYPE DOM::DOMString("click") #define ACTIVATION 1 -MetabarWidget::MetabarWidget(QWidget *parent, const char *name) : QWidget(parent, name) +MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(parent, name) { skip = false; loadComplete = false; @@ -84,9 +84,9 @@ MetabarWidget::MetabarWidget(QWidget *parent, const char *name) : QWidget(parent config = new KConfig("metabarrc"); dir_watch = new KDirWatch(); - connect(dir_watch, SIGNAL(dirty(const QString&)), this, SLOT(slotUpdateCurrentInfo(const QString&))); - connect(dir_watch, SIGNAL(created(const QString&)), this, SLOT(slotUpdateCurrentInfo(const QString&))); - connect(dir_watch, SIGNAL(deleted(const QString&)), this, SLOT(slotDeleteCurrentInfo(const QString&))); + connect(dir_watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(slotUpdateCurrentInfo(const TQString&))); + connect(dir_watch, TQT_SIGNAL(created(const TQString&)), this, TQT_SLOT(slotUpdateCurrentInfo(const TQString&))); + connect(dir_watch, TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(slotDeleteCurrentInfo(const TQString&))); html = new KHTMLPart(this, "metabarhtmlpart"); html->setJScriptEnabled(true); @@ -94,12 +94,12 @@ MetabarWidget::MetabarWidget(QWidget *parent, const char *name) : QWidget(parent html->setCaretVisible(false); html->setDNDEnabled(false); html->setJavaEnabled(false); - html->view()->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + html->view()->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); html->view()->hide(); - connect(html->browserExtension(), SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs & )), this, SLOT(handleURLRequest(const KURL &, const KParts::URLArgs &))); - connect(html, SIGNAL(completed()), this, SLOT(loadCompleted())); - connect(html, SIGNAL(popupMenu(const QString &, const QPoint &)), this, SLOT(slotShowPopup(const QString&, const QPoint &))); + connect(html->browserExtension(), TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs & )), this, TQT_SLOT(handleURLRequest(const KURL &, const KParts::URLArgs &))); + connect(html, TQT_SIGNAL(completed()), this, TQT_SLOT(loadCompleted())); + connect(html, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(slotShowPopup(const TQString&, const TQPoint &))); functions = new MetabarFunctions(html, this); @@ -114,14 +114,14 @@ MetabarWidget::MetabarWidget(QWidget *parent, const char *name) : QWidget(parent plugins.insert("http", httpPlugin); plugins.insert("https", httpPlugin); - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); layout->addWidget(html->view()); popup = new KPopupMenu(0); - KAction *configAction = new KAction(i18n("Configure %1...").arg("Metabar"), "configure", KShortcut(), this, SLOT(slotShowConfig()), html->actionCollection(), "configure"); + KAction *configAction = new KAction(i18n("Configure %1...").arg("Metabar"), "configure", KShortcut(), this, TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure"); configAction->plug(popup); - KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), this, SLOT(setTheme()), html->actionCollection(), "reload"); + KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), this, TQT_SLOT(setTheme()), html->actionCollection(), "reload"); reloadAction->plug(popup); setTheme(); @@ -197,7 +197,7 @@ void MetabarWidget::setFileItems(const KFileItemList &items, bool check) currentPlugin->deactivate(); } - QString protocol = currentItems->getFirst()->url().protocol(); + TQString protocol = currentItems->getFirst()->url().protocol(); currentPlugin = plugins[protocol]; if(!currentPlugin){ @@ -208,14 +208,14 @@ void MetabarWidget::setFileItems(const KFileItemList &items, bool check) currentPlugin->setFileItems(*currentItems); } -QString MetabarWidget::getCurrentURL() +TQString MetabarWidget::getCurrentURL() { DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name()); DCOPReply reply = ref.call("currentURL()"); if (reply.isValid()) { - QString url; - reply.get(url, "QString"); + TQString url; + reply.get(url, "TQString"); if(!url.isNull() && !url.isEmpty()){ return url; @@ -224,21 +224,21 @@ QString MetabarWidget::getCurrentURL() return 0; } -void MetabarWidget::openURL(const QString &url) +void MetabarWidget::openURL(const TQString &url) { DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name()); DCOPReply reply = ref.call("openURL", url); } -void MetabarWidget::openTab(const QString &url) +void MetabarWidget::openTab(const TQString &url) { DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name()); DCOPReply reply = ref.call("newTab", url); } -void MetabarWidget::callAction(const QString &action) +void MetabarWidget::callAction(const TQString &action) { - DCOPRef ref(kapp->dcopClient()->appId(), QString(this->topLevelWidget()->name()).append("/action/").append(action).utf8()); + DCOPRef ref(kapp->dcopClient()->appId(), TQString(this->topLevelWidget()->name()).append("/action/").append(action).utf8()); if(ref.call("enabled()")){ ref.call("activate()"); } @@ -247,7 +247,7 @@ void MetabarWidget::callAction(const QString &action) void MetabarWidget::loadLinks() { config->setGroup("General"); - QStringList links = config->readListEntry("Links"); + TQStringList links = config->readListEntry("Links"); if(links.count() == 0){ functions->hide("links"); @@ -261,7 +261,7 @@ void MetabarWidget::loadLinks() if(!node.isNull()){ DOM::DOMString innerHTML; - for(QStringList::Iterator it = links.begin(); it != links.end(); ++it){ + for(TQStringList::Iterator it = links.begin(); it != links.end(); ++it){ config->setGroup("Link_" + (*it)); addEntry(innerHTML, config->readEntry("Name"), config->readEntry("URL"), config->readEntry("Icon", "folder")); } @@ -282,14 +282,14 @@ void MetabarWidget::loadCompleted() DOM::HTMLElement node = static_cast(i18n_a_list.item(i)); if(!node.isNull()){ if(node.hasAttribute("i18n")){ - QString text = node.innerText().string(); + TQString text = node.innerText().string(); node.setInnerText(DOM::DOMString(i18n(text.utf8().data()))); } if(node.hasAttribute("image")){ - QString icon = node.getAttribute("image").string(); - QString url = getIconPath(icon); - QString style = QString("background-image: url(%1);").arg(url); + TQString icon = node.getAttribute("image").string(); + TQString url = getIconPath(icon); + TQString style = TQString("background-image: url(%1);").arg(url); node.setAttribute("style", style); } @@ -301,22 +301,22 @@ void MetabarWidget::loadCompleted() DOM::HTMLElement node = static_cast(i18n_ul_list.item(i)); if(!node.isNull()){ if(node.hasAttribute("i18n")){ - QString text = node.innerText().string(); + TQString text = node.innerText().string(); node.setInnerText(DOM::DOMString(i18n(text.utf8().data()))); } } } config->setGroup("General"); - QString file = locate("data", QString("metabar/themes/%1/default.css").arg(config->readEntry("Theme", "default"))); + TQString file = locate("data", TQString("metabar/themes/%1/default.css").arg(config->readEntry("Theme", "default"))); if(file.isNull()){ - file = locate("data", QString("metabar/themes/default/default.css")); + file = locate("data", TQString("metabar/themes/default/default.css")); } - QFile cssfile(file); + TQFile cssfile(file); if(cssfile.open(IO_ReadOnly)){ - QTextStream stream( &cssfile ); - QString tmp = stream.read(); + TQTextStream stream( &cssfile ); + TQString tmp = stream.read(); cssfile.close(); tmp.replace("./", KURL::fromPathOrURL(file).directory(false)); @@ -324,14 +324,14 @@ void MetabarWidget::loadCompleted() } loadComplete = true; - html->view()->setFrameShape(config->readBoolEntry("ShowFrame", true) ? QFrame::StyledPanel : QFrame::NoFrame); + html->view()->setFrameShape(config->readBoolEntry("ShowFrame", true) ? TQFrame::StyledPanel : TQFrame::NoFrame); html->view()->show(); if(currentItems && !currentItems->isEmpty()){ setFileItems(*currentItems, false); } else{ - QString url = getCurrentURL(); + TQString url = getCurrentURL(); KFileItem *item = new KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL(url), true); KFileItemList list; list.append(item); @@ -347,14 +347,14 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg return; } - QString protocol = url.protocol(); + TQString protocol = url.protocol(); if(currentPlugin->handleRequest(url)){ return; } if(protocol == "desktop"){ - QString path = url.path(); + TQString path = url.path(); if(KDesktopFile::isDesktopFile(path)){ KRun::run(new KDesktopFile(path, true), KURL::List()); @@ -362,15 +362,15 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg } else if(protocol == "kcmshell"){ - QString module = url.path().remove('/'); + TQString module = url.path().remove('/'); KRun::runCommand("kcmshell " + module); } else if(protocol == "action"){ - QString action = url.url().right(url.url().length() - 9); + TQString action = url.url().right(url.url().length() - 9); if(action.startsWith("metabar/")){ - QString newact = action.right(action.length() - 8); + TQString newact = action.right(action.length() - 8); if(newact == "share"){ slotShowSharingDialog(); @@ -393,15 +393,15 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg skip = true; //needed to prevent some weired reload DOM::DOMString innerHTML; - innerHTML += QString("
    ").arg(image.width(), image.height()); + innerHTML += TQString("
      ").arg(image.width(), image.height()); innerHTML += "mimetype(); innerHTML += "\" data=\""; innerHTML += item->url().url(); innerHTML += "\" width=\""; - innerHTML += QString().setNum(image.width()); + innerHTML += TQString().setNum(image.width()); innerHTML += "\" height=\""; - innerHTML += QString().setNum(image.height()); + innerHTML += TQString().setNum(image.height()); innerHTML += "\" />"; node.setInnerHTML(innerHTML); } @@ -409,7 +409,7 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg } else if(protocol == "more"){ - QString name = url.host(); + TQString name = url.host(); DOM::HTMLDocument doc = html->htmlDocument(); DOM::NodeList list = doc.getElementsByName(name); @@ -431,7 +431,7 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg } if(element.id().string().startsWith("hidden")){ - QString style = QString("background-image: url(%1);").arg(getIconPath(showMore ? "1downarrow" : "1uparrow")); + TQString style = TQString("background-image: url(%1);").arg(getIconPath(showMore ? "1downarrow" : "1uparrow")); element.setInnerText( showMore ? i18n("More") : i18n("Less") ); element.setAttribute("style", style); } @@ -466,16 +466,16 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg } } -QString MetabarWidget::getIconPath(const QString &name) +TQString MetabarWidget::getIconPath(const TQString &name) { - QPixmap icon = SmallIcon(name); + TQPixmap icon = SmallIcon(name); - QByteArray data; - QBuffer buffer(data); + TQByteArray data; + TQBuffer buffer(data); buffer.open(IO_WriteOnly); icon.save(&buffer, "PNG"); - return QString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); + return TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); } void MetabarWidget::slotShowSharingDialog() @@ -489,7 +489,7 @@ void MetabarWidget::slotShowSharingDialog() void MetabarWidget::slotShowConfig() { ConfigDialog *config_dialog = new ConfigDialog(this); - if(config_dialog->exec() == QDialog::Accepted){ + if(config_dialog->exec() == TQDialog::Accepted){ config->reparseConfiguration(); setFileItems(*currentItems, false); @@ -497,18 +497,18 @@ void MetabarWidget::slotShowConfig() setTheme(); - html->view()->setFrameShape(config->readBoolEntry("ShowFrame", true) ? QFrame::StyledPanel : QFrame::NoFrame); + html->view()->setFrameShape(config->readBoolEntry("ShowFrame", true) ? TQFrame::StyledPanel : TQFrame::NoFrame); } delete config_dialog; } -void MetabarWidget::slotShowPopup(const QString &url, const QPoint &point) +void MetabarWidget::slotShowPopup(const TQString &url, const TQPoint &point) { popup->exec(point); } -void MetabarWidget::slotUpdateCurrentInfo(const QString &path) +void MetabarWidget::slotUpdateCurrentInfo(const TQString &path) { if(currentItems){ KFileItem *item = new KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL(path), true); @@ -522,10 +522,10 @@ void MetabarWidget::slotUpdateCurrentInfo(const QString &path) } } -void MetabarWidget::slotDeleteCurrentInfo(const QString&) +void MetabarWidget::slotDeleteCurrentInfo(const TQString&) { if(currentItems && currentItems->count() == 1){ - QString url = getCurrentURL(); + TQString url = getCurrentURL(); KURL currentURL; if(currentItems){ @@ -548,7 +548,7 @@ void MetabarWidget::slotDeleteCurrentInfo(const QString&) } } -void MetabarWidget::addEntry(DOM::DOMString &html, const QString name, const QString url, const QString icon, const QString id, const QString nameatt, bool hidden) +void MetabarWidget::addEntry(DOM::DOMString &html, const TQString name, const TQString url, const TQString icon, const TQString id, const TQString nameatt, bool hidden) { html += "setGroup("General"); - QString file = locate("data", QString("metabar/themes/%1/layout.html").arg(config->readEntry("Theme", "default"))); + TQString file = locate("data", TQString("metabar/themes/%1/layout.html").arg(config->readEntry("Theme", "default"))); html->openURL(KURL(file)); } diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h index abd901d..e88a003 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.h +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h @@ -30,7 +30,7 @@ #include #include -#include +#include #include "protocolplugin.h" #include "metabarfunctions.h" @@ -40,13 +40,13 @@ class MetabarWidget : public QWidget Q_OBJECT public: - MetabarWidget(QWidget *parent = 0, const char* name=0); + MetabarWidget(TQWidget *parent = 0, const char* name=0); ~MetabarWidget(); void setFileItems(const KFileItemList &items, bool check = true); - static QString getIconPath(const QString &name); - static void addEntry(DOM::DOMString &html, const QString name, const QString url, const QString icon, const QString id = QString::null, const QString nameatt = QString::null, bool hidden = false); + static TQString getIconPath(const TQString &name); + static void addEntry(DOM::DOMString &html, const TQString name, const TQString url, const TQString icon, const TQString id = TQString::null, const TQString nameatt = TQString::null, bool hidden = false); private: KFileItemList *currentItems; @@ -62,26 +62,26 @@ class MetabarWidget : public QWidget KDirWatch *dir_watch; KPopupMenu *popup; - QDict plugins; + TQDict plugins; bool skip; bool loadComplete; - void callAction(const QString &action); - void openURL(const QString &url); - void openTab(const QString &url); + void callAction(const TQString &action); + void openURL(const TQString &url); + void openTab(const TQString &url); void loadLinks(); - QString getCurrentURL(); + TQString getCurrentURL(); private slots: void loadCompleted(); void slotShowSharingDialog(); void slotShowConfig(); - void slotShowPopup(const QString &url, const QPoint &pos); + void slotShowPopup(const TQString &url, const TQPoint &pos); void handleURLRequest(const KURL &url, const KParts::URLArgs &args); - void slotUpdateCurrentInfo(const QString &path); - void slotDeleteCurrentInfo(const QString &path); + void slotUpdateCurrentInfo(const TQString &path); + void slotDeleteCurrentInfo(const TQString &path); void setTheme(); }; diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp index ad8f2e5..99f5b31 100644 --- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp @@ -20,7 +20,7 @@ #include "protocolplugin.h" -#include +#include #include #include @@ -32,7 +32,7 @@ ProtocolPlugin* ProtocolPlugin::activePlugin = 0; -ProtocolPlugin::ProtocolPlugin(KHTMLPart *html, MetabarFunctions *functions, const char* name) : QObject(html, name), m_html(html), m_functions(functions) +ProtocolPlugin::ProtocolPlugin(KHTMLPart *html, MetabarFunctions *functions, const char* name) : TQObject(html, name), m_html(html), m_functions(functions) { } @@ -59,7 +59,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items) DOM::HTMLElement size = doc.getElementById("size"); if(!icon.isNull()){ - QPixmap pix; + TQPixmap pix; if(m_items.count() == 1){ pix = m_items.getFirst()->pixmap(KIcon::SizeLarge); } @@ -67,11 +67,11 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items) pix = DesktopIcon("kmultiple", KIcon::SizeLarge); } - QByteArray data; - QBuffer buffer(data); + TQByteArray data; + TQBuffer buffer(data); buffer.open(IO_WriteOnly); pix.save(&buffer, "PNG"); - QString icondata = QString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); + TQString icondata = TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); icon.setSrc(icondata); } diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp index 7e3e60d..1b59527 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp +++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp @@ -20,9 +20,9 @@ #include "serviceloader.h" -#include -#include -#include +#include +#include +#include #include @@ -37,7 +37,7 @@ #include -ServiceLoader::ServiceLoader(QWidget *parent, const char *name) : QObject(parent, name) +ServiceLoader::ServiceLoader(TQWidget *parent, const char *name) : TQObject(parent, name) { popups.setAutoDelete(true); } @@ -51,40 +51,40 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int popups.clear(); KURL url = item.url(); - QString mimeType = item.mimetype(); - QString mimeGroup = mimeType.left(mimeType.find('/')); + TQString mimeType = item.mimetype(); + TQString mimeGroup = mimeType.left(mimeType.find('/')); urlList.clear(); urlList.append(url); - QStringList dirs = KGlobal::dirs()->findDirs( "data", "konqueror/servicemenus/" ); + TQStringList dirs = KGlobal::dirs()->findDirs( "data", "konqueror/servicemenus/" ); KConfig config("metabarrc", true, false); config.setGroup("General"); int maxActions = config.readNumEntry("MaxActions"); bool matchAll = false; // config.readBoolEntry("MatchAll"); int id = 0; - QString idString; + TQString idString; - for(QStringList::Iterator dit = dirs.begin(); dit != dirs.end(); ++dit){ + for(TQStringList::Iterator dit = dirs.begin(); dit != dirs.end(); ++dit){ idString.setNum(id); - QDir dir(*dit); - QStringList entries = dir.entryList("*.desktop", QDir::Files); + TQDir dir(*dit); + TQStringList entries = dir.entryList("*.desktop", TQDir::Files); - for(QStringList::Iterator eit = entries.begin(); eit != entries.end(); ++eit){ + for(TQStringList::Iterator eit = entries.begin(); eit != entries.end(); ++eit){ KSimpleConfig cfg( *dit + *eit, true ); cfg.setDesktopGroup(); if(cfg.hasKey("X-KDE-ShowIfRunning" )){ - const QString app = cfg.readEntry( "X-KDE-ShowIfRunning" ); + const TQString app = cfg.readEntry( "X-KDE-ShowIfRunning" ); if(!kapp->dcopClient()->isApplicationRegistered(app.utf8())){ continue; } } if(cfg.hasKey("X-KDE-Protocol")){ - const QString protocol = cfg.readEntry( "X-KDE-Protocol" ); + const TQString protocol = cfg.readEntry( "X-KDE-Protocol" ); if(protocol != url.protocol()){ continue; } @@ -95,18 +95,18 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int } if(cfg.hasKey("X-KDE-Require")){ - const QStringList capabilities = cfg.readListEntry( "X-KDE-Require" ); + const TQStringList capabilities = cfg.readListEntry( "X-KDE-Require" ); if (capabilities.contains( "Write" )){ continue; } } if ( cfg.hasKey( "Actions" ) && cfg.hasKey( "ServiceTypes" ) ){ - const QStringList types = cfg.readListEntry( "ServiceTypes" ); - const QStringList excludeTypes = cfg.readListEntry( "ExcludeServiceTypes" ); + const TQStringList types = cfg.readListEntry( "ServiceTypes" ); + const TQStringList excludeTypes = cfg.readListEntry( "ExcludeServiceTypes" ); bool ok = false; - for (QStringList::ConstIterator it = types.begin(); it != types.end() && !ok; ++it){ + for (TQStringList::ConstIterator it = types.begin(); it != types.end() && !ok; ++it){ bool checkTheMimetypes = false; if(matchAll){ @@ -131,7 +131,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int if(checkTheMimetypes){ ok = true; - for(QStringList::ConstIterator itex = excludeTypes.begin(); itex != excludeTypes.end(); ++itex){ + for(TQStringList::ConstIterator itex = excludeTypes.begin(); itex != excludeTypes.end(); ++itex){ if( ((*itex).right(1) == "*" && (*itex).left((*itex).find('/')) == mimeGroup) || ((*itex) == mimeType)) { @@ -142,8 +142,8 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int } } if (ok){ - const QString priority = cfg.readEntry("X-KDE-Priority"); - const QString submenuName = cfg.readEntry( "X-KDE-Submenu" ); + const TQString priority = cfg.readEntry("X-KDE-Priority"); + const TQString submenuName = cfg.readEntry( "X-KDE-Submenu" ); bool usePopup = false; KPopupMenu *popup; @@ -154,7 +154,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int popup = popups[submenuName]; } else{ - MetabarWidget::addEntry(html, submenuName, "servicepopup://" + idString, "1rightarrow", "popup" + idString, count < maxActions ? QString::null : QString("hiddenaction"), count >= maxActions); + MetabarWidget::addEntry(html, submenuName, "servicepopup://" + idString, "1rightarrow", "popup" + idString, count < maxActions ? TQString::null : TQString("hiddenaction"), count >= maxActions); popup = new KPopupMenu(); popups.insert(idString, popup); @@ -163,16 +163,16 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int } } - QValueList list = KDEDesktopMimeType::userDefinedServices( *dit + *eit, url.isLocalFile()); + TQValueList list = KDEDesktopMimeType::userDefinedServices( *dit + *eit, url.isLocalFile()); - for (QValueList::iterator it = list.begin(); it != list.end(); ++it){ + for (TQValueList::iterator it = list.begin(); it != list.end(); ++it){ if(usePopup){ - KAction *action = new KAction((*it).m_strName, (*it).m_strIcon, KShortcut(), this, SLOT(runAction()), popup, idString.utf8()); + KAction *action = new KAction((*it).m_strName, (*it).m_strIcon, KShortcut(), this, TQT_SLOT(runAction()), popup, idString.utf8()); action->plug(popup); } else{ - MetabarWidget::addEntry(html, (*it).m_strName, "service://" + idString, (*it).m_strIcon, QString::null, count < maxActions ? QString::null : QString("hiddenaction"), count >= maxActions); + MetabarWidget::addEntry(html, (*it).m_strName, "service://" + idString, (*it).m_strIcon, TQString::null, count < maxActions ? TQString::null : TQString("hiddenaction"), count >= maxActions); count++; } @@ -194,7 +194,7 @@ void ServiceLoader::runAction() } } -void ServiceLoader::runAction(const QString& name) +void ServiceLoader::runAction(const TQString& name) { KDEDesktopMimeType::Service s = services[name]; if(!s.isEmpty()){ @@ -202,7 +202,7 @@ void ServiceLoader::runAction(const QString& name) } } -void ServiceLoader::showPopup(const QString &popup, const QPoint &point) +void ServiceLoader::showPopup(const TQString &popup, const TQPoint &point) { KPopupMenu *p = popups[popup]; if(p){ diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.h b/konq-plugins/sidebar/metabar/src/serviceloader.h index cd3fa8c..527ea97 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.h +++ b/konq-plugins/sidebar/metabar/src/serviceloader.h @@ -21,10 +21,10 @@ #ifndef _SERVICELOADER_H_ #define _SERVICELOADER_H_ -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -40,16 +40,16 @@ class ServiceLoader : public QObject Q_OBJECT public: - ServiceLoader(QWidget *parent, const char *name = 0); + ServiceLoader(TQWidget *parent, const char *name = 0); ~ServiceLoader(); void loadServices(const KFileItem item, DOM::DOMString &html, int &count); - void runAction(const QString &name); - void showPopup(const QString &popup, const QPoint &point); + void runAction(const TQString &name); + void showPopup(const TQString &popup, const TQPoint &point); private: - QDict popups; - QMap services; + TQDict popups; + TQMap services; KURL::List urlList; private slots: diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp index 91bb96d..76853c6 100644 --- a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp @@ -58,14 +58,14 @@ void SettingsPlugin::loadActions(DOM::HTMLElement node) if(url.path().endsWith("/")){ list_job = KIO::listDir(url, true, false); - connect(list_job, SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)), this, SLOT(slotGotEntries(KIO::Job *, const KIO::UDSEntryList &))); - connect(list_job, SIGNAL(result(KIO::Job *)), this, SLOT(slotJobFinished(KIO::Job *))); + connect(list_job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)), this, TQT_SLOT(slotGotEntries(KIO::Job *, const KIO::UDSEntryList &))); + connect(list_job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobFinished(KIO::Job *))); m_functions->show("actions"); } else{ - QString path = url.path(); - QString name = url.filename(); + TQString path = url.path(); + TQString name = url.filename(); KService::Ptr service = KService::serviceByStorageId(name); if(service && service->isValid()){ @@ -90,8 +90,8 @@ void SettingsPlugin::loadInformation(DOM::HTMLElement node) m_functions->hide("info"); } else{ - QString path = url.path(); - QString name = url.filename(); + TQString path = url.path(); + TQString name = url.filename(); KService::Ptr service = KService::serviceByStorageId(name); if(service && service->isValid()){ @@ -154,9 +154,9 @@ void SettingsPlugin::slotGotEntries(KIO::Job *job, const KIO::UDSEntryList &list KIO::UDSEntryList::ConstIterator it = list.begin(); KIO::UDSEntryList::ConstIterator it_end = list.end(); for(; it != it_end; ++it){ - QString name; - QString icon; - QString url; + TQString name; + TQString icon; + TQString url; long type; KIO::UDSEntry::ConstIterator atomit = (*it).begin(); diff --git a/konq-plugins/sidebar/newsticker/configfeeds.cpp b/konq-plugins/sidebar/newsticker/configfeeds.cpp index c682ab3..dd038b6 100644 --- a/konq-plugins/sidebar/newsticker/configfeeds.cpp +++ b/konq-plugins/sidebar/newsticker/configfeeds.cpp @@ -29,7 +29,7 @@ namespace KSB_News { -ConfigFeeds::ConfigFeeds(QWidget* parent, const char* name) : ConfigFeedsBase(parent, name) +ConfigFeeds::ConfigFeeds(TQWidget* parent, const char* name) : ConfigFeedsBase(parent, name) { } diff --git a/konq-plugins/sidebar/newsticker/configfeeds.h b/konq-plugins/sidebar/newsticker/configfeeds.h index 555b4f5..127ba27 100644 --- a/konq-plugins/sidebar/newsticker/configfeeds.h +++ b/konq-plugins/sidebar/newsticker/configfeeds.h @@ -43,7 +43,7 @@ namespace KSB_News { Q_OBJECT public: - ConfigFeeds(QWidget* parent, const char* name = 0); + ConfigFeeds(TQWidget* parent, const char* name = 0); }; diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp index d4c803a..db793bd 100644 --- a/konq-plugins/sidebar/newsticker/norsswidget.cpp +++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp @@ -22,8 +22,8 @@ Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include #include #include @@ -37,16 +37,16 @@ namespace KSB_News { - NoRSSWidget::NoRSSWidget(QWidget *parent, const char *name) - : QWidget(parent, name) { + NoRSSWidget::NoRSSWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { - QVBoxLayout *topLayout = new QVBoxLayout(this); + TQVBoxLayout *topLayout = new TQVBoxLayout(this); topLayout->addStretch(); KPushButton *btn = new KPushButton(i18n("&Configure"), this); - btn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum); - connect(btn, SIGNAL(clicked()), this, SLOT(slotBtnClicked())); + btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); + connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnClicked())); topLayout->addWidget(btn, 0, Qt::AlignHCenter); topLayout->addStretch(); @@ -71,8 +71,8 @@ namespace KSB_News { // User edited the configuration - update your local copies of the // configuration data - connect(m_confdlg, SIGNAL(settingsChanged()), this, - SLOT(slotConfigure_okClicked())); + connect(m_confdlg, TQT_SIGNAL(settingsChanged()), this, + TQT_SLOT(slotConfigure_okClicked())); m_confdlg->show(); } @@ -82,10 +82,10 @@ namespace KSB_News { DCOPRef rss_document("rssservice", "RSSService"); // read list of sources - QStringList m_our_rsssources = SidebarSettings::sources(); + TQStringList m_our_rsssources = SidebarSettings::sources(); // add new sources - QStringList::iterator it; + TQStringList::iterator it; for (it = m_our_rsssources.begin(); it != m_our_rsssources.end(); ++it) { rss_document.call("add", ( *it )); } diff --git a/konq-plugins/sidebar/newsticker/norsswidget.h b/konq-plugins/sidebar/newsticker/norsswidget.h index cebac3b..91a8c61 100644 --- a/konq-plugins/sidebar/newsticker/norsswidget.h +++ b/konq-plugins/sidebar/newsticker/norsswidget.h @@ -31,11 +31,11 @@ class KConfigDialog; namespace KSB_News { - class NoRSSWidget : public QWidget { + class NoRSSWidget : public TQWidget { Q_OBJECT public: - NoRSSWidget(QWidget *parent = 0, const char *name = 0); + NoRSSWidget(TQWidget *parent = 0, const char *name = 0); private slots: void slotBtnClicked(); diff --git a/konq-plugins/sidebar/newsticker/nspanel.cpp b/konq-plugins/sidebar/newsticker/nspanel.cpp index 8086b35..a5c1261 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.cpp +++ b/konq-plugins/sidebar/newsticker/nspanel.cpp @@ -22,9 +22,9 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include +#include +#include +#include #include #include #include "nspanel.h" @@ -35,22 +35,22 @@ namespace KSB_News { //////////////////////////////////////////////////////////////// // ListBox including ToolTip for item //////////////////////////////////////////////////////////////// - TTListBox::TTListBox(QWidget *parent, const char *name, WFlags f) + TTListBox::TTListBox(TQWidget *parent, const char *name, WFlags f) : KListBox(parent, name, f), - QToolTip(this) { + TQToolTip(this) { } void TTListBox::clear() { KListBox::clear(); } - void TTListBox::maybeTip(const QPoint &point) { - QListBoxItem *item = itemAt(point); + void TTListBox::maybeTip(const TQPoint &point) { + TQListBoxItem *item = itemAt(point); if (item) { - QString text = item->text(); + TQString text = item->text(); if (!text.isEmpty()) { // Show ToolTip only if necessary - QFontMetrics fm(fontMetrics()); + TQFontMetrics fm(fontMetrics()); int textWidth = fm.width(text); int widgetSpace = visibleWidth(); if ((textWidth > widgetSpace) || (contentsX() > 0)) @@ -61,10 +61,10 @@ namespace KSB_News { - NSPanel::NSPanel(QObject *parent, const char *name, const QString &key, + NSPanel::NSPanel(TQObject *parent, const char *name, const TQString &key, DCOPRef *rssservice) - :QObject(parent, name) - ,DCOPObject(QString(QString("sidebar-newsticker-")+key).latin1()) + :TQObject(parent, name) + ,DCOPObject(TQString(TQString("sidebar-newsticker-")+key).latin1()) ,m_listbox() ,m_pixmap() { @@ -72,7 +72,7 @@ namespace KSB_News { m_rssservice = rssservice; m_key = key; - m_rssdocument = m_rssservice->call("document(QString)", m_key); + m_rssdocument = m_rssservice->call("document(TQString)", m_key); m_isValid = false; connectDCOPSignal("rssservice", m_rssdocument.obj(), @@ -87,8 +87,8 @@ namespace KSB_News { // updating of RSS documents m_timeoutinterval = 10 * 60 * 1000; // 10 mins - m_timer = new QTimer(this); - connect(m_timer, SIGNAL(timeout()), this, SLOT(refresh())); + m_timer = new TQTimer(this); + connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(refresh())); m_timer->start(m_timeoutinterval); refresh(); } @@ -103,7 +103,7 @@ namespace KSB_News { } - void NSPanel::setTitle(const QString &tit) { + void NSPanel::setTitle(const TQString &tit) { m_title = tit; } @@ -113,7 +113,7 @@ namespace KSB_News { } - void NSPanel::setPixmap(const QPixmap &pm) { + void NSPanel::setPixmap(const TQPixmap &pm) { m_pixmap = pm; } @@ -123,24 +123,24 @@ namespace KSB_News { } - QPixmap NSPanel::pixmap() { + TQPixmap NSPanel::pixmap() { return m_pixmap; } - QString NSPanel::key() const { + TQString NSPanel::key() const { return m_key; } - QString NSPanel::title() const { + TQString NSPanel::title() const { return m_title; } - QStringList NSPanel::articles() { + TQStringList NSPanel::articles() { return m_articles; } - QStringList NSPanel::articleLinks() { + TQStringList NSPanel::articleLinks() { return m_articlelinks; } @@ -155,7 +155,7 @@ namespace KSB_News { m_articles.clear(); m_articlelinks.clear(); m_count = m_rssdocument.call("count()"); - QString temp = m_rssdocument.call("title()"); + TQString temp = m_rssdocument.call("title()"); m_title = temp; m_isValid = true; for (int idx = 0; idx < m_count; ++idx) { @@ -169,7 +169,7 @@ namespace KSB_News { void NSPanel::emitPixmapUpdated(DCOPRef /*dcopref*/) { if (m_rssdocument.call("pixmapValid()")) { - QPixmap tmp = m_rssdocument.call("pixmap()"); + TQPixmap tmp = m_rssdocument.call("pixmap()"); m_pixmap = tmp; emit pixmapUpdated(this); diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h index 0f30152..1f60947 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.h +++ b/konq-plugins/sidebar/newsticker/nspanel.h @@ -25,9 +25,9 @@ #ifndef _konq_sidebar_news_nspanelh_ #define _konq_sidebar_news_nspanelh_ -#include -#include -#include +#include +#include +#include #include #include #include @@ -42,38 +42,38 @@ namespace KSB_News { //////////////////////////////////////////////////////////////// // ListBox including ToolTip for item //////////////////////////////////////////////////////////////// - class TTListBox : public KListBox, QToolTip { + class TTListBox : public KListBox, TQToolTip { public: - TTListBox (QWidget *parent = 0, const char *name = 0, WFlags f = 0); + TTListBox (TQWidget *parent = 0, const char *name = 0, WFlags f = 0); void clear(); protected: - virtual void maybeTip(const QPoint &); + virtual void maybeTip(const TQPoint &); }; - class NSPanel : public QObject, public DCOPObject { + class NSPanel : public TQObject, public DCOPObject { Q_OBJECT K_DCOP public: - NSPanel(QObject *parent, const char *name, const QString &key, + NSPanel(TQObject *parent, const char *name, const TQString &key, DCOPRef *rssservice); ~NSPanel(); - void setTitle(const QString &tit); + void setTitle(const TQString &tit); void setListbox(TTListBox *lb); - void setPixmap(const QPixmap &pm); - void setPixmapBuffer(QBuffer *buf); + void setPixmap(const TQPixmap &pm); + void setPixmapBuffer(TQBuffer *buf); void setJob(KIO::Job *kio_job); TTListBox *listbox() const; - QPixmap pixmap(); - QString key() const; - QString title() const; - QStringList articles(); - QStringList articleLinks(); + TQPixmap pixmap(); + TQString key() const; + TQString title() const; + TQStringList articles(); + TQStringList articleLinks(); bool isValid() const; k_dcop: @@ -83,15 +83,15 @@ namespace KSB_News { private: DCOPRef *m_rssservice; DCOPRef m_rssdocument; - QString m_key; - QString m_title; + TQString m_key; + TQString m_title; TTListBox *m_listbox; - QPixmap m_pixmap; + TQPixmap m_pixmap; int m_count; - QStringList m_articles; // TODO: use proper container - QStringList m_articlelinks; // TODO: use proper container + TQStringList m_articles; // TODO: use proper container + TQStringList m_articlelinks; // TODO: use proper container int m_timeoutinterval; - QTimer *m_timer; + TQTimer *m_timer; bool m_isValid; signals: diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp index 74aa07e..6c7e44b 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp @@ -25,14 +25,14 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -50,10 +50,10 @@ namespace KSB_News { - NSStackTabWidget::NSStackTabWidget(QWidget *parent, const char *name, - QPixmap appIcon) : QWidget(parent, name) { + NSStackTabWidget::NSStackTabWidget(TQWidget *parent, const char *name, + TQPixmap appIcon) : TQWidget(parent, name) { currentPage = 0; - layout = new QVBoxLayout(this); + layout = new TQVBoxLayout(this); pagesheader.setAutoDelete(TRUE); pages.setAutoDelete(TRUE); @@ -86,19 +86,19 @@ namespace KSB_News { popup = new KPopupMenu(this); popup->insertItem(KStdGuiItem::configure().iconSet(), i18n("&Configure Newsticker..."), this, - SLOT(slotConfigure())); + TQT_SLOT(slotConfigure())); popup->insertItem(SmallIconSet("reload"), i18n("&Reload"), this, - SLOT(slotRefresh())); + TQT_SLOT(slotRefresh())); popup->insertItem(KStdGuiItem::close().iconSet(), - KStdGuiItem::close().text(), this, SLOT(slotClose())); + KStdGuiItem::close().text(), this, TQT_SLOT(slotClose())); popup->insertSeparator(); // help menu helpmenu = new KPopupMenu(this); helpmenu->insertItem(appIcon, i18n("&About Newsticker"), this, - SLOT(slotShowAbout())); + TQT_SLOT(slotShowAbout())); helpmenu->insertItem(i18n("&Report Bug..."), this, - SLOT(slotShowBugreport())); + TQT_SLOT(slotShowBugreport())); popup->insertItem(KStdGuiItem::help().iconSet(), KStdGuiItem::help().text(), helpmenu); @@ -109,24 +109,24 @@ namespace KSB_News { } - void NSStackTabWidget::addStackTab(NSPanel *nsp, QWidget *page) { - QPushButton *button = new QPushButton(this); + void NSStackTabWidget::addStackTab(NSPanel *nsp, TQWidget *page) { + TQPushButton *button = new TQPushButton(this); button->setText(KStringHandler::rPixelSqueeze(nsp->title(), button->fontMetrics(), button->width() - 4 )); - button->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, - QSizePolicy::Preferred)); - connect(button, SIGNAL(clicked()), this, SLOT(buttonClicked())); - QToolTip::add(button, nsp->title()); + button->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, + TQSizePolicy::Preferred)); + connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonClicked())); + TQToolTip::add(button, nsp->title()); // eventFiler for the title button button->installEventFilter(this); - QScrollView *sv = new QScrollView(this); - sv->setResizePolicy(QScrollView::AutoOneFit); + TQScrollView *sv = new TQScrollView(this); + sv->setResizePolicy(TQScrollView::AutoOneFit); sv->addChild(page); - sv->setFrameStyle(QFrame::NoFrame); + sv->setFrameStyle(TQFrame::NoFrame); page->show(); pagesheader.insert(nsp, button); @@ -150,8 +150,8 @@ namespace KSB_News { pagesheader.remove(nsp); if (pages.count() >= 1) { - QPtrDictIterator it(pages); - QWidget *previousPage = currentPage; + TQPtrDictIterator it(pages); + TQWidget *previousPage = currentPage; currentPage = it.current(); if (currentPage != previousPage) currentPage->show(); @@ -161,7 +161,7 @@ namespace KSB_News { void NSStackTabWidget::updateTitle(NSPanel *nsp) { - QPushButton *pb = (QPushButton *)pagesheader.find(nsp); + TQPushButton *pb = (TQPushButton *)pagesheader.find(nsp); if (! pb->pixmap()) pb->setText(nsp->title()); } @@ -169,11 +169,11 @@ namespace KSB_News { void NSStackTabWidget::updatePixmap(NSPanel *nsp) { - QPushButton *pb = (QPushButton *)pagesheader.find(nsp); - QPixmap pixmap = nsp->pixmap(); + TQPushButton *pb = (TQPushButton *)pagesheader.find(nsp); + TQPixmap pixmap = nsp->pixmap(); if ((pixmap.width() > 88) || (pixmap.height() > 31)) { - QImage image = pixmap.convertToImage(); - pixmap.convertFromImage(image.smoothScale(88, 31, QImage::ScaleMin)); + TQImage image = pixmap.convertToImage(); + pixmap.convertFromImage(image.smoothScale(88, 31, TQImage::ScaleMin)); } pb->setPixmap(pixmap); } @@ -182,13 +182,13 @@ namespace KSB_News { void NSStackTabWidget::buttonClicked() { - QPushButton *pb = (QPushButton*)sender(); + TQPushButton *pb = (TQPushButton*)sender(); NSPanel *nsp = NULL; // Which NSPanel belongs to pb - QPtrDictIterator it(pagesheader); + TQPtrDictIterator it(pagesheader); for (; it.current(); ++it) { - QPushButton *currentWidget = (QPushButton *)it.current(); + TQPushButton *currentWidget = (TQPushButton *)it.current(); if (currentWidget == pb) nsp = (NSPanel *)it.currentKey(); } @@ -197,7 +197,7 @@ namespace KSB_News { return; // Find current ScrollView - QWidget *sv = pages.find(nsp); + TQWidget *sv = pages.find(nsp); // Change visible page if (currentPage != sv) { @@ -211,22 +211,22 @@ namespace KSB_News { - bool NSStackTabWidget::eventFilter(QObject *obj, QEvent *ev) { - if (ev->type() == QEvent::MouseButtonPress - && ((QMouseEvent *)ev)->button() == QMouseEvent::RightButton) { - m_last_button_rightclicked = (QPushButton *)obj; - popup->exec(QCursor::pos()); + bool NSStackTabWidget::eventFilter(TQObject *obj, TQEvent *ev) { + if (ev->type() == TQEvent::MouseButtonPress + && ((TQMouseEvent *)ev)->button() == TQMouseEvent::RightButton) { + m_last_button_rightclicked = (TQPushButton *)obj; + popup->exec(TQCursor::pos()); return true; - } else if (ev->type() == QEvent::Resize) { - QPushButton *pb = (QPushButton *)obj; + } else if (ev->type() == TQEvent::Resize) { + TQPushButton *pb = (TQPushButton *)obj; - const QPixmap *pm = pb->pixmap(); + const TQPixmap *pm = pb->pixmap(); if ( ! pm ) { // Which NSPanel belongs to pb NSPanel *nsp = NULL; - QPtrDictIterator it(pagesheader); + TQPtrDictIterator it(pagesheader); for (; it.current(); ++it) { - QPushButton *currentWidget = (QPushButton *)it.current(); + TQPushButton *currentWidget = (TQPushButton *)it.current(); if (currentWidget == pb) nsp = (NSPanel *)it.currentKey(); } @@ -256,12 +256,12 @@ namespace KSB_News { KDialogBase::Ok, true); ConfigFeeds *conf_widget = new ConfigFeeds(0, "feedcfgdlg"); - m_confdlg->addPage(conf_widget, i18n("RSS Settings"), QString()); + m_confdlg->addPage(conf_widget, i18n("RSS Settings"), TQString()); // User edited the configuration - update your local copies of the // configuration data - connect(m_confdlg, SIGNAL(settingsChanged()), this, - SLOT(slotConfigure_okClicked())); + connect(m_confdlg, TQT_SIGNAL(settingsChanged()), this, + TQT_SLOT(slotConfigure_okClicked())); m_confdlg->show(); } @@ -271,7 +271,7 @@ namespace KSB_News { DCOPRef rss_document("rssservice", "RSSService"); // remove old sources and old stack tabs - QStringList::iterator it; + TQStringList::iterator it; for (it = m_our_rsssources.begin(); it != m_our_rsssources.end(); ++it) { rss_document.call("remove", (*it)); } @@ -304,9 +304,9 @@ namespace KSB_News { NSPanel *nsp = NULL; // find appendant NSPanel - QPtrDictIterator it(pagesheader); + TQPtrDictIterator it(pagesheader); for (; it.current(); ++it) { - QPushButton *currentWidget = (QPushButton *)it.current(); + TQPushButton *currentWidget = (TQPushButton *)it.current(); if (currentWidget == m_last_button_rightclicked) nsp = (NSPanel *)it.currentKey(); } @@ -322,9 +322,9 @@ namespace KSB_News { void NSStackTabWidget::slotClose() { NSPanel *nsp = NULL; // find appendant NSPanel - QPtrDictIterator it(pagesheader); + TQPtrDictIterator it(pagesheader); for (; it.current(); ++it) { - QPushButton *currentWidget = (QPushButton *)it.current(); + TQPushButton *currentWidget = (TQPushButton *)it.current(); if (currentWidget == m_last_button_rightclicked) nsp = (NSPanel *)it.currentKey(); } @@ -350,7 +350,7 @@ namespace KSB_News { } - bool NSStackTabWidget::isRegistered(const QString &key) { + bool NSStackTabWidget::isRegistered(const TQString &key) { m_our_rsssources = SidebarSettings::sources(); if (m_our_rsssources.findIndex(key) == -1) return false; diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h index 7b84289..fb0da4d 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h @@ -28,7 +28,7 @@ #ifndef _NSSTACKTABWIDGET_H_ #define _NSSTACKTABWIDGET_H_ -#include +#include #include "nspanel.h" @@ -45,21 +45,21 @@ namespace KSB_News { class NewRssSourceDlg; - class NSStackTabWidget : public QWidget { + class NSStackTabWidget : public TQWidget { Q_OBJECT public: - NSStackTabWidget(QWidget *parent = 0, const char *name = 0, - QPixmap appIcon = QPixmap()); - void addStackTab(NSPanel *nsp, QWidget *page); + NSStackTabWidget(TQWidget *parent = 0, const char *name = 0, + TQPixmap appIcon = TQPixmap()); + void addStackTab(NSPanel *nsp, TQWidget *page); void delStackTab(NSPanel *nsp); void updateTitle(NSPanel *nsp); void updatePixmap(NSPanel *nsp); bool isEmpty() const; - bool isRegistered(const QString &key); + bool isRegistered(const TQString &key); protected: - bool eventFilter(QObject *obj, QEvent *ev); + bool eventFilter(TQObject *obj, TQEvent *ev); private slots: void buttonClicked(); @@ -71,17 +71,17 @@ namespace KSB_News { void slotConfigure_okClicked(); private: - QPtrDict pages; - QPtrDict pagesheader; - QVBoxLayout *layout; - QWidget *currentPage; + TQPtrDict pages; + TQPtrDict pagesheader; + TQVBoxLayout *layout; + TQWidget *currentPage; KPopupMenu *popup, *helpmenu; KAboutData *m_aboutdata; KAboutApplication *m_about; KBugReport *m_bugreport; - QPushButton *m_last_button_rightclicked; + TQPushButton *m_last_button_rightclicked; KConfigDialog *m_confdlg; - QStringList m_our_rsssources; + TQStringList m_our_rsssources; }; diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp index f96bcd6..ae9c51b 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp +++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp @@ -28,9 +28,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -46,9 +46,9 @@ namespace KSB_News { - KonqSidebar_News::KonqSidebar_News(KInstance *inst, QObject *parent, - QWidget *widgetParent, - QString &desktopName, const char* name) + KonqSidebar_News::KonqSidebar_News(KInstance *inst, TQObject *parent, + TQWidget *widgetParent, + TQString &desktopName, const char* name) : KonqSidebarPlugin(inst, parent, widgetParent, desktopName, name), DCOPObject("sidebar-newsticker") { @@ -56,12 +56,12 @@ namespace KSB_News { // FIXME: as konqueror knows the icon there might be a possibility to // access the already present QPixmap KDesktopFile desktopFile(desktopName, true); - QString iconName = desktopFile.readIcon(); + TQString iconName = desktopFile.readIcon(); KIconLoader iconLoader; m_appIcon = iconLoader.loadIcon(iconName, KIcon::Small); // create all sidebar widgets - widgets = new QWidgetStack(widgetParent, "main_widgetstack"); + widgets = new TQWidgetStack(widgetParent, "main_widgetstack"); newswidget = new NSStackTabWidget(widgets, "feedbrowser_stackchld", m_appIcon); noRSSwidget = new NoRSSWidget(widgets, "nofeed_stackchld"); @@ -82,17 +82,17 @@ namespace KSB_News { } else { m_rssservice = DCOPRef("rssservice", "RSSService"); - QStringList reslist = SidebarSettings::sources(); - QStringList::iterator it; + TQStringList reslist = SidebarSettings::sources(); + TQStringList::iterator it; for (it = reslist.begin(); it != reslist.end(); ++it) { addedRSSSource(*it); } // fetch added and removed RSS sources - connectDCOPSignal("rssservice", m_rssservice.obj(), "added(QString)", - "addedRSSSource(QString)", false); - connectDCOPSignal("rssservice", m_rssservice.obj(), "removed(QString)", - "removedRSSSource(QString)", false); + connectDCOPSignal("rssservice", m_rssservice.obj(), "added(TQString)", + "addedRSSSource(TQString)", false); + connectDCOPSignal("rssservice", m_rssservice.obj(), "removed(TQString)", + "removedRSSSource(TQString)", false); // show special widget if there are no RSS sources available if (newswidget->isEmpty()) { @@ -110,11 +110,11 @@ namespace KSB_News { - void *KonqSidebar_News::provides(const QString &) {return 0;} + void *KonqSidebar_News::provides(const TQString &) {return 0;} - void KonqSidebar_News::emitStatusBarText (const QString &) {;} + void KonqSidebar_News::emitStatusBarText (const TQString &) {;} - QWidget *KonqSidebar_News::getWidget(){return widgets;} + TQWidget *KonqSidebar_News::getWidget(){return widgets;} void KonqSidebar_News::handleURL(const KURL &/*url*/) {;} @@ -122,11 +122,11 @@ namespace KSB_News { ///////// startup of the DCOP servce /////////////////////////////////////// int KonqSidebar_News::checkDcopService() { - QString rdfservice_error; + TQString rdfservice_error; int err = 0; if (! kapp->dcopClient()->isApplicationRegistered("rssservice")) - if (KApplication::startServiceByDesktopName("rssservice", QString(), + if (KApplication::startServiceByDesktopName("rssservice", TQString(), &rdfservice_error) > 0) err = 1; @@ -137,7 +137,7 @@ namespace KSB_News { ///////// helper methods /////////////////////////////////////////////////// - NSPanel *KonqSidebar_News::getNSPanelByKey(QString key) { + NSPanel *KonqSidebar_News::getNSPanelByKey(TQString key) { NSPanel *nsp = NULL, *current_nsp; for (current_nsp = nspanelptrlist.first(); current_nsp; @@ -150,14 +150,14 @@ namespace KSB_News { } - void KonqSidebar_News::addedRSSSource(QString key) { + void KonqSidebar_News::addedRSSSource(TQString key) { kdDebug(90140) << "KonqSidebar_News::addedRSSSource: " << key << endl; // Only add RSS source if we have registered the URI before in // NSStackTabWidget. if (newswidget->isRegistered(key)) { NSPanel *nspanel = new NSPanel(this, - QString(QString("sidebar-newsticker-")+key).latin1(), + TQString(TQString("sidebar-newsticker-")+key).latin1(), key, &m_rssservice); nspanel->setTitle(key); nspanelptrlist.append(nspanel); @@ -166,19 +166,19 @@ namespace KSB_News { if (! nspanel->listbox()) { TTListBox *listbox = new TTListBox(newswidget, "article_lb"); newswidget->addStackTab(nspanel, listbox); - connect(listbox, SIGNAL(executed(QListBoxItem *)), - this, SLOT(slotArticleItemExecuted(QListBoxItem *))); + connect(listbox, TQT_SIGNAL(executed(TQListBoxItem *)), + this, TQT_SLOT(slotArticleItemExecuted(TQListBoxItem *))); listbox->insertItem(i18n("Connecting..." )); nspanel->setListbox(listbox); } // listen to updates - connect(nspanel, SIGNAL(documentUpdated(NSPanel *)), - this, SLOT(updateArticles(NSPanel *))); - connect(nspanel, SIGNAL(documentUpdated(NSPanel *)), - this, SLOT(updateTitle(NSPanel *))); - connect(nspanel, SIGNAL(pixmapUpdated(NSPanel *)), - this, SLOT(updatePixmap(NSPanel *))); + connect(nspanel, TQT_SIGNAL(documentUpdated(NSPanel *)), + this, TQT_SLOT(updateArticles(NSPanel *))); + connect(nspanel, TQT_SIGNAL(documentUpdated(NSPanel *)), + this, TQT_SLOT(updateTitle(NSPanel *))); + connect(nspanel, TQT_SIGNAL(pixmapUpdated(NSPanel *)), + this, TQT_SLOT(updatePixmap(NSPanel *))); if (widgets->visibleWidget() != newswidget) widgets->raiseWidget(newswidget); @@ -186,7 +186,7 @@ namespace KSB_News { } - void KonqSidebar_News::removedRSSSource(QString key) { + void KonqSidebar_News::removedRSSSource(TQString key) { kdDebug(90140) << "inside KonqSidebar_News::removedSource " << key << endl; if (NSPanel *nsp = getNSPanelByKey(key)) { @@ -202,7 +202,7 @@ namespace KSB_News { ///////////////////////////////////////////////////////////////////// - void KonqSidebar_News::slotArticleItemExecuted(QListBoxItem *item) { + void KonqSidebar_News::slotArticleItemExecuted(TQListBoxItem *item) { if (!item) return; NSPanel *current_nspanel, *nspanel = NULL; @@ -213,7 +213,7 @@ namespace KSB_News { } int subid = nspanel->listbox()->index(item); - QString link = nspanel->articleLinks()[subid]; + TQString link = nspanel->articleLinks()[subid]; emit openURLRequest(KURL(link)); @@ -226,8 +226,8 @@ namespace KSB_News { void KonqSidebar_News::updateArticles(NSPanel *nsp) { nsp->listbox()->clear(); - QStringList articleList = nsp->articles(); - QStringList::iterator it; + TQStringList articleList = nsp->articles(); + TQStringList::iterator it; for (it = articleList.begin(); it != articleList.end(); ++it) nsp->listbox()->insertItem((*it)); } @@ -252,9 +252,9 @@ namespace KSB_News { extern "C" { - KDE_EXPORT void* create_konq_sidebarnews(KInstance *instance, QObject *par, - QWidget *widp, - QString &desktopname, + KDE_EXPORT void* create_konq_sidebarnews(KInstance *instance, TQObject *par, + TQWidget *widp, + TQString &desktopname, const char *name) { KGlobal::locale()->insertCatalogue("konqsidebar_news"); return new KonqSidebar_News(instance, par, widp, desktopname, name); @@ -262,8 +262,8 @@ namespace KSB_News { } extern "C" { - KDE_EXPORT bool add_konq_sidebarnews(QString* fn, QString*, - QMap *map) { + KDE_EXPORT bool add_konq_sidebarnews(TQString* fn, TQString*, + TQMap *map) { map->insert("Type", "Link"); map->insert("Icon", "konqsidebar_news"); map->insert("Name", i18n("Newsticker")); diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.h b/konq-plugins/sidebar/newsticker/sidebar_news.h index e6da786..d09862f 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.h +++ b/konq-plugins/sidebar/newsticker/sidebar_news.h @@ -47,30 +47,30 @@ namespace KSB_News { K_DCOP public: - KonqSidebar_News(KInstance *instance, QObject *parent, - QWidget *widgetParent, QString &desktopName_, + KonqSidebar_News(KInstance *instance, TQObject *parent, + TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_News(); - virtual void *provides(const QString &); - void emitStatusBarText (const QString &); - virtual QWidget *getWidget(); + virtual void *provides(const TQString &); + void emitStatusBarText (const TQString &); + virtual TQWidget *getWidget(); k_dcop: - virtual void addedRSSSource(QString); - virtual void removedRSSSource(QString); + virtual void addedRSSSource(TQString); + virtual void removedRSSSource(TQString); protected: virtual void handleURL(const KURL &url); private: int checkDcopService(); - QWidgetStack *widgets; + TQWidgetStack *widgets; NSStackTabWidget *newswidget; NoRSSWidget *noRSSwidget; - QPtrList nspanelptrlist; - NSPanel *getNSPanelByKey(QString key); + TQPtrList nspanelptrlist; + NSPanel *getNSPanelByKey(TQString key); DCOPRef m_rssservice; - QPixmap m_appIcon; + TQPixmap m_appIcon; signals: // see @@ -78,7 +78,7 @@ namespace KSB_News { const KParts::URLArgs &args = KParts::URLArgs()); private slots: - void slotArticleItemExecuted(QListBoxItem *item); + void slotArticleItemExecuted(TQListBoxItem *item); void updateArticles(NSPanel *nsp); void updateTitle(NSPanel *nsp); void updatePixmap(NSPanel *nsp); -- cgit v1.2.1