summaryrefslogtreecommitdiffstats
path: root/noatun-plugins/nexscope
diff options
context:
space:
mode:
Diffstat (limited to 'noatun-plugins/nexscope')
-rw-r--r--noatun-plugins/nexscope/Makefile.am2
-rw-r--r--noatun-plugins/nexscope/gui.cpp32
-rw-r--r--noatun-plugins/nexscope/gui.h4
-rw-r--r--noatun-plugins/nexscope/nex.cpp18
-rw-r--r--noatun-plugins/nexscope/nex.h26
-rw-r--r--noatun-plugins/nexscope/noatunplugin.cpp2
-rw-r--r--noatun-plugins/nexscope/noatunplugin.h1
-rw-r--r--noatun-plugins/nexscope/output.cpp2
-rw-r--r--noatun-plugins/nexscope/regionwidget.cpp8
-rw-r--r--noatun-plugins/nexscope/regionwidget.h11
-rw-r--r--noatun-plugins/nexscope/renderers.cpp6
-rw-r--r--noatun-plugins/nexscope/renderers.h2
12 files changed, 61 insertions, 53 deletions
diff --git a/noatun-plugins/nexscope/Makefile.am b/noatun-plugins/nexscope/Makefile.am
index d182ff1..79e0b94 100644
--- a/noatun-plugins/nexscope/Makefile.am
+++ b/noatun-plugins/nexscope/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(all_includes) $(SDL_CFLAGS)
+INCLUDES= $(all_includes) $(SDL_CFLAGS) -I$(kde_includes)/kde
METASOURCES = AUTO
diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp
index 9a4776e..d483a22 100644
--- a/noatun-plugins/nexscope/gui.cpp
+++ b/noatun-plugins/nexscope/gui.cpp
@@ -10,23 +10,23 @@
#include "renderers.h"
#include "nex.h"
-class CreatorItem : public QListViewItem
+class CreatorItem : public TQListViewItem
{
public:
- CreatorItem(TQListView *parent, const TQString &title)
- : TQListViewItem(parent, title)
+ CreatorItem(TQListView *tqparent, const TQString &title)
+ : TQListViewItem(tqparent, title)
{}
};
-class TreeItem : public QListViewItem
+class TreeItem : public TQListViewItem
{
public:
- TreeItem(TreeItem *parent, TreeItem *after, CreatorItem *creator)
- : TQListViewItem(parent, after, creator->text(0))
+ TreeItem(TreeItem *tqparent, TreeItem *after, CreatorItem *creator)
+ : TQListViewItem(tqparent, after, creator->text(0))
{
RendererList *list;
- if (parent)
- list=static_cast<RendererList*>(parent->mRenderer);
+ if (tqparent)
+ list=static_cast<RendererList*>(tqparent->mRenderer);
else
list=nex->rendererList();
@@ -35,15 +35,15 @@ public:
afterRenderer=after->mRenderer;
list->lock();
- int pos=list->renderers().findRef(afterRenderer);
+ int pos=list->renderers().tqfindRef(afterRenderer);
if (pos==-1) pos=list->renderers().count();
list->renderers().insert((uint)pos, mRenderer=nex->renderer(creator->text(0)));
list->unlock();
}
- TreeItem(TQListView *parent, TreeItem *after, const TQString &title)
- : TQListViewItem(parent, after, title)
+ TreeItem(TQListView *tqparent, TreeItem *after, const TQString &title)
+ : TQListViewItem(tqparent, after, title)
{
mRenderer=nex->rendererList();
setExpandable(true);
@@ -52,8 +52,8 @@ public:
~TreeItem()
{
RendererList *list;
- if (parent())
- list=static_cast<RendererList*>(static_cast<TreeItem*>(parent())->mRenderer);
+ if (tqparent())
+ list=static_cast<RendererList*>(static_cast<TreeItem*>(tqparent())->mRenderer);
else
return;
@@ -149,9 +149,9 @@ void Control::addCreator(const TQString &title)
new CreatorItem(mCreatorsList, title);
}
-void Control::dropEvent(TQDropEvent *e, TQListViewItem *parent, TQListViewItem *pafter)
+void Control::dropEvent(TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem *pafter)
{
-// if ((e->source() == mCreatorsList) && parent)
+// if ((e->source() == mCreatorsList) && tqparent)
{
CreatorItem *i=static_cast<CreatorItem*>(mCreatorsList->currentItem());
if (!i)
@@ -159,7 +159,7 @@ void Control::dropEvent(TQDropEvent *e, TQListViewItem *parent, TQListViewItem *
std::cerr << "no creatoritem" << std::endl;
}
- new TreeItem(static_cast<TreeItem*>(parent), static_cast<TreeItem*>(pafter), i);
+ new TreeItem(static_cast<TreeItem*>(tqparent), static_cast<TreeItem*>(pafter), i);
}
}
diff --git a/noatun-plugins/nexscope/gui.h b/noatun-plugins/nexscope/gui.h
index 3fea2ae..a96e137 100644
--- a/noatun-plugins/nexscope/gui.h
+++ b/noatun-plugins/nexscope/gui.h
@@ -13,6 +13,7 @@ class Renderer;
class Control : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
Control();
@@ -28,7 +29,7 @@ public slots:
void open(const KURL &file);
protected slots:
- void dropEvent(TQDropEvent *e, TQListViewItem *parent, TQListViewItem *pafter);
+ void dropEvent(TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem *pafter);
void currentChanged(TQListViewItem *item);
private:
@@ -42,6 +43,7 @@ private:
class RendererListView : public KListView
{
Q_OBJECT
+ TQ_OBJECT
public:
RendererListView(TQWidget *p);
diff --git a/noatun-plugins/nexscope/nex.cpp b/noatun-plugins/nexscope/nex.cpp
index c152c95..e7e4332 100644
--- a/noatun-plugins/nexscope/nex.cpp
+++ b/noatun-plugins/nexscope/nex.cpp
@@ -56,9 +56,9 @@ int Thread::threadRun(void *v)
return t->run();
}
-NexCheckBox::NexCheckBox(TQWidget *parent,
+NexCheckBox::NexCheckBox(TQWidget *tqparent,
const TQString &name, bool *v)
- : TQCheckBox(name, parent)
+ : TQCheckBox(name, tqparent)
{
value=v;
setChecked(*v);
@@ -71,8 +71,8 @@ void NexCheckBox::change(bool b)
-NexColorButton::NexColorButton(TQWidget *parent, Pixel *color)
- : KColorButton(parent)
+NexColorButton::NexColorButton(TQWidget *tqparent, Pixel *color)
+ : KColorButton(tqparent)
{
c=color;
TQColor temp( (*c >> 16) & 0xFF, (*c >> 8) & 0xFF, *c & 0xFF);
@@ -82,7 +82,7 @@ NexColorButton::NexColorButton(TQWidget *parent, Pixel *color)
void NexColorButton::change(const TQColor &co)
{
- *c= COLOR(qRed(co.rgb()), qGreen(co.rgb()), qBlue(co.rgb()));
+ *c= COLOR(tqRed(co.rgb()), tqGreen(co.rgb()), tqBlue(co.rgb()));
}
void Bitmap::resize(int w, int h)
@@ -401,13 +401,13 @@ void RendererList::load(const TQDomElement &e)
-TQWidget *RendererList::configure(TQWidget *parent)
+TQWidget *RendererList::configure(TQWidget *tqparent)
{
- return new RendererListConfigurator(this, parent);
+ return new RendererListConfigurator(this, tqparent);
}
-RendererListConfigurator::RendererListConfigurator(RendererList *l, TQWidget *parent)
- : TQWidget(parent), mList(l)
+RendererListConfigurator::RendererListConfigurator(RendererList *l, TQWidget *tqparent)
+ : TQWidget(tqparent), mList(l)
{
(new TQVBoxLayout(this))->setAutoAdd(true);
mErase=new TQCheckBox(i18n("&Erase between frames"), this);
diff --git a/noatun-plugins/nexscope/nex.h b/noatun-plugins/nexscope/nex.h
index c9477f2..8340b67 100644
--- a/noatun-plugins/nexscope/nex.h
+++ b/noatun-plugins/nexscope/nex.h
@@ -20,8 +20,8 @@ typedef uint8_t Byte;
#define COLOR(r,g,b) ((r<<16) | (g<<8) | (b))
#define COLORSTR(pixel) \
- TQString("#%1%2%3").arg(TQString::number((pixel>>16) & 8, 16)) \
- .arg(TQString::number((pixel>>8) & 8, 16)).arg(TQString::number(pixel& 8, 16))
+ TQString("#%1%2%3").tqarg(TQString::number((pixel>>16) & 8, 16)) \
+ .tqarg(TQString::number((pixel>>8) & 8, 16)).tqarg(TQString::number(pixel& 8, 16))
#define STRCOLOR(pixel) \
Pixel(((pixel.mid(1,2).toInt(0, 16)) <<16) \
@@ -72,13 +72,14 @@ private:
SDL_Thread *mThread;
};
-class Spacer : public QWidget
+class Spacer : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- Spacer(TQWidget *parent) : TQWidget(parent)
+ Spacer(TQWidget *tqparent) : TQWidget(tqparent)
{
- setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
+ tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
TQSizePolicy::MinimumExpanding));
}
};
@@ -220,11 +221,12 @@ private:
#include <tqcheckbox.h>
#include <kcolorbutton.h>
-class NexCheckBox : public QCheckBox
+class NexCheckBox : public TQCheckBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- NexCheckBox(TQWidget *parent, const TQString &, bool *v);
+ NexCheckBox(TQWidget *tqparent, const TQString &, bool *v);
private slots:
void change(bool b);
@@ -237,8 +239,9 @@ private:
class NexColorButton : public KColorButton
{
Q_OBJECT
+ TQ_OBJECT
public:
- NexColorButton(TQWidget *parent, Pixel *color);
+ NexColorButton(TQWidget *tqparent, Pixel *color);
private slots:
void change(const TQColor &c);
@@ -266,11 +269,12 @@ class TQCheckBox;
class TQMultiLineEdit;
class RendererList;
-class RendererListConfigurator : public QWidget
+class RendererListConfigurator : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- RendererListConfigurator(RendererList *l, TQWidget *parent);
+ RendererListConfigurator(RendererList *l, TQWidget *tqparent);
~RendererListConfigurator();
public slots:
@@ -299,7 +303,7 @@ public:
bool clearAfter() const { return mClearAfter; }
void setClearAfter(bool b) { mClearAfter=b; }
- virtual TQWidget *configure(TQWidget *parent);
+ virtual TQWidget *configure(TQWidget *tqparent);
virtual void save(TQDomElement &e);
diff --git a/noatun-plugins/nexscope/noatunplugin.cpp b/noatun-plugins/nexscope/noatunplugin.cpp
index e0b3d28..64b6f4f 100644
--- a/noatun-plugins/nexscope/noatunplugin.cpp
+++ b/noatun-plugins/nexscope/noatunplugin.cpp
@@ -45,5 +45,5 @@ void NexPlugin::processExited(KProcess *)
unload();
}
-#include "noatunplugin.moc"
+#include "noatunplugin.tqmoc"
diff --git a/noatun-plugins/nexscope/noatunplugin.h b/noatun-plugins/nexscope/noatunplugin.h
index d1b0ec8..47098c5 100644
--- a/noatun-plugins/nexscope/noatunplugin.h
+++ b/noatun-plugins/nexscope/noatunplugin.h
@@ -7,6 +7,7 @@
class NexPlugin : public TQObject, public Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
NexPlugin();
diff --git a/noatun-plugins/nexscope/output.cpp b/noatun-plugins/nexscope/output.cpp
index 84885e2..09bfbd2 100644
--- a/noatun-plugins/nexscope/output.cpp
+++ b/noatun-plugins/nexscope/output.cpp
@@ -36,7 +36,7 @@ int OutputSDL::display(Bitmap *source)
{
switch (event.type)
{
- case SDL_QUIT:
+ case SDL_TQUIT:
return Exit;
default:
break;
diff --git a/noatun-plugins/nexscope/regionwidget.cpp b/noatun-plugins/nexscope/regionwidget.cpp
index 119096b..d760619 100644
--- a/noatun-plugins/nexscope/regionwidget.cpp
+++ b/noatun-plugins/nexscope/regionwidget.cpp
@@ -1,23 +1,23 @@
#include "regionwidget.h"
-RegionWidget::RegionWidget(TQWidget *parent)
+RegionWidget::RegionWidget(TQWidget *tqparent)
{
}
-RegionWidget::RegionWidget(const TQSize &viewsize, TQWidget *parent)
+RegionWidget::RegionWidget(const TQSize &viewsize, TQWidget *tqparent)
{
}
RegionWidget::RegionWidget(int x, int y, int w, int h, const TQSize &viewsize,
- TQWidget *parent)
+ TQWidget *tqparent)
{
}
RegionWidget::RegionWidget(const TQRect &region, const TQSize &viewsize,
- TQWidget *parent)
+ TQWidget *tqparent)
{
}
diff --git a/noatun-plugins/nexscope/regionwidget.h b/noatun-plugins/nexscope/regionwidget.h
index 38c919a..ee975ee 100644
--- a/noatun-plugins/nexscope/regionwidget.h
+++ b/noatun-plugins/nexscope/regionwidget.h
@@ -9,15 +9,16 @@
* text boxes allow the region to be resized and moved, along with
* click-n-drag
**/
-class RegionWidget : public QFrame
+class RegionWidget : public TQFrame
{
Q_OBJECT
+ TQ_OBJECT
public:
- RegionWidget(TQWidget *parent);
- RegionWidget(const TQSize &viewsize, TQWidget *parent);
+ RegionWidget(TQWidget *tqparent);
+ RegionWidget(const TQSize &viewsize, TQWidget *tqparent);
RegionWidget(int x, int y, int w, int h, const TQSize &viewsize,
- TQWidget *parent);
- RegionWidget(const TQRect &region, const TQSize &viewsize, TQWidget *parent);
+ TQWidget *tqparent);
+ RegionWidget(const TQRect &region, const TQSize &viewsize, TQWidget *tqparent);
~RegionWidget();
diff --git a/noatun-plugins/nexscope/renderers.cpp b/noatun-plugins/nexscope/renderers.cpp
index f5e97c9..37db147 100644
--- a/noatun-plugins/nexscope/renderers.cpp
+++ b/noatun-plugins/nexscope/renderers.cpp
@@ -6,7 +6,7 @@
#include <tqlayout.h>
#include <klocale.h>
-struct HorizontalPair : public Renderer
+structQt::HorizontalPair : public Renderer
{
HorizontalPair() : color(0x578cd8)
{
@@ -15,9 +15,9 @@ struct HorizontalPair : public Renderer
pair=true;
}
- TQWidget *configure(TQWidget *parent)
+ TQWidget *configure(TQWidget *tqparent)
{
- TQWidget *config=new TQWidget(parent);
+ TQWidget *config=new TQWidget(tqparent);
(new TQVBoxLayout(config))->setAutoAdd(true);
new NexColorButton(config, &color);
diff --git a/noatun-plugins/nexscope/renderers.h b/noatun-plugins/nexscope/renderers.h
index 5d75eeb..e23304a 100644
--- a/noatun-plugins/nexscope/renderers.h
+++ b/noatun-plugins/nexscope/renderers.h
@@ -23,7 +23,7 @@ Renderer *function();
REGISTER(fade, Fade)
REGISTER(doubler, Doubler)
-REGISTER(waveform, HorizontalPair);
+REGISTER(waveform,Qt::HorizontalPair);
REGISTER(hartley, Hartley);
#undef REGISTER
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 08:36:23 +0000