From 7be55ffa061c026e35e2d6a0effe1161ddb0d41f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:53:50 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kontact/src/aboutdialog.cpp | 54 ++++----- kontact/src/aboutdialog.h | 4 +- kontact/src/iconsidepane.cpp | 152 +++++++++++++------------- kontact/src/iconsidepane.h | 70 ++++++------ kontact/src/kcmkontact.cpp | 42 +++---- kontact/src/kcmkontact.h | 12 +- kontact/src/kontactiface.h | 2 +- kontact/src/main.cpp | 12 +- kontact/src/mainwindow.cpp | 242 ++++++++++++++++++++--------------------- kontact/src/mainwindow.h | 42 +++---- kontact/src/profiledialog.cpp | 100 ++++++++--------- kontact/src/profiledialog.h | 32 +++--- kontact/src/profilemanager.cpp | 80 +++++++------- kontact/src/profilemanager.h | 68 ++++++------ kontact/src/sidepanebase.cpp | 4 +- kontact/src/sidepanebase.h | 8 +- 16 files changed, 462 insertions(+), 462 deletions(-) (limited to 'kontact/src') diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp index d0a43721a..19e9d9ea7 100644 --- a/kontact/src/aboutdialog.cpp +++ b/kontact/src/aboutdialog.cpp @@ -33,8 +33,8 @@ #include #include -#include -#include +#include +#include #include @@ -45,12 +45,12 @@ AboutDialog::AboutDialog( Kontact::Core *core, const char *name ) true ), mCore( core ) { - addAboutData( i18n( "Kontact Container" ), QString( "kontact" ), + addAboutData( i18n( "Kontact Container" ), TQString( "kontact" ), KGlobal::instance()->aboutData() ); - QValueList plugins = mCore->pluginList(); - QValueList::ConstIterator end = plugins.end(); - QValueList::ConstIterator it = plugins.begin(); + TQValueList plugins = mCore->pluginList(); + TQValueList::ConstIterator end = plugins.end(); + TQValueList::ConstIterator it = plugins.begin(); for ( ; it != end; ++it ) addAboutPlugin( *it ); @@ -62,22 +62,22 @@ void AboutDialog::addAboutPlugin( Kontact::Plugin *plugin ) addAboutData( plugin->title(), plugin->icon(), plugin->aboutData() ); } -void AboutDialog::addAboutData( const QString &title, const QString &icon, +void AboutDialog::addAboutData( const TQString &title, const TQString &icon, const KAboutData *about ) { - QPixmap pixmap = KGlobal::iconLoader()->loadIcon( icon, + TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( icon, KIcon::Desktop, 48 ); - QFrame *topFrame = addPage( title, QString::null, pixmap ); + TQFrame *topFrame = addPage( title, TQString::null, pixmap ); - QBoxLayout *topLayout = new QVBoxLayout( topFrame ); + TQBoxLayout *topLayout = new TQVBoxLayout( topFrame ); if ( !about ) { - QLabel *label = new QLabel( i18n( "No about information available." ), + TQLabel *label = new TQLabel( i18n( "No about information available." ), topFrame ); topLayout->addWidget( label ); } else { - QString text; + TQString text; text += "

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

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

Authors:

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

Thanks to:

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

Translators:

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

%1

" ) + TQString loading = i18n( "

%1

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

Welcome to Kontact %1

" + TQString info = i18n( "

Welcome to Kontact %1

" "

%1

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