From c663b6440964f6ac48027143ac9e63298991f9d0 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:33:34 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kioslave/media/kcmodule/main.cpp | 22 +++++------ kioslave/media/kcmodule/main.h | 4 +- kioslave/media/kcmodule/managermodule.cpp | 8 ++-- kioslave/media/kcmodule/managermodule.h | 2 +- kioslave/media/kcmodule/mimetypelistboxitem.cpp | 6 +-- kioslave/media/kcmodule/mimetypelistboxitem.h | 10 ++--- kioslave/media/kcmodule/notifiermodule.cpp | 50 ++++++++++++------------- kioslave/media/kcmodule/notifiermodule.h | 6 +-- kioslave/media/kcmodule/serviceconfigdialog.cpp | 38 +++++++++---------- kioslave/media/kcmodule/serviceconfigdialog.h | 4 +- 10 files changed, 75 insertions(+), 75 deletions(-) (limited to 'kioslave/media/kcmodule') diff --git a/kioslave/media/kcmodule/main.cpp b/kioslave/media/kcmodule/main.cpp index e431e95f8..da52ea119 100644 --- a/kioslave/media/kcmodule/main.cpp +++ b/kioslave/media/kcmodule/main.cpp @@ -19,8 +19,8 @@ #include "main.h" -#include -#include +#include +#include #include #include @@ -32,16 +32,16 @@ #include "managermodule.h" -typedef KGenericFactory MediaFactory; +typedef KGenericFactory MediaFactory; K_EXPORT_COMPONENT_FACTORY( kcm_media, MediaFactory( "kcmmedia" ) ) -MediaModule::MediaModule( QWidget *parent, const char *name, const QStringList& ) +MediaModule::MediaModule( TQWidget *parent, const char *name, const TQStringList& ) : KCModule(MediaFactory::instance(), parent, name ) { KGlobal::locale()->insertCatalogue("kio_media"); - QVBoxLayout *layout = new QVBoxLayout( this, 0, KDialog::spacingHint() ); - QTabWidget *tab = new QTabWidget( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQTabWidget *tab = new TQTabWidget( this ); layout->addWidget( tab ); @@ -49,13 +49,13 @@ MediaModule::MediaModule( QWidget *parent, const char *name, const QStringList& m_notifierModule = new NotifierModule( this, "notifier" ); tab->addTab( m_notifierModule, i18n( "&Notifications" ) ); - connect( m_notifierModule, SIGNAL( changed( bool ) ), - this, SLOT( moduleChanged( bool ) ) ); + connect( m_notifierModule, TQT_SIGNAL( changed( bool ) ), + this, TQT_SLOT( moduleChanged( bool ) ) ); m_managerModule = new ManagerModule( this, "manager" ); tab->addTab( m_managerModule, i18n( "&Advanced" ) ); - connect( m_managerModule, SIGNAL( changed( bool ) ), - this, SLOT( moduleChanged( bool ) ) ); + connect( m_managerModule, TQT_SIGNAL( changed( bool ) ), + this, TQT_SLOT( moduleChanged( bool ) ) ); @@ -95,7 +95,7 @@ void MediaModule::moduleChanged( bool state ) emit changed( state ); } -QString MediaModule::quickHelp() const +TQString MediaModule::quickHelp() const { return i18n("FIXME : Write me..."); } diff --git a/kioslave/media/kcmodule/main.h b/kioslave/media/kcmodule/main.h index 1ab909527..14e747bd9 100644 --- a/kioslave/media/kcmodule/main.h +++ b/kioslave/media/kcmodule/main.h @@ -27,12 +27,12 @@ class MediaModule : public KCModule Q_OBJECT public: - MediaModule( QWidget *parent, const char *name, const QStringList& ); + MediaModule( TQWidget *parent, const char *name, const TQStringList& ); virtual void load(); virtual void save(); virtual void defaults(); - virtual QString quickHelp() const; + virtual TQString quickHelp() const; protected slots: void moduleChanged( bool state ); diff --git a/kioslave/media/kcmodule/managermodule.cpp b/kioslave/media/kcmodule/managermodule.cpp index e5f493d27..e0b30b90f 100644 --- a/kioslave/media/kcmodule/managermodule.cpp +++ b/kioslave/media/kcmodule/managermodule.cpp @@ -22,13 +22,13 @@ #include #include -#include +#include #include #include "managermoduleview.h" #include "mediamanagersettings.h" -ManagerModule::ManagerModule( QWidget* parent, const char* name ) +ManagerModule::ManagerModule( TQWidget* parent, const char* name ) : KCModule( parent, name ) { ManagerModuleView *view = new ManagerModuleView( this ); @@ -36,14 +36,14 @@ ManagerModule::ManagerModule( QWidget* parent, const char* name ) addConfig( MediaManagerSettings::self(), view ); #ifndef COMPILE_HALBACKEND - QString hal_text = view->kcfg_HalBackendEnabled->text(); + TQString hal_text = view->kcfg_HalBackendEnabled->text(); hal_text += " ("+i18n("No support for HAL on this system")+")"; view->kcfg_HalBackendEnabled->setText( hal_text ); #endif view->kcfg_HalBackendEnabled->setEnabled( false ); #ifndef COMPILE_LINUXCDPOLLING - QString poll_text = view->kcfg_CdPollingEnabled->text(); + TQString poll_text = view->kcfg_CdPollingEnabled->text(); poll_text += " ("+i18n("No support for CD polling on this system")+")"; view->kcfg_CdPollingEnabled->setText( poll_text ); #endif diff --git a/kioslave/media/kcmodule/managermodule.h b/kioslave/media/kcmodule/managermodule.h index 7fa3d649a..0b62dfc5e 100644 --- a/kioslave/media/kcmodule/managermodule.h +++ b/kioslave/media/kcmodule/managermodule.h @@ -26,7 +26,7 @@ class ManagerModule : public KCModule Q_OBJECT public: - ManagerModule( QWidget* parent = 0, const char* name = 0); + ManagerModule( TQWidget* parent = 0, const char* name = 0); void save(); }; diff --git a/kioslave/media/kcmodule/mimetypelistboxitem.cpp b/kioslave/media/kcmodule/mimetypelistboxitem.cpp index 86460ed88..e7334248a 100644 --- a/kioslave/media/kcmodule/mimetypelistboxitem.cpp +++ b/kioslave/media/kcmodule/mimetypelistboxitem.cpp @@ -21,14 +21,14 @@ #include -MimetypeListBoxItem::MimetypeListBoxItem(const QString &mimetype, QListBox *parent) - : QListBoxText(parent), m_mimetype(mimetype) +MimetypeListBoxItem::MimetypeListBoxItem(const TQString &mimetype, TQListBox *parent) + : TQListBoxText(parent), m_mimetype(mimetype) { KMimeType::Ptr mime = KMimeType::mimeType( mimetype ); setText( mime->comment() ); } -const QString &MimetypeListBoxItem::mimetype() const +const TQString &MimetypeListBoxItem::mimetype() const { return m_mimetype; } diff --git a/kioslave/media/kcmodule/mimetypelistboxitem.h b/kioslave/media/kcmodule/mimetypelistboxitem.h index fee215ecf..f61afba3d 100644 --- a/kioslave/media/kcmodule/mimetypelistboxitem.h +++ b/kioslave/media/kcmodule/mimetypelistboxitem.h @@ -20,18 +20,18 @@ #ifndef _MIMETYPELISTBOXITEM_H_ #define _MIMETYPELISTBOXITEM_H_ -#include -#include +#include +#include class MimetypeListBoxItem : public QListBoxText { public: - MimetypeListBoxItem(const QString &mimetype, QListBox *parent); + MimetypeListBoxItem(const TQString &mimetype, TQListBox *parent); - const QString &mimetype() const; + const TQString &mimetype() const; private: - QString m_mimetype; + TQString m_mimetype; }; #endif diff --git a/kioslave/media/kcmodule/notifiermodule.cpp b/kioslave/media/kcmodule/notifiermodule.cpp index 015d7396a..c7871c953 100644 --- a/kioslave/media/kcmodule/notifiermodule.cpp +++ b/kioslave/media/kcmodule/notifiermodule.cpp @@ -21,7 +21,7 @@ #include -#include +#include #include #include #include @@ -31,10 +31,10 @@ #include "actionlistboxitem.h" #include "mimetypelistboxitem.h" -NotifierModule::NotifierModule(QWidget *parent, const char *name) +NotifierModule::NotifierModule(TQWidget *parent, const char *name) : KCModule(parent, name) { - QBoxLayout *layout = new QVBoxLayout( this, 0, KDialog::spacingHint() ); + TQBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); m_view = new NotifierModuleView( this ); layout->addWidget( m_view ); @@ -45,10 +45,10 @@ NotifierModule::NotifierModule(QWidget *parent, const char *name) m_view->mimetypesCombo->insertItem( i18n("All Mime Types") ); - QStringList mimetypes = m_settings.supportedMimetypes(); + TQStringList mimetypes = m_settings.supportedMimetypes(); - QStringList::iterator it = mimetypes.begin(); - QStringList::iterator end = mimetypes.end(); + TQStringList::iterator it = mimetypes.begin(); + TQStringList::iterator end = mimetypes.end(); for ( ; it!=end; ++it ) { @@ -57,18 +57,18 @@ NotifierModule::NotifierModule(QWidget *parent, const char *name) updateListBox(); - connect( m_view->mimetypesCombo, SIGNAL( activated(int) ), - this, SLOT( slotMimeTypeChanged(int) ) ); - connect( m_view->actionsList, SIGNAL( selectionChanged(QListBoxItem*) ), - this, SLOT( slotActionSelected(QListBoxItem*) ) ); - connect( m_view->addButton, SIGNAL( clicked() ), - this, SLOT( slotAdd() ) ); - connect( m_view->editButton, SIGNAL( clicked() ), - this, SLOT( slotEdit() ) ); - connect( m_view->deleteButton, SIGNAL( clicked() ), - this, SLOT( slotDelete() ) ); - connect( m_view->toggleAutoButton, SIGNAL( clicked() ), - this, SLOT( slotToggleAuto() ) ); + connect( m_view->mimetypesCombo, TQT_SIGNAL( activated(int) ), + this, TQT_SLOT( slotMimeTypeChanged(int) ) ); + connect( m_view->actionsList, TQT_SIGNAL( selectionChanged(TQListBoxItem*) ), + this, TQT_SLOT( slotActionSelected(TQListBoxItem*) ) ); + connect( m_view->addButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotAdd() ) ); + connect( m_view->editButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotEdit() ) ); + connect( m_view->deleteButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotDelete() ) ); + connect( m_view->toggleAutoButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotToggleAuto() ) ); } NotifierModule::~NotifierModule() @@ -97,7 +97,7 @@ void NotifierModule::updateListBox() m_view->actionsList->clear(); slotActionSelected( 0L ); - QValueList services; + TQValueList services; if ( m_mimetype.isEmpty() ) { services = m_settings.actions(); @@ -107,7 +107,7 @@ void NotifierModule::updateListBox() services = m_settings.actionsForMimetype( m_mimetype ); } - QValueList::iterator it; + TQValueList::iterator it; for ( it = services.begin(); it != services.end(); ++it ) { @@ -115,7 +115,7 @@ void NotifierModule::updateListBox() } } -void NotifierModule::slotActionSelected(QListBoxItem *item) +void NotifierModule::slotActionSelected(TQListBoxItem *item) { NotifierAction *action = 0L; @@ -137,11 +137,11 @@ void NotifierModule::slotMimeTypeChanged(int index) { if ( index == 0 ) { - m_mimetype = QString(); + m_mimetype = TQString(); } else { - QListBoxItem *item = m_view->mimetypesCombo->listBox()->item( index ); + TQListBoxItem *item = m_view->mimetypesCombo->listBox()->item( index ); MimetypeListBoxItem *mime_item = static_cast( item ); m_mimetype = mime_item->mimetype(); @@ -157,7 +157,7 @@ void NotifierModule::slotAdd() int value = dialog.exec(); - if ( value == QDialog::Accepted ) + if ( value == TQDialog::Accepted ) { m_settings.addAction( action ); updateListBox(); @@ -181,7 +181,7 @@ void NotifierModule::slotEdit() int value = dialog.exec(); - if ( value == QDialog::Accepted ) + if ( value == TQDialog::Accepted ) { updateListBox(); emit changed( true ); diff --git a/kioslave/media/kcmodule/notifiermodule.h b/kioslave/media/kcmodule/notifiermodule.h index 6c71df51f..e284e87fe 100644 --- a/kioslave/media/kcmodule/notifiermodule.h +++ b/kioslave/media/kcmodule/notifiermodule.h @@ -30,7 +30,7 @@ class NotifierModule : public KCModule Q_OBJECT public: - NotifierModule( QWidget* parent = 0, const char* name = 0); + NotifierModule( TQWidget* parent = 0, const char* name = 0); ~NotifierModule(); void load(); @@ -43,13 +43,13 @@ private slots: void slotEdit(); void slotToggleAuto(); - void slotActionSelected( QListBoxItem * item ); + void slotActionSelected( TQListBoxItem * item ); void slotMimeTypeChanged( int index ); private: void updateListBox(); - QString m_mimetype; + TQString m_mimetype; NotifierSettings m_settings; NotifierModuleView *m_view; }; diff --git a/kioslave/media/kcmodule/serviceconfigdialog.cpp b/kioslave/media/kcmodule/serviceconfigdialog.cpp index 1a127d12b..61dd060f2 100644 --- a/kioslave/media/kcmodule/serviceconfigdialog.cpp +++ b/kioslave/media/kcmodule/serviceconfigdialog.cpp @@ -23,20 +23,20 @@ #include #include #include -#include +#include #include #include #include #include -#include -#include +#include +#include #include "mimetypelistboxitem.h" ServiceConfigDialog::ServiceConfigDialog(NotifierServiceAction *action, - const QStringList &mimetypesList, - QWidget* parent, const char* name) + const TQStringList &mimetypesList, + TQWidget* parent, const char* name) : KDialogBase(parent, name, true, i18n("Edit Service"), Ok|Cancel, Ok, true), m_action(action) { @@ -46,22 +46,22 @@ ServiceConfigDialog::ServiceConfigDialog(NotifierServiceAction *action, m_view->labelEdit->setText( m_action->label() ); m_view->commandEdit->setText( m_action->service().m_strExec ); - QIconSet iconSet = SmallIconSet("configure"); - QPixmap pixMap = iconSet.pixmap( QIconSet::Small, QIconSet::Normal ); + TQIconSet iconSet = SmallIconSet("configure"); + TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); m_view->commandButton->setIconSet( iconSet ); m_view->commandButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); m_iconChanged = false; - QStringList all_mimetypes = mimetypesList; - QStringList action_mimetypes = action->mimetypes(); + TQStringList all_mimetypes = mimetypesList; + TQStringList action_mimetypes = action->mimetypes(); - QStringList::iterator it = all_mimetypes.begin(); - QStringList::iterator end = all_mimetypes.end(); + TQStringList::iterator it = all_mimetypes.begin(); + TQStringList::iterator end = all_mimetypes.end(); for ( ; it!=end; ++it ) { - QListBox *list; + TQListBox *list; if ( action_mimetypes.contains( *it ) ) { @@ -78,10 +78,10 @@ ServiceConfigDialog::ServiceConfigDialog(NotifierServiceAction *action, setMainWidget(m_view); setCaption( m_action->label() ); - connect( m_view->iconButton, SIGNAL( iconChanged(QString) ), - this, SLOT( slotIconChanged() ) ); - connect( m_view->commandButton, SIGNAL( clicked() ), - this, SLOT( slotCommand() ) ); + connect( m_view->iconButton, TQT_SIGNAL( iconChanged(TQString) ), + this, TQT_SLOT( slotIconChanged() ) ); + connect( m_view->commandButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotCommand() ) ); } bool operator==( KDEDesktopMimeType::Service s1, KDEDesktopMimeType::Service s2 ) @@ -103,12 +103,12 @@ void ServiceConfigDialog::slotOk() service.m_strIcon = m_view->iconButton->icon(); service.m_strExec = m_view->commandEdit->text(); - QStringList mimetypes; + TQStringList mimetypes; uint list_count = m_view->mimetypesSelector->selectedListBox()->count(); for( uint i=0; i < list_count; ++i ) { - QListBoxItem *item = m_view->mimetypesSelector->selectedListBox()->item(i); + TQListBoxItem *item = m_view->mimetypesSelector->selectedListBox()->item(i); MimetypeListBoxItem *mime_item = static_cast( item ); mimetypes.append( mime_item->mimetype() ); } @@ -134,7 +134,7 @@ void ServiceConfigDialog::slotCommand() { KOpenWithDlg d(this); int value = d.exec(); - if ( value == QDialog::Accepted ) + if ( value == TQDialog::Accepted ) { KService::Ptr service = d.service(); if ( service != 0L ) diff --git a/kioslave/media/kcmodule/serviceconfigdialog.h b/kioslave/media/kcmodule/serviceconfigdialog.h index 090a978d4..24e907205 100644 --- a/kioslave/media/kcmodule/serviceconfigdialog.h +++ b/kioslave/media/kcmodule/serviceconfigdialog.h @@ -31,8 +31,8 @@ class ServiceConfigDialog : public KDialogBase public: ServiceConfigDialog(NotifierServiceAction *action, - const QStringList &mimetypesList, - QWidget* parent = 0, const char* name = 0); + const TQStringList &mimetypesList, + TQWidget* parent = 0, const char* name = 0); public slots: void slotOk(); -- cgit v1.2.1