From ffe8a83e053396df448e9413828527613ca3bd46 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:46:43 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../kfileaudiopreview/kfileaudiopreview.cpp | 44 +++++++++++----------- .../kfileaudiopreview/kfileaudiopreview.h | 8 ++-- interfaces/kmediaplayer/player.cpp | 4 +- interfaces/kmediaplayer/player.h | 4 +- interfaces/kmediaplayer/view.cpp | 10 ++--- interfaces/kmediaplayer/view.h | 12 +++--- 6 files changed, 41 insertions(+), 41 deletions(-) (limited to 'interfaces/kmediaplayer') diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp index 5db8f65d0..11fa58f27 100644 --- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp +++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp @@ -1,9 +1,9 @@ #include "kfileaudiopreview.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -20,12 +20,12 @@ class KFileAudioPreviewFactory : public KLibFactory { protected: - virtual QObject *createObject( QObject *parent, const char *name, - const char *className, const QStringList & args) + virtual TQObject *createObject( TQObject *parent, const char *name, + const char *className, const TQStringList & args) { Q_UNUSED(className); Q_UNUSED(args); - return new KFileAudioPreview( dynamic_cast( parent ), name ); + return new KFileAudioPreview( dynamic_cast( parent ), name ); } }; @@ -39,9 +39,9 @@ K_EXPORT_COMPONENT_FACTORY( kfileaudiopreview, KFileAudioPreviewFactory ) class KFileAudioPreview::KFileAudioPreviewPrivate { public: - KFileAudioPreviewPrivate( QWidget *parent ) + KFileAudioPreviewPrivate( TQWidget *parent ) { - player = KParts::ComponentFactory::createInstanceFromQuery( "KMediaPlayer/Player", QString::null, parent ); + player = KParts::ComponentFactory::createInstanceFromQuery( "KMediaPlayer/Player", TQString::null, parent ); } ~KFileAudioPreviewPrivate() @@ -53,22 +53,22 @@ public: }; -KFileAudioPreview::KFileAudioPreview( QWidget *parent, const char *name ) +KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name ) : KPreviewWidgetBase( parent, name ) { KGlobal::locale()->insertCatalogue("kfileaudiopreview"); - QStringList formats = KDE::PlayObjectFactory::mimeTypes(); + TQStringList formats = KDE::PlayObjectFactory::mimeTypes(); // ### - QStringList::ConstIterator it = formats.begin(); + TQStringList::ConstIterator it = formats.begin(); for ( ; it != formats.end(); ++it ) m_supportedFormats.insert( *it, (void*) 1 ); - QVGroupBox *box = new QVGroupBox( i18n("Media Player"), this ); - QVBoxLayout *layout = new QVBoxLayout( this ); + TQVGroupBox *box = new TQVGroupBox( i18n("Media Player"), this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); layout->addWidget( box ); - (void) new QWidget( box ); // spacer + (void) new TQWidget( box ); // spacer d = new KFileAudioPreviewPrivate( 0L ); // not box -- being reparented anyway if ( d->player ) // only if there actually is a component... @@ -81,19 +81,19 @@ KFileAudioPreview::KFileAudioPreview( QWidget *parent, const char *name ) // So, reparent first the video widget, then the view. if ( view->videoWidget() ) { - QHBox *frame = new QHBox( box ); - frame->setFrameStyle( QFrame::Panel | QFrame::Sunken ); - frame->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); - view->videoWidget()->reparent( frame, QPoint(0,0) ); + TQHBox *frame = new TQHBox( box ); + frame->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); + frame->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + view->videoWidget()->reparent( frame, TQPoint(0,0) ); } - view->reparent( box, QPoint(0,0) ); + view->reparent( box, TQPoint(0,0) ); } - m_autoPlay = new QCheckBox( i18n("Play &automatically"), box ); + m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box ); KConfigGroup config( KGlobal::config(), ConfigGroup ); m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) ); - connect( m_autoPlay, SIGNAL(toggled(bool)), SLOT(toggleAuto(bool)) ); + connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) ); } KFileAudioPreview::~KFileAudioPreview() diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.h b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.h index df1d19e5b..db921c7e1 100644 --- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.h +++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.h @@ -19,7 +19,7 @@ #ifndef KFILEAUDIOPREVIEW_H #define KFILEAUDIOPREVIEW_H -#include +#include #include #include @@ -39,7 +39,7 @@ class KFileAudioPreview : public KPreviewWidgetBase Q_OBJECT public: - KFileAudioPreview(QWidget *parent = 0, const char *name = 0 ); + KFileAudioPreview(TQWidget *parent = 0, const char *name = 0 ); ~KFileAudioPreview(); public slots: @@ -50,9 +50,9 @@ private slots: void toggleAuto(bool); private: - QDict m_supportedFormats; + TQDict m_supportedFormats; KURL m_currentURL; - QCheckBox *m_autoPlay; + TQCheckBox *m_autoPlay; protected: virtual void virtual_hook( int id, void* data ); diff --git a/interfaces/kmediaplayer/player.cpp b/interfaces/kmediaplayer/player.cpp index cbfba1368..681459731 100644 --- a/interfaces/kmediaplayer/player.cpp +++ b/interfaces/kmediaplayer/player.cpp @@ -28,7 +28,7 @@ KMediaPlayer::PlayerDCOPObject::PlayerDCOPObject(void) { } -KMediaPlayer::Player::Player(QWidget *, const char *, QObject *parent, const char *name) +KMediaPlayer::Player::Player(TQWidget *, const char *, TQObject *parent, const char *name) : KParts::ReadOnlyPart(parent, name) , currentLooping(false) , currentState(Empty) @@ -36,7 +36,7 @@ KMediaPlayer::Player::Player(QWidget *, const char *, QObject *parent, const cha { } -KMediaPlayer::Player::Player(QObject *parent, const char *name) +KMediaPlayer::Player::Player(TQObject *parent, const char *name) : KParts::ReadOnlyPart(parent, name) , currentLooping(false) , currentState(Empty) diff --git a/interfaces/kmediaplayer/player.h b/interfaces/kmediaplayer/player.h index 89a4a0b23..10e9f4a74 100644 --- a/interfaces/kmediaplayer/player.h +++ b/interfaces/kmediaplayer/player.h @@ -51,12 +51,12 @@ public: /** This constructor is what to use when no GUI is required, as in the * case of a KMediaPlayer/Engine. */ - Player(QObject *parent, const char *name); + Player(TQObject *parent, const char *name); /** This constructor is what to use when a GUI is required, as in the * case of a KMediaPlayer/Player. */ - Player(QWidget *parentWidget, const char *widgetName, QObject *parent, const char *name); + Player(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name); virtual ~Player(void); diff --git a/interfaces/kmediaplayer/view.cpp b/interfaces/kmediaplayer/view.cpp index c231d8aaf..64e3bf484 100644 --- a/interfaces/kmediaplayer/view.cpp +++ b/interfaces/kmediaplayer/view.cpp @@ -27,11 +27,11 @@ struct KMediaPlayer::View::Data { Data() : videoWidget(0L) {} - QWidget *videoWidget; + TQWidget *videoWidget; }; -KMediaPlayer::View::View(QWidget *parent, const char *name) - : QWidget(parent, name) +KMediaPlayer::View::View(TQWidget *parent, const char *name) + : TQWidget(parent, name) , currentButtons((int)All) , d(new Data()) { @@ -76,12 +76,12 @@ void KMediaPlayer::View::toggleButton(int b) setButtons(currentButtons ^ b); } -void KMediaPlayer::View::setVideoWidget(QWidget *videoWidget) +void KMediaPlayer::View::setVideoWidget(TQWidget *videoWidget) { d->videoWidget = videoWidget; } -QWidget* KMediaPlayer::View::videoWidget() +TQWidget* KMediaPlayer::View::videoWidget() { return d->videoWidget; } diff --git a/interfaces/kmediaplayer/view.h b/interfaces/kmediaplayer/view.h index be60f9e75..54f46a8ca 100644 --- a/interfaces/kmediaplayer/view.h +++ b/interfaces/kmediaplayer/view.h @@ -24,7 +24,7 @@ #ifndef KMEDIAPLAYERVIEW_H #define KMEDIAPLAYERVIEW_H -#include +#include #include namespace KMediaPlayer @@ -36,8 +36,8 @@ class KDE_EXPORT View : public QWidget Q_OBJECT public: - /** Your typical QWidget constructor. */ - View(QWidget *parent, const char *name); + /** Your typical TQWidget constructor. */ + View(TQWidget *parent, const char *name); virtual ~View(void); /** The Possible buttons that can appear in the UI. */ @@ -58,9 +58,9 @@ public: /** Return which buttons are being displayed. */ int buttons(void); - /** Return the QWidget in which video is displayed. + /** Return the TQWidget in which video is displayed. May Return 0L if there is none. */ - QWidget *videoWidget(); + TQWidget *videoWidget(); public slots: /** Set which buttons to display. See Button. */ @@ -84,7 +84,7 @@ protected: the video will be displayed. KMediaPlayer users may reparent() it to somewhere else, for example. */ - void setVideoWidget(QWidget *videoWidget); + void setVideoWidget(TQWidget *videoWidget); private: int currentButtons; -- cgit v1.2.1