diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:22:56 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:22:56 +0000 |
commit | 7346aee26bf190a7e70333c40fab4caca847cd27 (patch) | |
tree | 4b019b434f88dcc3eeaafe1d3f26240b4c4718e8 /noatun-plugins/nexscope | |
parent | 23a3d3aa5b44cbdf305495919866d9dbf4f6da54 (diff) | |
download | tdeaddons-7346aee26bf190a7e70333c40fab4caca847cd27.tar.gz tdeaddons-7346aee26bf190a7e70333c40fab4caca847cd27.zip |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1157634 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'noatun-plugins/nexscope')
-rw-r--r-- | noatun-plugins/nexscope/bitmappool.cpp | 4 | ||||
-rw-r--r-- | noatun-plugins/nexscope/gui.cpp | 60 | ||||
-rw-r--r-- | noatun-plugins/nexscope/gui.h | 20 | ||||
-rw-r--r-- | noatun-plugins/nexscope/nex.cpp | 74 | ||||
-rw-r--r-- | noatun-plugins/nexscope/nex.h | 64 | ||||
-rw-r--r-- | noatun-plugins/nexscope/noatunplugin.cpp | 2 | ||||
-rw-r--r-- | noatun-plugins/nexscope/noatunplugin.h | 2 | ||||
-rw-r--r-- | noatun-plugins/nexscope/regionwidget.cpp | 20 | ||||
-rw-r--r-- | noatun-plugins/nexscope/regionwidget.h | 20 | ||||
-rw-r--r-- | noatun-plugins/nexscope/renderers.cpp | 12 | ||||
-rw-r--r-- | noatun-plugins/nexscope/renderers.h | 2 |
11 files changed, 140 insertions, 140 deletions
diff --git a/noatun-plugins/nexscope/bitmappool.cpp b/noatun-plugins/nexscope/bitmappool.cpp index 0a0ad78..45f35d0 100644 --- a/noatun-plugins/nexscope/bitmappool.cpp +++ b/noatun-plugins/nexscope/bitmappool.cpp @@ -22,7 +22,7 @@ Bitmap *BitmapPool::get(bool clear) { mMutex.lock(); BitmapPool::PoolItem *p=0; - for (QPtrListIterator<BitmapPool::PoolItem> i(mBitmaps); i.current(); ++i) + for (TQPtrListIterator<BitmapPool::PoolItem> i(mBitmaps); i.current(); ++i) { if (!(*i)->used) p=*i; @@ -44,7 +44,7 @@ Bitmap *BitmapPool::get(bool clear) void BitmapPool::release(Bitmap *bitmap) { mMutex.lock(); - for (QPtrListIterator<BitmapPool::PoolItem> i(mBitmaps); i.current(); ++i) + for (TQPtrListIterator<BitmapPool::PoolItem> i(mBitmaps); i.current(); ++i) { if (&((*i)->bitmap)==bitmap) (*i)->used=false; diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp index 912d8ea..9a4776e 100644 --- a/noatun-plugins/nexscope/gui.cpp +++ b/noatun-plugins/nexscope/gui.cpp @@ -1,7 +1,7 @@ #include <klocale.h> -#include <qheader.h> -#include <qlayout.h> -#include <qdragobject.h> +#include <tqheader.h> +#include <tqlayout.h> +#include <tqdragobject.h> #include <kfiledialog.h> #include <kstdaction.h> #include <kaction.h> @@ -13,8 +13,8 @@ class CreatorItem : public QListViewItem { public: - CreatorItem(QListView *parent, const QString &title) - : QListViewItem(parent, title) + CreatorItem(TQListView *parent, const TQString &title) + : TQListViewItem(parent, title) {} }; @@ -22,7 +22,7 @@ class TreeItem : public QListViewItem { public: TreeItem(TreeItem *parent, TreeItem *after, CreatorItem *creator) - : QListViewItem(parent, after, creator->text(0)) + : TQListViewItem(parent, after, creator->text(0)) { RendererList *list; if (parent) @@ -42,8 +42,8 @@ public: list->unlock(); } - TreeItem(QListView *parent, TreeItem *after, const QString &title) - : QListViewItem(parent, after, title) + TreeItem(TQListView *parent, TreeItem *after, const TQString &title) + : TQListViewItem(parent, after, title) { mRenderer=nex->rendererList(); setExpandable(true); @@ -72,27 +72,27 @@ Control::Control() : mConfigurator(0) { { KToolBar *tools=toolBar(); - KStdAction::save(this, SLOT(save()), actionCollection())->plug(tools); - KStdAction::saveAs(this, SLOT(saveAs()), actionCollection())->plug(tools); - KStdAction::open(this, SLOT(open()), actionCollection())->plug(tools); + KStdAction::save(this, TQT_SLOT(save()), actionCollection())->plug(tools); + KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection())->plug(tools); + KStdAction::open(this, TQT_SLOT(open()), actionCollection())->plug(tools); } setCaption(i18n("Nex Configuration")); - QSplitter *mainSplitter=new QSplitter(this); + TQSplitter *mainSplitter=new TQSplitter(this); setCentralWidget(mainSplitter); - QSplitter *left=new QSplitter(Qt::Vertical, mainSplitter); + TQSplitter *left=new TQSplitter(Qt::Vertical, mainSplitter); { mTree=new RendererListView(left); mTree->setItemsMovable(true); mTree->setSorting(-1); mTree->setRootIsDecorated(true); - connect(mTree, SIGNAL(dropped(QDropEvent*, QListViewItem*, QListViewItem*)), - SLOT(dropEvent(QDropEvent*, QListViewItem*, QListViewItem*))); + connect(mTree, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*, TQListViewItem*))); - connect(mTree, SIGNAL(currentChanged(QListViewItem*)), - SLOT(currentChanged(QListViewItem*))); + connect(mTree, TQT_SIGNAL(currentChanged(TQListViewItem*)), + TQT_SLOT(currentChanged(TQListViewItem*))); mCreatorsList=new RendererListView(left); mCreatorsList->addColumn(i18n("Name")); @@ -100,11 +100,11 @@ Control::Control() : mConfigurator(0) mCreatorsList->setDropVisualizer(false); } - mRight=new QWidget(mainSplitter); - (new QHBoxLayout(mRight))->setAutoAdd(true); + mRight=new TQWidget(mainSplitter); + (new TQHBoxLayout(mRight))->setAutoAdd(true); - QStringList list=nex->renderers(); - for (QStringList::Iterator i=list.begin(); i!=list.end(); ++i) + TQStringList list=nex->renderers(); + for (TQStringList::Iterator i=list.begin(); i!=list.end(); ++i) addCreator(*i); new TreeItem(mTree, 0, i18n("Main")); @@ -144,12 +144,12 @@ void Control::open(const KURL &file) } -void Control::addCreator(const QString &title) +void Control::addCreator(const TQString &title) { new CreatorItem(mCreatorsList, title); } -void Control::dropEvent(QDropEvent *e, QListViewItem *parent, QListViewItem *pafter) +void Control::dropEvent(TQDropEvent *e, TQListViewItem *parent, TQListViewItem *pafter) { // if ((e->source() == mCreatorsList) && parent) { @@ -163,7 +163,7 @@ void Control::dropEvent(QDropEvent *e, QListViewItem *parent, QListViewItem *paf } } -void Control::currentChanged(QListViewItem *item) +void Control::currentChanged(TQListViewItem *item) { TreeItem *treeItem=static_cast<TreeItem*>(item); delete mConfigurator; @@ -173,24 +173,24 @@ void Control::currentChanged(QListViewItem *item) } -RendererListView::RendererListView(QWidget *p) : KListView(p) +RendererListView::RendererListView(TQWidget *p) : KListView(p) { addColumn(i18n("Name")); header()->hide(); setDragEnabled(true); setAcceptDrops(true); - setSelectionMode(QListView::Single); + setSelectionMode(TQListView::Single); } -bool RendererListView::acceptDrag(QDropEvent *event) const +bool RendererListView::acceptDrag(TQDropEvent *event) const { - return true; //QCString(event->format()) == "application/x-nex-rendererdrag"; + return true; //TQCString(event->format()) == "application/x-nex-rendererdrag"; } -QDragObject *RendererListView::dragObject() const +TQDragObject *RendererListView::dragObject() const { if (!currentItem()) return 0; - return new QStoredDrag("application/x-nex-rendererdrag", (QWidget*)this); + return new TQStoredDrag("application/x-nex-rendererdrag", (TQWidget*)this); } diff --git a/noatun-plugins/nexscope/gui.h b/noatun-plugins/nexscope/gui.h index 84fd2bf..3fea2ae 100644 --- a/noatun-plugins/nexscope/gui.h +++ b/noatun-plugins/nexscope/gui.h @@ -3,8 +3,8 @@ #include <kmainwindow.h> #include <klistview.h> -#include <qsplitter.h> -#include <qdict.h> +#include <tqsplitter.h> +#include <tqdict.h> #include <dcopobject.h> #include <kurl.h> @@ -17,7 +17,7 @@ Q_OBJECT public: Control(); - void addCreator(const QString &title); + void addCreator(const TQString &title); public slots: void save(const KURL &file); @@ -28,13 +28,13 @@ public slots: void open(const KURL &file); protected slots: - void dropEvent(QDropEvent *e, QListViewItem *parent, QListViewItem *pafter); - void currentChanged(QListViewItem *item); + void dropEvent(TQDropEvent *e, TQListViewItem *parent, TQListViewItem *pafter); + void currentChanged(TQListViewItem *item); private: - QWidget *mRight; + TQWidget *mRight; KListView *mTree, *mCreatorsList; - QWidget *mConfigurator; + TQWidget *mConfigurator; KURL mCurrentURL; }; @@ -43,11 +43,11 @@ class RendererListView : public KListView { Q_OBJECT public: - RendererListView(QWidget *p); + RendererListView(TQWidget *p); protected: - virtual bool acceptDrag(QDropEvent *event) const; - virtual QDragObject *dragObject() const; + virtual bool acceptDrag(TQDropEvent *event) const; + virtual TQDragObject *dragObject() const; }; diff --git a/noatun-plugins/nexscope/nex.cpp b/noatun-plugins/nexscope/nex.cpp index af19409..c152c95 100644 --- a/noatun-plugins/nexscope/nex.cpp +++ b/noatun-plugins/nexscope/nex.cpp @@ -8,16 +8,16 @@ #include <kcmdlineargs.h> #include <klocale.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qmultilineedit.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqmultilineedit.h> #include "renderers.h" Mutex runLock; Nex *Nex::sNex=0; -QTime timer; +TQTime timer; Renderer::Renderer() {} Renderer::~Renderer() {} @@ -56,13 +56,13 @@ int Thread::threadRun(void *v) return t->run(); } -NexCheckBox::NexCheckBox(QWidget *parent, - const QString &name, bool *v) - : QCheckBox(name, parent) +NexCheckBox::NexCheckBox(TQWidget *parent, + const TQString &name, bool *v) + : TQCheckBox(name, parent) { value=v; setChecked(*v); - connect(this, SIGNAL(toggled(bool)), SLOT(change(bool))); + connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(change(bool))); } void NexCheckBox::change(bool b) { @@ -71,16 +71,16 @@ void NexCheckBox::change(bool b) -NexColorButton::NexColorButton(QWidget *parent, Pixel *color) +NexColorButton::NexColorButton(TQWidget *parent, Pixel *color) : KColorButton(parent) { c=color; - QColor temp( (*c >> 16) & 0xFF, (*c >> 8) & 0xFF, *c & 0xFF); + TQColor temp( (*c >> 16) & 0xFF, (*c >> 8) & 0xFF, *c & 0xFF); setColor(temp); - connect(this, SIGNAL(changed(const QColor&)), SLOT(change(const QColor&))); + connect(this, TQT_SIGNAL(changed(const TQColor&)), TQT_SLOT(change(const TQColor&))); } -void NexColorButton::change(const QColor &co) +void NexColorButton::change(const TQColor &co) { *c= COLOR(qRed(co.rgb()), qGreen(co.rgb()), qBlue(co.rgb())); } @@ -313,7 +313,7 @@ Bitmap *RendererList::render(float *pcm[4], Bitmap *source) if (mClearAfter) mFrame->clear(); lock(); - for (QPtrListIterator<Renderer> i(mRendererList); i.current(); ++i) + for (TQPtrListIterator<Renderer> i(mRendererList); i.current(); ++i) { Bitmap *newframe=(*i)->render(pcm, mFrame); @@ -359,14 +359,14 @@ Bitmap *RendererList::render(float *pcm[4], Bitmap *source) return source; } -void RendererList::save(QDomElement &e) +void RendererList::save(TQDomElement &e) { lock(); e.setTagName("List"); - for (QPtrListIterator<Renderer> i(mRendererList); *i; ++i) + for (TQPtrListIterator<Renderer> i(mRendererList); *i; ++i) { - QDomElement item; + TQDomElement item; (*i)->save(item); e.appendChild(item); } @@ -374,14 +374,14 @@ void RendererList::save(QDomElement &e) unlock(); } -void RendererList::load(const QDomElement &e) +void RendererList::load(const TQDomElement &e) { lock(); - for (QDomNode n=e.firstChild(); !n.isNull(); n=n.nextSibling()) + for (TQDomNode n=e.firstChild(); !n.isNull(); n=n.nextSibling()) { if (!n.isElement()) continue; - QDomElement child=n.toElement(); + TQDomElement child=n.toElement(); Renderer *r=0; @@ -401,31 +401,31 @@ void RendererList::load(const QDomElement &e) -QWidget *RendererList::configure(QWidget *parent) +TQWidget *RendererList::configure(TQWidget *parent) { return new RendererListConfigurator(this, parent); } -RendererListConfigurator::RendererListConfigurator(RendererList *l, QWidget *parent) - : QWidget(parent), mList(l) +RendererListConfigurator::RendererListConfigurator(RendererList *l, TQWidget *parent) + : TQWidget(parent), mList(l) { - (new QVBoxLayout(this))->setAutoAdd(true); - mErase=new QCheckBox(i18n("&Erase between frames"), this); - connect(mErase, SIGNAL(toggled(bool)), SLOT(eraseOn(bool))); + (new TQVBoxLayout(this))->setAutoAdd(true); + mErase=new TQCheckBox(i18n("&Erase between frames"), this); + connect(mErase, TQT_SIGNAL(toggled(bool)), TQT_SLOT(eraseOn(bool))); mErase->setChecked(mList->mClearAfter); if (nex->rendererList()==l) { - QCheckBox *mConvolve=new QCheckBox(i18n("&Convolve audio"), this); - connect(mConvolve, SIGNAL(toggled(bool)), SLOT(convolve(bool))); + TQCheckBox *mConvolve=new TQCheckBox(i18n("&Convolve audio"), this); + connect(mConvolve, TQT_SIGNAL(toggled(bool)), TQT_SLOT(convolve(bool))); mConvolve->setChecked(nex->input()->convolve()); } - new QLabel(i18n("Comments"), this); + new TQLabel(i18n("Comments"), this); - mComments=new QMultiLineEdit(this); + mComments=new TQMultiLineEdit(this); mComments->setText(l->mComments); - mComments->setWordWrap(QMultiLineEdit::WidgetWidth); + mComments->setWordWrap(TQMultiLineEdit::WidgetWidth); } RendererListConfigurator::~RendererListConfigurator() @@ -488,7 +488,7 @@ void Nex::go() frame=mBitmapPool->get(true); int frames=0; - QTime start(QTime::currentTime()); + TQTime start(TQTime::currentTime()); while (1) { @@ -506,7 +506,7 @@ void Nex::go() std::cerr << "Deleted" << std::endl; std::cout << "Frames per Second: " - << frames/start.secsTo(QTime::currentTime()) << std::endl; + << frames/start.secsTo(TQTime::currentTime()) << std::endl; return; case OutputSDL::Resize: // setupSize(width, height); @@ -520,7 +520,7 @@ void Nex::go() } -Renderer *Nex::renderer(const QString &name) +Renderer *Nex::renderer(const TQString &name) { CreatorSig **sig=mCreators[name]; if (sig) @@ -529,10 +529,10 @@ Renderer *Nex::renderer(const QString &name) return 0; } -QStringList Nex::renderers() const +TQStringList Nex::renderers() const { - QDictIterator<CreatorSig*> i(mCreators); - QStringList list; + TQDictIterator<CreatorSig*> i(mCreators); + TQStringList list; for (;i.current(); ++i) list += i.currentKey(); diff --git a/noatun-plugins/nexscope/nex.h b/noatun-plugins/nexscope/nex.h index 05c7f81..81fd680 100644 --- a/noatun-plugins/nexscope/nex.h +++ b/noatun-plugins/nexscope/nex.h @@ -1,16 +1,16 @@ #ifndef NEX_H #define NEX_H -#include <qwidget.h> -#include <qptrlist.h> +#include <tqwidget.h> +#include <tqptrlist.h> #include <stdint.h> #include <vector> -#include <qdict.h> +#include <tqdict.h> -#include <qdatetime.h> +#include <tqdatetime.h> #include <iostream> -#include <qdom.h> +#include <tqdom.h> #include "SDL.h" #include "SDL_thread.h" @@ -20,8 +20,8 @@ typedef uint8_t Byte; #define COLOR(r,g,b) ((r<<16) | (g<<8) | (b)) #define COLORSTR(pixel) \ - QString("#%1%2%3").arg(QString::number((pixel>>16) & 8, 16)) \ - .arg(QString::number((pixel>>8) & 8, 16)).arg(QString::number(pixel& 8, 16)) + TQString("#%1%2%3").arg(TQString::number((pixel>>16) & 8, 16)) \ + .arg(TQString::number((pixel>>8) & 8, 16)).arg(TQString::number(pixel& 8, 16)) #define STRCOLOR(pixel) \ Pixel(((pixel.mid(1,2).toInt(0, 16)) <<16) \ @@ -76,10 +76,10 @@ class Spacer : public QWidget { Q_OBJECT public: - Spacer(QWidget *parent) : QWidget(parent) + Spacer(TQWidget *parent) : TQWidget(parent) { - setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, - QSizePolicy::MinimumExpanding)); + setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, + TQSizePolicy::MinimumExpanding)); } }; @@ -153,7 +153,7 @@ public: private: struct PoolItem; - QPtrList<BitmapPool::PoolItem> mBitmaps; + TQPtrList<BitmapPool::PoolItem> mBitmaps; Mutex mMutex; }; @@ -198,7 +198,7 @@ private: float fhtTab[(samples-256)*2]; bool ok; - QObject *notifier; + TQObject *notifier; }; class OutputSDL @@ -217,14 +217,14 @@ private: static SDL_Surface *surface; }; -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <kcolorbutton.h> class NexCheckBox : public QCheckBox { Q_OBJECT public: - NexCheckBox(QWidget *parent, const QString &, bool *v); + NexCheckBox(TQWidget *parent, const TQString &, bool *v); private slots: void change(bool b); @@ -238,10 +238,10 @@ class NexColorButton : public KColorButton { Q_OBJECT public: - NexColorButton(QWidget *parent, Pixel *color); + NexColorButton(TQWidget *parent, Pixel *color); private slots: - void change(const QColor &c); + void change(const TQColor &c); private: Pixel *c; @@ -255,11 +255,11 @@ public: virtual Bitmap *render(float *pcm[4], Bitmap *source) = 0; - virtual QWidget *configure(QWidget*) { return 0; } + virtual TQWidget *configure(TQWidget*) { return 0; } - virtual void save(QDomElement &) {} + virtual void save(TQDomElement &) {} - virtual void load(const QDomElement &) {} + virtual void load(const TQDomElement &) {} }; class QCheckBox; @@ -270,7 +270,7 @@ class RendererListConfigurator : public QWidget { Q_OBJECT public: - RendererListConfigurator(RendererList *l, QWidget *parent); + RendererListConfigurator(RendererList *l, TQWidget *parent); ~RendererListConfigurator(); public slots: @@ -278,8 +278,8 @@ public slots: void convolve(bool state); private: - QCheckBox *mErase; - QMultiLineEdit *mComments; + TQCheckBox *mErase; + TQMultiLineEdit *mComments; RendererList *mList; }; @@ -293,22 +293,22 @@ public: virtual ~RendererList(); virtual Bitmap *render(float *pcm[4], Bitmap *source); - QPtrList<Renderer> &renderers() { return mRendererList; } - const QPtrList<Renderer> &renderers() const { return mRendererList; } + TQPtrList<Renderer> &renderers() { return mRendererList; } + const TQPtrList<Renderer> &renderers() const { return mRendererList; } bool clearAfter() const { return mClearAfter; } void setClearAfter(bool b) { mClearAfter=b; } - virtual QWidget *configure(QWidget *parent); + virtual TQWidget *configure(TQWidget *parent); - virtual void save(QDomElement &e); + virtual void save(TQDomElement &e); - virtual void load(const QDomElement &e); + virtual void load(const TQDomElement &e); private: - QPtrList<Renderer> mRendererList; + TQPtrList<Renderer> mRendererList; volatile bool mClearAfter; - QString mComments; + TQString mComments; Bitmap *mFrame; }; @@ -331,9 +331,9 @@ public: Input *input() { return mInput; } - Renderer *renderer(const QString &name); + Renderer *renderer(const TQString &name); - QStringList renderers() const; + TQStringList renderers() const; public: static Nex *sNex; @@ -343,7 +343,7 @@ private: OutputSDL mOutput; BitmapPool *mBitmapPool; RendererList *mRendererList; - QDict<CreatorSig*> mCreators; + TQDict<CreatorSig*> mCreators; }; #define nex Nex::nex() diff --git a/noatun-plugins/nexscope/noatunplugin.cpp b/noatun-plugins/nexscope/noatunplugin.cpp index 8bbc860..e0b3d28 100644 --- a/noatun-plugins/nexscope/noatunplugin.cpp +++ b/noatun-plugins/nexscope/noatunplugin.cpp @@ -18,7 +18,7 @@ Plugin *create_plugin() NexPlugin::NexPlugin() { - connect(&process, SIGNAL(processExited(KProcess *)), this, SLOT(processExited(KProcess *))); + connect(&process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(processExited(KProcess *))); } NexPlugin::~NexPlugin() diff --git a/noatun-plugins/nexscope/noatunplugin.h b/noatun-plugins/nexscope/noatunplugin.h index 8f8abb2..d1b0ec8 100644 --- a/noatun-plugins/nexscope/noatunplugin.h +++ b/noatun-plugins/nexscope/noatunplugin.h @@ -4,7 +4,7 @@ #include <kprocess.h> #include <noatun/plugin.h> -class NexPlugin : public QObject, public Plugin +class NexPlugin : public TQObject, public Plugin { Q_OBJECT diff --git a/noatun-plugins/nexscope/regionwidget.cpp b/noatun-plugins/nexscope/regionwidget.cpp index 32e9987..119096b 100644 --- a/noatun-plugins/nexscope/regionwidget.cpp +++ b/noatun-plugins/nexscope/regionwidget.cpp @@ -1,23 +1,23 @@ #include "regionwidget.h" -RegionWidget::RegionWidget(QWidget *parent) +RegionWidget::RegionWidget(TQWidget *parent) { } -RegionWidget::RegionWidget(const QSize &viewsize, QWidget *parent) +RegionWidget::RegionWidget(const TQSize &viewsize, TQWidget *parent) { } -RegionWidget::RegionWidget(int x, int y, int w, int h, const QSize &viewsize, - QWidget *parent) +RegionWidget::RegionWidget(int x, int y, int w, int h, const TQSize &viewsize, + TQWidget *parent) { } -RegionWidget::RegionWidget(const QRect ®ion, const QSize &viewsize, - QWidget *parent) +RegionWidget::RegionWidget(const TQRect ®ion, const TQSize &viewsize, + TQWidget *parent) { } @@ -28,9 +28,9 @@ RegionWidget::~RegionWidget() } -QRect RegionWidget::region() const +TQRect RegionWidget::region() const { - return QRect(0,0,0,0); + return TQRect(0,0,0,0); } void RegionWidget::setX(int x) @@ -53,12 +53,12 @@ void RegionWidget::setHeight(int h) } -void RegionWidget::setRegion(const QRect ®ion) +void RegionWidget::setRegion(const TQRect ®ion) { } -void RegionWidget::setViewSize(const QSize &size) +void RegionWidget::setViewSize(const TQSize &size) { } diff --git a/noatun-plugins/nexscope/regionwidget.h b/noatun-plugins/nexscope/regionwidget.h index eeac8b4..38c919a 100644 --- a/noatun-plugins/nexscope/regionwidget.h +++ b/noatun-plugins/nexscope/regionwidget.h @@ -1,7 +1,7 @@ #ifndef REGIONWIDGET_H #define REGIONWIDGET_H -#include <qframe.h> +#include <tqframe.h> /** * show a widget with a field rectangle, and a mini-region inside @@ -13,15 +13,15 @@ class RegionWidget : public QFrame { Q_OBJECT public: - RegionWidget(QWidget *parent); - RegionWidget(const QSize &viewsize, QWidget *parent); - RegionWidget(int x, int y, int w, int h, const QSize &viewsize, - QWidget *parent); - RegionWidget(const QRect ®ion, const QSize &viewsize, QWidget *parent); + RegionWidget(TQWidget *parent); + RegionWidget(const TQSize &viewsize, TQWidget *parent); + RegionWidget(int x, int y, int w, int h, const TQSize &viewsize, + TQWidget *parent); + RegionWidget(const TQRect ®ion, const TQSize &viewsize, TQWidget *parent); ~RegionWidget(); - QRect region() const; + TQRect region() const; public slots: void setX(int x); @@ -29,14 +29,14 @@ public slots: void setWidth(int w); void setHeight(int h); - void setRegion(const QRect ®ion); + void setRegion(const TQRect ®ion); - void setViewSize(const QSize &size); + void setViewSize(const TQSize &size); signals: void changed(); void changed(int x, int y, int w, int h); - void changed(const QRect ®ion); + void changed(const TQRect ®ion); protected: virtual void moved(int x, int y); diff --git a/noatun-plugins/nexscope/renderers.cpp b/noatun-plugins/nexscope/renderers.cpp index 830024b..f5e97c9 100644 --- a/noatun-plugins/nexscope/renderers.cpp +++ b/noatun-plugins/nexscope/renderers.cpp @@ -3,7 +3,7 @@ #include <time.h> #include <math.h> #include <iostream> -#include <qlayout.h> +#include <tqlayout.h> #include <klocale.h> struct HorizontalPair : public Renderer @@ -15,10 +15,10 @@ struct HorizontalPair : public Renderer pair=true; } - QWidget *configure(QWidget *parent) + TQWidget *configure(TQWidget *parent) { - QWidget *config=new QWidget(parent); - (new QVBoxLayout(config))->setAutoAdd(true); + TQWidget *config=new TQWidget(parent); + (new TQVBoxLayout(config))->setAutoAdd(true); new NexColorButton(config, &color); new NexCheckBox(config, i18n("Horizontal"), &horizontal); @@ -99,7 +99,7 @@ struct HorizontalPair : public Renderer return src; } - virtual void save(QDomElement &e) + virtual void save(TQDomElement &e) { e.setTagName("Waveform"); e.setAttribute("horizontal", (int)horizontal); @@ -108,7 +108,7 @@ struct HorizontalPair : public Renderer e.setAttribute("color", COLORSTR(color)); } - virtual void load(const QDomElement &e) + virtual void load(const TQDomElement &e) { horizontal=(bool)e.attribute("horizontal", 0).toInt(); pair=(bool)e.attribute("pair", 0).toInt(); diff --git a/noatun-plugins/nexscope/renderers.h b/noatun-plugins/nexscope/renderers.h index 3105849..5d75eeb 100644 --- a/noatun-plugins/nexscope/renderers.h +++ b/noatun-plugins/nexscope/renderers.h @@ -1,7 +1,7 @@ #ifndef RENDERERS_H #define RENDERERS_H -#include <qstring.h> +#include <tqstring.h> class Renderer; |