diff options
Diffstat (limited to 'arts')
122 files changed, 1501 insertions, 1501 deletions
diff --git a/arts/builder/autorouter.h b/arts/builder/autorouter.h index e65f531a..cd422c4f 100644 --- a/arts/builder/autorouter.h +++ b/arts/builder/autorouter.h @@ -33,19 +33,19 @@ #include <pthread.h> #endif -#include <qptrlist.h> -#include <qvaluelist.h> +#include <tqptrlist.h> +#include <tqvaluelist.h> class PathInfo { public: int x1, x2, y1, y2, cost, depth; - QString history; + TQString history; int operator<(const PathInfo& x) const { return cost < x.cost; } int operator==(const PathInfo& x) const { return cost == x.cost; } }; -typedef QValueList<PathInfo> PathQueue; +typedef TQValueList<PathInfo> PathQueue; class ARCommand; @@ -96,7 +96,7 @@ protected: pthread_t route_thread; #endif - QPtrList<ARCommand> command_queue; + TQPtrList<ARCommand> command_queue; bool thread_terminate_now; /*************************/ diff --git a/arts/builder/createtool.cpp b/arts/builder/createtool.cpp index d533a8fa..a08515f3 100644 --- a/arts/builder/createtool.cpp +++ b/arts/builder/createtool.cpp @@ -25,8 +25,8 @@ #include "structureport.h" //#include <arts/debug.h> -#include <qpalette.h> -#include <qpainter.h> +#include <tqpalette.h> +#include <tqpainter.h> #include <kmessagebox.h> #include <klocale.h> @@ -50,7 +50,7 @@ CreateTool::CreateTool(ModuleWidget *mwidget) width = -1; height = -1; - componentRect = QRect(0, 0, 0, 0); + componentRect = TQRect(0, 0, 0, 0); } CreateTool::~CreateTool() @@ -60,7 +60,7 @@ CreateTool::~CreateTool() mwidget->setMouseTracking(oldMouseTracking); } -void CreateTool::mousePressEvent(QMouseEvent *e) +void CreateTool::mousePressEvent(TQMouseEvent *e) { int x = mwidget->findCol(e->x()); int y = mwidget->findRow(e->y()); @@ -74,7 +74,7 @@ void CreateTool::mousePressEvent(QMouseEvent *e) mwidget->leaveTool(this); } -void CreateTool::mouseMoveEvent(QMouseEvent *e) +void CreateTool::mouseMoveEvent(TQMouseEvent *e) { if(width == -1) estimateSize(); @@ -90,9 +90,9 @@ void CreateTool::mouseMoveEvent(QMouseEvent *e) if(!posok) return; mwidget->repaint(componentRect); - componentRect = QRect(cellx, celly, cellx2 - cellx, celly2 - celly); + componentRect = TQRect(cellx, celly, cellx2 - cellx, celly2 - celly); - QPainter *p = new QPainter; + TQPainter *p = new QPainter; p->begin(mwidget); p->save(); @@ -102,7 +102,7 @@ void CreateTool::mouseMoveEvent(QMouseEvent *e) delete p; } -void CreateTool::mouseReleaseEvent(QMouseEvent *e) +void CreateTool::mouseReleaseEvent(TQMouseEvent *e) { } @@ -241,17 +241,17 @@ CreatePortTool::CreatePortTool(ModuleWidget *mwidget, this->type = type; } -MoveComponentsTool::MoveComponentsTool(ModuleWidget *widget, QMouseEvent *e) +MoveComponentsTool::MoveComponentsTool(ModuleWidget *widget, TQMouseEvent *e) : MWidgetTool(widget), lastPos(e->pos()) { } -void MoveComponentsTool::mousePressEvent(QMouseEvent *e) +void MoveComponentsTool::mousePressEvent(TQMouseEvent *e) { } -void MoveComponentsTool::mouseMoveEvent(QMouseEvent *e) +void MoveComponentsTool::mouseMoveEvent(TQMouseEvent *e) { int dx = (e->x() - lastPos.x())/mwidget->cellsize; int dy = (e->y() - lastPos.y())/mwidget->cellsize; @@ -283,7 +283,7 @@ void MoveComponentsTool::mouseMoveEvent(QMouseEvent *e) mwidget->reRoute(); } -void MoveComponentsTool::mouseReleaseEvent(QMouseEvent *e) +void MoveComponentsTool::mouseReleaseEvent(TQMouseEvent *e) { mwidget->leaveTool(this, true); } @@ -295,20 +295,20 @@ ConnectPortsTool::ConnectPortsTool(ModuleWidget *widget, ModulePort *connectingP firstPos = mwidget->portPos(connectingPort) + connectingPort->clickrect.center(); } -void ConnectPortsTool::mousePressEvent(QMouseEvent *e) +void ConnectPortsTool::mousePressEvent(TQMouseEvent *e) { } -void ConnectPortsTool::mouseMoveEvent(QMouseEvent *e) +void ConnectPortsTool::mouseMoveEvent(TQMouseEvent *e) { - QPainter painter(mwidget); + TQPainter painter(mwidget); painter.setPen(Qt::white); - mwidget->repaint(QRect(firstPos, lastPos).normalize()); + mwidget->repaint(TQRect(firstPos, lastPos).normalize()); painter.drawLine(firstPos, e->pos()); lastPos = e->pos(); } -void ConnectPortsTool::mouseReleaseEvent(QMouseEvent *e) +void ConnectPortsTool::mouseReleaseEvent(TQMouseEvent *e) { StructureComponent *component; ModulePort *otherPort; @@ -334,6 +334,6 @@ void ConnectPortsTool::mouseReleaseEvent(QMouseEvent *e) } } } - mwidget->repaint(QRect(firstPos, lastPos).normalize()); + mwidget->repaint(TQRect(firstPos, lastPos).normalize()); mwidget->leaveTool(this); } diff --git a/arts/builder/createtool.h b/arts/builder/createtool.h index c8fe0763..15a4b5e7 100644 --- a/arts/builder/createtool.h +++ b/arts/builder/createtool.h @@ -22,8 +22,8 @@ #ifndef _CREATETOOL_H #define _CREATETOOL_H -#include <qwidget.h> -#include <qcursor.h> +#include <tqwidget.h> +#include <tqcursor.h> #include "structure.h" #include "module.h" @@ -41,17 +41,17 @@ public: MWidgetTool(ModuleWidget *mwidget); virtual ~MWidgetTool(); - virtual void mousePressEvent(QMouseEvent *e) = 0; - virtual void mouseMoveEvent(QMouseEvent *e) = 0; - virtual void mouseReleaseEvent(QMouseEvent *e) = 0; + virtual void mousePressEvent(TQMouseEvent *e) = 0; + virtual void mouseMoveEvent(TQMouseEvent *e) = 0; + virtual void mouseReleaseEvent(TQMouseEvent *e) = 0; }; class CreateTool: public MWidgetTool { protected: - QCursor oldCursor; + TQCursor oldCursor; bool oldMouseTracking; - QRect componentRect; + TQRect componentRect; int width, height; public: @@ -61,9 +61,9 @@ public: virtual void estimateSize() = 0; virtual void performCreate(int x, int y) = 0; - void mousePressEvent(QMouseEvent *e); - void mouseMoveEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *e); + void mousePressEvent(TQMouseEvent *e); + void mouseMoveEvent(TQMouseEvent *e); + void mouseReleaseEvent(TQMouseEvent *e); }; class CreateModuleTool: public CreateTool @@ -106,27 +106,27 @@ public: class MoveComponentsTool: public MWidgetTool { - QPoint lastPos; + TQPoint lastPos; public: - MoveComponentsTool(ModuleWidget *widget, QMouseEvent *e); + MoveComponentsTool(ModuleWidget *widget, TQMouseEvent *e); - void mousePressEvent(QMouseEvent *e); - void mouseMoveEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *e); + void mousePressEvent(TQMouseEvent *e); + void mouseMoveEvent(TQMouseEvent *e); + void mouseReleaseEvent(TQMouseEvent *e); }; class ConnectPortsTool: public MWidgetTool { ModulePort *connectingPort; - QPoint firstPos, lastPos; + TQPoint firstPos, lastPos; public: ConnectPortsTool(ModuleWidget *widget, ModulePort *connectingPort); - void mousePressEvent(QMouseEvent *e); - void mouseMoveEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *e); + void mousePressEvent(TQMouseEvent *e); + void mouseMoveEvent(TQMouseEvent *e); + void mouseReleaseEvent(TQMouseEvent *e); }; #endif diff --git a/arts/builder/dirmanager.cpp b/arts/builder/dirmanager.cpp index 27347738..2f22f104 100644 --- a/arts/builder/dirmanager.cpp +++ b/arts/builder/dirmanager.cpp @@ -23,7 +23,7 @@ #include <stdio.h> #include <stdlib.h> -#include <qfile.h> +#include <tqfile.h> #include <kstandarddirs.h> #include <kmessagebox.h> @@ -68,19 +68,19 @@ const char *DirManager::baseDir() return d; } -char *DirManager::directory(const char *subdir, const QString &desc) +char *DirManager::directory(const char *subdir, const TQString &desc) { const char *home = getenv("HOME"); if(home == 0) return strdup(""); - QCString dirname = QCString(home) + "/arts" + subdir; + TQCString dirname = TQCString(home) + "/arts" + subdir; struct stat buf; if(stat(dirname.data(), &buf) == -1) { - QString message; - QString dir = QFile::decodeName(dirname); + TQString message; + TQString dir = TQFile::decodeName(dirname); message = i18n("You need the folder %1.\n" "It will be used to store %2.\nShould I create it now?") .arg(dir).arg(desc); diff --git a/arts/builder/dirmanager.h b/arts/builder/dirmanager.h index b007bcbe..17ec4343 100644 --- a/arts/builder/dirmanager.h +++ b/arts/builder/dirmanager.h @@ -24,7 +24,7 @@ class DirManager { protected: - static char *directory(const char *subdir, const QString& desc); + static char *directory(const char *subdir, const TQString& desc); public: static const char *mapDir(); static const char *sessionDir(); diff --git a/arts/builder/drawutils.cpp b/arts/builder/drawutils.cpp index 43b449e8..c2c0ef3f 100644 --- a/arts/builder/drawutils.cpp +++ b/arts/builder/drawutils.cpp @@ -21,9 +21,9 @@ #include "drawutils.h" -QString DrawUtils::cropText(QPainter *p, QString text, int maxlen, int& textwidth) +TQString DrawUtils::cropText(TQPainter *p, TQString text, int maxlen, int& textwidth) { - QString label = text; + TQString label = text; while(p->fontMetrics().width(label) > maxlen && label.length() > 0) { int i = label.find('_'); diff --git a/arts/builder/drawutils.h b/arts/builder/drawutils.h index 25032eb3..08aadb3c 100644 --- a/arts/builder/drawutils.h +++ b/arts/builder/drawutils.h @@ -22,10 +22,10 @@ #ifndef __DRAWUTILS_H__ #define __DRAWUTILS_H__ -#include <qpainter.h> +#include <tqpainter.h> class DrawUtils { public: - static QString cropText(QPainter *p, QString text, int maxlen, int& textwidth); + static TQString cropText(TQPainter *p, TQString text, int maxlen, int& textwidth); }; #endif diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp index 4ed8bac9..ccd1ae40 100644 --- a/arts/builder/execdlg.cpp +++ b/arts/builder/execdlg.cpp @@ -19,12 +19,12 @@ */ -#include <qfile.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qlineedit.h> +#include <tqfile.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqlineedit.h> #include <kbuttonbox.h> #include <kfiledialog.h> @@ -37,44 +37,44 @@ #include "execdlg.h" #include "dirmanager.h" #include <arts/debug.h> -#include <qpushbutton.h> +#include <tqpushbutton.h> #ifndef KDE_USE_FINAL -static void min_size(QWidget *w) { +static void min_size(TQWidget *w) { w->setMinimumSize(w->sizeHint()); } #endif -ExecDlg::ExecDlg(QWidget *parent, ExecutableStructure *structure) - :QDialog(parent,"X") +ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure) + :TQDialog(parent,"X") /*, TRUE)*/ { this->structure = structure; setCaption(i18n("aRts Module Execution")); - mainlayout = new QVBoxLayout(this); + mainlayout = new TQVBoxLayout(this); // caption label: "Synthesis running..." mainlayout->addSpacing(5); - QLabel *captionlabel = new QLabel(this); - QFont labelfont(captionlabel->font()); + TQLabel *captionlabel = new TQLabel(this); + TQFont labelfont(captionlabel->font()); labelfont.setPointSize(labelfont.pointSize()*3/2); captionlabel->setFont(labelfont); - captionlabel->setText(QString(" ")+i18n("Synthesis running...")+QString(" ")); + captionlabel->setText(TQString(" ")+i18n("Synthesis running...")+TQString(" ")); captionlabel->setAlignment(AlignCenter); min_size(captionlabel); mainlayout->addWidget(captionlabel); - cpuusagelabel = new QLabel(this); + cpuusagelabel = new TQLabel(this); cpuusagelabel->setText(i18n("CPU usage: unknown")); - cpuusagetimer = new QTimer( this ); - connect( cpuusagetimer, SIGNAL(timeout()), - this, SLOT(updateCpuUsage()) ); - connect( cpuusagetimer, SIGNAL(timeout()), - this, SLOT(guiServerTick()) ); + cpuusagetimer = new TQTimer( this ); + connect( cpuusagetimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(updateCpuUsage()) ); + connect( cpuusagetimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(guiServerTick()) ); cpuusagetimer->start( 2000, false ); min_size(cpuusagelabel); @@ -107,7 +107,7 @@ ExecDlg::ExecDlg(QWidget *parent, ExecutableStructure *structure) // buttons - QHBoxLayout *buttonlayout = new QHBoxLayout; + TQHBoxLayout *buttonlayout = new QHBoxLayout; mainlayout->addSpacing(5); mainlayout->addLayout(buttonlayout); mainlayout->addSpacing(5); @@ -115,15 +115,15 @@ ExecDlg::ExecDlg(QWidget *parent, ExecutableStructure *structure) buttonlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - bbox->addButton(KStdGuiItem::help(), this, SLOT( help() )); + bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() )); bbox->addStretch(1); - QButton *savebutton = bbox->addButton(KStdGuiItem::saveAs()); - connect( savebutton, SIGNAL( clicked() ), SLOT(saveSession() ) ); + TQButton *savebutton = bbox->addButton(KStdGuiItem::saveAs()); + connect( savebutton, TQT_SIGNAL( clicked() ), TQT_SLOT(saveSession() ) ); - QButton *okbutton = bbox->addButton(KStdGuiItem::ok()); - connect( okbutton, SIGNAL( clicked() ), SLOT(accept() ) ); + TQButton *okbutton = bbox->addButton(KStdGuiItem::ok()); + connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) ); bbox->layout(); //min_size(bbox); @@ -178,7 +178,7 @@ void ExecDlg::updateCpuUsage() void ExecDlg::done( int r ) { structure->stopExecute(); - QDialog::done(r); + TQDialog::done(r); emit ready(); } @@ -186,11 +186,11 @@ void ExecDlg::saveSession() { chdir(DirManager::sessionDir()); - QString filename = KFileDialog::getSaveFileName(0,"*.arts-session",this); + TQString filename = KFileDialog::getSaveFileName(0,"*.arts-session",this); if(!filename.isEmpty()) { arts_debug("save... %s",filename.local8Bit().data()); - structure->saveSession(QFile::encodeName(filename)); + structure->saveSession(TQFile::encodeName(filename)); } } diff --git a/arts/builder/execdlg.h b/arts/builder/execdlg.h index 43562d2f..1fbd8069 100644 --- a/arts/builder/execdlg.h +++ b/arts/builder/execdlg.h @@ -23,23 +23,23 @@ #define __EXECDLG_H_ #include "structure.h" -#include <qdialog.h> -#include <qtimer.h> -#include <qlabel.h> -#include <qscrollbar.h> -#include <qlayout.h> +#include <tqdialog.h> +#include <tqtimer.h> +#include <tqlabel.h> +#include <tqscrollbar.h> +#include <tqlayout.h> -class ExecDlg :public QDialog { +class ExecDlg :public TQDialog { Q_OBJECT public: - QTimer *cpuusagetimer; - QLabel *cpuusagelabel; - QVBoxLayout *mainlayout,*sliderlayout; + TQTimer *cpuusagetimer; + TQLabel *cpuusagelabel; + TQVBoxLayout *mainlayout,*sliderlayout; ExecutableStructure *structure; void start(); void done(int r); - ExecDlg(QWidget *parent, ExecutableStructure *structure); + ExecDlg(TQWidget *parent, ExecutableStructure *structure); protected slots: void updateCpuUsage(); diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp index 82d985ed..a96a1b35 100644 --- a/arts/builder/interfacedlg.cpp +++ b/arts/builder/interfacedlg.cpp @@ -21,41 +21,41 @@ #include "interfacedlg.h" #include "structureport.h" -#include <qlayout.h> -#include <qlabel.h> -#include <qlistbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqlistbox.h> #include <kbuttonbox.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> #include <kapplication.h> #include <kiconloader.h> #include <kseparator.h> #include <klocale.h> -#include <qlineedit.h> +#include <tqlineedit.h> #include <stdio.h> #include <arts/debug.h> #include <arts/core.h> #include <arts/dispatcher.h> -#include <qpushbutton.h> +#include <tqpushbutton.h> #include <kstdguiitem.h> using namespace std; -InterfaceDlg::InterfaceDlg(QWidget *parent) :QDialog(parent,"Props", TRUE) +InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE) { setCaption(i18n("aRts: Structureport View")); - QVBoxLayout *mainlayout = new QVBoxLayout(this); - //QHBoxLayout *contentslayout = new QHBoxLayout; + TQVBoxLayout *mainlayout = new TQVBoxLayout(this); + //TQHBoxLayout *contentslayout = new QHBoxLayout; // object type /* mainlayout->addSpacing(5); - QLabel *objectlabel = new QLabel(this); - QFont labelfont(objectlabel->font()); + TQLabel *objectlabel = new TQLabel(this); + TQFont labelfont(objectlabel->font()); labelfont.setPointSize(labelfont.pointSize()*3/2); objectlabel->setFont(labelfont); - objectlabel->setText(QString(" ")+i18n("Object type: ")+QString(port->owner->name())+QString(" ")); + objectlabel->setText(TQString(" ")+i18n("Object type: ")+TQString(port->owner->name())+TQString(" ")); objectlabel->setAlignment(AlignCenter); min_size(objectlabel); mainlayout->addWidget(objectlabel); @@ -65,7 +65,7 @@ InterfaceDlg::InterfaceDlg(QWidget *parent) :QDialog(parent,"Props", TRUE) /* mainlayout->addSpacing(5); - QLabel *portlabel = new QLabel(this); + TQLabel *portlabel = new TQLabel(this); labelfont.setPointSize(labelfont.pointSize()*4/5); portlabel->setFont(labelfont); portlabel->setText(i18n("Port description: ")+ port->description); @@ -88,14 +88,14 @@ InterfaceDlg::InterfaceDlg(QWidget *parent) :QDialog(parent,"Props", TRUE) */ // list - listbox = new QListBox(this); + listbox = new TQListBox(this); update(); listbox->setMinimumSize(340,400); mainlayout->addWidget(listbox); - connect( listbox, SIGNAL( doubleClicked ( QListBoxItem *)), this, - SLOT(accept())); + connect( listbox, TQT_SIGNAL( doubleClicked ( TQListBoxItem *)), this, + TQT_SLOT(accept())); // hruler mainlayout->addSpacing(5); @@ -104,7 +104,7 @@ InterfaceDlg::InterfaceDlg(QWidget *parent) :QDialog(parent,"Props", TRUE) // buttons - QHBoxLayout *buttonlayout = new QHBoxLayout; + TQHBoxLayout *buttonlayout = new QHBoxLayout; mainlayout->addSpacing(5); mainlayout->addLayout(buttonlayout); mainlayout->addSpacing(5); @@ -112,14 +112,14 @@ InterfaceDlg::InterfaceDlg(QWidget *parent) :QDialog(parent,"Props", TRUE) buttonlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - bbox->addButton(KStdGuiItem::help(), this, SLOT( help() )); + bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() )); bbox->addStretch(1); - QButton *okbutton = bbox->addButton(KStdGuiItem::ok()); - connect( okbutton, SIGNAL( clicked() ), SLOT(accept() ) ); + TQButton *okbutton = bbox->addButton(KStdGuiItem::ok()); + connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) ); - QButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel()); - connect( cancelbutton, SIGNAL( clicked() ), SLOT(reject() ) ); + TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel()); + connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) ); bbox->layout(); //min_size(bbox); diff --git a/arts/builder/interfacedlg.h b/arts/builder/interfacedlg.h index d5a888c4..4524eaaa 100644 --- a/arts/builder/interfacedlg.h +++ b/arts/builder/interfacedlg.h @@ -24,19 +24,19 @@ #include "structure.h" #include "structureport.h" -#include <qdialog.h> -#include <qlistbox.h> -#include <qlabel.h> -#include <qlineedit.h> +#include <tqdialog.h> +#include <tqlistbox.h> +#include <tqlabel.h> +#include <tqlineedit.h> #include <vector> -class InterfaceDlg :public QDialog { +class InterfaceDlg :public TQDialog { Q_OBJECT protected: - QListBox *listbox; + TQListBox *listbox; public: - InterfaceDlg(QWidget *parent); + InterfaceDlg(TQWidget *parent); std::string interfaceName(); void update(const std::string& interface, const std::string& indent); diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp index 9cc300ed..4630f2f7 100644 --- a/arts/builder/main.cpp +++ b/arts/builder/main.cpp @@ -54,8 +54,8 @@ #include <kaboutdata.h> #include <kstandarddirs.h> #include <kartsserver.h> -#include <qfile.h> -#include <qpopupmenu.h> +#include <tqfile.h> +#include <tqpopupmenu.h> #include <soundserver.h> @@ -78,7 +78,7 @@ protected: public: ArtsBuilderApp(); - ArtsBuilderApp(QString filename); + ArtsBuilderApp(TQString filename); void start(); void end(); }; @@ -146,7 +146,7 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name) arts_debug("PORT: modulewidget"); modulewidget = new ModuleWidget(structure, mainDock, "mwidget"); mainDock->setWidget(modulewidget); - connect(modulewidget, SIGNAL(modified(bool)), SLOT(setModified(bool))); + connect(modulewidget, TQT_SIGNAL(modified(bool)), TQT_SLOT(setModified(bool))); arts_debug("PORT: modulewidget ok"); // allow others to dock to the 4 sides @@ -167,20 +167,20 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name) 80); // relation target/this (in percent) // selection - connect(modulewidget, SIGNAL(portSelected(ModulePort *)), - propertyPanel, SLOT (setSelectedPort(ModulePort *))); - connect(propertyPanel, SIGNAL(portSelected(ModulePort *)), - modulewidget, SLOT (selectPort(ModulePort *))); - connect(modulewidget, SIGNAL(componentSelected(StructureComponent *)), - propertyPanel, SLOT (setSelectedComponent(StructureComponent *))); + connect(modulewidget, TQT_SIGNAL(portSelected(ModulePort *)), + propertyPanel, TQT_SLOT (setSelectedPort(ModulePort *))); + connect(propertyPanel, TQT_SIGNAL(portSelected(ModulePort *)), + modulewidget, TQT_SLOT (selectPort(ModulePort *))); + connect(modulewidget, TQT_SIGNAL(componentSelected(StructureComponent *)), + propertyPanel, TQT_SLOT (setSelectedComponent(StructureComponent *))); // connection - connect(propertyPanel, SIGNAL(startConnection(ModulePort *)), - modulewidget, SLOT (startConnection(ModulePort *))); + connect(propertyPanel, TQT_SIGNAL(startConnection(ModulePort *)), + modulewidget, TQT_SLOT (startConnection(ModulePort *))); // port properties changed - connect(propertyPanel, SIGNAL(portPropertiesChanged(ModulePort *)), - modulewidget, SLOT (portPropertiesChanged(ModulePort *))); + connect(propertyPanel, TQT_SIGNAL(portPropertiesChanged(ModulePort *)), + modulewidget, TQT_SLOT (portPropertiesChanged(ModulePort *))); arts_debug("PORT: setcanvas"); structure->setCanvas(modulewidget); @@ -251,25 +251,25 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name) */ #if 000 - connect(menubar, SIGNAL(highlighted(int)), this, SLOT(activateMenu(int))); - connect(m_view, SIGNAL(activated(int)), modulewidget, SLOT(setZoom(int))); - connect(m_ports, SIGNAL(activated(int)), this, SLOT(addPort(int))); - connect(m_file_new, SIGNAL(activated(int)), this, SLOT(fileNew(int))); + connect(menubar, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(activateMenu(int))); + connect(m_view, TQT_SIGNAL(activated(int)), modulewidget, TQT_SLOT(setZoom(int))); + connect(m_ports, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addPort(int))); + connect(m_file_new, TQT_SIGNAL(activated(int)), this, TQT_SLOT(fileNew(int))); - //connect(m_modules, SIGNAL(activated(int)), this, SLOT(addModule(int))); + //connect(m_modules, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int))); /* - connect(m_modules_synth, SIGNAL(activated(int)), this, SLOT(addModule(int))); - connect(m_modules_gui, SIGNAL(activated(int)), this, SLOT(addModule(int))); - connect(m_modules_instruments, SIGNAL(activated(int)), this, SLOT(addModule(int))); - connect(m_modules_other, SIGNAL(activated(int)), this, SLOT(addModule(int))); + connect(m_modules_synth, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int))); + connect(m_modules_gui, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int))); + connect(m_modules_instruments, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int))); + connect(m_modules_other, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int))); */ - connect(kapp, SIGNAL(lastWindowClosed()), this , SLOT(quit())); + connect(kapp, TQT_SIGNAL(lastWindowClosed()), this , TQT_SLOT(quit())); // update the modules menu once for the start #endif arts_debug("PORT: activatemenu"); - connect(menumaker, SIGNAL(activated(const char *)), this, SLOT(addModule(const char *))); + connect(menumaker, TQT_SIGNAL(activated(const char *)), this, TQT_SLOT(addModule(const char *))); fillModuleMenu(); arts_debug("PORT: activatemenu ok"); setupActions(); @@ -277,13 +277,13 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name) createGUI(); // connect to aboutToShow to correctly show state of dockwidget there: - QPopupMenu *viewmenu = (QPopupMenu*)factory()->container("view", this); + TQPopupMenu *viewmenu = (TQPopupMenu*)factory()->container("view", this); if (viewmenu) - connect(viewmenu, SIGNAL(aboutToShow()), this, SLOT(viewMenuAboutToShow())); + connect(viewmenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(viewMenuAboutToShow())); else arts_debug("view menu not found!"); - m_filename = QString::null; + m_filename = TQString::null; setModified(false); installEventFilter(propertyPanel); @@ -292,55 +292,55 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name) void ArtsBuilderWindow::setupActions() { // File menu - KStdAction::openNew(this, SLOT(fileNew()), actionCollection()); + KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - (void)new KAction(i18n("Open Session..."), 0, this, SLOT(openSession()), + (void)new KAction(i18n("Open Session..."), 0, this, TQT_SLOT(openSession()), actionCollection(), "file_open_session"); - KStdAction::open(this, SLOT(open()), actionCollection()); - (void)new KAction(i18n("Open E&xample..."), Qt::CTRL + Qt::Key_X, this, SLOT(openExample()), + KStdAction::open(this, TQT_SLOT(open()), actionCollection()); + (void)new KAction(i18n("Open E&xample..."), Qt::CTRL + Qt::Key_X, this, TQT_SLOT(openExample()), actionCollection(), "file_open_example"); - KStdAction::save(this, SLOT(save()), actionCollection()); - KStdAction::saveAs(this, SLOT(saveAs()), actionCollection()); - (void)new KAction(i18n("&Retrieve From Server..."), Qt::CTRL + Qt::Key_R, this, SLOT(retrieve()), + KStdAction::save(this, TQT_SLOT(save()), actionCollection()); + KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection()); + (void)new KAction(i18n("&Retrieve From Server..."), Qt::CTRL + Qt::Key_R, this, TQT_SLOT(retrieve()), actionCollection(), "file_retrieve_from_server"); - (void)new KAction(i18n("&Execute Structure"), "artsbuilderexecute", Qt::CTRL + Qt::Key_E, this, SLOT(execute()), + (void)new KAction(i18n("&Execute Structure"), "artsbuilderexecute", Qt::CTRL + Qt::Key_E, this, TQT_SLOT(execute()), actionCollection(), "file_execute_structure"); - (void)new KAction(i18n("&Rename Structure..."), Qt::CTRL + Qt::Key_R, this, SLOT(rename()), + (void)new KAction(i18n("&Rename Structure..."), Qt::CTRL + Qt::Key_R, this, TQT_SLOT(rename()), actionCollection(), "file_rename_structure"); - (void)new KAction(i18n("&Publish Structure"), Qt::CTRL + Qt::Key_P, this, SLOT(publish()), + (void)new KAction(i18n("&Publish Structure"), Qt::CTRL + Qt::Key_P, this, TQT_SLOT(publish()), actionCollection(), "file_publish_structure"); - KStdAction::quit(this, SLOT(close()), actionCollection()); + KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); // Edit menu - (void)new KAction(i18n("&Delete"), Qt::Key_Delete, modulewidget, SLOT(delModule()), + (void)new KAction(i18n("&Delete"), Qt::Key_Delete, modulewidget, TQT_SLOT(delModule()), actionCollection(), "edit_delete"); - KStdAction::selectAll(modulewidget, SLOT(selectAll()), actionCollection()); + KStdAction::selectAll(modulewidget, TQT_SLOT(selectAll()), actionCollection()); // View menu viewPropertiesAction= new KToggleAction(i18n("&Property Panel"), 0, - propertyDock, SLOT(changeHideShowState()), + propertyDock, TQT_SLOT(changeHideShowState()), actionCollection(), "view_properties"); - (void)new KAction(i18n("200%"), 0, this, SLOT(viewAt200()), + (void)new KAction(i18n("200%"), 0, this, TQT_SLOT(viewAt200()), actionCollection(), "view_200"); - (void)new KAction(i18n("150%"), 0, this, SLOT(viewAt150()), + (void)new KAction(i18n("150%"), 0, this, TQT_SLOT(viewAt150()), actionCollection(), "view_150"); - (void)new KAction(i18n("100%"), 0, this, SLOT(viewAt100()), + (void)new KAction(i18n("100%"), 0, this, TQT_SLOT(viewAt100()), actionCollection(), "view_100"); - (void)new KAction(i18n("50%"), 0, this, SLOT(viewAt50()), + (void)new KAction(i18n("50%"), 0, this, TQT_SLOT(viewAt50()), actionCollection(), "view_50"); // Ports menu - (void)new KAction(i18n("Create IN Audio Signal"), 0, this, SLOT(createInAudioSignal()), + (void)new KAction(i18n("Create IN Audio Signal"), 0, this, TQT_SLOT(createInAudioSignal()), actionCollection(), "ports_create_in_audio_signal"); - (void)new KAction(i18n("Create OUT Audio Signal"), 0, this, SLOT(createOutAudioSignal()), + (void)new KAction(i18n("Create OUT Audio Signal"), 0, this, TQT_SLOT(createOutAudioSignal()), actionCollection(), "ports_create_out_audio_signal"); - (void)new KAction(i18n("Create IN String Property"), 0, this, SLOT(createInStringProperty()), + (void)new KAction(i18n("Create IN String Property"), 0, this, TQT_SLOT(createInStringProperty()), actionCollection(), "ports_create_in_string_property"); - (void)new KAction(i18n("Create IN Audio Property"), 0, this, SLOT(createInAudioProperty()), + (void)new KAction(i18n("Create IN Audio Property"), 0, this, TQT_SLOT(createInAudioProperty()), actionCollection(), "ports_create_in_audio_property"); - (void)new KAction(i18n("Implement Interface..."), 0, this, SLOT(addInterface()), + (void)new KAction(i18n("Implement Interface..."), 0, this, TQT_SLOT(addInterface()), actionCollection(), "ports_implement_interface"); - (void)new KAction(i18n("Change Positions/Names..."), 0, this, SLOT(changePortPositions()), + (void)new KAction(i18n("Change Positions/Names..."), 0, this, TQT_SLOT(changePortPositions()), actionCollection(), "ports_change_positions"); } @@ -444,10 +444,10 @@ void ArtsBuilderWindow::publish() i18n("The structure has been published as: '%1' on the server.").arg( structure->name().c_str() )); } -QString ArtsBuilderWindow::getOpenFilename(const char *pattern, const char *initialDir) +TQString ArtsBuilderWindow::getOpenFilename(const char *pattern, const char *initialDir) { arts_debug(">>>>> getOpenFilename"); - QString filename = KFileDialog::getOpenFileName(initialDir, pattern, this); + TQString filename = KFileDialog::getOpenFileName(initialDir, pattern, this); arts_debug(">>>>> opendlg closed"); if(!filename.isEmpty()) { @@ -455,7 +455,7 @@ QString ArtsBuilderWindow::getOpenFilename(const char *pattern, const char *init // check that the file is ok: - FILE *infile = fopen(QFile::encodeName(filename), "r"); + FILE *infile = fopen(TQFile::encodeName(filename), "r"); if(infile) { @@ -463,7 +463,7 @@ QString ArtsBuilderWindow::getOpenFilename(const char *pattern, const char *init return(filename); } } - return QString(""); + return TQString(""); } void ArtsBuilderWindow::fileNew() @@ -474,7 +474,7 @@ void ArtsBuilderWindow::fileNew() propertyPanel->setSelectedComponent(0); structure->clear(); modulewidget->reInit(); - m_filename = QString::null; + m_filename = TQString::null; setModified(false); } @@ -486,14 +486,14 @@ void ArtsBuilderWindow::open() open(getOpenFilename("*.arts", DirManager::structureDir())); } -void ArtsBuilderWindow::open(QString filename) +void ArtsBuilderWindow::open(TQString filename) { if(!promptToSave()) return; if(!filename.isEmpty()) { - structure->load(QFile::encodeName(filename)); + structure->load(TQFile::encodeName(filename)); modulewidget->reInit(); if(!structure->valid()) { @@ -514,12 +514,12 @@ void ArtsBuilderWindow::openSession() if(!promptToSave()) return; - QString filename = getOpenFilename("*.arts-session", DirManager::sessionDir()); + TQString filename = getOpenFilename("*.arts-session", DirManager::sessionDir()); if(!filename.isEmpty()) { Session *session = new Session(); - session->loadSession(QFile::encodeName(filename)); + session->loadSession(TQFile::encodeName(filename)); assert(!execDlg); execDlg = new ExecDlg(0, session); @@ -532,7 +532,7 @@ void ArtsBuilderWindow::openSession() execDlg->start(); execDlg->show(); - connect(execDlg, SIGNAL(ready()), this, SLOT(endexecute())); + connect(execDlg, TQT_SIGNAL(ready()), this, TQT_SLOT(endexecute())); hide(); // m_filename = filename; FIXME: DOESN'T THIS BELONG HERE? @@ -545,14 +545,14 @@ void ArtsBuilderWindow::openExample() if(!promptToSave()) return; - QString dir = locate("data", "artsbuilder/examples/"); + TQString dir = locate("data", "artsbuilder/examples/"); if(!dir) KMessageBox::sorry( this, i18n("Unable to find the examples folder.\nUsing the current folder instead."), i18n("aRts Warning")); - open(getOpenFilename("*.arts", QFile::encodeName(dir))); + open(getOpenFilename("*.arts", TQFile::encodeName(dir))); } void ArtsBuilderWindow::saveAs() @@ -566,19 +566,19 @@ void ArtsBuilderWindow::saveAs() dlg->setSelection(defaultname.c_str()); dlg->setCaption(i18n("Save As")); - QString filename; - if(dlg->exec() == QDialog::Accepted) + TQString filename; + if(dlg->exec() == TQDialog::Accepted) filename = dlg->selectedFile(); delete dlg; - // QString filename = KFileDialog::getSaveFileName(0, "*.arts", this); + // TQString filename = KFileDialog::getSaveFileName(0, "*.arts", this); // filename.detach(); if(!filename.isEmpty()) save(filename); } -bool ArtsBuilderWindow::save(QString filename) +bool ArtsBuilderWindow::save(TQString filename) { arts_debug("trying to save structure as '%s'", filename.local8Bit().data()); @@ -629,7 +629,7 @@ void ArtsBuilderWindow::rename() { bool ok; - QString name = KInputDialog::getText( i18n( "Rename Structure" ), + TQString name = KInputDialog::getText( i18n( "Rename Structure" ), i18n( "Enter structure name:" ), structure->name().c_str(), &ok, this ); if (ok) { @@ -649,7 +649,7 @@ void ArtsBuilderWindow::retrieve() if(rd.exec()) { - QString result = rd.result(); + TQString result = rd.result(); if(!result.isEmpty()) { structure->retrieve(result.local8Bit()); @@ -674,7 +674,7 @@ void ArtsBuilderWindow::execute() execDlg->start(); execDlg->show(); - connect(execDlg, SIGNAL(ready()), this, SLOT(endexecute())); + connect(execDlg, TQT_SIGNAL(ready()), this, TQT_SLOT(endexecute())); hide(); } @@ -838,7 +838,7 @@ bool ArtsBuilderWindow::promptToSave() return true; query = KMessageBox::warningYesNoCancel(this, - i18n("The current structure has been modified.\nWould you like to save it?"), QString::null, KStdGuiItem::save(), KStdGuiItem::discard()); + i18n("The current structure has been modified.\nWould you like to save it?"), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard()); result = false; switch(query) @@ -864,10 +864,10 @@ ArtsBuilderApp::ArtsBuilderApp() start(); } -ArtsBuilderApp::ArtsBuilderApp(QString filename) +ArtsBuilderApp::ArtsBuilderApp(TQString filename) { start(); - if(QFile::exists(filename)) + if(TQFile::exists(filename)) { mainWindow->open(filename); } else { @@ -946,7 +946,7 @@ int main(int argc, char **argv) } if(args->count() > 0) { - ArtsBuilderApp Application(QFile::decodeName(args->arg(0))); + ArtsBuilderApp Application(TQFile::decodeName(args->arg(0))); args->clear(); return Application.exec(); } else { diff --git a/arts/builder/main.h b/arts/builder/main.h index 1ae4473f..e9c17391 100644 --- a/arts/builder/main.h +++ b/arts/builder/main.h @@ -56,7 +56,7 @@ protected: ExecDlg *execDlg; - QString m_filename; + TQString m_filename; bool modified; protected: @@ -68,7 +68,7 @@ public: void clear(); void checkName(); - QString getOpenFilename(const char *pattern, const char *initialDir = 0); + TQString getOpenFilename(const char *pattern, const char *initialDir = 0); bool isModified(); bool promptToSave(); bool queryClose(); @@ -99,8 +99,8 @@ public slots: void saveAs(); void quit(); - void open(QString filename); - bool save(QString filename); + void open(TQString filename); + bool save(TQString filename); void setModified(bool m = true); void execute(); diff --git a/arts/builder/menumaker.cpp b/arts/builder/menumaker.cpp index 54e32e2b..2aed8401 100644 --- a/arts/builder/menumaker.cpp +++ b/arts/builder/menumaker.cpp @@ -8,9 +8,9 @@ using namespace std; MenuEntry::MenuEntry(MenuMaker *menumaker, KActionMenu *parent, const char *text) : menumaker(menumaker), text(text) { - action = new KAction(QString::fromLocal8Bit(text)); + action = new KAction(TQString::fromLocal8Bit(text)); parent->insert(action); - connect(action, SIGNAL(activated()), this, SLOT(activated())); + connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(activated())); } void MenuEntry::activated() @@ -18,7 +18,7 @@ void MenuEntry::activated() menumaker->menuActivated(text); } -MenuCategory::MenuCategory(const QString& name, const char *prefix, KActionMenu *menu) +MenuCategory::MenuCategory(const TQString& name, const char *prefix, KActionMenu *menu) { _menu = menu; _name = name; @@ -26,7 +26,7 @@ MenuCategory::MenuCategory(const QString& name, const char *prefix, KActionMenu addPrefix(prefix); } -QString MenuCategory::name() +TQString MenuCategory::name() { return _name; } @@ -76,7 +76,7 @@ MenuMaker::MenuMaker(KActionMenu *root) // addCategory("&Synthesis", "Synth_"); // addCategory("&Synthesis/&Waveforms", "Synth_WAVE"); -void MenuMaker::addCategory(const QString& name, const char *prefix) +void MenuMaker::addCategory(const TQString& name, const char *prefix) { MenuCategory *mc = 0,*pc = 0; @@ -93,7 +93,7 @@ void MenuMaker::addCategory(const QString& name, const char *prefix) KActionMenu *newMenu = new KActionMenu(catname(name)); pc->menu()->insert(newMenu); /* 000 */ - /*connect(newMenu,SIGNAL(activated(int)),this,SLOT(menuactivated(int))); + /*connect(newMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(menuactivated(int))); pc->menu()->insertItem(catname(name).c_str(), newMenu, CAT_MAGIC_ID);*/ arts_debug("inserting a menu called '%s' in the parent menu '%s'", catname(name).local8Bit().data(),pc->name().local8Bit().data()); @@ -106,7 +106,7 @@ void MenuMaker::addCategory(const QString& name, const char *prefix) } } -MenuCategory *MenuMaker::lookupCategoryByName(const QString& name) +MenuCategory *MenuMaker::lookupCategoryByName(const TQString& name) { MenuCategory *mc = 0; list<MenuCategory *>::iterator i; @@ -137,16 +137,16 @@ void MenuMaker::addItem(const char *name, int index) //mc->menu()->insert(new KAction(name)); // index?? new MenuEntry(this, mc->menu(), name); /* - KAction *action = new KAction(QString(name)); + KAction *action = new KAction(TQString(name)); mc->menu()->insert(action); */ //action->plug(mc->menu()); //mc->menu()->insert(new KAction(name)); // index?? } -QString MenuMaker::basename(const QString& name) +TQString MenuMaker::basename(const TQString& name) { - QString result = ""; + TQString result = ""; int i = name.findRev('/'); if(i != -1) @@ -157,7 +157,7 @@ QString MenuMaker::basename(const QString& name) return result; } -QString MenuMaker::catname(const QString& name) +TQString MenuMaker::catname(const TQString& name) { int i = name.findRev('/'); if(i >= 0) diff --git a/arts/builder/menumaker.h b/arts/builder/menumaker.h index 5b999dc5..f2481a2f 100644 --- a/arts/builder/menumaker.h +++ b/arts/builder/menumaker.h @@ -2,7 +2,7 @@ #define __MENUMAKER_H__ #include <kaction.h> -#include <qobject.h> +#include <tqobject.h> #include <string> #include <list> @@ -15,7 +15,7 @@ class MenuEntry : public QObject protected: MenuMaker *menumaker; KAction *action; - QCString text; + TQCString text; public: MenuEntry(MenuMaker *menumaker, KActionMenu *parent, const char *text); @@ -28,15 +28,15 @@ class MenuCategory { protected: KActionMenu *_menu; - QString _name; + TQString _name; std::list<std::string> prefixList; bool _catchall; public: - MenuCategory(const QString& name, const char *prefix, KActionMenu *menu); + MenuCategory(const TQString& name, const char *prefix, KActionMenu *menu); void addPrefix(const char *prefix); - QString name(); + TQString name(); KActionMenu *menu(); bool catchall(); @@ -53,11 +53,11 @@ public: MenuMaker(KActionMenu *root); - void addCategory(const QString& name, const char *prefix); - MenuCategory *lookupCategoryByName(const QString& name); + void addCategory(const TQString& name, const char *prefix); + MenuCategory *lookupCategoryByName(const TQString& name); void addItem(const char *name, int i); - QString basename(const QString& name); - QString catname(const QString& name); + TQString basename(const TQString& name); + TQString catname(const TQString& name); void clear(); diff --git a/arts/builder/module.cpp b/arts/builder/module.cpp index 94f56591..5432492e 100644 --- a/arts/builder/module.cpp +++ b/arts/builder/module.cpp @@ -24,8 +24,8 @@ #include <stdio.h> #include <arts/debug.h> -#include <qpalette.h> -#include <qdrawutil.h> +#include <tqpalette.h> +#include <tqdrawutil.h> #include <kiconloader.h> #include <algorithm> @@ -56,20 +56,20 @@ bool ModulePort::down() return (PortDesc.isConnected() || PortDesc.hasValue() || selected); } -QColor ModulePort::color(bool isInterface) +TQColor ModulePort::color(bool isInterface) { - if(selected) return QColor(255, 165, 0); + if(selected) return TQColor(255, 165, 0); if(PortDesc.hasValue()) { - if(isinitarg) return QColor(180, 180, 180); - return QColor(100, 100, 255); + if(isinitarg) return TQColor(180, 180, 180); + return TQColor(100, 100, 255); } - if(isinitarg) return QColor(128, 128, 128); + if(isinitarg) return TQColor(128, 128, 128); - if(isInterface) return QColor(100, 100, 100); - return QColor(43, 43, 168); + if(isInterface) return TQColor(100, 100, 100); + return TQColor(43, 43, 168); } Module::Module(Arts::ModuleDesc module, Arts::StructureDesc structuredesc, @@ -94,7 +94,7 @@ Module::Module(const Arts::ModuleInfo& minfo, Arts::StructureDesc structuredesc, void Module::initModule() { - QString iconname; + TQString iconname; KIconLoader iconloader; _selected = false; @@ -107,12 +107,12 @@ void Module::initModule() iconname = _name + ".xpm"; - _pixmap = new QPixmap(iconloader.loadIcon(iconname, KIcon::User)); + _pixmap = new TQPixmap(iconloader.loadIcon(iconname, KIcon::User)); if(!_pixmap->height()) { iconname = _name + ".png"; delete _pixmap; - _pixmap = new QPixmap( iconloader.loadIcon( iconname, KIcon::User ) ); + _pixmap = new TQPixmap( iconloader.loadIcon( iconname, KIcon::User ) ); if( !_pixmap->height() ) { delete _pixmap; @@ -125,12 +125,12 @@ void Module::initModule() { iconname = iconname.mid(6); - _pixmap = new QPixmap(iconloader.loadIcon(iconname, KIcon::User)); + _pixmap = new TQPixmap(iconloader.loadIcon(iconname, KIcon::User)); if(!_pixmap->height()) { iconname.replace( iconname.length() - 4, 3, "png" ); delete _pixmap; - _pixmap = new QPixmap(iconloader.loadIcon(iconname, KIcon::User)); + _pixmap = new TQPixmap(iconloader.loadIcon(iconname, KIcon::User)); if( !_pixmap->height() ) { delete _pixmap; @@ -139,10 +139,10 @@ void Module::initModule() } } /* - FILE *test = fopen(QFile::encodeName(iconname), "r"); + FILE *test = fopen(TQFile::encodeName(iconname), "r"); if(test) { - pixmap = new QPixmap(iconname); + pixmap = new TQPixmap(iconname); fclose(test); } */ @@ -229,24 +229,24 @@ bool Module::drawNeedsBackground(int segment) return (segment == 0); } -void Module::drawSegment(QPainter *p, int cellsize, int segment) +void Module::drawSegment(TQPainter *p, int cellsize, int segment) { int border = cellsize / 10; // for the logo int ltop = (cellsize - border)/2; int lbot = (cellsize + border)/2; - QColor mcolor(43, 43, 168); - QColor mcolorlight(164, 176, 242); + TQColor mcolor(43, 43, 168); + TQColor mcolorlight(164, 176, 242); if(isInterface) { - mcolor = QColor(100, 100, 100); - mcolorlight = QColor(160, 160, 160); + mcolor = TQColor(100, 100, 100); + mcolorlight = TQColor(160, 160, 160); } - QColorGroup g( Qt::white, Qt::blue, mcolorlight, mcolor.dark(), mcolor, + TQColorGroup g( Qt::white, Qt::blue, mcolorlight, mcolor.dark(), mcolor, Qt::black, Qt::black ); - QBrush fill( mcolor ); - QPen textpen(QColor(255, 255, 180), 1); + TQBrush fill( mcolor ); + TQPen textpen(TQColor(255, 255, 180), 1); if(segment == 0) { @@ -263,9 +263,9 @@ void Module::drawSegment(QPainter *p, int cellsize, int segment) float sx = (float)destsize/(float)_pixmap->width(); float sy = (float)destsize/(float)_pixmap->height(); - QWMatrix matrix; + TQWMatrix matrix; matrix.scale(sx, sy); - QPixmap pmscaled = _pixmap->xForm(matrix); + TQPixmap pmscaled = _pixmap->xForm(matrix); p->drawPixmap(border*2, border*2, pmscaled); } return; @@ -300,25 +300,25 @@ void Module::drawSegment(QPainter *p, int cellsize, int segment) { int border = cellsize/7; int textwidth; - QString label = DrawUtils::cropText(p, port->description, + TQString label = DrawUtils::cropText(p, port->description, cellsize/2, textwidth); - QBrush pbrush(port->color(isInterface)); + TQBrush pbrush(port->color(isInterface)); - port->clickrect = QRect(border, direction * cellsize/2 + border, + port->clickrect = TQRect(border, direction * cellsize/2 + border, cellsize/2 - 2*border, cellsize/2 - 2*border); qDrawShadePanel(p, port->clickrect, g, port->down(), 2, &pbrush); #if 0 - QBrush fillport(fill); + TQBrush fillport(fill); if(port->isinitarg) { - fillport = QColor(128, 128, 128); + fillport = TQColor(128, 128, 128); } if(port->selected) { - QBrush fillorange(QColor(255, 165, 0)); + TQBrush fillorange(TQColor(255, 165, 0)); qDrawShadePanel(p, port->clickrect, g, true, 2, &fillorange); } else @@ -329,10 +329,10 @@ void Module::drawSegment(QPainter *p, int cellsize, int segment) } else if(port->PortDesc->hasValue()) { - QBrush fillp(QColor(100, 100, 255)); + TQBrush fillp(TQColor(100, 100, 255)); if(port->isinitarg) { - fillp = QColor(180, 180, 180); + fillp = TQColor(180, 180, 180); } qDrawShadePanel(p, port->clickrect, g, true, 2, &fillp); } @@ -356,10 +356,10 @@ void Module::drawSegment(QPainter *p, int cellsize, int segment) { // object type label int textwidth; - QString label = DrawUtils::cropText(p, _name, cellsize - 4, textwidth); + TQString label = DrawUtils::cropText(p, _name, cellsize - 4, textwidth); p->setPen(textpen); - p->fillRect(1, cellsize - 16, textwidth + 7, 15, QBrush(g.dark())); + p->fillRect(1, cellsize - 16, textwidth + 7, 15, TQBrush(g.dark())); p->drawText(4, cellsize - 5, label); // logo connection @@ -373,7 +373,7 @@ void Module::drawSegment(QPainter *p, int cellsize, int segment) if(selected()) { - QPen pen(Qt::white, 1, Qt::DotLine); + TQPen pen(Qt::white, 1, Qt::DotLine); p->setPen(pen); p->drawLine(0, 0, cellsize - 1, 0); @@ -412,7 +412,7 @@ ModulePort *Module::portAt(int segment, int x, int y) ModulePort *port = findPort(segment, direction); if(port) { - QPoint clickpoint(x, y); + TQPoint clickpoint(x, y); if(port->clickrect.contains(clickpoint)) return port; } } @@ -426,12 +426,12 @@ void Module::dumpPorts(list<ModulePort *>& ports) for(i = outports.begin(); i != outports.end(); ++i) ports.push_back(*i); } -QPixmap *Module::pixmap() +TQPixmap *Module::pixmap() { return _pixmap; } -QString Module::name() +TQString Module::name() { return _name; } diff --git a/arts/builder/module.h b/arts/builder/module.h index 0d23bb11..6fbff74d 100644 --- a/arts/builder/module.h +++ b/arts/builder/module.h @@ -24,9 +24,9 @@ #include <list> -#include <qpixmap.h> -#include <qstring.h> -#include <qrect.h> +#include <tqpixmap.h> +#include <tqstring.h> +#include <tqrect.h> #include <ksimpleconfig.h> #include "artsbuilder.h" @@ -59,7 +59,7 @@ public: int drawsegment, Direction direction, Arts::PortDesc PortDesc); bool down(); - QColor color(bool isInterface); + TQColor color(bool isInterface); }; class Module :public StructureComponent @@ -68,8 +68,8 @@ protected: Arts::StructureDesc StructureDesc; Arts::ModuleDesc ModuleDesc; - QPixmap *_pixmap; - QString _name; + TQPixmap *_pixmap; + TQString _name; int _width, _height; bool moveInternal(int x, int y); @@ -100,9 +100,9 @@ public: void dumpPorts(std::list<ModulePort *>& ports); bool drawNeedsBackground(int segment); - void drawSegment(QPainter *dest, int cellsize, int segment); - QPixmap *pixmap(); - QString name(); + void drawSegment(TQPainter *dest, int cellsize, int segment); + TQPixmap *pixmap(); + TQString name(); }; #endif diff --git a/arts/builder/mwidget.cpp b/arts/builder/mwidget.cpp index b6c3d841..808b3bcf 100644 --- a/arts/builder/mwidget.cpp +++ b/arts/builder/mwidget.cpp @@ -7,9 +7,9 @@ #include <klocale.h> #include <kmessagebox.h> -#include <qtimer.h> -#include <qpainter.h> -#include <qevent.h> +#include <tqtimer.h> +#include <tqpainter.h> +#include <tqevent.h> #include "createtool.h" @@ -56,22 +56,22 @@ void ModuleWidget::leaveTool(MWidgetTool *tool, bool wasModified) emit modified(wasModified); } -QPoint ModuleWidget::componentPos(const StructureComponent *component) const +TQPoint ModuleWidget::componentPos(const StructureComponent *component) const { int cellx = 0, celly = 0; colXPos(component->x(), &cellx); rowYPos(component->y(), &celly); - return QPoint(cellx, celly); + return TQPoint(cellx, celly); } -QPoint ModuleWidget::portPos(const ModulePort *port) const +TQPoint ModuleWidget::portPos(const ModulePort *port) const { int cellx = 0, celly = 0; colXPos(port->owner->x() + port->drawsegment, &cellx); rowYPos(port->owner->y(), &celly); - return QPoint(cellx, celly); + return TQPoint(cellx, celly); } bool ModuleWidget::insertModule( Module *newModule ) @@ -125,7 +125,7 @@ void ModuleWidget::selectComponent( StructureComponent *component, bool onlyThis endUpdate(); } -void ModuleWidget::mousePressEvent( QMouseEvent *e ) +void ModuleWidget::mousePressEvent( TQMouseEvent *e ) { if(activeTool) { @@ -172,7 +172,7 @@ void ModuleWidget::mousePressEvent( QMouseEvent *e ) } } -void ModuleWidget::mouseMoveEvent( QMouseEvent *e ) +void ModuleWidget::mouseMoveEvent( TQMouseEvent *e ) { if(activeTool) { @@ -181,7 +181,7 @@ void ModuleWidget::mouseMoveEvent( QMouseEvent *e ) } } -void ModuleWidget::mouseReleaseEvent( QMouseEvent *e ) +void ModuleWidget::mouseReleaseEvent( TQMouseEvent *e ) { if(activeTool) { @@ -250,16 +250,16 @@ bool ModuleWidget::hasSpace(StructureComponent *c, int destx, int desty, return true; } -void ModuleWidget::paintCellBackground(QPainter *p, int y, int x) +void ModuleWidget::paintCellBackground(TQPainter *p, int y, int x) { - QColor bgcolor; + TQColor bgcolor; if((y & 1) == 1) - bgcolor = QColor(168, 168, 168); + bgcolor = TQColor(168, 168, 168); else - bgcolor = QColor(146, 168, 146); + bgcolor = TQColor(146, 168, 146); - p->fillRect(0, 0, cellsize, cellsize, QBrush(bgcolor)); + p->fillRect(0, 0, cellsize, cellsize, TQBrush(bgcolor)); p->setPen(bgcolor.dark(115)); p->drawLine(0, 0, 0, cellsize - 1); @@ -296,7 +296,7 @@ void ModuleWidget::endUpdate() { if(!--updateDepth) { - std::list<QRect>::iterator i; + std::list<TQRect>::iterator i; for(i = UpdateList.begin(); i != UpdateList.end(); i++) { @@ -309,7 +309,7 @@ void ModuleWidget::endUpdate() void ModuleWidget::redrawRect(int x, int y, int width, int height) { - QRect r = QRect(x, y, width, height); + TQRect r = TQRect(x, y, width, height); if(!updateDepth) { @@ -321,7 +321,7 @@ void ModuleWidget::redrawRect(int x, int y, int width, int height) } } -void ModuleWidget::redrawCells(QRect &r) +void ModuleWidget::redrawCells(TQRect &r) { int x, y; @@ -461,18 +461,18 @@ void ModuleWidget::reRoute() void ModuleWidget::redrawAll() { // redraw everything - QRect updaterect(0, 0, cols, rows); + TQRect updaterect(0, 0, cols, rows); redrawCells(updaterect); } -void ModuleWidget::paintConnection(QPainter *p, int x, int y, int arx, int ary) +void ModuleWidget::paintConnection(TQPainter *p, int x, int y, int arx, int ary) { long linetype = autorouter->get(arx, ary); long ud_owner = -1, lr_owner = -1, lr_break = 0, ud_break = 0; autorouter->getowners(arx, ary, ud_owner, lr_owner); - p->setPen(QColor(255, 255, 255)); + p->setPen(TQColor(255, 255, 255)); /* if(linetype == AutoRouter::none) @@ -481,7 +481,7 @@ void ModuleWidget::paintConnection(QPainter *p, int x, int y, int arx, int ary) } if(linetype & AutoRouter::solid) { - QBrush whitefill(QColor(255, 255, 255)); + TQBrush whitefill(TQColor(255, 255, 255)); p->fillRect(x + cellsize/6, y + cellsize/6, cellsize/6, cellsize/6, whitefill); } @@ -513,7 +513,7 @@ void ModuleWidget::paintConnection(QPainter *p, int x, int y, int arx, int ary) p->drawLine(x, y + cellsize/4, x, y + ud_break); } -void ModuleWidget::paintConnections(QPainter *p, int y, int x) +void ModuleWidget::paintConnections(TQPainter *p, int y, int x) { // paints connections in the given 2x2-autorouter-block being a 1x1 block to the user for(int dx = 0; dx < 2; dx++) @@ -521,7 +521,7 @@ void ModuleWidget::paintConnections(QPainter *p, int y, int x) paintConnection(p, (cellsize*dx)/2, (cellsize*dy)/2, x*2 + dx, y*2 + dy); } -void ModuleWidget::paintCell(QPainter *p, int y, int x) +void ModuleWidget::paintCell(TQPainter *p, int y, int x) { #if 0 /* PORT */ if(theArtsBuilderApp->eventStackDepth() > 1) @@ -594,7 +594,7 @@ void ModuleWidget::delModule() if(KMessageBox::warningContinueCancel(0, i18n("Delete %n selected module, port or connection? (No undo possible.)", "Delete %n selected modules, ports and connections? (No undo possible.)", - numSelected), QString::null, i18n("&Delete")) == KMessageBox::Continue) + numSelected), TQString::null, i18n("&Delete")) == KMessageBox::Continue) { selectPort(0L); emit componentSelected(0); @@ -608,7 +608,7 @@ void ModuleWidget::autoRedrawRouter() if(autorouter->needRedraw()) redrawAll(); } -ModuleWidget::ModuleWidget(Structure *structure, QWidget *parent, const char *name, WFlags f) +ModuleWidget::ModuleWidget(Structure *structure, TQWidget *parent, const char *name, WFlags f) : QtTableView( parent, name, f), updateDepth( 0 ), activeTool( 0L ), @@ -636,9 +636,9 @@ ModuleWidget::ModuleWidget(Structure *structure, QWidget *parent, const char *na autorouter = new AutoRouter(cols*2, rows*2); arts_debug("PORT: mw; new ar ok - qtimer"); - QTimer *timer = new QTimer( this ); - connect( timer, SIGNAL(timeout()), - this, SLOT(autoRedrawRouter()) ); + TQTimer *timer = new TQTimer( this ); + connect( timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(autoRedrawRouter()) ); arts_debug("PORT: mw; tstart"); timer->start( 100, FALSE ); // 100 ms reoccurring check diff --git a/arts/builder/mwidget.h b/arts/builder/mwidget.h index 93f7726f..8f92c946 100644 --- a/arts/builder/mwidget.h +++ b/arts/builder/mwidget.h @@ -55,15 +55,15 @@ protected: ModulePort *selectedPort; std::list<Module *> *ModuleList; - std::list<QRect> UpdateList; + std::list<TQRect> UpdateList; - void paintCell(QPainter *p, int y, int x); - void paintCellBackground(QPainter *p, int y, int x); - void paintConnection(QPainter *p, int x, int y, int arx, int ary); - void paintConnections(QPainter *p, int y, int x); - void mousePressEvent( QMouseEvent *e ); - void mouseMoveEvent( QMouseEvent *e ); - void mouseReleaseEvent( QMouseEvent *e ); + void paintCell(TQPainter *p, int y, int x); + void paintCellBackground(TQPainter *p, int y, int x); + void paintConnection(TQPainter *p, int x, int y, int arx, int ary); + void paintConnections(TQPainter *p, int y, int x); + void mousePressEvent( TQMouseEvent *e ); + void mouseMoveEvent( TQMouseEvent *e ); + void mouseReleaseEvent( TQMouseEvent *e ); bool hasSpace(StructureComponent *c, int destx, int desty, bool ignore_selected = false); @@ -72,7 +72,7 @@ protected: void setSelectAll(bool newstate); void beginUpdate(); - void redrawCells(QRect &r); + void redrawCells(TQRect &r); void redrawAll(); void endUpdate(); @@ -105,10 +105,10 @@ public: void reInit(); void leaveTool(MWidgetTool *tool, bool wasModified= false); - QPoint componentPos(const StructureComponent *component) const; - QPoint portPos(const ModulePort *port) const; + TQPoint componentPos(const StructureComponent *component) const; + TQPoint portPos(const ModulePort *port) const; - ModuleWidget( Structure *structure, QWidget *parent = 0, + ModuleWidget( Structure *structure, TQWidget *parent = 0, const char *name = 0, WFlags f = 0); ~ModuleWidget(); diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp index 6d5d0deb..3584de45 100644 --- a/arts/builder/portposdlg.cpp +++ b/arts/builder/portposdlg.cpp @@ -21,42 +21,42 @@ #include "portposdlg.h" #include "structureport.h" -#include <qlayout.h> -#include <qlabel.h> -#include <qlistbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqlistbox.h> #include <kbuttonbox.h> #include <klocale.h> #include <kinputdialog.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> #include <kapplication.h> #include <kiconloader.h> #include <kseparator.h> -#include <qlineedit.h> +#include <tqlineedit.h> #include <stdio.h> #include <arts/debug.h> -#include <qpushbutton.h> +#include <tqpushbutton.h> #include <kstdguiitem.h> using namespace std; -PortPosDlg::PortPosDlg(QWidget *parent, Structure *structure) :QDialog(parent,"Props", TRUE) +PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,"Props", TRUE) { this->structure = structure; setCaption(i18n("aRts: Structureport View")); - QVBoxLayout *mainlayout = new QVBoxLayout(this); - //QHBoxLayout *contentslayout = new QHBoxLayout; + TQVBoxLayout *mainlayout = new TQVBoxLayout(this); + //TQHBoxLayout *contentslayout = new QHBoxLayout; // object type /* mainlayout->addSpacing(5); - QLabel *objectlabel = new QLabel(this); - QFont labelfont(objectlabel->font()); + TQLabel *objectlabel = new TQLabel(this); + TQFont labelfont(objectlabel->font()); labelfont.setPointSize(labelfont.pointSize()*3/2); objectlabel->setFont(labelfont); - objectlabel->setText(QString(" ")+i18n("Object type: ")+QString(port->owner->name())+QString(" ")); + objectlabel->setText(TQString(" ")+i18n("Object type: ")+TQString(port->owner->name())+TQString(" ")); objectlabel->setAlignment(AlignCenter); min_size(objectlabel); mainlayout->addWidget(objectlabel); @@ -66,7 +66,7 @@ PortPosDlg::PortPosDlg(QWidget *parent, Structure *structure) :QDialog(parent,"P /* mainlayout->addSpacing(5); - QLabel *portlabel = new QLabel(this); + TQLabel *portlabel = new TQLabel(this); labelfont.setPointSize(labelfont.pointSize()*4/5); portlabel->setFont(labelfont); portlabel->setText(i18n("Port description: ")+ port->description); @@ -89,7 +89,7 @@ PortPosDlg::PortPosDlg(QWidget *parent, Structure *structure) :QDialog(parent,"P */ // list - listbox = new QListBox(this); + listbox = new TQListBox(this); update(); @@ -103,7 +103,7 @@ PortPosDlg::PortPosDlg(QWidget *parent, Structure *structure) :QDialog(parent,"P // buttons - QHBoxLayout *buttonlayout = new QHBoxLayout; + TQHBoxLayout *buttonlayout = new QHBoxLayout; mainlayout->addSpacing(5); mainlayout->addLayout(buttonlayout); mainlayout->addSpacing(5); @@ -111,27 +111,27 @@ PortPosDlg::PortPosDlg(QWidget *parent, Structure *structure) :QDialog(parent,"P buttonlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - bbox->addButton(KStdGuiItem::help(), this, SLOT( help() )); + bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() )); bbox->addStretch(1); KIconLoader iconloader; - QButton *raise = bbox->addButton(i18n("&Raise")); + TQButton *raise = bbox->addButton(i18n("&Raise")); raise->setPixmap(iconloader.loadIcon("up", KIcon::Small)); - connect( raise, SIGNAL( clicked() ), SLOT( raise() )); + connect( raise, TQT_SIGNAL( clicked() ), TQT_SLOT( raise() )); - QButton *lower = bbox->addButton(i18n("&Lower")); + TQButton *lower = bbox->addButton(i18n("&Lower")); lower->setPixmap(iconloader.loadIcon("down", KIcon::Small)); - connect( lower, SIGNAL( clicked() ), SLOT( lower() )); + connect( lower, TQT_SIGNAL( clicked() ), TQT_SLOT( lower() )); - QButton *rename = bbox->addButton(i18n("R&ename...")); - connect( rename, SIGNAL( clicked() ), SLOT( rename() )); + TQButton *rename = bbox->addButton(i18n("R&ename...")); + connect( rename, TQT_SIGNAL( clicked() ), TQT_SLOT( rename() )); - QButton *okbutton = bbox->addButton(KStdGuiItem::ok()); - connect( okbutton, SIGNAL( clicked() ), SLOT(accept() ) ); + TQButton *okbutton = bbox->addButton(KStdGuiItem::ok()); + connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) ); /* - QButton *cancelbutton = bbox->addButton(i18n("Cancel")); - connect( cancelbutton, SIGNAL( clicked() ), SLOT(reject() ) ); + TQButton *cancelbutton = bbox->addButton(i18n("Cancel")); + connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) ); */ bbox->layout(); //min_size(bbox); @@ -188,7 +188,7 @@ void PortPosDlg::rename() assert(port); bool ok; - QString name = KInputDialog::getText( i18n( "Rename Port" ), + TQString name = KInputDialog::getText( i18n( "Rename Port" ), i18n( "Enter port name:" ), port->name(), &ok, this ); if (ok) { diff --git a/arts/builder/portposdlg.h b/arts/builder/portposdlg.h index 775e24be..1adc997c 100644 --- a/arts/builder/portposdlg.h +++ b/arts/builder/portposdlg.h @@ -24,21 +24,21 @@ #include "structure.h" #include "structureport.h" -#include <qdialog.h> -#include <qlistbox.h> -#include <qlabel.h> -#include <qlineedit.h> +#include <tqdialog.h> +#include <tqlistbox.h> +#include <tqlabel.h> +#include <tqlineedit.h> #include <vector> -class PortPosDlg :public QDialog { +class PortPosDlg :public TQDialog { Q_OBJECT protected: Structure *structure; - QListBox *listbox; + TQListBox *listbox; std::vector<StructurePort *> listports; public: - PortPosDlg(QWidget *parent, Structure *structure); + PortPosDlg(TQWidget *parent, Structure *structure); void update(); public slots: diff --git a/arts/builder/propertypanel.cpp b/arts/builder/propertypanel.cpp index 3b281c2a..cca2ee5d 100644 --- a/arts/builder/propertypanel.cpp +++ b/arts/builder/propertypanel.cpp @@ -25,38 +25,38 @@ #include <klocale.h> #include <kdebug.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qcombobox.h> -#include <qlistbox.h> -#include <qlineedit.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqcombobox.h> +#include <tqlistbox.h> +#include <tqlineedit.h> #include <arts/debug.h> -PropertyPanel::PropertyPanel( QWidget* parent, const char* name, WFlags fl ) +PropertyPanel::PropertyPanel( TQWidget* parent, const char* name, WFlags fl ) : PropertyPanelBase( parent, name, fl ), component(0L), port(0L) { setTitleFont(); setTitleColors(); - connect( kapp, SIGNAL( kdisplayFontChanged() ), - this, SLOT( setTitleFont() )); - connect( kapp, SIGNAL( kdisplayPaletteChanged() ), - this, SLOT( setTitleColors() )); - connect( portValueGroup, SIGNAL( clicked(int) ), - this, SLOT( pvModeChanged(int) )); - connect( constantValueEdit, SIGNAL( returnPressed() ), - this, SLOT( writePortProperties() )); - connect( constantValueComboBox, SIGNAL( activated(int) ), - this, SLOT( writePortProperties() )); - connect( portCombo, SIGNAL( activated(int) ), - this, SLOT( comboPortSelected(int) )); - connect( connectButton, SIGNAL( clicked() ), - this, SLOT( connectButtonClicked() )); + connect( kapp, TQT_SIGNAL( kdisplayFontChanged() ), + this, TQT_SLOT( setTitleFont() )); + connect( kapp, TQT_SIGNAL( kdisplayPaletteChanged() ), + this, TQT_SLOT( setTitleColors() )); + connect( portValueGroup, TQT_SIGNAL( clicked(int) ), + this, TQT_SLOT( pvModeChanged(int) )); + connect( constantValueEdit, TQT_SIGNAL( returnPressed() ), + this, TQT_SLOT( writePortProperties() )); + connect( constantValueComboBox, TQT_SIGNAL( activated(int) ), + this, TQT_SLOT( writePortProperties() )); + connect( portCombo, TQT_SIGNAL( activated(int) ), + this, TQT_SLOT( comboPortSelected(int) )); + connect( connectButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( connectButtonClicked() )); constantValueComboBox->hide(); setEnabled( false ); @@ -65,7 +65,7 @@ PropertyPanel::PropertyPanel( QWidget* parent, const char* name, WFlags fl ) void PropertyPanel::setTitleFont() { - QFont titleFont = font(); + TQFont titleFont = font(); titleFont.setPointSizeFloat( titleFont.pointSizeFloat()*1.5f ); moduleNameLabel->setFont( titleFont ); titleFont = font(); @@ -73,35 +73,35 @@ void PropertyPanel::setTitleFont() selectedLabel->setFont( titleFont ); } -QColorGroup PropertyPanel::highlightColorGroup( QColorGroup cg ) +TQColorGroup PropertyPanel::highlightColorGroup( TQColorGroup cg ) { - cg.setColor( QColorGroup::Foreground, cg.highlightedText() ); - cg.setColor( QColorGroup::Background, cg.highlight() ); + cg.setColor( TQColorGroup::Foreground, cg.highlightedText() ); + cg.setColor( TQColorGroup::Background, cg.highlight() ); return cg; } void PropertyPanel::setTitleColors() { - QPalette palette = titleFrame->palette(); + TQPalette palette = titleFrame->palette(); palette.setActive( highlightColorGroup( palette.active() ) ); palette.setInactive( highlightColorGroup( palette.inactive() ) ); palette.setDisabled( highlightColorGroup( palette.disabled() ) ); titleFrame->setPalette( palette ); } -void PropertyPanel::resizeEvent ( QResizeEvent * ) +void PropertyPanel::resizeEvent ( TQResizeEvent * ) { if(width()*3 < height()*4) - mainBoxLayout->setDirection( QBoxLayout::TopToBottom ); + mainBoxLayout->setDirection( TQBoxLayout::TopToBottom ); else - mainBoxLayout->setDirection( QBoxLayout::LeftToRight ); + mainBoxLayout->setDirection( TQBoxLayout::LeftToRight ); } /*************************************************************/ void PropertyPanel::setSelectedComponent( StructureComponent *component ) { - //kdDebug() << QString("PropertyPanel::setSelectedComponent ") << component << endl; + //kdDebug() << TQString("PropertyPanel::setSelectedComponent ") << component << endl; if( this->component == component ) return; this->component = component; @@ -127,8 +127,8 @@ void PropertyPanel::setSelectedComponent( StructureComponent *component ) for(std::list<ModulePort *>::iterator it = modulePorts.begin(); it != modulePorts.end(); it++) { - QString portTitle = (*it)->description - + QString(" (%1)").arg( (*it)->PortDesc.type().direction == Arts::output ? + TQString portTitle = (*it)->description + + TQString(" (%1)").arg( (*it)->PortDesc.type().direction == Arts::output ? i18n("OUTPUT") : i18n("INPUT") ); portCombo->insertItem( portTitle ); } @@ -149,7 +149,7 @@ void PropertyPanel::setSelectedPort( ModulePort *port ) setSelectedComponent( port->owner ); rereadPortProperties(); portValueGroup->setEnabled( true ); - QString tipText = i18n("Tip: Just typing numbers or alphabetic characters starts entering constant values."); + TQString tipText = i18n("Tip: Just typing numbers or alphabetic characters starts entering constant values."); tipLabel->setText( tipText ); tipLabel->show(); @@ -208,7 +208,7 @@ void PropertyPanel::writePortProperties() void PropertyPanel::writePortProperties( bool reread ) { - //kdDebug() << QString("PropertyPanel::writePortProperties") << endl; + //kdDebug() << TQString("PropertyPanel::writePortProperties") << endl; if(!port) return; // sanity check bool dirty = false; @@ -232,7 +232,7 @@ void PropertyPanel::writePortProperties( bool reread ) if(pvConstantButton->isChecked()) { std::string type = port->PortDesc.type().dataType; - QString newvalue = constantValueEdit->text(); + TQString newvalue = constantValueEdit->text(); Arts::Any a; a.type = type; @@ -270,7 +270,7 @@ void PropertyPanel::writePortProperties( bool reread ) void PropertyPanel::rereadPortProperties() { - //kdDebug() << QString("PropertyPanel::rereadPortProperties") << endl; + //kdDebug() << TQString("PropertyPanel::rereadPortProperties") << endl; if(!port) return; // sanity check std::string dataType = port->PortDesc.type().dataType; @@ -291,7 +291,7 @@ void PropertyPanel::rereadPortProperties() { pvConstantButton->setChecked( true ); - QString constValue; + TQString constValue; Arts::Any value = port->PortDesc.value(); Arts::Buffer b; @@ -337,14 +337,14 @@ void PropertyPanel::rereadPortProperties() pvConnectionButton->setEnabled( port->PortDesc.isConnected() ); } -bool PropertyPanel::eventFilter( QObject *o, QEvent *e ) +bool PropertyPanel::eventFilter( TQObject *o, TQEvent *e ) { - if( port && !constantValueEdit->hasFocus() && (e->type() == QEvent::KeyPress) ) { -// kdDebug() << QString(" ..is KeyPress") << endl; - QString entered = static_cast<QKeyEvent *>(e)->text(); + if( port && !constantValueEdit->hasFocus() && (e->type() == TQEvent::KeyPress) ) { +// kdDebug() << TQString(" ..is KeyPress") << endl; + TQString entered = static_cast<TQKeyEvent *>(e)->text(); bool goodString = entered.length() > 0; -// kdDebug() << QString("pressed '%1'").arg(entered) << endl; +// kdDebug() << TQString("pressed '%1'").arg(entered) << endl; for( unsigned int i = 0; i < entered.length(); i++) goodString = goodString && entered[i].isLetterOrNumber(); @@ -359,7 +359,7 @@ bool PropertyPanel::eventFilter( QObject *o, QEvent *e ) } } // else -// kdDebug() << "event type = " << e->type() << " != " << QEvent::KeyPress << endl; +// kdDebug() << "event type = " << e->type() << " != " << TQEvent::KeyPress << endl; return FALSE; // PropertyPanelBase::eventFilter( o, e ); } @@ -378,7 +378,7 @@ void PropertyPanel::fillEnumChoices(const std::string& type) std::vector<Arts::EnumComponent>::const_iterator eci; for(eci = edef.contents.begin(); eci != edef.contents.end(); ++eci) - constantValueComboBox->insertItem(QString::fromUtf8(eci->name.c_str())); + constantValueComboBox->insertItem(TQString::fromUtf8(eci->name.c_str())); } long PropertyPanel::selectedEnumValue(const std::string& type) diff --git a/arts/builder/propertypanel.h b/arts/builder/propertypanel.h index 28cc7abd..3603ddad 100644 --- a/arts/builder/propertypanel.h +++ b/arts/builder/propertypanel.h @@ -21,7 +21,7 @@ #define PROPERTYPANEL_H #include "propertypanelbase.h" -#include "qpalette.h" +#include "tqpalette.h" #include <vector> #include <list> @@ -35,7 +35,7 @@ class PropertyPanel: public PropertyPanelBase Q_OBJECT public: - PropertyPanel( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + PropertyPanel( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); public slots: void setSelectedComponent( StructureComponent *component ); @@ -53,7 +53,7 @@ protected slots: void writePortProperties( bool reread ); void rereadPortProperties(); - bool eventFilter( QObject *, QEvent * ); + bool eventFilter( TQObject *, TQEvent * ); signals: void startConnection( ModulePort * ); @@ -62,13 +62,13 @@ signals: protected: enum ConnType { ctNone, ctValue, ctConnection }; - void resizeEvent ( QResizeEvent * ); + void resizeEvent ( TQResizeEvent * ); StructureComponent *component; ModulePort *port; std::list<ModulePort *> modulePorts; - QColorGroup highlightColorGroup( QColorGroup cg ); + TQColorGroup highlightColorGroup( TQColorGroup cg ); bool isEnum(const std::string& type); void fillEnumChoices(const std::string& type); long selectedEnumValue(const std::string& type); diff --git a/arts/builder/qttableview.cpp b/arts/builder/qttableview.cpp index 7f044d25..1a283ed0 100644 --- a/arts/builder/qttableview.cpp +++ b/arts/builder/qttableview.cpp @@ -15,9 +15,9 @@ #include "qttableview.h" #include "qttableview.moc" #ifndef QT_NO_QTTABLEVIEW -#include "qscrollbar.h" -#include "qpainter.h" -#include "qdrawutil.h" +#include "tqscrollbar.h" +#include "tqpainter.h" +#include "tqdrawutil.h" #include <limits.h> enum ScrollBarDirtyFlags { @@ -41,16 +41,16 @@ enum ScrollBarDirtyFlags { class QCornerSquare : public QWidget // internal class { public: - QCornerSquare( QWidget *, const char* = 0 ); - void paintEvent( QPaintEvent * ); + QCornerSquare( TQWidget *, const char* = 0 ); + void paintEvent( TQPaintEvent * ); }; -QCornerSquare::QCornerSquare( QWidget *parent, const char *name ) - : QWidget( parent, name ) +QCornerSquare::QCornerSquare( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { } -void QCornerSquare::paintEvent( QPaintEvent * ) +void QCornerSquare::paintEvent( TQPaintEvent * ) { } @@ -113,9 +113,9 @@ void QCornerSquare::paintEvent( QPaintEvent * ) \warning Experience has shown that use of this widget tends to cause more bugs than expected and our analysis indicates that the widget's - very flexibility is the problem. If QScrollView or QListBox can + very flexibility is the problem. If TQScrollView or TQListBox can easily be made to do the job you need, we recommend subclassing - those widgets rather than QtTableView. In addition, QScrollView makes + those widgets rather than QtTableView. In addition, TQScrollView makes it easy to have child widgets inside tables, which QtTableView doesn't support at all. @@ -126,7 +126,7 @@ void QCornerSquare::paintEvent( QPaintEvent * ) /*! Constructs a table view. The \a parent, \a name and \f arguments - are passed to the QFrame constructor. + are passed to the TQFrame constructor. The \link setTableFlags() table flags\endlink are all cleared (set to 0). Set \c Tbl_autoVScrollBar or \c Tbl_autoHScrollBar to get automatic scroll @@ -135,17 +135,17 @@ void QCornerSquare::paintEvent( QPaintEvent * ) The \link setCellHeight() cell height\endlink and \link setCellWidth() cell width\endlink are set to 0. - Frame line shapes (QFrame::HLink and QFrame::VLine) are disallowed; - see QFrame::setFrameStyle(). + Frame line shapes (TQFrame::HLink and TQFrame::VLine) are disallowed; + see TQFrame::setFrameStyle(). Note that the \a f argument is \e not \link setTableFlags() table - flags \endlink but rather \link QWidget::QWidget() widget + flags \endlink but rather \link TQWidget::TQWidget() widget flags. \endlink */ -QtTableView::QtTableView( QWidget *parent, const char *name, WFlags f ) - : QFrame( parent, name, f ) +QtTableView::QtTableView( TQWidget *parent, const char *name, WFlags f ) + : TQFrame( parent, name, f ) { nRows = nCols = 0; // zero rows/cols xCellOffs = yCellOffs = 0; // zero offset @@ -179,21 +179,21 @@ QtTableView::~QtTableView() /*! \internal - Reimplements QWidget::setBackgroundColor() for binary compatibility. + Reimplements TQWidget::setBackgroundColor() for binary compatibility. \sa setPalette() */ -void QtTableView::setBackgroundColor( const QColor &c ) +void QtTableView::setBackgroundColor( const TQColor &c ) { - QWidget::setBackgroundColor( c ); + TQWidget::setBackgroundColor( c ); } /*!\reimp */ -void QtTableView::setPalette( const QPalette &p ) +void QtTableView::setPalette( const TQPalette &p ) { - QWidget::setPalette( p ); + TQWidget::setPalette( p ); } /*!\reimp @@ -202,7 +202,7 @@ void QtTableView::setPalette( const QPalette &p ) void QtTableView::show() { showOrHideScrollBars(); - QWidget::show(); + TQWidget::show(); } @@ -226,7 +226,7 @@ void QtTableView::show() event. At present, QtTableView is the only widget that reimplements \link - QWidget::repaint() repaint()\endlink. It does this because by + TQWidget::repaint() repaint()\endlink. It does this because by clearing and then repainting one cell at at time, it can make the screen flicker less than it would otherwise. */ @@ -238,10 +238,10 @@ void QtTableView::repaint( int x, int y, int w, int h, bool erase ) w = width() - x; if ( h < 0 ) h = height() - y; - QRect r( x, y, w, h ); + TQRect r( x, y, w, h ); if ( r.isEmpty() ) return; // nothing to do - QPaintEvent e( r ); + TQPaintEvent e( r ); if ( erase && backgroundMode() != NoBackground ) eraseInPaint = TRUE; // erase when painting paintEvent( &e ); @@ -249,7 +249,7 @@ void QtTableView::repaint( int x, int y, int w, int h, bool erase ) } /*! - \overload void QtTableView::repaint( const QRect &r, bool erase ) + \overload void QtTableView::repaint( const TQRect &r, bool erase ) Replaints rectangle \a r. If \a erase is TRUE draws the background using the palette's background. */ @@ -730,7 +730,7 @@ int QtTableView::totalHeight() <dt> Tbl_autoHScrollBar <dd> The table has a horizontal scroll bar if - and only if - the table is wider than the view. <dt> Tbl_autoScrollBars <dd> - The union of the previous two flags. - <dt> Tbl_clipCellPainting <dd> - The table uses QPainter::setClipRect() to + <dt> Tbl_clipCellPainting <dd> - The table uses TQPainter::setClipRect() to make sure that paintCell() will not draw outside the cell boundaries. <dt> Tbl_cutCellsV <dd> - The table will never show part of a @@ -960,7 +960,7 @@ void QtTableView::updateCell( int row, int col, bool erase ) return; if ( !rowYPos( row, &yPos ) ) return; - QRect uR = QRect( xPos, yPos, + TQRect uR = TQRect( xPos, yPos, cellW ? cellW : cellWidth(col), cellH ? cellH : cellHeight(row) ); repaint( uR.intersect(viewRect()), erase ); @@ -968,7 +968,7 @@ void QtTableView::updateCell( int row, int col, bool erase ) /*! - \fn QRect QtTableView::cellUpdateRect() const + \fn TQRect QtTableView::cellUpdateRect() const This function should be called only from the paintCell() function in subclasses. It returns the portion of a cell that actually needs to be @@ -982,9 +982,9 @@ void QtTableView::updateCell( int row, int col, bool erase ) frame, in \e widget coordinates. */ -QRect QtTableView::viewRect() const +TQRect QtTableView::viewRect() const { - return QRect( frameWidth(), frameWidth(), viewWidth(), viewHeight() ); + return TQRect( frameWidth(), frameWidth(), viewWidth(), viewHeight() ); } @@ -1127,7 +1127,7 @@ void QtTableView::snapToGrid( bool horizontal, bool vertical ) /*! \internal This internal slot is connected to the horizontal scroll bar's - QScrollBar::valueChanged() signal. + TQScrollBar::valueChanged() signal. Moves the table horizontally to offset \a val without updating the scroll bar. @@ -1148,7 +1148,7 @@ void QtTableView::horSbValue( int val ) /*! \internal This internal slot is connected to the horizontal scroll bar's - QScrollBar::sliderMoved() signal. + TQScrollBar::sliderMoved() signal. Scrolls the table smoothly horizontally even if \c Tbl_snapToHGrid is set. */ @@ -1168,7 +1168,7 @@ void QtTableView::horSbSliding( int val ) /*! \internal This internal slot is connected to the horizontal scroll bar's - QScrollBar::sliderReleased() signal. + TQScrollBar::sliderReleased() signal. */ void QtTableView::horSbSlidingDone( ) @@ -1181,7 +1181,7 @@ void QtTableView::horSbSlidingDone( ) /*! \internal This internal slot is connected to the vertical scroll bar's - QScrollBar::valueChanged() signal. + TQScrollBar::valueChanged() signal. Moves the table vertically to offset \a val without updating the scroll bar. @@ -1202,7 +1202,7 @@ void QtTableView::verSbValue( int val ) /*! \internal This internal slot is connected to the vertical scroll bar's - QScrollBar::sliderMoved() signal. + TQScrollBar::sliderMoved() signal. Scrolls the table smoothly vertically even if \c Tbl_snapToVGrid is set. */ @@ -1222,7 +1222,7 @@ void QtTableView::verSbSliding( int val ) /*! \internal This internal slot is connected to the vertical scroll bar's - QScrollBar::sliderReleased() signal. + TQScrollBar::sliderReleased() signal. */ void QtTableView::verSbSlidingDone( ) @@ -1240,18 +1240,18 @@ void QtTableView::verSbSlidingDone( ) do so for each cell. */ -void QtTableView::setupPainter( QPainter * ) +void QtTableView::setupPainter( TQPainter * ) { } /*! - \fn void QtTableView::paintCell( QPainter *p, int row, int col ) + \fn void QtTableView::paintCell( TQPainter *p, int row, int col ) This pure virtual function is called to paint the single cell at \a (row,col) using \a p, which is open when paintCell() is called and must remain open. - The coordinate system is \link QPainter::translate() translated \endlink + The coordinate system is \link TQPainter::translate() translated \endlink so that the origin is at the top-left corner of the cell to be painted, i.e. \e cell coordinates. Do not scale or shear the coordinate system (or if you do, restore the transformation matrix before you @@ -1269,16 +1269,16 @@ void QtTableView::setupPainter( QPainter * ) Calls paintCell() for the cells that needs to be repainted. */ -void QtTableView::paintEvent( QPaintEvent *e ) +void QtTableView::paintEvent( TQPaintEvent *e ) { - QRect updateR = e->rect(); // update rectangle + TQRect updateR = e->rect(); // update rectangle if ( sbDirty ) { bool e = eraseInPaint; updateScrollBars(); eraseInPaint = e; } - QPainter paint( this ); + TQPainter paint( this ); if ( !contentsRect().contains( updateR, TRUE ) ) {// update frame ? drawFrame( &paint ); @@ -1312,11 +1312,11 @@ void QtTableView::paintEvent( QPaintEvent *e ) int xPos = maxX+1; // in case the while() is empty int nextX; int nextY; - QRect winR = viewRect(); - QRect cellR; - QRect cellUR; + TQRect winR = viewRect(); + TQRect cellR; + TQRect cellUR; #ifndef QT_NO_TRANSFORMATIONS - QWMatrix matrix; + TQWMatrix matrix; #endif while ( yPos <= maxY && row < nRows ) { @@ -1384,22 +1384,22 @@ void QtTableView::paintEvent( QPaintEvent *e ) // inside the cells. So QtTableView is reponsible for all pixels // outside the cells. - QRect viewR = viewRect(); - const QColorGroup g = colorGroup(); + TQRect viewR = viewRect(); + const TQColorGroup g = colorGroup(); if ( xPos <= maxX ) { - QRect r = viewR; + TQRect r = viewR; r.setLeft( xPos ); r.setBottom( yPos<maxY?yPos:maxY ); - if ( inherits( "QMultiLineEdit" ) ) + if ( inherits( "TQMultiLineEdit" ) ) paint.fillRect( r.intersect( updateR ), g.base() ); else paint.eraseRect( r.intersect( updateR ) ); } if ( yPos <= maxY ) { - QRect r = viewR; + TQRect r = viewR; r.setTop( yPos ); - if ( inherits( "QMultiLineEdit" ) ) + if ( inherits( "TQMultiLineEdit" ) ) paint.fillRect( r.intersect( updateR ), g.base() ); else paint.eraseRect( r.intersect( updateR ) ); @@ -1408,7 +1408,7 @@ void QtTableView::paintEvent( QPaintEvent *e ) /*!\reimp */ -void QtTableView::resizeEvent( QResizeEvent * ) +void QtTableView::resizeEvent( TQResizeEvent * ) { updateScrollBars( horValue | verValue | horSteps | horGeometry | horRange | verSteps | verGeometry | verRange ); @@ -1435,11 +1435,11 @@ void QtTableView::updateView() values; use findRow() to translate to cell numbers. */ -QScrollBar *QtTableView::verticalScrollBar() const +TQScrollBar *QtTableView::verticalScrollBar() const { QtTableView *that = (QtTableView*)this; // semantic const if ( !vScrollBar ) { - QScrollBar *sb = new QScrollBar( QScrollBar::Vertical, that ); + TQScrollBar *sb = new TQScrollBar( TQScrollBar::Vertical, that ); #ifndef QT_NO_CURSOR sb->setCursor( arrowCursor ); #endif @@ -1447,12 +1447,12 @@ QScrollBar *QtTableView::verticalScrollBar() const Q_CHECK_PTR(sb); sb->setTracking( FALSE ); sb->setFocusPolicy( NoFocus ); - connect( sb, SIGNAL(valueChanged(int)), - SLOT(verSbValue(int))); - connect( sb, SIGNAL(sliderMoved(int)), - SLOT(verSbSliding(int))); - connect( sb, SIGNAL(sliderReleased()), - SLOT(verSbSlidingDone())); + connect( sb, TQT_SIGNAL(valueChanged(int)), + TQT_SLOT(verSbValue(int))); + connect( sb, TQT_SIGNAL(sliderMoved(int)), + TQT_SLOT(verSbSliding(int))); + connect( sb, TQT_SIGNAL(sliderReleased()), + TQT_SLOT(verSbSlidingDone())); sb->hide(); that->vScrollBar = sb; return sb; @@ -1466,11 +1466,11 @@ QScrollBar *QtTableView::verticalScrollBar() const values; use findCol() to translate to cell numbers. */ -QScrollBar *QtTableView::horizontalScrollBar() const +TQScrollBar *QtTableView::horizontalScrollBar() const { QtTableView *that = (QtTableView*)this; // semantic const if ( !hScrollBar ) { - QScrollBar *sb = new QScrollBar( QScrollBar::Horizontal, that ); + TQScrollBar *sb = new TQScrollBar( TQScrollBar::Horizontal, that ); #ifndef QT_NO_CURSOR sb->setCursor( arrowCursor ); #endif @@ -1478,12 +1478,12 @@ QScrollBar *QtTableView::horizontalScrollBar() const sb->setFocusPolicy( NoFocus ); Q_CHECK_PTR(sb); sb->setTracking( FALSE ); - connect( sb, SIGNAL(valueChanged(int)), - SLOT(horSbValue(int))); - connect( sb, SIGNAL(sliderMoved(int)), - SLOT(horSbSliding(int))); - connect( sb, SIGNAL(sliderReleased()), - SLOT(horSbSlidingDone())); + connect( sb, TQT_SIGNAL(valueChanged(int)), + TQT_SLOT(horSbValue(int))); + connect( sb, TQT_SIGNAL(sliderMoved(int)), + TQT_SLOT(horSbSliding(int))); + connect( sb, TQT_SIGNAL(sliderReleased()), + TQT_SLOT(horSbSlidingDone())); sb->hide(); that->hScrollBar = sb; return sb; @@ -1787,10 +1787,10 @@ bool QtTableView::colXPos( int col, int *xPos ) const Moves the visible area of the table right by \a xPixels and down by \a yPixels pixels. Both may be negative. - \warning You might find that QScrollView offers a higher-level of + \warning You might find that TQScrollView offers a higher-level of functionality than using QtTableView and this function. - This function is \e not the same as QWidget::scroll(); in particular, + This function is \e not the same as TQWidget::scroll(); in particular, the signs of \a xPixels and \a yPixels have the reverse semantics. \sa setXOffset(), setYOffset(), setOffset(), setTopCell(), @@ -1799,7 +1799,7 @@ bool QtTableView::colXPos( int col, int *xPos ) const void QtTableView::scroll( int xPixels, int yPixels ) { - QWidget::scroll( -xPixels, -yPixels, contentsRect() ); + TQWidget::scroll( -xPixels, -yPixels, contentsRect() ); } @@ -2058,7 +2058,7 @@ void QtTableView::updateFrameSize() if ( autoUpdate() ) { int fh = frameRect().height(); int fw = frameRect().width(); - setFrameRect( QRect(0,0,rw,rh) ); + setFrameRect( TQRect(0,0,rw,rh) ); if ( rw != fw ) update( QMIN(fw,rw) - frameWidth() - 2, 0, frameWidth()+4, rh ); diff --git a/arts/builder/qttableview.h b/arts/builder/qttableview.h index c5a540dd..9acf0179 100644 --- a/arts/builder/qttableview.h +++ b/arts/builder/qttableview.h @@ -16,7 +16,7 @@ #define QTTABLEVIEW_H #ifndef QT_H -#include "qframe.h" +#include "tqframe.h" #endif // QT_H #ifndef QT_NO_QTTABLEVIEW @@ -29,16 +29,16 @@ class QtTableView : public QFrame { Q_OBJECT public: - virtual void setBackgroundColor( const QColor & ); - virtual void setPalette( const QPalette & ); + virtual void setBackgroundColor( const TQColor & ); + virtual void setPalette( const TQPalette & ); void show(); void repaint( bool erase=TRUE ); void repaint( int x, int y, int w, int h, bool erase=TRUE ); - void repaint( const QRect &, bool erase=TRUE ); + void repaint( const TQRect &, bool erase=TRUE ); protected: - QtTableView( QWidget *parent=0, const char *name=0, WFlags f=0 ); + QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 ); ~QtTableView(); int numRows() const; @@ -87,8 +87,8 @@ protected: bool rowIsVisible( int row ) const; bool colIsVisible( int col ) const; - QScrollBar *verticalScrollBar() const; - QScrollBar *horizontalScrollBar() const; + TQScrollBar *verticalScrollBar() const; + TQScrollBar *horizontalScrollBar() const; private slots: void horSbValue( int ); @@ -99,11 +99,11 @@ private slots: void verSbSlidingDone(); protected: - virtual void paintCell( QPainter *, int row, int col ) = 0; - virtual void setupPainter( QPainter * ); + virtual void paintCell( TQPainter *, int row, int col ) = 0; + virtual void setupPainter( TQPainter * ); - void paintEvent( QPaintEvent * ); - void resizeEvent( QResizeEvent * ); + void paintEvent( TQPaintEvent * ); + void resizeEvent( TQResizeEvent * ); int findRow( int yPos ) const; int findCol( int xPos ) const; @@ -164,8 +164,8 @@ private: uint tFlags; QRect cellUpdateR; - QScrollBar *vScrollBar; - QScrollBar *hScrollBar; + TQScrollBar *vScrollBar; + TQScrollBar *hScrollBar; QCornerSquare *cornerSquare; private: // Disabled copy constructor and operator= @@ -230,7 +230,7 @@ inline uint QtTableView::tableFlags() const inline bool QtTableView::testTableFlags( uint f ) const { return (tFlags & f) != 0; } -inline QRect QtTableView::cellUpdateRect() const +inline TQRect QtTableView::cellUpdateRect() const { return cellUpdateR; } inline bool QtTableView::autoUpdate() const @@ -239,7 +239,7 @@ inline bool QtTableView::autoUpdate() const inline void QtTableView::repaint( bool erase ) { repaint( 0, 0, width(), height(), erase ); } -inline void QtTableView::repaint( const QRect &r, bool erase ) +inline void QtTableView::repaint( const TQRect &r, bool erase ) { repaint( r.x(), r.y(), r.width(), r.height(), erase ); } inline void QtTableView::updateScrollBars() diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp index cbf6af95..4e091928 100644 --- a/arts/builder/retrievedlg.cpp +++ b/arts/builder/retrievedlg.cpp @@ -20,13 +20,13 @@ */ #include "retrievedlg.h" -#include <qlayout.h> -#include <qlabel.h> -#include <qlistbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqlistbox.h> #include <kbuttonbox.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qlineedit.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqlineedit.h> #include <kapplication.h> #include <kseparator.h> #include <klocale.h> @@ -34,26 +34,26 @@ #include <stdio.h> #include <set> #include <arts/debug.h> -#include <qpushbutton.h> +#include <tqpushbutton.h> -static void min_size(QWidget *w) { +static void min_size(TQWidget *w) { w->setMinimumSize(w->sizeHint()); } -RetrieveDlg::RetrieveDlg(QWidget *parent) :QDialog(parent,"X", TRUE) +RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE) { setCaption(i18n("Retrieve Structure From Server")); - QVBoxLayout *mainlayout = new QVBoxLayout(this); + TQVBoxLayout *mainlayout = new TQVBoxLayout(this); // caption label: "Synthesis running..." mainlayout->addSpacing(5); - QLabel *captionlabel = new QLabel(this); - QFont labelfont(captionlabel->font()); + TQLabel *captionlabel = new TQLabel(this); + TQFont labelfont(captionlabel->font()); labelfont.setPointSize(labelfont.pointSize()*3/2); captionlabel->setFont(labelfont); - captionlabel->setText(QString(" ")+i18n("Published structures")+QString(" ")); + captionlabel->setText(TQString(" ")+i18n("Published structures")+TQString(" ")); captionlabel->setAlignment(AlignCenter); min_size(captionlabel); mainlayout->addWidget(captionlabel); @@ -67,7 +67,7 @@ RetrieveDlg::RetrieveDlg(QWidget *parent) :QDialog(parent,"X", TRUE) // listwidget - listbox = new QListBox(this); + listbox = new TQListBox(this); listbox->setMinimumSize(300,200); arts_debug("TODO:PORT:get available structures"); @@ -96,7 +96,7 @@ RetrieveDlg::RetrieveDlg(QWidget *parent) :QDialog(parent,"X", TRUE) // buttons - QHBoxLayout *buttonlayout = new QHBoxLayout; + TQHBoxLayout *buttonlayout = new QHBoxLayout; mainlayout->addSpacing(5); mainlayout->addLayout(buttonlayout); mainlayout->addSpacing(5); @@ -104,14 +104,14 @@ RetrieveDlg::RetrieveDlg(QWidget *parent) :QDialog(parent,"X", TRUE) buttonlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - bbox->addButton(KStdGuiItem::help(), this, SLOT( help() )); + bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() )); bbox->addStretch(1); - QButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel()); - connect( cancelbutton, SIGNAL( clicked() ), SLOT(reject() ) ); + TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel()); + connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) ); - QButton *okbutton = bbox->addButton(KStdGuiItem::ok()); - connect( okbutton, SIGNAL( clicked() ), SLOT(accept() ) ); + TQButton *okbutton = bbox->addButton(KStdGuiItem::ok()); + connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) ); bbox->layout(); @@ -121,13 +121,13 @@ RetrieveDlg::RetrieveDlg(QWidget *parent) :QDialog(parent,"X", TRUE) mainlayout->freeze(); } -QString RetrieveDlg::result() +TQString RetrieveDlg::result() { if(listbox->currentItem() != -1) { return(listbox->text(listbox->currentItem())); } - return QString::null; + return TQString::null; } void RetrieveDlg::help() diff --git a/arts/builder/retrievedlg.h b/arts/builder/retrievedlg.h index 97a389aa..e0a6eb0c 100644 --- a/arts/builder/retrievedlg.h +++ b/arts/builder/retrievedlg.h @@ -24,21 +24,21 @@ #include "structure.h" -#include <qdialog.h> -#include <qtimer.h> -#include <qlabel.h> -#include <qscrollbar.h> -#include <qlineedit.h> -#include <qlayout.h> -#include <qlistbox.h> +#include <tqdialog.h> +#include <tqtimer.h> +#include <tqlabel.h> +#include <tqscrollbar.h> +#include <tqlineedit.h> +#include <tqlayout.h> +#include <tqlistbox.h> #include <string> -class RetrieveDlg :public QDialog { +class RetrieveDlg :public TQDialog { Q_OBJECT - QListBox *listbox; + TQListBox *listbox; public: - RetrieveDlg(QWidget *parent); - QString result(); + RetrieveDlg(TQWidget *parent); + TQString result(); public slots: void help(); }; diff --git a/arts/builder/scomponent.cpp b/arts/builder/scomponent.cpp index fb461f3a..094af402 100644 --- a/arts/builder/scomponent.cpp +++ b/arts/builder/scomponent.cpp @@ -21,8 +21,8 @@ #include "scomponent.h" //#include <arts/debug.h> -#include <qpainter.h> -#include <qpixmap.h> +#include <tqpainter.h> +#include <tqpixmap.h> #include <stdio.h> StructureComponent::StructureComponent(StructureCanvas *canvas) diff --git a/arts/builder/scomponent.h b/arts/builder/scomponent.h index 3d5970f4..e35b3708 100644 --- a/arts/builder/scomponent.h +++ b/arts/builder/scomponent.h @@ -22,7 +22,7 @@ #ifndef __SCOMPONENT_H__ #define __SCOMPONENT_H__ -#include <qstring.h> +#include <tqstring.h> #include <list> class ModulePort; @@ -65,9 +65,9 @@ public: // drawing virtual bool drawNeedsBackground(int segment) = 0; - virtual void drawSegment(QPainter *dest, int cellsize, int segment) = 0; - virtual QPixmap *pixmap() = 0; - virtual QString name() = 0; + virtual void drawSegment(TQPainter *dest, int cellsize, int segment) = 0; + virtual TQPixmap *pixmap() = 0; + virtual TQString name() = 0; // space checking & positioning (dimensions in cells) bool move(int x, int y); diff --git a/arts/builder/structureport.cpp b/arts/builder/structureport.cpp index b57e9632..35b36b45 100644 --- a/arts/builder/structureport.cpp +++ b/arts/builder/structureport.cpp @@ -21,10 +21,10 @@ #include "structureport.h" #include "drawutils.h" -#include <qpainter.h> -#include <qpalette.h> -#include <qdrawutil.h> -#include <qbitmap.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqdrawutil.h> +#include <tqbitmap.h> #include <assert.h> #include <stdio.h> #include <arts/debug.h> @@ -90,24 +90,24 @@ bool StructurePort::drawNeedsBackground(int segment) return true; } -void StructurePort::drawSegment(QPainter *dest, int cellsize, int segment) +void StructurePort::drawSegment(TQPainter *dest, int cellsize, int segment) { - QString pname = QString::fromLocal8Bit(SPortDesc.name().c_str()); + TQString pname = TQString::fromLocal8Bit(SPortDesc.name().c_str()); assert(segment==0); - QPainter &p = *dest; + TQPainter &p = *dest; int direction = (_port->direction == ModulePort::out)?1:0; // FIXME: make these color defs available at one central place, they // are currently copied from main.cpp - QColor mcolor(43,43,168); - QColor mcolorlight(164,176,242); - QColorGroup g( Qt::white, Qt::blue, mcolorlight, mcolor.dark(), mcolor, + TQColor mcolor(43,43,168); + TQColor mcolorlight(164,176,242); + TQColorGroup g( Qt::white, Qt::blue, mcolorlight, mcolor.dark(), mcolor, Qt::black, Qt::black ); - QBrush fill( mcolor ); - QPen textpen(QColor(255,255,180),1); + TQBrush fill( mcolor ); + TQPen textpen(TQColor(255,255,180),1); int border = cellsize/10; int boxtop = (cellsize/2)*(1-direction); @@ -117,14 +117,14 @@ void StructurePort::drawSegment(QPainter *dest, int cellsize, int segment) // Selection box if(_selected) { - QPen pen(Qt::white,1,Qt::DotLine); + TQPen pen(Qt::white,1,Qt::DotLine); p.setPen(pen); p.drawRect(0,boxtop,cellsize,cellsize/2); } // ... doesn't look centered without the 2*border ?!? int textwidth; - QString label=DrawUtils::cropText(&p, pname, cellsize-border*2, textwidth); + TQString label=DrawUtils::cropText(&p, pname, cellsize-border*2, textwidth); p.drawText(border,border+boxtop,cellsize-border-1,(cellsize/2-1)-2*border, Qt::AlignCenter,label); @@ -133,15 +133,15 @@ void StructurePort::drawSegment(QPainter *dest, int cellsize, int segment) int i; for(i=0;i<3;i++) { - QBrush fbrush; + TQBrush fbrush; int delta = 0; switch(i) { case 0: delta = 0; - fbrush = QBrush(g.light()); + fbrush = TQBrush(g.light()); break; case 1: delta = 2; - fbrush = QBrush(g.dark()); + fbrush = TQBrush(g.dark()); break; case 2: delta = 1; fbrush = fill; @@ -172,7 +172,7 @@ d | | int c = cellsize/12; int d = cellsize/5; - QPointArray a(9); + TQPointArray a(9); a.setPoint(0,b+l,t); a.setPoint(1,b+l,t+c); a.setPoint(2,l,t+c); @@ -211,9 +211,9 @@ d | | { int border = cellsize/7; - QBrush pbrush(_port->color(false)); + TQBrush pbrush(_port->color(false)); - _port->clickrect = QRect(border,direction * cellsize/2 + border, + _port->clickrect = TQRect(border,direction * cellsize/2 + border, cellsize/2-2*border, cellsize/2-2*border); qDrawShadePanel(&p, _port->clickrect, g, _port->down(), 2, &pbrush); } @@ -223,7 +223,7 @@ ModulePort *StructurePort::portAt(int segment, int x, int y) { assert(segment == 0); - QPoint clickpoint(x,y); + TQPoint clickpoint(x,y); if(_port->clickrect.contains(clickpoint)) return _port; return 0; } @@ -233,14 +233,14 @@ void StructurePort::dumpPorts(list<ModulePort *>& ports) ports.push_back(_port); } -QPixmap *StructurePort::pixmap() +TQPixmap *StructurePort::pixmap() { return 0; } -QString StructurePort::name() +TQString StructurePort::name() { - return QString::fromLocal8Bit(SPortDesc.name().c_str()); + return TQString::fromLocal8Bit(SPortDesc.name().c_str()); } void StructurePort::raisePosition() diff --git a/arts/builder/structureport.h b/arts/builder/structureport.h index 8729cc24..7c9f61f1 100644 --- a/arts/builder/structureport.h +++ b/arts/builder/structureport.h @@ -58,9 +58,9 @@ public: void dumpPorts(std::list<ModulePort *>& ports); bool drawNeedsBackground(int segment); - void drawSegment(QPainter *dest, int cellsize, int segment); - QPixmap *pixmap(); - QString name(); + void drawSegment(TQPainter *dest, int cellsize, int segment); + TQPixmap *pixmap(); + TQString name(); }; #endif // STRUCTUREPORT_H diff --git a/arts/gui/kde/artstestgui.cpp b/arts/gui/kde/artstestgui.cpp index 1ccde8cf..6d1b798e 100644 --- a/arts/gui/kde/artstestgui.cpp +++ b/arts/gui/kde/artstestgui.cpp @@ -23,7 +23,7 @@ #include "artsgui.h" #include <connect.h> #include <qiomanager.h> -#include <qpushbutton.h> +#include <tqpushbutton.h> #include <kapplication.h> #include <objectmanager.h> diff --git a/arts/gui/kde/dbtest.cpp b/arts/gui/kde/dbtest.cpp index 164b3630..fef8b0b9 100644 --- a/arts/gui/kde/dbtest.cpp +++ b/arts/gui/kde/dbtest.cpp @@ -10,9 +10,9 @@ #include <dbtest.h> #include <dbtest.moc> -dBTestWidget::dBTestWidget( QWidget* p, const char* n ) : QWidget( p,n ), dB2VolCalc( -24,6 ) { +dBTestWidget::dBTestWidget( TQWidget* p, const char* n ) : TQWidget( p,n ), dB2VolCalc( -24,6 ) { kdDebug() << k_funcinfo << endl; - ( void* ) KStdAction::quit( this, SLOT( close() ), new KActionCollection( this ) ); + ( void* ) KStdAction::quit( this, TQT_SLOT( close() ), new KActionCollection( this ) ); for ( float i=0; i<=1; i+=0.25 ) kdDebug() << i << " : " << amptodb( i ) << "dB" <<endl; diff --git a/arts/gui/kde/dbtest.h b/arts/gui/kde/dbtest.h index e7d996b0..085ee7a0 100644 --- a/arts/gui/kde/dbtest.h +++ b/arts/gui/kde/dbtest.h @@ -2,14 +2,14 @@ #ifndef DBTESTWIDGET_H #define DBTESTWIDGET_H -#include <qwidget.h> +#include <tqwidget.h> #include "dbvolcalc.h" -class dBTestWidget : public QWidget, public dB2VolCalc { +class dBTestWidget : public TQWidget, public dB2VolCalc { Q_OBJECT public: - dBTestWidget( QWidget*, const char* =0 ); + dBTestWidget( TQWidget*, const char* =0 ); ~dBTestWidget(); }; diff --git a/arts/gui/kde/kartswidget.cpp b/arts/gui/kde/kartswidget.cpp index 1a9c6b0e..dde61820 100644 --- a/arts/gui/kde/kartswidget.cpp +++ b/arts/gui/kde/kartswidget.cpp @@ -24,48 +24,48 @@ #include "kartswidget.h" #include "kwidgetrepo.h" #include "debug.h" -#include "qlayout.h" +#include "tqlayout.h" class KArtsWidgetPrivate { public: - QHBoxLayout *layout; + TQHBoxLayout *layout; }; -KArtsWidget::KArtsWidget( QWidget* parent, const char* name ) - :QWidget( parent, name ), _content( Arts::Widget::null() ) +KArtsWidget::KArtsWidget( TQWidget* parent, const char* name ) + :TQWidget( parent, name ), _content( Arts::Widget::null() ) { d = new KArtsWidgetPrivate; - d->layout = new QHBoxLayout(this); + d->layout = new TQHBoxLayout(this); } -KArtsWidget::KArtsWidget( Arts::Widget content, QWidget* parent, const char* name ) - :QWidget( parent, name ), _content( Arts::Widget::null()) +KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name ) + :TQWidget( parent, name ), _content( Arts::Widget::null()) { d = new KArtsWidgetPrivate; - d->layout = new QHBoxLayout(this); + d->layout = new TQHBoxLayout(this); setContent(content); } -KArtsWidget::KArtsWidget( Arts::Widget content, QWidget* parent, const char* name, WFlags wflags ) - :QWidget( parent, name, wflags ), _content( Arts::Widget::null() ) +KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name, WFlags wflags ) + :TQWidget( parent, name, wflags ), _content( Arts::Widget::null() ) { d = new KArtsWidgetPrivate; - d->layout = new QHBoxLayout( this ); + d->layout = new TQHBoxLayout( this ); setContent( content ); } -KArtsWidget::KArtsWidget(QWidget* parent, const char* name, WFlags wflags ) - :QWidget(parent, name, wflags ), _content(Arts::Widget::null()) +KArtsWidget::KArtsWidget(TQWidget* parent, const char* name, WFlags wflags ) + :TQWidget(parent, name, wflags ), _content(Arts::Widget::null()) { d = new KArtsWidgetPrivate; - d->layout = new QHBoxLayout(this); + d->layout = new TQHBoxLayout(this); } KArtsWidget::~KArtsWidget() { - QWidget *contentAsWidget + TQWidget *contentAsWidget = KWidgetRepo::the()->lookupQWidget(_content.widgetID()); - contentAsWidget->reparent(0,QPoint(0,0),_content.visible()); + contentAsWidget->reparent(0,TQPoint(0,0),_content.visible()); delete d; d = 0; } @@ -74,12 +74,12 @@ KArtsWidget::~KArtsWidget() void KArtsWidget::setContent(Arts::Widget content) { arts_return_if_fail(!content.isNull()); - QWidget *contentAsWidget + TQWidget *contentAsWidget = KWidgetRepo::the()->lookupQWidget(content.widgetID()); arts_return_if_fail(contentAsWidget != 0); _content = content; - contentAsWidget->reparent(this,QPoint(0,0),content.visible()); + contentAsWidget->reparent(this,TQPoint(0,0),content.visible()); d->layout->addWidget(contentAsWidget); } diff --git a/arts/gui/kde/kartswidget.h b/arts/gui/kde/kartswidget.h index 353a09b2..2cd072bc 100644 --- a/arts/gui/kde/kartswidget.h +++ b/arts/gui/kde/kartswidget.h @@ -24,7 +24,7 @@ #ifndef ARTS_GUI_KARTSWIDGET_H #define ARTS_GUI_KARTSWIDGET_H -#include <qwidget.h> +#include <tqwidget.h> #include "artsgui.h" #include <kdelibs_export.h> class KArtsWidgetPrivate; @@ -46,7 +46,7 @@ class KArtsWidgetPrivate; * The KArtsWidget class keeps a reference to the content widget, so the * content widget will not be freed until the KArtsWidget gets destroyed. */ -class KDE_EXPORT KArtsWidget : public QWidget { +class KDE_EXPORT KArtsWidget : public TQWidget { private: KArtsWidgetPrivate *d; @@ -57,21 +57,21 @@ public: /** * creates a new KArtsWidget */ - KArtsWidget( QWidget* parent, const char* name ); + KArtsWidget( TQWidget* parent, const char* name ); /** * creates a new KArtsWidget and sets the content to an Arts::Widget */ - KArtsWidget( Arts::Widget content, QWidget* parent, const char* name ); + KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name ); /** * creates a new KArtsWidget with WidgetFlags and content * * BCI: should replace the above in the next major release. ( akrille ) */ - KArtsWidget( Arts::Widget, QWidget* =0, const char* =0, WFlags =0 ); + KArtsWidget( Arts::Widget, TQWidget* =0, const char* =0, WFlags =0 ); // same without the content - KArtsWidget( QWidget* =0, const char* =0, WFlags =0 ); + KArtsWidget( TQWidget* =0, const char* =0, WFlags =0 ); /** * destructor diff --git a/arts/gui/kde/kbutton_impl.cpp b/arts/gui/kde/kbutton_impl.cpp index 119e72e0..34c5791b 100644 --- a/arts/gui/kde/kbutton_impl.cpp +++ b/arts/gui/kde/kbutton_impl.cpp @@ -28,15 +28,15 @@ using namespace Arts; using namespace std; -KButtonMapper::KButtonMapper( KButton_impl *_impl, QPushButton *but ) - : QObject( but, "KButtonMapper" ) +KButtonMapper::KButtonMapper( KButton_impl *_impl, TQPushButton *but ) + : TQObject( but, "KButtonMapper" ) , impl( _impl ) , button( but ) { - connect( but, SIGNAL( pressed() ), this, SLOT( pressed() ) ); - connect( but, SIGNAL( released() ), this, SLOT( released() ) ); - connect( but, SIGNAL( toggled( bool ) ), this, SLOT( toggled( bool ) ) ); - connect( but, SIGNAL( clicked() ), this, SLOT( clicked() ) ); + connect( but, TQT_SIGNAL( pressed() ), this, TQT_SLOT( pressed() ) ); + connect( but, TQT_SIGNAL( released() ), this, TQT_SLOT( released() ) ); + connect( but, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggled( bool ) ) ); + connect( but, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) ); } void KButtonMapper::pressed() @@ -62,11 +62,11 @@ void KButtonMapper::clicked() impl->emitClicked(); } -KButton_impl::KButton_impl( QPushButton * widget ) - : KWidget_impl( widget ? widget : new QPushButton( 0 ) ) +KButton_impl::KButton_impl( TQPushButton * widget ) + : KWidget_impl( widget ? widget : new TQPushButton( 0 ) ) , _clicked( false ) { - _qpushbutton = static_cast<QPushButton*>( _qwidget ); + _qpushbutton = static_cast<TQPushButton*>( _qwidget ); ( void )new KButtonMapper( this, _qpushbutton ); } @@ -94,7 +94,7 @@ string KButton_impl::text() void KButton_impl::text(const string& newText) { - _qpushbutton->setText(QString::fromUtf8(newText.c_str())); + _qpushbutton->setText(TQString::fromUtf8(newText.c_str())); } bool KButton_impl::toggle() diff --git a/arts/gui/kde/kbutton_impl.h b/arts/gui/kde/kbutton_impl.h index f254c00a..723c5023 100644 --- a/arts/gui/kde/kbutton_impl.h +++ b/arts/gui/kde/kbutton_impl.h @@ -25,17 +25,17 @@ #ifndef ARTS_GUI_KBUTTON_IMPL_H #define ARTS_GUI_KBUTTON_IMPL_H #include "kwidget_impl.h" -#include <qpushbutton.h> +#include <tqpushbutton.h> namespace Arts { class KButton_impl; -class KButtonMapper : public QObject { +class KButtonMapper : public TQObject { Q_OBJECT KButton_impl *impl; - QPushButton * button; + TQPushButton * button; public: - KButtonMapper(KButton_impl *impl, QPushButton *but); + KButtonMapper(KButton_impl *impl, TQPushButton *but); protected slots: void pressed(); void released(); @@ -50,10 +50,10 @@ private: bool _clicked; protected: - QPushButton * _qpushbutton; + TQPushButton * _qpushbutton; public: - KButton_impl( QPushButton * w = 0 ); + KButton_impl( TQPushButton * w = 0 ); void constructor( Widget parent ); void constructor( const std::string &, Widget ); diff --git a/arts/gui/kde/kcombobox_impl.cpp b/arts/gui/kde/kcombobox_impl.cpp index b73f57f9..eab55d0d 100644 --- a/arts/gui/kde/kcombobox_impl.cpp +++ b/arts/gui/kde/kcombobox_impl.cpp @@ -31,13 +31,13 @@ using namespace Arts; using namespace std; ComboBoxIntMapper::ComboBoxIntMapper(KComboBox_impl *impl, KComboBox *co) - : QObject( co, "map Qt signal to aRts" ) + : TQObject( co, "map Qt signal to aRts" ) ,impl(impl) { - connect(co, SIGNAL(activated(const QString &)), this, SLOT(activated(const QString &))); + connect(co, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(activated(const TQString &))); } -void ComboBoxIntMapper::activated(const QString & newValue) +void ComboBoxIntMapper::activated(const TQString & newValue) { impl->value(string(newValue.utf8().data())); } @@ -56,7 +56,7 @@ string KComboBox_impl::caption() void KComboBox_impl::caption(const string& newCaption) { - m_caption = QString::fromUtf8(newCaption.c_str()); + m_caption = TQString::fromUtf8(newCaption.c_str()); // FIXME: do something with the caption here } @@ -73,7 +73,7 @@ void KComboBox_impl::choices(const vector<string> & newChoices) _kcombobox->clear(); for(vector<string>::const_iterator it = m_choices.begin(); it != m_choices.end(); ++it) { - _kcombobox->insertItem(QString::fromUtf8(it->c_str())); + _kcombobox->insertItem(TQString::fromUtf8(it->c_str())); } if(visible()) choices_changed(newChoices); @@ -89,7 +89,7 @@ void KComboBox_impl::value(const string & newValue) { if(newValue != m_value.utf8().data()) { - m_value = QString::fromUtf8(newValue.c_str()); + m_value = TQString::fromUtf8(newValue.c_str()); for(unsigned int i = 0; i < m_choices.size(); ++i) { if(m_choices[i] == newValue) diff --git a/arts/gui/kde/kcombobox_impl.h b/arts/gui/kde/kcombobox_impl.h index 52a95109..3041d352 100644 --- a/arts/gui/kde/kcombobox_impl.h +++ b/arts/gui/kde/kcombobox_impl.h @@ -26,21 +26,21 @@ #define ARTS_GUI_KCOMBOBOX_IMPL_H #include "kwidget_impl.h" #include <kcombobox.h> -#include <qobject.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqstringlist.h> namespace Arts { class KComboBox_impl; -class ComboBoxIntMapper :public QObject { +class ComboBoxIntMapper :public TQObject { Q_OBJECT KComboBox_impl *impl; public: ComboBoxIntMapper(KComboBox_impl *impl, KComboBox *co); public slots: - void activated(const QString &); + void activated(const TQString &); }; class KComboBox_impl : virtual public Arts::ComboBox_skel, @@ -48,8 +48,8 @@ class KComboBox_impl : virtual public Arts::ComboBox_skel, { protected: KComboBox * _kcombobox; - QString m_caption; - QString m_value; + TQString m_caption; + TQString m_value; std::vector<std::string> m_choices; void applyValue(); diff --git a/arts/gui/kde/kfader.cpp b/arts/gui/kde/kfader.cpp index 2978dd0c..e5179f9f 100644 --- a/arts/gui/kde/kfader.cpp +++ b/arts/gui/kde/kfader.cpp @@ -5,14 +5,14 @@ void KFader::init() { } -KFader::KFader( QWidget * parent, const char * name ) - : QSlider( Qt::Vertical, parent, name ) +KFader::KFader( TQWidget * parent, const char * name ) + : TQSlider( Qt::Vertical, parent, name ) { init(); } -KFader::KFader( int minValue, int maxValue, int pageStep, int value, QWidget * parent, const char * name ) - : QSlider( minValue, maxValue, pageStep, value, Qt::Vertical, parent, name ) +KFader::KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * parent, const char * name ) + : TQSlider( minValue, maxValue, pageStep, value, Qt::Vertical, parent, name ) { init(); } @@ -21,11 +21,11 @@ KFader::~KFader() { } -void KFader::setColor( QColor & ) +void KFader::setColor( TQColor & ) { } void KFader::setRange( int minValue, int maxValue ) { - QRangeControl::setRange( minValue, maxValue ); + TQRangeControl::setRange( minValue, maxValue ); } diff --git a/arts/gui/kde/kfader.h b/arts/gui/kde/kfader.h index 71b3ba03..603ad7cd 100644 --- a/arts/gui/kde/kfader.h +++ b/arts/gui/kde/kfader.h @@ -23,7 +23,7 @@ #ifndef _KFADER_H #define _KFADER_H -#include <qslider.h> +#include <tqslider.h> class KFader : public QSlider { @@ -31,12 +31,12 @@ class KFader : public QSlider protected: void init(); public: - KFader( QWidget * parent = 0, const char * name = 0 ); - KFader( int minValue, int maxValue, int pageStep, int value, QWidget * parent = 0, const char * name = 0 ); + KFader( TQWidget * parent = 0, const char * name = 0 ); + KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * parent = 0, const char * name = 0 ); virtual ~KFader(); - void setColor( QColor & ); + void setColor( TQColor & ); virtual void setRange( int, int ); }; diff --git a/arts/gui/kde/kfader_impl.cpp b/arts/gui/kde/kfader_impl.cpp index a0caf7db..27a50191 100644 --- a/arts/gui/kde/kfader_impl.cpp +++ b/arts/gui/kde/kfader_impl.cpp @@ -34,7 +34,7 @@ using namespace std; FaderIntMapper::FaderIntMapper(KFader_impl *impl, KFader *kp) :impl(impl) { - connect(kp, SIGNAL(valueChanged(int)), this, SLOT(valueChanged(int))); + connect(kp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); } void FaderIntMapper::valueChanged(int pos) @@ -63,7 +63,7 @@ string KFader_impl::caption() void KFader_impl::caption(const string& newText) { - _caption = QString::fromUtf8(newText.c_str()); + _caption = TQString::fromUtf8(newText.c_str()); _kfader->setName(_caption.utf8().data()); } @@ -77,7 +77,7 @@ void KFader_impl::color(const string& newColor) _color = newColor; if(strlen(_color.c_str())) { - QColor qc(_color.c_str()); + TQColor qc(_color.c_str()); _kfader->setColor(qc); } } diff --git a/arts/gui/kde/kfader_impl.h b/arts/gui/kde/kfader_impl.h index 2368d551..0d1b81ed 100644 --- a/arts/gui/kde/kfader_impl.h +++ b/arts/gui/kde/kfader_impl.h @@ -27,15 +27,15 @@ #include "kwidget_impl.h" #include "kfader.h" -#include <qobject.h> -#include <qstring.h> +#include <tqobject.h> +#include <tqstring.h> namespace Arts { class KFader_impl; -class FaderIntMapper :public QObject { +class FaderIntMapper :public TQObject { Q_OBJECT KFader_impl *impl; public: @@ -49,7 +49,7 @@ class KFader_impl : virtual public Arts::Fader_skel, { protected: KFader * _kfader; - QString _caption; + TQString _caption; std::string _color; float _min, _max, _value; float _factor; diff --git a/arts/gui/kde/kframe_impl.cpp b/arts/gui/kde/kframe_impl.cpp index 472484e2..d95da549 100644 --- a/arts/gui/kde/kframe_impl.cpp +++ b/arts/gui/kde/kframe_impl.cpp @@ -19,17 +19,17 @@ // $Id$ #include "kframe_impl.h" -#include <qframe.h> +#include <tqframe.h> #include <debug.h> #include <stdio.h> using namespace Arts; using namespace std; -KFrame_impl::KFrame_impl( QFrame * widget ) - : KWidget_impl( widget ? widget : new QFrame ) +KFrame_impl::KFrame_impl( TQFrame * widget ) + : KWidget_impl( widget ? widget : new TQFrame ) { - _qframe = static_cast<QFrame*>( _qwidget ); + _qframe = static_cast<TQFrame*>( _qwidget ); assert( _qframe ); } @@ -80,7 +80,7 @@ Shape KFrame_impl::frameshape() void KFrame_impl::frameshape( Shape fs ) { - _qframe->setFrameShape( ( QFrame::Shape )fs ); + _qframe->setFrameShape( ( TQFrame::Shape )fs ); } Shadow KFrame_impl::frameshadow() @@ -90,7 +90,7 @@ Shadow KFrame_impl::frameshadow() void KFrame_impl::frameshadow( Shadow fs ) { - _qframe->setFrameShadow( ( QFrame::Shadow )fs ); + _qframe->setFrameShadow( ( TQFrame::Shadow )fs ); } REGISTER_IMPLEMENTATION(KFrame_impl); diff --git a/arts/gui/kde/kframe_impl.h b/arts/gui/kde/kframe_impl.h index f4653314..68585b5c 100644 --- a/arts/gui/kde/kframe_impl.h +++ b/arts/gui/kde/kframe_impl.h @@ -30,10 +30,10 @@ class KDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel, public Arts::KWidget_impl { protected: - QFrame * _qframe; + TQFrame * _qframe; public: - KFrame_impl( QFrame * widget = 0 ); + KFrame_impl( TQFrame * widget = 0 ); inline void constructor( Widget p ) { parent( p ); } long margin(); diff --git a/arts/gui/kde/kgraph.cpp b/arts/gui/kde/kgraph.cpp index 80541b96..21d3d8cf 100644 --- a/arts/gui/kde/kgraph.cpp +++ b/arts/gui/kde/kgraph.cpp @@ -23,7 +23,7 @@ #include "kgraph.h" #include "kgraph.moc" #include "kgraphline_impl.h" -#include "qpainter.h" +#include "tqpainter.h" #include <cstdlib> #include <math.h> @@ -31,8 +31,8 @@ using namespace Arts; using namespace std; -KGraph::KGraph( QWidget * parent, const char * name ) - : QWidget( parent, name ) +KGraph::KGraph( TQWidget * parent, const char * name ) + : TQWidget( parent, name ) { setBackgroundColor(white); @@ -65,21 +65,21 @@ void KGraph::removeLine(Arts::KGraphLine_impl *line) lines.remove(line); } -inline QPoint KGraph::g2qPoint(const GraphPoint &gp) +inline TQPoint KGraph::g2qPoint(const GraphPoint &gp) { - return QPoint(int(((gp.x - minx)/(maxx-minx)) * (width()-1)), + return TQPoint(int(((gp.x - minx)/(maxx-minx)) * (width()-1)), int((1.0 - (gp.y - miny)/(maxy-miny)) * (height()-1))); } -inline GraphPoint KGraph::q2gPoint(const QPoint &qp) +inline GraphPoint KGraph::q2gPoint(const TQPoint &qp) { return GraphPoint((float(qp.x())/float(width()-1)) * (maxx-minx) + minx, (1.0 - (float(qp.y())/float(height()-1))) * (maxy-miny) + miny); } -void KGraph::paintEvent( QPaintEvent *e ) +void KGraph::paintEvent( TQPaintEvent *e ) { - QPainter painter(this); + TQPainter painter(this); painter.setClipRect(e->rect()); std::list<KGraphLine_impl *>::iterator li; @@ -88,14 +88,14 @@ void KGraph::paintEvent( QPaintEvent *e ) KGraphLine_impl *gline = *li; vector<GraphPoint>::iterator pi; - QPoint lastp; + TQPoint lastp; bool first = true; painter.setPen(gline->_color.c_str()); for(pi = gline->_points.begin(); pi != gline->_points.end(); pi++) { - QPoint p = g2qPoint(*pi); + TQPoint p = g2qPoint(*pi); if(!first) painter.drawLine(lastp,p); @@ -109,7 +109,7 @@ void KGraph::paintEvent( QPaintEvent *e ) } } -void KGraph::mousePressEvent(QMouseEvent *e) +void KGraph::mousePressEvent(TQMouseEvent *e) { if(e->button() == LeftButton || e->button() == RightButton) { @@ -122,7 +122,7 @@ void KGraph::mousePressEvent(QMouseEvent *e) int index = 0; for(pi = gline->_points.begin(); pi != gline->_points.end(); pi++, index++) { - QPoint p = g2qPoint(*pi); + TQPoint p = g2qPoint(*pi); int dx = e->x() - p.x(); int dy = e->y() - p.y(); @@ -167,14 +167,14 @@ void KGraph::mousePressEvent(QMouseEvent *e) { KGraphLine_impl *gline = *li; - QPoint lastp; + TQPoint lastp; bool first = true; vector<GraphPoint>::iterator pi; int index = 0; for(pi = gline->_points.begin(); pi != gline->_points.end(); pi++, index++) { - QPoint p = g2qPoint(*pi); + TQPoint p = g2qPoint(*pi); if(!first && (e->x() > lastp.x()+2) && (e->x() < p.x()-2)) { @@ -183,7 +183,7 @@ void KGraph::mousePressEvent(QMouseEvent *e) if(abs(y-e->y()) < 5) { - GraphPoint gp = q2gPoint(QPoint(e->x(),y)); + GraphPoint gp = q2gPoint(TQPoint(e->x(),y)); vector<GraphPoint> newPoints; for(int i=0;i<( int )gline->_points.size();i++) @@ -208,9 +208,9 @@ void KGraph::mousePressEvent(QMouseEvent *e) } } -void KGraph::mouseMoveEvent(QMouseEvent *e) +void KGraph::mouseMoveEvent(TQMouseEvent *e) { - QPoint pos = e->pos(); + TQPoint pos = e->pos(); if(pos.x() < 0) pos.setX(0); if(pos.y() < 0) pos.setY(0); @@ -257,7 +257,7 @@ void KGraph::mouseMoveEvent(QMouseEvent *e) } } -void KGraph::mouseReleaseEvent(QMouseEvent *) +void KGraph::mouseReleaseEvent(TQMouseEvent *) { selectedIndex = -1; selectedLine = 0; diff --git a/arts/gui/kde/kgraph.h b/arts/gui/kde/kgraph.h index d3e622ad..83c1aa7c 100644 --- a/arts/gui/kde/kgraph.h +++ b/arts/gui/kde/kgraph.h @@ -23,8 +23,8 @@ #ifndef _KGRAPH_H #define _KGRAPH_H -#include <qwidget.h> -#include <qpoint.h> +#include <tqwidget.h> +#include <tqpoint.h> #include "artsgui.h" #include <list> @@ -43,21 +43,21 @@ protected: GraphPoint selectedPoint; int selectedIndex; // -1 if nothing is selected - inline GraphPoint q2gPoint(const QPoint &qp); - inline QPoint g2qPoint(const GraphPoint &gp); + inline GraphPoint q2gPoint(const TQPoint &qp); + inline TQPoint g2qPoint(const GraphPoint &gp); public: - KGraph( QWidget * parent = 0, const char * name = 0 ); + KGraph( TQWidget * parent = 0, const char * name = 0 ); virtual ~KGraph(); void addLine(Arts::KGraphLine_impl *line); void redrawLine(Arts::KGraphLine_impl *line); void removeLine(Arts::KGraphLine_impl *line); - void mousePressEvent(QMouseEvent *me); - void mouseMoveEvent(QMouseEvent *me); - void mouseReleaseEvent(QMouseEvent *me); + void mousePressEvent(TQMouseEvent *me); + void mouseMoveEvent(TQMouseEvent *me); + void mouseReleaseEvent(TQMouseEvent *me); - void paintEvent(QPaintEvent *e); + void paintEvent(TQPaintEvent *e); }; } diff --git a/arts/gui/kde/kgraph_impl.cpp b/arts/gui/kde/kgraph_impl.cpp index 354fdad7..85ad72ad 100644 --- a/arts/gui/kde/kgraph_impl.cpp +++ b/arts/gui/kde/kgraph_impl.cpp @@ -43,7 +43,7 @@ string KGraph_impl::caption() void KGraph_impl::caption(const string& newCaption) { - _caption = QString::fromUtf8(newCaption.c_str()); + _caption = TQString::fromUtf8(newCaption.c_str()); // FIXME: do something with the caption here } diff --git a/arts/gui/kde/kgraph_impl.h b/arts/gui/kde/kgraph_impl.h index e100b095..408ad961 100644 --- a/arts/gui/kde/kgraph_impl.h +++ b/arts/gui/kde/kgraph_impl.h @@ -25,8 +25,8 @@ #include "kwidget_impl.h" #include "kgraph.h" -#include <qobject.h> -#include <qstring.h> +#include <tqobject.h> +#include <tqstring.h> namespace Arts { @@ -37,7 +37,7 @@ class KGraph_impl : virtual public Arts::Graph_skel, public Arts::KWidget_impl { protected: - QString _caption; + TQString _caption; float _minx, _miny, _maxx, _maxy; KGraph * _kgraph; diff --git a/arts/gui/kde/kgraphline_impl.cpp b/arts/gui/kde/kgraphline_impl.cpp index affb5fc2..ccb6ed1f 100644 --- a/arts/gui/kde/kgraphline_impl.cpp +++ b/arts/gui/kde/kgraphline_impl.cpp @@ -112,7 +112,7 @@ void KGraphLine_impl::points(const vector<GraphPoint>& newPoints) KGraph *KGraphLine_impl::getKGraph() { - QWidget *widget = KWidgetRepo::the()->lookupQWidget(_graphID); + TQWidget *widget = KWidgetRepo::the()->lookupQWidget(_graphID); if(!widget) return 0; diff --git a/arts/gui/kde/khbox_impl.cpp b/arts/gui/kde/khbox_impl.cpp index 29438a09..431ce286 100644 --- a/arts/gui/kde/khbox_impl.cpp +++ b/arts/gui/kde/khbox_impl.cpp @@ -22,15 +22,15 @@ */ #include "khbox_impl.h" -#include <qhbox.h> +#include <tqhbox.h> using namespace Arts; -KHBox_impl::KHBox_impl( QHBox * widget ) - : KFrame_impl( widget ? widget : new QHBox ) +KHBox_impl::KHBox_impl( TQHBox * widget ) + : KFrame_impl( widget ? widget : new TQHBox ) , _spacing( 5 ) { - _qhbox = static_cast<QHBox*>( _qwidget ); + _qhbox = static_cast<TQHBox*>( _qwidget ); _qhbox->setSpacing( _spacing ); _qhbox->setMargin( 5 ); } diff --git a/arts/gui/kde/khbox_impl.h b/arts/gui/kde/khbox_impl.h index b82bf80c..7b020b39 100644 --- a/arts/gui/kde/khbox_impl.h +++ b/arts/gui/kde/khbox_impl.h @@ -34,10 +34,10 @@ private: long _spacing; protected: - QHBox * _qhbox; + TQHBox * _qhbox; public: - KHBox_impl( QHBox * w = 0 ); + KHBox_impl( TQHBox * w = 0 ); long spacing(); void spacing( long ); diff --git a/arts/gui/kde/klabel_impl.cpp b/arts/gui/kde/klabel_impl.cpp index 774a7de0..dd0a9557 100644 --- a/arts/gui/kde/klabel_impl.cpp +++ b/arts/gui/kde/klabel_impl.cpp @@ -22,12 +22,12 @@ #include "klabel_impl.moc" #include <kdebug.h> -#include <qfont.h> +#include <tqfont.h> using namespace Arts; using namespace std; -KLabel_impl::KLabel_impl( QFrame *widget ) : KFrame_impl( widget ? widget : new RotateLabel( 0 ) ) { +KLabel_impl::KLabel_impl( TQFrame *widget ) : KFrame_impl( widget ? widget : new RotateLabel( 0 ) ) { _label = static_cast<RotateLabel*>( _qwidget ); } @@ -36,7 +36,7 @@ string KLabel_impl::text() { } void KLabel_impl::text( const string& newtext ) { - _label->title( QString::fromUtf8( newtext.c_str() ) ); + _label->title( TQString::fromUtf8( newtext.c_str() ) ); } long KLabel_impl::align() { return _label->align(); } @@ -50,40 +50,40 @@ void KLabel_impl::bottom( Arts::TextBottom n ) { _label->bottom( n ); } REGISTER_IMPLEMENTATION( KLabel_impl ); -RotateLabel::RotateLabel( QWidget* p, const char* n ) : QFrame( p,n ) { +RotateLabel::RotateLabel( TQWidget* p, const char* n ) : TQFrame( p,n ) { _bottom = Arts::South; _align = Arts::AlignCenter; } -void RotateLabel::paintEvent( QPaintEvent* ) { - QPainter p( this ); +void RotateLabel::paintEvent( TQPaintEvent* ) { + TQPainter p( this ); if ( _bottom == Arts::East ) { p.rotate( 270 ); - p.drawText( QRect( 0,0, -height(), width() ), _align, _title ); + p.drawText( TQRect( 0,0, -height(), width() ), _align, _title ); } else if ( _bottom == Arts::West ) { p.rotate( 90 ); - p.drawText( QRect( 0,0, height(), -width() ), _align, _title ); + p.drawText( TQRect( 0,0, height(), -width() ), _align, _title ); } else if ( _bottom == Arts::North ) { p.rotate( 180 ); - p.drawText( QRect( 0,0, -width(), -height() ), _align, _title ); + p.drawText( TQRect( 0,0, -width(), -height() ), _align, _title ); } else { - p.drawText( QRect( 0,0, width(), height() ), _align, _title ); + p.drawText( TQRect( 0,0, width(), height() ), _align, _title ); } } -void RotateLabel::fontfamily( QString n ) { - QFont font = this->font(); +void RotateLabel::fontfamily( TQString n ) { + TQFont font = this->font(); font.setFamily( n ); this->setFont( font ); } void RotateLabel::fontsize( int n ) { - QFont font = this->font(); + TQFont font = this->font(); font.setPixelSize( n ); this->setFont( font ); } -void RotateLabel::title( QString n ) { +void RotateLabel::title( TQString n ) { _title = n; - QSize size = this->fontMetrics().size( SingleLine, _title ); + TQSize size = this->fontMetrics().size( SingleLine, _title ); if ( _bottom == Arts::East || _bottom == Arts::West ) this->setMinimumSize( size.height(), size.width() ); else diff --git a/arts/gui/kde/klabel_impl.h b/arts/gui/kde/klabel_impl.h index 332b0006..7822e960 100644 --- a/arts/gui/kde/klabel_impl.h +++ b/arts/gui/kde/klabel_impl.h @@ -23,10 +23,10 @@ #define ARTS_KLABEL_IMPL #include <kframe_impl.h> -#include <qframe.h> -#include <qpainter.h> -#include <qfontmetrics.h> -#include <qfont.h> +#include <tqframe.h> +#include <tqpainter.h> +#include <tqfontmetrics.h> +#include <tqfont.h> #include <artsgui.h> #include <kdelibs_export.h> @@ -41,7 +41,7 @@ class KDE_EXPORT KLabel_impl : virtual public Arts::Label_skel, protected: RotateLabel* _label; public: - KLabel_impl( QFrame* w=0 ); + KLabel_impl( TQFrame* w=0 ); void constructor( Widget p ) { parent( p ); } std::string text(); @@ -63,16 +63,16 @@ public: } // namespace -class RotateLabel : public QFrame { +class RotateLabel : public TQFrame { Q_OBJECT public: - RotateLabel( QWidget*, const char* =0 ); - void paintEvent( QPaintEvent* ); + RotateLabel( TQWidget*, const char* =0 ); + void paintEvent( TQPaintEvent* ); - void fontfamily( QString ); + void fontfamily( TQString ); void fontsize( int ); - void title( QString ); - QString title() { return _title; } + void title( TQString ); + TQString title() { return _title; } long align() { return _align; } void align( long ); @@ -82,7 +82,7 @@ public: private: long _align; Arts::TextBottom _bottom; - QString _title; + TQString _title; }; #endif diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp index 7f9efa9b..847e803a 100644 --- a/arts/gui/kde/klayoutbox_impl.cpp +++ b/arts/gui/kde/klayoutbox_impl.cpp @@ -20,21 +20,21 @@ #include "klayoutbox_impl.h" -#include <qframe.h> -#include <qlayout.h> +#include <tqframe.h> +#include <tqlayout.h> #include <kdebug.h> -#include <qpainter.h> -#include <qstyle.h> -#include <qpen.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqpen.h> #include "kwidgetrepo.h" using namespace Arts; using namespace std; -KLayoutBox_impl::KLayoutBox_impl( QFrame *widget ) : KFrame_impl( widget ? widget :new QFrame( 0 ) ) +KLayoutBox_impl::KLayoutBox_impl( TQFrame *widget ) : KFrame_impl( widget ? widget :new TQFrame( 0 ) ) { - _qframe = static_cast<QFrame*>( _qwidget ); - _layout = new QBoxLayout( _qframe, QBoxLayout::LeftToRight ); + _qframe = static_cast<TQFrame*>( _qwidget ); + _layout = new TQBoxLayout( _qframe, TQBoxLayout::LeftToRight ); } KLayoutBox_impl::~KLayoutBox_impl() { } @@ -42,14 +42,14 @@ KLayoutBox_impl::~KLayoutBox_impl() { void KLayoutBox_impl::addWidget( Arts::Widget widget, long stretch, long align ) { widget.parent( self() ); this->_addChild( widget, "layoutbox_item" ); - QWidget * tmp = KWidgetRepo::the()->lookupQWidget( widget.widgetID() ); + TQWidget * tmp = KWidgetRepo::the()->lookupQWidget( widget.widgetID() ); _layout->addWidget( tmp, stretch, align ); } void KLayoutBox_impl::insertWidget( long index, Arts::Widget widget, long stretch, long align ) { widget.parent( self() ); this->_addChild( widget, "layoutbox_item" ); - QWidget * tmp = KWidgetRepo::the()->lookupQWidget( widget.widgetID() ); + TQWidget * tmp = KWidgetRepo::the()->lookupQWidget( widget.widgetID() ); _layout->insertWidget( index, tmp, stretch, align ); } @@ -70,31 +70,31 @@ long KLayoutBox_impl::layoutmargin() { return _layout->margin(); } void KLayoutBox_impl::layoutmargin( long n ) { _layout->setMargin( n ); this->margin( n ); } Direction KLayoutBox_impl::direction() { return Arts::Direction( _layout->direction() ); } -void KLayoutBox_impl::direction( Direction d ) { _layout->setDirection( QBoxLayout::Direction( d ) ); } +void KLayoutBox_impl::direction( Direction d ) { _layout->setDirection( TQBoxLayout::Direction( d ) ); } REGISTER_IMPLEMENTATION( KLayoutBox_impl ); -KLayoutBox_Separator::KLayoutBox_Separator( QWidget* p, const char* n ) : QWidget( p,n ) { +KLayoutBox_Separator::KLayoutBox_Separator( TQWidget* p, const char* n ) : TQWidget( p,n ) { //kdDebug() << k_funcinfo << endl; } -void KLayoutBox_Separator::resizeEvent( QResizeEvent* ) { kdDebug() << k_funcinfo << size() << endl; } +void KLayoutBox_Separator::resizeEvent( TQResizeEvent* ) { kdDebug() << k_funcinfo << size() << endl; } -void KLayoutBox_Separator::paintEvent( QPaintEvent* ) { +void KLayoutBox_Separator::paintEvent( TQPaintEvent* ) { //kdDebug() << k_funcinfo << size() << endl; - QPainter p( this ); - QStyle::SFlags flags = QStyle::Style_Default; - if ( width() < height() ) flags |= QStyle::Style_Horizontal; - style().drawPrimitive( QStyle::PE_Splitter, &p, rect(), colorGroup(), flags ); + TQPainter p( this ); + TQStyle::SFlags flags = TQStyle::Style_Default; + if ( width() < height() ) flags |= TQStyle::Style_Horizontal; + style().drawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), flags ); } -QSize KLayoutBox_Separator::minimumSizeHint() const { - int wh = style().pixelMetric( QStyle::PM_SplitterWidth, this ); - return QSize( wh, wh ); +TQSize KLayoutBox_Separator::minimumSizeHint() const { + int wh = style().pixelMetric( TQStyle::PM_SplitterWidth, this ); + return TQSize( wh, wh ); } -KLayoutBox_Line::KLayoutBox_Line( int width, int space, QWidget* p, const char* n ) - : QWidget( p,n ) +KLayoutBox_Line::KLayoutBox_Line( int width, int space, TQWidget* p, const char* n ) + : TQWidget( p,n ) , _width( width ) , _space( space ) { @@ -102,18 +102,18 @@ KLayoutBox_Line::KLayoutBox_Line( int width, int space, QWidget* p, const char* } -void KLayoutBox_Line::paintEvent( QPaintEvent* ) { +void KLayoutBox_Line::paintEvent( TQPaintEvent* ) { //kdDebug() << k_funcinfo << size() << endl; - QPainter p( this ); - p.setPen( QPen( colorGroup().foreground(), _width ) ); + TQPainter p( this ); + p.setPen( TQPen( colorGroup().foreground(), _width ) ); if ( width() > height() ) p.drawLine( 0, height()/2, width(), height()/2 ); else p.drawLine( width()/2, 0, width()/2, height() ); } -QSize KLayoutBox_Line::minimumSizeHint() const { +TQSize KLayoutBox_Line::minimumSizeHint() const { //kdDebug() << k_funcinfo << size() << endl; int wh = _width + 2* _space; - return QSize( wh, wh ); + return TQSize( wh, wh ); } #include <klayoutbox_impl.moc> diff --git a/arts/gui/kde/klayoutbox_impl.h b/arts/gui/kde/klayoutbox_impl.h index ee8f18a3..cdebba71 100644 --- a/arts/gui/kde/klayoutbox_impl.h +++ b/arts/gui/kde/klayoutbox_impl.h @@ -36,12 +36,12 @@ class KDE_EXPORT KLayoutBox_impl : virtual public Arts::LayoutBox_skel, public Arts::KFrame_impl { protected: - QFrame* _qframe; - QBoxLayout* _layout; + TQFrame* _qframe; + TQBoxLayout* _layout; LayoutBox self() { return LayoutBox::_from_base( _copy() ); } public: - KLayoutBox_impl( QFrame* w=0 ); + KLayoutBox_impl( TQFrame* w=0 ); ~KLayoutBox_impl(); Direction direction(); @@ -78,23 +78,23 @@ public: } // namespace -class KDE_EXPORT KLayoutBox_Separator : public QWidget { +class KDE_EXPORT KLayoutBox_Separator : public TQWidget { Q_OBJECT public: - KLayoutBox_Separator( QWidget*, const char* =0 ); - void resizeEvent( QResizeEvent* ); - void paintEvent( QPaintEvent* ); - QSize minimumSizeHint() const; + KLayoutBox_Separator( TQWidget*, const char* =0 ); + void resizeEvent( TQResizeEvent* ); + void paintEvent( TQPaintEvent* ); + TQSize minimumSizeHint() const; }; -class KLayoutBox_Line : public QWidget { +class KLayoutBox_Line : public TQWidget { Q_OBJECT private: int _width, _space; public: - KLayoutBox_Line( int, int, QWidget*, const char* =0 ); - void paintEvent( QPaintEvent* ); - QSize minimumSizeHint() const; + KLayoutBox_Line( int, int, TQWidget*, const char* =0 ); + void paintEvent( TQPaintEvent* ); + TQSize minimumSizeHint() const; }; #endif diff --git a/arts/gui/kde/klevelmeter_firebars.cpp b/arts/gui/kde/klevelmeter_firebars.cpp index 83d93d3c..9a78804c 100644 --- a/arts/gui/kde/klevelmeter_firebars.cpp +++ b/arts/gui/kde/klevelmeter_firebars.cpp @@ -21,16 +21,16 @@ #include "klevelmeter_firebars.h" #include <kdebug.h> -#include <qpainter.h> -#include <qpixmap.h> +#include <tqpainter.h> +#include <tqpixmap.h> -KLevelMeter_FireBars_private::KLevelMeter_FireBars_private( KLevelMeter_FireBars* p, const char* n ) : QWidget( p,n ) { +KLevelMeter_FireBars_private::KLevelMeter_FireBars_private( KLevelMeter_FireBars* p, const char* n ) : TQWidget( p,n ) { _parent = p; - _pixmap = new QPixmap( 0,0 ); -// setPaletteBackgroundColor( QColor( 0,0,255 ) ); + _pixmap = new TQPixmap( 0,0 ); +// setPaletteBackgroundColor( TQColor( 0,0,255 ) ); } -void KLevelMeter_FireBars_private::paintEvent( QPaintEvent* ) { - QPainter p; +void KLevelMeter_FireBars_private::paintEvent( TQPaintEvent* ) { + TQPainter p; if ( _pixmap->size() != this->size() ) { _pixmap->resize( this->size() ); p.begin( _pixmap ); @@ -55,15 +55,15 @@ kdDebug() << k_funcinfo << dir << endl; } p.begin( this ); p.translate( 0,0 ); - p.drawPixmap( QPoint( 0,0 ), *_pixmap ); + p.drawPixmap( TQPoint( 0,0 ), *_pixmap ); p.end(); } -KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* impl, QWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) { -//kdDebug()<<"KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* "<<impl<<", QWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; +KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) { +//kdDebug()<<"KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; this->setMinimumSize( 5, 5 ); _bar = new KLevelMeter_FireBars_private( this, 0 ); - _peakwidget = new QWidget( this ); + _peakwidget = new TQWidget( this ); _peakwidget->resize( size() ); _peakwidget->setPaletteBackgroundColor( color( 1 ) ); _peakwidget->hide(); @@ -94,10 +94,10 @@ void KLevelMeter_FireBars::invalue( float n, float p ) { repaint(); } -void KLevelMeter_FireBars::paintEvent( QPaintEvent* ) { - QPainter p( this ); +void KLevelMeter_FireBars::paintEvent( TQPaintEvent* ) { + TQPainter p( this ); //p.setPen( NoPen ); - p.setPen( QColor( 0,0,255 ) ); + p.setPen( TQColor( 0,0,255 ) ); // PeakBar if ( _peak > 1.0/1000 ) { if ( _dir == Arts::BottomToTop || _dir == Arts::TopToBottom ) { @@ -117,8 +117,8 @@ void KLevelMeter_FireBars::paintEvent( QPaintEvent* ) { /** Planned feature: a little Tooltip showing the actual value of the volume in deziBel and perhaps as linear scaleFactor */ -void KLevelMeter_FireBars::mouseMoveEvent( QMouseEvent* /*qme*/ ) { -//kdDebug()<<"KLevelMeter_FireBars::mouseMoveEvent(QMouseEvent* "<<qme<<" )"<<endl; +void KLevelMeter_FireBars::mouseMoveEvent( TQMouseEvent* /*qme*/ ) { +//kdDebug()<<"KLevelMeter_FireBars::mouseMoveEvent(TQMouseEvent* "<<qme<<" )"<<endl; } #include <klevelmeter_firebars.moc> diff --git a/arts/gui/kde/klevelmeter_firebars.h b/arts/gui/kde/klevelmeter_firebars.h index 5dcc628a..5d7ff2d7 100644 --- a/arts/gui/kde/klevelmeter_firebars.h +++ b/arts/gui/kde/klevelmeter_firebars.h @@ -26,32 +26,32 @@ class QPixmap; class KLevelMeter_FireBars; -class KLevelMeter_FireBars_private : public QWidget { +class KLevelMeter_FireBars_private : public TQWidget { Q_OBJECT public: KLevelMeter_FireBars_private( KLevelMeter_FireBars*, const char* ); - void paintEvent( QPaintEvent* ); + void paintEvent( TQPaintEvent* ); Arts::Direction dir; private: KLevelMeter_FireBars* _parent; - QPixmap *_pixmap; + TQPixmap *_pixmap; }; class KLevelMeter_FireBars : public KLevelMeter_Template { Q_OBJECT public: - KLevelMeter_FireBars( Arts::KLevelMeter_impl*, QWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); + KLevelMeter_FireBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); void invalue( float, float =0 ); - void paintEvent( QPaintEvent* ); + void paintEvent( TQPaintEvent* ); - void mouseMoveEvent( QMouseEvent* ); + void mouseMoveEvent( TQMouseEvent* ); private: float _value, _peak; KLevelMeter_FireBars_private *_bar; - QWidget* _peakwidget; + TQWidget* _peakwidget; }; #endif diff --git a/arts/gui/kde/klevelmeter_impl.cpp b/arts/gui/kde/klevelmeter_impl.cpp index 1e090e65..418108ad 100644 --- a/arts/gui/kde/klevelmeter_impl.cpp +++ b/arts/gui/kde/klevelmeter_impl.cpp @@ -23,9 +23,9 @@ #include <math.h> -#include <qframe.h> +#include <tqframe.h> #include <kdebug.h> -#include <qlayout.h> +#include <tqlayout.h> #include <kartswidget.h> #include "klevelmeter_private.h" @@ -41,8 +41,8 @@ using namespace Arts; using namespace std; -KLevelMeter_Private::KLevelMeter_Private( KLevelMeter_impl* impl, QFrame* frame, LevelMeterStyle defstyle, QObject* parent, const char* name ) - : QObject( parent, name ) +KLevelMeter_Private::KLevelMeter_Private( KLevelMeter_impl* impl, TQFrame* frame, LevelMeterStyle defstyle, TQObject* parent, const char* name ) + : TQObject( parent, name ) , _impl( impl ) , _frame( frame ) , _levelmeter( 0 ) @@ -53,7 +53,7 @@ KLevelMeter_Private::KLevelMeter_Private( KLevelMeter_impl* impl, QFrame* frame, , _peak( 20 ), _peakvalue( 0.0 ) , _dbmin( -36 ), _dbmax( 0 ) { - _layout = new QBoxLayout( _frame, QBoxLayout::LeftToRight ); + _layout = new TQBoxLayout( _frame, TQBoxLayout::LeftToRight ); } void KLevelMeter_Private::createWidget() { @@ -78,8 +78,8 @@ void KLevelMeter_Private::createWidget() { _levelmeter->setMinimumSize( 10,10 ); } -KLevelMeter_impl::KLevelMeter_impl( QFrame* w ) : Arts::KFrame_impl( w ? w : new QFrame( 0 ) ) { -//kdDebug()<<"KLevelMeter_impl::KLevelMeter_impl( QFrame* "<<w<<" )"<<endl; +KLevelMeter_impl::KLevelMeter_impl( TQFrame* w ) : Arts::KFrame_impl( w ? w : new TQFrame( 0 ) ) { +//kdDebug()<<"KLevelMeter_impl::KLevelMeter_impl( TQFrame* "<<w<<" )"<<endl; p = new KLevelMeter_Private( this, _qframe, lmLineBars ); p->createWidget(); } diff --git a/arts/gui/kde/klevelmeter_impl.h b/arts/gui/kde/klevelmeter_impl.h index 2e26b996..b2f58ce8 100644 --- a/arts/gui/kde/klevelmeter_impl.h +++ b/arts/gui/kde/klevelmeter_impl.h @@ -37,7 +37,7 @@ class KLevelMeter_impl : virtual public Arts::LevelMeter_skel, private: KLevelMeter_Private *p; public: - KLevelMeter_impl( QFrame* =0 ); + KLevelMeter_impl( TQFrame* =0 ); LevelMeterStyle style(); void style( LevelMeterStyle ); diff --git a/arts/gui/kde/klevelmeter_linebars.cpp b/arts/gui/kde/klevelmeter_linebars.cpp index 3292ba4a..6d63a18c 100644 --- a/arts/gui/kde/klevelmeter_linebars.cpp +++ b/arts/gui/kde/klevelmeter_linebars.cpp @@ -21,14 +21,14 @@ #include "klevelmeter_linebars.h" #include <kdebug.h> -#include <qpainter.h> -#include <qpixmap.h> +#include <tqpainter.h> +#include <tqpixmap.h> -KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* impl, QWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) +KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) , _value( 0.0 ) , _peak( 0.0 ) { -//kdDebug()<<"KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* "<<impl<<", QWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", Arts::Direction "<<dir<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; +//kdDebug()<<"KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", Arts::Direction "<<dir<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; this->setMinimumSize( 5, 5 ); this->substyle( substyle ); _stdcolors = colorGroup(); @@ -47,9 +47,9 @@ void KLevelMeter_LineBars::substyle( long n ) { } long KLevelMeter_LineBars::substyle() { return _substyle; } -void KLevelMeter_LineBars::paintEvent( QPaintEvent* ) { - QPixmap pm( size() ); - QPainter p( &pm ); +void KLevelMeter_LineBars::paintEvent( TQPaintEvent* ) { + TQPixmap pm( size() ); + TQPainter p( &pm ); switch ( _dir ) { case Arts::BottomToTop: @@ -69,16 +69,16 @@ void KLevelMeter_LineBars::paintEvent( QPaintEvent* ) { } if ( _substyle & 1 ) - p.setBrush( ( _peak<1 )?QColor( 0,0,255 ):QColor( 255,0,0 ) ); + p.setBrush( ( _peak<1 )?TQColor( 0,0,255 ):TQColor( 255,0,0 ) ); else - p.setBrush( ( _peak<1 )?color( _value ):QColor( 255,0,0 ) ); + p.setBrush( ( _peak<1 )?color( _value ):TQColor( 255,0,0 ) ); - QColor bgcolor = ( _substyle & 2 ) ? p.brush().color().dark() : _stdcolors.background(); + TQColor bgcolor = ( _substyle & 2 ) ? p.brush().color().dark() : _stdcolors.background(); pm.fill( bgcolor ); p.setPen( NoPen ); - QSize s = size(); + TQSize s = size(); if ( Arts::LeftToRight == _dir || Arts::RightToLeft == _dir ) s.transpose(); @@ -89,7 +89,7 @@ void KLevelMeter_LineBars::paintEvent( QPaintEvent* ) { p.drawRect( 0, top, w, h ); // PeakBar if ( _peak > 1.0/1000 && _peak <= 1.0 ) { - p.setPen( QColor( 255-bgcolor.red(), 255-bgcolor.green(), 255-bgcolor.blue() ) ); + p.setPen( TQColor( 255-bgcolor.red(), 255-bgcolor.green(), 255-bgcolor.blue() ) ); top = int( s.height() * ( 1 - _peak ) ); p.drawLine( 0, top, w, top ); } @@ -100,8 +100,8 @@ void KLevelMeter_LineBars::paintEvent( QPaintEvent* ) { /** Planned feature: a little Tooltip showing the actual value of the volume in deziBel and perhaps as linear scaleFactor */ -void KLevelMeter_LineBars::mouseMoveEvent( QMouseEvent* /*qme*/ ) { -//kdDebug()<<"KLevelMeter_LineBars::mouseMoveEvent(QMouseEvent* "<<qme<<" )"<<endl; +void KLevelMeter_LineBars::mouseMoveEvent( TQMouseEvent* /*qme*/ ) { +//kdDebug()<<"KLevelMeter_LineBars::mouseMoveEvent(TQMouseEvent* "<<qme<<" )"<<endl; //kdDebug()<<"qme.y()="<<this->height()-qme->y()<<" db="<<db<<" dbtoamp(db)="<<dbtoamp( db )<<endl; } diff --git a/arts/gui/kde/klevelmeter_linebars.h b/arts/gui/kde/klevelmeter_linebars.h index e10d4ba7..cf0c4217 100644 --- a/arts/gui/kde/klevelmeter_linebars.h +++ b/arts/gui/kde/klevelmeter_linebars.h @@ -26,20 +26,20 @@ class KLevelMeter_LineBars : public KLevelMeter_Template { Q_OBJECT public: - KLevelMeter_LineBars( Arts::KLevelMeter_impl*, QWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); + KLevelMeter_LineBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); void invalue( float, float =0 ); void substyle( long ); long substyle(); - void paintEvent( QPaintEvent* ); + void paintEvent( TQPaintEvent* ); - void mouseMoveEvent( QMouseEvent* ); + void mouseMoveEvent( TQMouseEvent* ); private: float _value, _peak; long _substyle; - QColorGroup _stdcolors; + TQColorGroup _stdcolors; }; #endif diff --git a/arts/gui/kde/klevelmeter_normalbars.cpp b/arts/gui/kde/klevelmeter_normalbars.cpp index 7a6fcdfb..29593551 100644 --- a/arts/gui/kde/klevelmeter_normalbars.cpp +++ b/arts/gui/kde/klevelmeter_normalbars.cpp @@ -21,19 +21,19 @@ #include "klevelmeter_normalbars.h" #include <kdebug.h> -#include <qpainter.h> -#include <qlayout.h> +#include <tqpainter.h> +#include <tqlayout.h> -KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* impl, QWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) { -//kdDebug()<<"KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* "<<impl<<", QWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; - _layout = new QBoxLayout( this, QBoxLayout::BottomToTop ); +KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) { +//kdDebug()<<"KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; + _layout = new TQBoxLayout( this, TQBoxLayout::BottomToTop ); } void KLevelMeter_NormalBars::invalue( float n, float p ) { //kdDebug()<<"KLevelMeter_NormalBars::invalue( float "<<n<<", float "<<p<<" )"<<endl; _peak = amptondb( p ); _value = amptondb( n ); - if ( _dir != Arts::Direction( _layout->direction() ) ) _layout->setDirection( QBoxLayout::Direction( _dir ) ); + if ( _dir != Arts::Direction( _layout->direction() ) ) _layout->setDirection( TQBoxLayout::Direction( _dir ) ); for ( uint i=0; i<bars.count(); i++ ) bars.at( i )->setValue( _value ); } @@ -46,8 +46,8 @@ void KLevelMeter_NormalBars::count( long n ) { } } -void KLevelMeter_NormalBars::resizeEvent( QResizeEvent* ) { - //kdDebug()<<"KLevelMeter_NormalBars::resizeEvent( QResizeEvent* )"<<endl; +void KLevelMeter_NormalBars::resizeEvent( TQResizeEvent* ) { + //kdDebug()<<"KLevelMeter_NormalBars::resizeEvent( TQResizeEvent* )"<<endl; uint barscount = _count; //kdDebug()<<"[1] barscount="<<barscount<<" bars.count()="<<bars.count()<<endl; if ( _dir==Arts::BottomToTop || _dir==Arts::TopToBottom ) { diff --git a/arts/gui/kde/klevelmeter_normalbars.h b/arts/gui/kde/klevelmeter_normalbars.h index 2783e09f..5705ef5e 100644 --- a/arts/gui/kde/klevelmeter_normalbars.h +++ b/arts/gui/kde/klevelmeter_normalbars.h @@ -23,7 +23,7 @@ #include "klevelmeter_template.h" -#include <qptrlist.h> +#include <tqptrlist.h> class Bar; class QBoxLayout; @@ -31,29 +31,29 @@ class QBoxLayout; class KLevelMeter_NormalBars : public KLevelMeter_Template { Q_OBJECT public: - KLevelMeter_NormalBars( Arts::KLevelMeter_impl*, QWidget* =0, long substyle=0, long count=25, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); + KLevelMeter_NormalBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=25, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); void invalue( float, float =0 ); void count( long ); long count(); - void resizeEvent( QResizeEvent* =0 ); + void resizeEvent( TQResizeEvent* =0 ); private: float _value, _peak; - QPtrList <Bar> bars; + TQPtrList <Bar> bars; // long _count; - QBoxLayout *_layout; + TQBoxLayout *_layout; }; -class Bar : public QWidget { +class Bar : public TQWidget { Q_OBJECT private: float _min, _max; - QColor _color; + TQColor _color; bool _on; public: - Bar( float min, float max, QColor color, QWidget* parent ) : QWidget( parent ), _min( min ), _max( max ), _color( color ), _on( false ) { + Bar( float min, float max, TQColor color, TQWidget* parent ) : TQWidget( parent ), _min( min ), _max( max ), _color( color ), _on( false ) { setBackgroundColor( _color.dark() ); } void setValue( float n ) { @@ -68,7 +68,7 @@ public: else setBackgroundColor( _color.dark() ); } } - void setValues( float min, float max, QColor color ) { _min = min; _max = max; _color = color; on( _on ); } + void setValues( float min, float max, TQColor color ) { _min = min; _max = max; _color = color; on( _on ); } }; #endif diff --git a/arts/gui/kde/klevelmeter_private.h b/arts/gui/kde/klevelmeter_private.h index f7ff4e93..79fe49b2 100644 --- a/arts/gui/kde/klevelmeter_private.h +++ b/arts/gui/kde/klevelmeter_private.h @@ -21,7 +21,7 @@ #ifndef ARTS_KLEVELMETER_PRIVATE_H #define ARTS_KLEVELMETER_PRIVATE_H -#include <qwidget.h> +#include <tqwidget.h> #include "klevelmeter_impl.h" @@ -29,12 +29,12 @@ class KLevelMeter_Template; class QBoxLayout; class KArtsWidget; -class KLevelMeter_Private : public QObject { +class KLevelMeter_Private : public TQObject { Q_OBJECT public: Arts::KLevelMeter_impl* _impl; - QFrame* _frame; - QBoxLayout *_layout; + TQFrame* _frame; + TQBoxLayout *_layout; KLevelMeter_Template *_levelmeter; @@ -46,7 +46,7 @@ public: float _peakvalue; float _dbmin, _dbmax; - KLevelMeter_Private( Arts::KLevelMeter_impl* impl, QFrame* frame, Arts::LevelMeterStyle defstyle, QObject* =0, const char* =0 ); + KLevelMeter_Private( Arts::KLevelMeter_impl* impl, TQFrame* frame, Arts::LevelMeterStyle defstyle, TQObject* =0, const char* =0 ); void createWidget(); }; diff --git a/arts/gui/kde/klevelmeter_small.cpp b/arts/gui/kde/klevelmeter_small.cpp index 1c9c4817..c74dfa44 100644 --- a/arts/gui/kde/klevelmeter_small.cpp +++ b/arts/gui/kde/klevelmeter_small.cpp @@ -21,26 +21,26 @@ #include "klevelmeter_small.h" #include <kdebug.h> -#include <qpainter.h> +#include <tqpainter.h> -KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* impl, QWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) { -//kdDebug()<<"KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* "<<impl<<", QWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; +KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) { +//kdDebug()<<"KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; } void KLevelMeter_Small::invalue( float n, float p ) { //kdDebug()<<"KLevelMeter_Small::invalue( float "<<n<<", float "<<p<<" )"<<endl; _peak = amptondb( p ); if ( n ) this->setBackgroundColor( color( amptondb( n ) ) ); - else this->setBackgroundColor( QColor( 0,255,0 ).dark() ); + else this->setBackgroundColor( TQColor( 0,255,0 ).dark() ); } -void KLevelMeter_Small::paintEvent( QPaintEvent* /*qpe*/ ) { -//kdDebug()<<"KLevelMeter_Small::paintEvent( QPaintEvent* "<<qpe<<" )"<<endl; +void KLevelMeter_Small::paintEvent( TQPaintEvent* /*qpe*/ ) { +//kdDebug()<<"KLevelMeter_Small::paintEvent( TQPaintEvent* "<<qpe<<" )"<<endl; if ( _peak && _peak <= 1.0 ) { - QPainter p( this ); - //p.setPen( QColor( 0,0,0 ) ); - QColor bgcolor = this->paletteBackgroundColor(); - p.setPen( QColor( 255-bgcolor.red(), 255-bgcolor.green(), 255-bgcolor.blue() ) ); + TQPainter p( this ); + //p.setPen( TQColor( 0,0,0 ) ); + TQColor bgcolor = this->paletteBackgroundColor(); + p.setPen( TQColor( 255-bgcolor.red(), 255-bgcolor.green(), 255-bgcolor.blue() ) ); if ( _dir==Arts::BottomToTop || _dir==Arts::TopToBottom ) { if ( _dir==Arts::BottomToTop ) p.translate( 0, rect().bottom() ); int h = int( this->height() * _peak ); diff --git a/arts/gui/kde/klevelmeter_small.h b/arts/gui/kde/klevelmeter_small.h index ba189dd6..1c2c20e6 100644 --- a/arts/gui/kde/klevelmeter_small.h +++ b/arts/gui/kde/klevelmeter_small.h @@ -26,11 +26,11 @@ class KLevelMeter_Small : public KLevelMeter_Template { Q_OBJECT public: - KLevelMeter_Small( Arts::KLevelMeter_impl*, QWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); + KLevelMeter_Small( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); void invalue( float, float =0 ); - void paintEvent( QPaintEvent* ); + void paintEvent( TQPaintEvent* ); private: float _peak; }; diff --git a/arts/gui/kde/klevelmeter_template.h b/arts/gui/kde/klevelmeter_template.h index 1b3915be..c822be40 100644 --- a/arts/gui/kde/klevelmeter_template.h +++ b/arts/gui/kde/klevelmeter_template.h @@ -21,7 +21,7 @@ #ifndef ARTS_KLEVELMETER_TEMPLATE_H #define ARTS_KLEVELMETER_TEMPLATE_H -#include <qwidget.h> +#include <tqwidget.h> #include <math.h> @@ -29,13 +29,13 @@ #include "klevelmeter_impl.h" -class KLevelMeter_Template : public QWidget, public dB2VolCalc { +class KLevelMeter_Template : public TQWidget, public dB2VolCalc { Q_OBJECT public: Arts::KLevelMeter_impl* _impl; - KLevelMeter_Template( Arts::KLevelMeter_impl* impl, QWidget* p, long /*substyle*/, long count, Arts::Direction dir, float _dbmin, float _dbmax ) - : QWidget( p ) + KLevelMeter_Template( Arts::KLevelMeter_impl* impl, TQWidget* p, long /*substyle*/, long count, Arts::Direction dir, float _dbmin, float _dbmax ) + : TQWidget( p ) , dB2VolCalc( _dbmin, _dbmax ) , _impl( impl ) , _count( count ) @@ -57,8 +57,8 @@ public: float nilline; /// Gives the colors between green and red - QColor color( float n ) { - return QColor( int( ( n<=nilline )?255*( 1/nilline )*n:255 ), + TQColor color( float n ) { + return TQColor( int( ( n<=nilline )?255*( 1/nilline )*n:255 ), int( ( n<=1 && n>nilline )?255-255*( 1/nilline )*( n-nilline ):( ( n>1 )?0:255 ) ), 0 ); } diff --git a/arts/gui/kde/klineedit_impl.cpp b/arts/gui/kde/klineedit_impl.cpp index 898879f7..e3643645 100644 --- a/arts/gui/kde/klineedit_impl.cpp +++ b/arts/gui/kde/klineedit_impl.cpp @@ -29,11 +29,11 @@ using namespace std; KLineEditStringMapper::KLineEditStringMapper(KLineEdit_impl *impl, KLineEdit *ke) :impl(impl) { - connect(ke, SIGNAL(textChanged(const QString&)), - this, SLOT(textChanged(const QString&))); + connect(ke, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(textChanged(const TQString&))); } -void KLineEditStringMapper::textChanged(const QString& newText) +void KLineEditStringMapper::textChanged(const TQString& newText) { impl->textChanged(newText.utf8().data()); } @@ -52,7 +52,7 @@ string KLineEdit_impl::text() void KLineEdit_impl::text(const string& newText) { - _klineedit->setText(QString::fromUtf8(newText.c_str())); + _klineedit->setText(TQString::fromUtf8(newText.c_str())); } void KLineEdit_impl::textChanged(const string& newText) diff --git a/arts/gui/kde/klineedit_impl.h b/arts/gui/kde/klineedit_impl.h index b9099ac2..2bd6b693 100644 --- a/arts/gui/kde/klineedit_impl.h +++ b/arts/gui/kde/klineedit_impl.h @@ -47,13 +47,13 @@ public: void textChanged(const std::string& newText); }; -class KLineEditStringMapper :public QObject { +class KLineEditStringMapper :public TQObject { Q_OBJECT KLineEdit_impl *impl; public: KLineEditStringMapper(KLineEdit_impl *impl, KLineEdit *ed); public slots: - void textChanged(const QString& newText); + void textChanged(const TQString& newText); }; } diff --git a/arts/gui/kde/kpopupbox_impl.cpp b/arts/gui/kde/kpopupbox_impl.cpp index 2c56c73e..23de74fc 100644 --- a/arts/gui/kde/kpopupbox_impl.cpp +++ b/arts/gui/kde/kpopupbox_impl.cpp @@ -22,7 +22,7 @@ #include "kpopupbox_impl.h" #include "kpopupbox_private.h" -#include <qlayout.h> +#include <tqlayout.h> using namespace Arts; @@ -54,25 +54,25 @@ void KPopupBox_impl::name( const std::string& n ) { _name = ""; _name = n; _widg // Following the private class: -KPopupBox_widget::KPopupBox_widget( QWidget *parent, const char* name ) : QFrame( parent,name ) +KPopupBox_widget::KPopupBox_widget( TQWidget *parent, const char* name ) : TQFrame( parent,name ) { - this->setFrameShape( QFrame::Box ); + this->setFrameShape( TQFrame::Box ); this->setMargin( 1 ); this->setLineWidth( 1 ); - _titlebar = new QFrame( this ); - _titlebarlayout = new QBoxLayout( _titlebar, QBoxLayout::BottomToTop ); + _titlebar = new TQFrame( this ); + _titlebarlayout = new TQBoxLayout( _titlebar, TQBoxLayout::BottomToTop ); _titlebarlayout->setAutoAdd( true ); _showbutton = new ShowButton( _titlebar ); - connect( _showbutton, SIGNAL( toggled( bool ) ), this, SLOT( hide( bool ) ) ); + connect( _showbutton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( hide( bool ) ) ); _drag = new HandleDrag( _titlebar ); - connect( _drag, SIGNAL( clicked() ), _showbutton, SLOT( toggle() ) ); + connect( _drag, TQT_SIGNAL( clicked() ), _showbutton, TQT_SLOT( toggle() ) ); _ownbutton = new OwnButton( _titlebar ); - connect( _ownbutton, SIGNAL( toggled( bool ) ), this, SLOT( own( bool ) ) ); + connect( _ownbutton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( own( bool ) ) ); _artswidget = new OwnWidget( _showbutton, this ); - _layout = new QBoxLayout( this, QBoxLayout::LeftToRight ); + _layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); _layout->addWidget( _titlebar , -1 ); _layout->addWidget( _artswidget, 20 ); _layout->addStretch( 0 ); @@ -85,18 +85,18 @@ Arts::Direction KPopupBox_widget::direction() { } void KPopupBox_widget::direction( Arts::Direction n ) { - _layout->setDirection( QBoxLayout::Direction( n ) ); - _showbutton->direction( QBoxLayout::Direction( n ) ); + _layout->setDirection( TQBoxLayout::Direction( n ) ); + _showbutton->direction( TQBoxLayout::Direction( n ) ); switch( n ) { case LeftToRight: case RightToLeft: - _titlebarlayout->setDirection( QBoxLayout::BottomToTop ); + _titlebarlayout->setDirection( TQBoxLayout::BottomToTop ); _drag->setMinimumHeight( 30 ); _drag->setMinimumWidth( 0 ); break; case TopToBottom: case BottomToTop: - _titlebarlayout->setDirection( QBoxLayout::RightToLeft ); + _titlebarlayout->setDirection( TQBoxLayout::RightToLeft ); _drag->setMinimumHeight( 0 ); _drag->setMinimumWidth( 30 ); } @@ -117,7 +117,7 @@ void KPopupBox_widget::own( bool n ) { _artswidget->reparent( 0, _artswidget->mapToGlobal( _artswidget->pos() ), !( _artswidget->isHidden() ) ); else { - _artswidget->reparent( this, QPoint( 0,0 ), !( _artswidget->isHidden() ) ); + _artswidget->reparent( this, TQPoint( 0,0 ), !( _artswidget->isHidden() ) ); _layout->insertWidget( 1, _artswidget, 20 ); } } diff --git a/arts/gui/kde/kpopupbox_private.h b/arts/gui/kde/kpopupbox_private.h index 6b032912..a5072b05 100644 --- a/arts/gui/kde/kpopupbox_private.h +++ b/arts/gui/kde/kpopupbox_private.h @@ -30,13 +30,13 @@ class KArtsWidget; class OwnWidget; class QBoxLayout; -#include <qframe.h> +#include <tqframe.h> class KPopupBox_widget : public QFrame { Q_OBJECT public: - KPopupBox_widget( QWidget* =0, const char* =0); + KPopupBox_widget( TQWidget* =0, const char* =0); ~KPopupBox_widget(); Arts::Direction direction(); @@ -50,10 +50,10 @@ private slots: void hide( bool ); void own( bool ); private: - QBoxLayout *_layout; + TQBoxLayout *_layout; - QFrame *_titlebar; - QBoxLayout *_titlebarlayout; + TQFrame *_titlebar; + TQBoxLayout *_titlebarlayout; HandleDrag *_drag; ShowButton *_showbutton; OwnButton *_ownbutton; @@ -63,34 +63,34 @@ private: // See kpopupbox_impl.h - The eventmapper isn't needed at present, but perhaps in the future... -/*class KPopupBoxEventMapper : public QObject { +/*class KPopupBoxEventMapper : public TQObject { Q_OBJECT public: KPopupBoxEventMapper( KPopupBox_widget *widget, Arts::KPopupBox_impl *impl ) - : QObject( widget,"" ), _widget( widget ), _impl( impl ) + : TQObject( widget,"" ), _widget( widget ), _impl( impl ) {} private: KPopupBox_widget *_widget; Arts::KPopupBox_impl *_impl; };*/ -#include <qpainter.h> -#include <qstyle.h> +#include <tqpainter.h> +#include <tqstyle.h> -class HandleDrag : public QWidget { +class HandleDrag : public TQWidget { Q_OBJECT public: - HandleDrag( QWidget *parent, const char* name=0 ) : QWidget( parent,name ) {} - void paintEvent( QPaintEvent * ) { - QPainter p( this ); - QStyle::SFlags flags = QStyle::Style_Default; - if( width() < height() ) flags |= QStyle::Style_Horizontal; - style().drawPrimitive( QStyle::PE_DockWindowHandle, &p, rect(), colorGroup(), flags ); + HandleDrag( TQWidget *parent, const char* name=0 ) : TQWidget( parent,name ) {} + void paintEvent( TQPaintEvent * ) { + TQPainter p( this ); + TQStyle::SFlags flags = TQStyle::Style_Default; + if( width() < height() ) flags |= TQStyle::Style_Horizontal; + style().drawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), colorGroup(), flags ); } signals: void clicked(); protected: - virtual void mouseDoubleClickEvent( QMouseEvent * ) { + virtual void mouseDoubleClickEvent( TQMouseEvent * ) { emit clicked(); } }; @@ -103,76 +103,76 @@ static const char* const right_xpm[] = { "5 5 2 1", "# c black", ". c None", ". static const char* const inside_xpm[] = { "5 5 2 1", "# c black", ". c None", "#####", "#...#", "#...#", "#...#", "#####"}; static const char* const own_xpm[] = { "5 5 2 1", "# c black", ". c None", "###..", "#.###", "###.#", ".#..#", ".####"}; -#include <qpushbutton.h> -#include <qlayout.h> +#include <tqpushbutton.h> +#include <tqlayout.h> -class ShowButton : public QPushButton { +class ShowButton : public TQPushButton { Q_OBJECT private: - QBoxLayout::Direction _dir; - QPixmap _pmleft, _pmright, _pmup, _pmdown; + TQBoxLayout::Direction _dir; + TQPixmap _pmleft, _pmright, _pmup, _pmdown; public: - ShowButton( QWidget *parent, const char* name=0 ) : QPushButton( parent,name ), _dir( QBoxLayout::LeftToRight ) + ShowButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ), _dir( TQBoxLayout::LeftToRight ) { - connect( this, SIGNAL( toggled( bool ) ), this, SLOT( owntoggle( bool ) ) ); + connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( owntoggle( bool ) ) ); setToggleButton( true ); - _pmleft = QPixmap( const_cast<const char**>( left_xpm ) ); - _pmright = QPixmap( const_cast<const char**>( right_xpm ) ); - _pmup = QPixmap( const_cast<const char**>( up_xpm ) ); - _pmdown = QPixmap( const_cast<const char**>( down_xpm ) ); + _pmleft = TQPixmap( const_cast<const char**>( left_xpm ) ); + _pmright = TQPixmap( const_cast<const char**>( right_xpm ) ); + _pmup = TQPixmap( const_cast<const char**>( up_xpm ) ); + _pmdown = TQPixmap( const_cast<const char**>( down_xpm ) ); setPixmap( _pmright ); } - void direction( QBoxLayout::Direction n ) { _dir=n; } + void direction( TQBoxLayout::Direction n ) { _dir=n; } public slots: void owntoggle( bool b ) { switch( _dir ) { - case QBoxLayout::BottomToTop: + case TQBoxLayout::BottomToTop: if( b ) setPixmap( _pmdown ); else setPixmap( _pmup ); break; - case QBoxLayout::TopToBottom: + case TQBoxLayout::TopToBottom: if( b ) setPixmap( _pmup ); else setPixmap( _pmdown ); break; - case QBoxLayout::LeftToRight: + case TQBoxLayout::LeftToRight: if( b ) setPixmap( _pmright ); else setPixmap( _pmleft ); break; - case QBoxLayout::RightToLeft: + case TQBoxLayout::RightToLeft: if( b ) setPixmap( _pmleft ); else setPixmap( _pmright ); break; } } public: - QSize minimumSizeHint() const { - int wh = style().pixelMetric( QStyle::PM_DockWindowHandleExtent, this ); - return QSize( wh, wh ); + TQSize minimumSizeHint() const { + int wh = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + return TQSize( wh, wh ); } - QSizePolicy sizePolicy() const { return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ); } - QSize minimumSize() const { return minimumSizeHint(); } - QSize sizeHint() const { return minimumSize(); } + TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } + TQSize minimumSize() const { return minimumSizeHint(); } + TQSize sizeHint() const { return minimumSize(); } - void drawButton( QPainter * p ) + void drawButton( TQPainter * p ) { - p->fillRect( 0,0, width(), height(), QBrush( colorGroup().brush( QColorGroup::Background ) ) ); + p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); p->drawPixmap( ( width() - pixmap()->width() ) / 2, ( height() - pixmap()->height() ) / 2, *pixmap() ); } }; -class OwnButton : public QPushButton { +class OwnButton : public TQPushButton { Q_OBJECT private: - QPixmap _pmown, _pminside; + TQPixmap _pmown, _pminside; public: - OwnButton( QWidget *parent, const char* name=0 ) : QPushButton( parent,name ) + OwnButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ) { - connect( this, SIGNAL( toggled( bool ) ), this, SLOT( toggle( bool ) ) ); + connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggle( bool ) ) ); setToggleButton( true ); - _pmown = QPixmap( const_cast<const char**>( own_xpm ) ); - _pminside = QPixmap( const_cast<const char**>( inside_xpm ) ); + _pmown = TQPixmap( const_cast<const char**>( own_xpm ) ); + _pminside = TQPixmap( const_cast<const char**>( inside_xpm ) ); setPixmap( _pmown ); } @@ -182,17 +182,17 @@ public slots: else setPixmap( _pmown ); } public: - QSize minimumSizeHint() const { - int wh = style().pixelMetric( QStyle::PM_DockWindowHandleExtent, this ); - return QSize( wh, wh ); + TQSize minimumSizeHint() const { + int wh = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + return TQSize( wh, wh ); } - QSizePolicy sizePolicy() const { return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ); } - QSize minimumSize() const { return minimumSizeHint(); } - QSize sizeHint() const { return minimumSize(); } + TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } + TQSize minimumSize() const { return minimumSizeHint(); } + TQSize sizeHint() const { return minimumSize(); } - void drawButton( QPainter * p ) + void drawButton( TQPainter * p ) { - p->fillRect( 0,0, width(), height(), QBrush( colorGroup().brush( QColorGroup::Background ) ) ); + p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); p->drawPixmap( ( width() - pixmap()->width() ) / 2, ( height() - pixmap()->height() ) / 2, *pixmap() ); } }; @@ -204,10 +204,10 @@ class OwnWidget : public KArtsWidget Q_OBJECT ShowButton *_b; public: - OwnWidget( ShowButton* b, QWidget* p, const char* n=0, WFlags f=0 ) : KArtsWidget( p,n,f ) { _b = b; } + OwnWidget( ShowButton* b, TQWidget* p, const char* n=0, WFlags f=0 ) : KArtsWidget( p,n,f ) { _b = b; } ~OwnWidget() {} public slots: - void closeEvent( QCloseEvent * ) { _b->toggle(); } + void closeEvent( TQCloseEvent * ) { _b->toggle(); } }; #endif diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp index e12c1bf5..462d640b 100644 --- a/arts/gui/kde/kpoti.cpp +++ b/arts/gui/kde/kpoti.cpp @@ -20,15 +20,15 @@ #include "kpoti.h" #include "kpoti.moc" -#include <qbitmap.h> -#include <qpainter.h> -#include <qcolor.h> -#include <qdrawutil.h> -#include <qtimer.h> -#include <qkeycode.h> -#include <qpen.h> -#include <qstring.h> -#include <qstyle.h> +#include <tqbitmap.h> +#include <tqpainter.h> +#include <tqcolor.h> +#include <tqdrawutil.h> +#include <tqtimer.h> +#include <tqkeycode.h> +#include <tqpen.h> +#include <tqstring.h> +#include <tqstyle.h> #include <math.h> @@ -53,18 +53,18 @@ struct KPoti::KPotiPrivate bool bgDirty; KPixmap bgdb; - KPixmap bgPixmap( const QColorGroup & colorGroup ) + KPixmap bgPixmap( const TQColorGroup & colorGroup ) { if( bgDirty || bgdb.isNull() ) { bgdb.resize( buttonRect.size() ); - QPainter dbp( &bgdb ); + TQPainter dbp( &bgdb ); dbp.setPen( Qt::NoPen ); - QRect drawRect = bgdb.rect(); + TQRect drawRect = bgdb.rect(); // create mask - QBitmap mask( bgdb.size(), true ); - QPainter maskpainter( &mask ); + TQBitmap mask( bgdb.size(), true ); + TQPainter maskpainter( &mask ); maskpainter.setPen( Qt::NoPen ); maskpainter.setBrush( Qt::color1 ); maskpainter.drawEllipse( drawRect ); @@ -74,7 +74,7 @@ struct KPoti::KPotiPrivate // inset shadow KPixmap gradient( bgdb.size() ); KPixmapEffect::gradient( gradient, colorGroup.light(), colorGroup.dark(), KPixmapEffect::DiagonalGradient ); - dbp.setBrush( QBrush( colorGroup.button(), gradient ) ); + dbp.setBrush( TQBrush( colorGroup.button(), gradient ) ); dbp.drawEllipse( drawRect ); potiRect.setSize( drawRect.size() * 0.9 ); @@ -90,7 +90,7 @@ struct KPoti::KPotiPrivate return bgdb; } - QColor potiColor; + TQColor potiColor; bool potiDirty; KPixmap potidb; KPixmap potiPixmap() @@ -98,13 +98,13 @@ struct KPoti::KPotiPrivate if( ( potiDirty || potidb.isNull() ) && ! potiRect.size().isEmpty() ) { potidb.resize( potiRect.size() ); - QPainter dbp( &potidb ); + TQPainter dbp( &potidb ); dbp.setPen( Qt::NoPen ); - QRect drawRect( potidb.rect() ); + TQRect drawRect( potidb.rect() ); // create mask - QBitmap mask( potidb.size(), true ); - QPainter maskpainter( &mask ); + TQBitmap mask( potidb.size(), true ); + TQPainter maskpainter( &mask ); maskpainter.setPen( Qt::NoPen ); maskpainter.setBrush( Qt::color1 ); maskpainter.drawEllipse( drawRect ); @@ -113,7 +113,7 @@ struct KPoti::KPotiPrivate KPixmap gradient( potidb.size() ); KPixmapEffect::gradient( gradient, potiColor.dark( 130 ), potiColor.light( 130 ), KPixmapEffect::DiagonalGradient ); - dbp.setBrush( QBrush( potiColor, gradient ) ); + dbp.setBrush( TQBrush( potiColor, gradient ) ); dbp.drawEllipse( drawRect ); potiDirty = false; @@ -121,45 +121,45 @@ struct KPoti::KPotiPrivate return potidb; } - QRect buttonRect; - QRect potiRect; - QRect labelRect; - QString label; - QPoint center; + TQRect buttonRect; + TQRect potiRect; + TQRect labelRect; + TQString label; + TQPoint center; }; -QSizePolicy KPoti::sizePolicy() const +TQSizePolicy KPoti::sizePolicy() const { - return QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ); + return TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ); } -QSize KPoti::sizeHint() const +TQSize KPoti::sizeHint() const { return minimumSizeHint(); } -QSize KPoti::minimumSizeHint() const +TQSize KPoti::minimumSizeHint() const { int width = 40; int height = 40; if( m_bLabel ) { - QFontMetrics metrics( font() ); + TQFontMetrics metrics( font() ); d->labelRect = metrics.boundingRect( d->label ); d->labelRect.setHeight( metrics.lineSpacing() ); width = KMAX( width, d->labelRect.width() + frameRect().width() - contentsRect().width() ); height += metrics.lineSpacing(); } //kdDebug() << k_funcinfo << "return " << width << "x" << height << endl; - return QSize( width, height ); + return TQSize( width, height ); } -QString KPoti::text() const +TQString KPoti::text() const { return d->label; } -void KPoti::setText( const QString & text ) +void KPoti::setText( const TQString & text ) { d->label = text; setMinimumSize( minimumSizeHint() ); @@ -169,10 +169,10 @@ void KPoti::setText( const QString & text ) /** Constructs a poti. - The \e parent and \e name arguments are sent to the QWidget constructor. + The \e parent and \e name arguments are sent to the TQWidget constructor. */ -KPoti::KPoti( QWidget *parent, const char *name ) - : QFrame( parent, name, WResizeNoErase | WRepaintNoErase ) +KPoti::KPoti( TQWidget *parent, const char *name ) + : TQFrame( parent, name, WResizeNoErase | WRepaintNoErase ) , d( 0 ) { init(); @@ -188,13 +188,13 @@ KPoti::KPoti( QWidget *parent, const char *name ) \arg \e step is the page step value. \arg \e value is the initial value. - The \e parent and \e name arguments are sent to the QWidget constructor. + The \e parent and \e name arguments are sent to the TQWidget constructor. */ KPoti::KPoti( int minValue, int maxValue, int step, - int value, QWidget *parent, const char *name ) - : QFrame( parent, name, WResizeNoErase | WRepaintNoErase ) - , QRangeControl( minValue, maxValue, 1, step, value ) + int value, TQWidget *parent, const char *name ) + : TQFrame( parent, name, WResizeNoErase | WRepaintNoErase ) + , TQRangeControl( minValue, maxValue, 1, step, value ) , d( 0 ) { init(value); @@ -233,7 +233,7 @@ void KPoti::init(int value) void KPoti::initTicks() { - QRect available = contentsRect(); + TQRect available = contentsRect(); if( m_bLabel ) available.rTop() += d->labelRect.height(); d->center = available.center(); @@ -336,7 +336,7 @@ int KPoti::valueFromPosition( float p ) const } /*! - Implements the virtual QRangeControl function. + Implements the virtual TQRangeControl function. */ void KPoti::rangeChange() @@ -347,7 +347,7 @@ void KPoti::rangeChange() } } -void KPoti::paletteChange( const QPalette & ) +void KPoti::paletteChange( const TQPalette & ) { d->bgDirty = true; d->potiDirty = true; @@ -372,7 +372,7 @@ void KPoti::valueChange() Handles resize events for the poti. */ -void KPoti::resizeEvent( QResizeEvent * ) +void KPoti::resizeEvent( TQResizeEvent * ) { rangeChange(); initTicks(); @@ -387,7 +387,7 @@ void KPoti::setLabel(bool s) /** Sets the color of the button */ -void KPoti::setColor( const QColor &c ) +void KPoti::setColor( const TQColor &c ) { d->potiColor = c; d->potiDirty = true; @@ -395,7 +395,7 @@ void KPoti::setColor( const QColor &c ) } -void KPoti::paintPoti( QPainter * p ) +void KPoti::paintPoti( TQPainter * p ) { if( isVisible() ) { @@ -403,11 +403,11 @@ void KPoti::paintPoti( QPainter * p ) if( db.isNull() ) return; - QPainter p2( &db ); + TQPainter p2( &db ); p2.translate( db.rect().center().x(), db.rect().center().y() ); p2.rotate( potiPos * 180.0 / PI ); - QRect pointer( db.width() / -20, db.width() / -2, db.width() / 10, db.width() / 2 ); - QBrush buttonbrush( colorGroup().button() ); + TQRect pointer( db.width() / -20, db.width() / -2, db.width() / 10, db.width() / 2 ); + TQBrush buttonbrush( colorGroup().button() ); qDrawShadePanel( &p2, pointer, colorGroup(), true, 1, &buttonbrush ); p2.end(); @@ -421,7 +421,7 @@ void KPoti::paintPoti( QPainter * p ) void KPoti::reallyMovePoti( float newPos ) { - QPainter p; + TQPainter p; p.begin( this ); p.setPen(NoPen); potiPos = newPos; @@ -436,15 +436,15 @@ void KPoti::reallyMovePoti( float newPos ) Handles paint events for the slider. */ -void KPoti::drawContents( QPainter * p ) +void KPoti::drawContents( TQPainter * p ) { - QPixmap doublebuffer( contentsRect().size() ); + TQPixmap doublebuffer( contentsRect().size() ); doublebuffer.fill( colorGroup().background() ); - QPainter dbp( &doublebuffer ); + TQPainter dbp( &doublebuffer ); if( m_bLabel ) { dbp.setFont( font() ); - QFontMetrics metrics = dbp.fontMetrics(); + TQFontMetrics metrics = dbp.fontMetrics(); dbp.drawText( contentsRect().x() - metrics.leftBearing( d->label[ 0 ] ) + ( contentsRect().width() - d->labelRect.width() ) / 2, metrics.height(), d->label ); } @@ -457,7 +457,7 @@ void KPoti::drawContents( QPainter * p ) dbp.drawPixmap( d->buttonRect, d->bgPixmap( colorGroup() ) ); if( hasFocus() ) - style().drawPrimitive( QStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() ); + style().drawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() ); paintPoti( &dbp ); dbp.end(); @@ -469,7 +469,7 @@ void KPoti::drawContents( QPainter * p ) Handles mouse press events for the slider. */ -void KPoti::mousePressEvent( QMouseEvent *e ) +void KPoti::mousePressEvent( TQMouseEvent *e ) { resetState(); @@ -493,15 +493,15 @@ void KPoti::mousePressEvent( QMouseEvent *e ) state = TimingDown; subtractPage(); if ( !timer ) - timer = new QTimer( this ); - connect( timer, SIGNAL(timeout()), SLOT(repeatTimeout()) ); + timer = new TQTimer( this ); + connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(repeatTimeout()) ); timer->start( thresholdTime, TRUE ); } else { state = TimingUp; addPage(); if ( !timer ) - timer = new QTimer( this ); - connect( timer, SIGNAL(timeout()), SLOT(repeatTimeout()) ); + timer = new TQTimer( this ); + connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(repeatTimeout()) ); timer->start( thresholdTime, TRUE ); } } @@ -509,7 +509,7 @@ void KPoti::mousePressEvent( QMouseEvent *e ) /*! Handles mouse move events for the slider. */ -void KPoti::mouseMoveEvent( QMouseEvent *e ) +void KPoti::mouseMoveEvent( TQMouseEvent *e ) { if ( (e->state() & MidButton) ) { // middle button wins @@ -532,29 +532,29 @@ void KPoti::mouseMoveEvent( QMouseEvent *e ) Handles mouse release events for the slider. */ -void KPoti::mouseReleaseEvent( QMouseEvent *e ) +void KPoti::mouseReleaseEvent( TQMouseEvent *e ) { if ( !(e->button() & LeftButton) ) return; resetState(); } -void KPoti::focusInEvent( QFocusEvent * e ) +void KPoti::focusInEvent( TQFocusEvent * e ) { //setFrameStyle( Raised | Box ); //setLineWidth( 1 ); - QFrame::focusInEvent( e ); + TQFrame::focusInEvent( e ); } -void KPoti::focusOutEvent( QFocusEvent * e ) +void KPoti::focusOutEvent( TQFocusEvent * e ) { //setFrameStyle( NoFrame ); //setLineWidth( 0 ); - QFrame::focusOutEvent( e ); + TQFrame::focusOutEvent( e ); } -void KPoti::enterEvent( QEvent * ) +void KPoti::enterEvent( TQEvent * ) { emit mouseEntered( potiVal ); } @@ -616,7 +616,7 @@ void KPoti::resetState() Handles key press events for the slider. */ -void KPoti::keyPressEvent( QKeyEvent *e ) +void KPoti::keyPressEvent( TQKeyEvent *e ) { switch ( e->key() ) { @@ -656,12 +656,12 @@ void KPoti::keyPressEvent( QKeyEvent *e ) /*! - Makes QRangeControl::setValue() available as a slot. + Makes TQRangeControl::setValue() available as a slot. */ void KPoti::setValue( int value ) { - QRangeControl::setValue( value ); + TQRangeControl::setValue( value ); } @@ -694,9 +694,9 @@ void KPoti::repeatTimeout() Q_ASSERT( timer ); timer->disconnect(); if ( state == TimingDown ) - connect( timer, SIGNAL(timeout()), SLOT(subtractStep()) ); + connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(subtractStep()) ); else if ( state == TimingUp ) - connect( timer, SIGNAL(timeout()), SLOT(addStep()) ); + connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(addStep()) ); timer->start( repeatTime, FALSE ); } @@ -708,7 +708,7 @@ void KPoti::repeatTimeout() of the widget, using \a w pixels and \a i intervals. */ -void KPoti::drawTicks( QPainter *p, double dist, double w, int i ) const +void KPoti::drawTicks( TQPainter *p, double dist, double w, int i ) const { p->setPen( colorGroup().foreground() ); double angle,s,c; @@ -725,7 +725,7 @@ void KPoti::drawTicks( QPainter *p, double dist, double w, int i ) const } } -void KPoti::wheelEvent(QWheelEvent *e) +void KPoti::wheelEvent(TQWheelEvent *e) { setValue(value()+e->delta()/120*8); } @@ -760,7 +760,7 @@ void KPoti::setTickmarks( bool s ) not a pixel interval. If \a i is 0, the slider will choose between lineStep() and pageStep(). The initial value of tickInterval() is 0. - \sa tickInterval(), QRangeControl::lineStep(), QRangeControl::pageStep() + \sa tickInterval(), TQRangeControl::lineStep(), TQRangeControl::pageStep() */ void KPoti::setTickInterval( int i ) diff --git a/arts/gui/kde/kpoti.h b/arts/gui/kde/kpoti.h index a87b5162..278d6350 100644 --- a/arts/gui/kde/kpoti.h +++ b/arts/gui/kde/kpoti.h @@ -20,29 +20,29 @@ #ifndef _KPOTI_H #define _KPOTI_H -#include <qframe.h> -#include <qrangecontrol.h> +#include <tqframe.h> +#include <tqrangecontrol.h> class QTimer; struct QPotiData; -class KPoti : public QFrame, public QRangeControl +class KPoti : public TQFrame, public QRangeControl { Q_OBJECT public: - KPoti( QWidget *parent=0, const char *name=0 ); + KPoti( TQWidget *parent=0, const char *name=0 ); KPoti( int minValue, int maxValue, int step, int value, - QWidget *parent=0, const char *name=0 ); + TQWidget *parent=0, const char *name=0 ); ~KPoti(); void setTracking( bool enable ); bool tracking() const; - void setColor( const QColor & ); + void setColor( const TQColor & ); virtual void setTickmarks( bool ); virtual void setLabel( bool ); @@ -51,16 +51,16 @@ public: virtual void setTickInterval( int ); int tickInterval() const { return tickInt; } - virtual QSizePolicy sizePolicy() const; - virtual QSize sizeHint() const; - virtual QSize minimumSizeHint() const; - QString text() const; + virtual TQSizePolicy sizePolicy() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; + TQString text() const; public slots: void setValue( int ); void addStep(); void subtractStep(); - void setText( const QString & ); + void setText( const TQString & ); signals: void valueChanged( int value ); @@ -70,29 +70,29 @@ signals: void mouseEntered(int value); protected: - void resizeEvent( QResizeEvent * ); - void drawContents( QPainter * ); + void resizeEvent( TQResizeEvent * ); + void drawContents( TQPainter * ); - void keyPressEvent( QKeyEvent * ); + void keyPressEvent( TQKeyEvent * ); - void mousePressEvent( QMouseEvent * ); - void mouseReleaseEvent( QMouseEvent * ); - void mouseMoveEvent( QMouseEvent * ); - void enterEvent( QEvent *); + void mousePressEvent( TQMouseEvent * ); + void mouseReleaseEvent( TQMouseEvent * ); + void mouseMoveEvent( TQMouseEvent * ); + void enterEvent( TQEvent *); - void focusInEvent( QFocusEvent *e ); - void focusOutEvent( QFocusEvent *e ); + void focusInEvent( TQFocusEvent *e ); + void focusOutEvent( TQFocusEvent *e ); void valueChange(); void rangeChange(); - virtual void paletteChange( const QPalette & ); + virtual void paletteChange( const TQPalette & ); - virtual void paintPoti( QPainter * ); - void drawButton( QPainter *); - void drawTicks( QPainter *, double, double, int=1 ) const; + virtual void paintPoti( TQPainter * ); + void drawButton( TQPainter *); + void drawTicks( TQPainter *, double, double, int=1 ) const; - virtual void wheelEvent(QWheelEvent *e); + virtual void wheelEvent(TQWheelEvent *e); private slots: void repeatTimeout(); diff --git a/arts/gui/kde/kpoti_impl.cpp b/arts/gui/kde/kpoti_impl.cpp index ba904f7a..ffac2a20 100644 --- a/arts/gui/kde/kpoti_impl.cpp +++ b/arts/gui/kde/kpoti_impl.cpp @@ -32,10 +32,10 @@ using namespace Arts; using namespace std; PotiIntMapper::PotiIntMapper(KPoti_impl *impl, KPoti *kp) - : QObject( kp ) + : TQObject( kp ) , impl( impl ) { - connect(kp, SIGNAL(valueChanged(int)), this, SLOT(valueChanged(int))); + connect(kp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); } void PotiIntMapper::valueChanged(int pos) @@ -62,7 +62,7 @@ string KPoti_impl::caption() void KPoti_impl::caption(const string& newText) { - _caption = QString::fromUtf8( newText.c_str() ); + _caption = TQString::fromUtf8( newText.c_str() ); _kpoti->setText( _caption ); } @@ -76,7 +76,7 @@ void KPoti_impl::color(const string& newColor) _color = newColor; if(strlen(_color.c_str())) { - QColor qc(_color.c_str()); + TQColor qc(_color.c_str()); _kpoti->setColor(qc); } } diff --git a/arts/gui/kde/kpoti_impl.h b/arts/gui/kde/kpoti_impl.h index a87972c5..0502cdc8 100644 --- a/arts/gui/kde/kpoti_impl.h +++ b/arts/gui/kde/kpoti_impl.h @@ -26,15 +26,15 @@ #include "kframe_impl.h" #include "kpoti.h" -#include <qobject.h> -#include <qstring.h> +#include <tqobject.h> +#include <tqstring.h> namespace Arts { class KPoti_impl; -class PotiIntMapper :public QObject { +class PotiIntMapper :public TQObject { Q_OBJECT KPoti_impl *impl; public: @@ -48,7 +48,7 @@ class KPoti_impl : virtual public Arts::Poti_skel, { protected: KPoti * _kpoti; - QString _caption; + TQString _caption; std::string _color; float _min, _max, _value; float _factor; diff --git a/arts/gui/kde/kspinbox_impl.cpp b/arts/gui/kde/kspinbox_impl.cpp index cd8c90c5..db40ae10 100644 --- a/arts/gui/kde/kspinbox_impl.cpp +++ b/arts/gui/kde/kspinbox_impl.cpp @@ -29,10 +29,10 @@ using namespace Arts; using namespace std; -SpinBoxIntMapper::SpinBoxIntMapper(KSpinBox_impl *impl, QSpinBox *sp) +SpinBoxIntMapper::SpinBoxIntMapper(KSpinBox_impl *impl, TQSpinBox *sp) :impl(impl) { - connect(sp, SIGNAL(valueChanged(int)), this, SLOT(valueChanged(int))); + connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); } void SpinBoxIntMapper::valueChanged(int pos) @@ -40,11 +40,11 @@ void SpinBoxIntMapper::valueChanged(int pos) impl->valueChanged(pos); } -KSpinBox_impl::KSpinBox_impl( QSpinBox * widget ) - : KWidget_impl( widget ? widget : new QSpinBox ) +KSpinBox_impl::KSpinBox_impl( TQSpinBox * widget ) + : KWidget_impl( widget ? widget : new TQSpinBox ) { _min = 0; _max = 100; _value = 0; - _qspinbox = static_cast<QSpinBox*>( _qwidget ); + _qspinbox = static_cast<TQSpinBox*>( _qwidget ); _qspinbox->setRange( 0, 100 ); ( void )new SpinBoxIntMapper( this, _qspinbox ); } @@ -56,7 +56,7 @@ string KSpinBox_impl::caption() void KSpinBox_impl::caption(const string& newCaption) { - _caption = QString::fromUtf8(newCaption.c_str()); + _caption = TQString::fromUtf8(newCaption.c_str()); // FIXME: do something with the caption here } diff --git a/arts/gui/kde/kspinbox_impl.h b/arts/gui/kde/kspinbox_impl.h index ef662a10..d200c6f3 100644 --- a/arts/gui/kde/kspinbox_impl.h +++ b/arts/gui/kde/kspinbox_impl.h @@ -25,19 +25,19 @@ #define ARTS_GUI_KSPINBOX_IMPL_H #include "kwidget_impl.h" -#include <qspinbox.h> -#include <qobject.h> -#include <qstring.h> +#include <tqspinbox.h> +#include <tqobject.h> +#include <tqstring.h> namespace Arts { class KSpinBox_impl; -class SpinBoxIntMapper :public QObject { +class SpinBoxIntMapper :public TQObject { Q_OBJECT KSpinBox_impl *impl; public: - SpinBoxIntMapper(KSpinBox_impl *impl, QSpinBox *sp); + SpinBoxIntMapper(KSpinBox_impl *impl, TQSpinBox *sp); public slots: void valueChanged(int x); }; @@ -46,14 +46,14 @@ class KSpinBox_impl : virtual public Arts::SpinBox_skel, public Arts::KWidget_impl { protected: - QSpinBox * _qspinbox; - QString _caption; + TQSpinBox * _qspinbox; + TQString _caption; long _min, _max, _value; void applyValue(); public: - KSpinBox_impl( QSpinBox * w = 0 ); + KSpinBox_impl( TQSpinBox * w = 0 ); void constructor( Widget p ) { parent( p ); } std::string caption(); diff --git a/arts/gui/kde/ktickmarks_impl.cpp b/arts/gui/kde/ktickmarks_impl.cpp index 4db81ee0..1a95c2a6 100644 --- a/arts/gui/kde/ktickmarks_impl.cpp +++ b/arts/gui/kde/ktickmarks_impl.cpp @@ -21,13 +21,13 @@ #include "ktickmarks_impl.h" #include <kdebug.h> -#include <qpainter.h> -#include <qfont.h> -#include <qfontmetrics.h> +#include <tqpainter.h> +#include <tqfont.h> +#include <tqfontmetrics.h> -KTickmarks_impl::KTickmarks_impl( QFrame* w ) : Arts::KFrame_impl( w ? w : new KTickmarks_Widget( 0 ) ) +KTickmarks_impl::KTickmarks_impl( TQFrame* w ) : Arts::KFrame_impl( w ? w : new KTickmarks_Widget( 0 ) ) { - //kdDebug()<<"KTickmarks_impl::KTickmarks_impl( QFrame* w="<<w<<" )"<<endl; + //kdDebug()<<"KTickmarks_impl::KTickmarks_impl( TQFrame* w="<<w<<" )"<<endl; _tmwidget = static_cast<KTickmarks_Widget*>( _qwidget ); } @@ -50,22 +50,22 @@ void KTickmarks_impl::constructor( float min, float max, Arts::Direction dir, lo this->min( min ); this->max( max ); direction( dir ); position( pos ); } -KTickmarks_Widget::KTickmarks_Widget( KTickmarks_impl* impl, QWidget* p, const char* n ) : QFrame( p,n ), dB2VolCalc( -24, 0 ), _impl( impl ), _pos( Arts::posLeft ), _dir( Arts::BottomToTop ), minstep( 1 ), substep( 0.5 ) { +KTickmarks_Widget::KTickmarks_Widget( KTickmarks_impl* impl, TQWidget* p, const char* n ) : TQFrame( p,n ), dB2VolCalc( -24, 0 ), _impl( impl ), _pos( Arts::posLeft ), _dir( Arts::BottomToTop ), minstep( 1 ), substep( 0.5 ) { setMinimumSize( 20,20 ); } -void KTickmarks_Widget::drawContents( QPainter* p ) { - //kdDebug()<<"KTickmarks::drawContents( QPainter* "<<p<<" )"<<endl; +void KTickmarks_Widget::drawContents( TQPainter* p ) { + //kdDebug()<<"KTickmarks::drawContents( TQPainter* "<<p<<" )"<<endl; bool left=false, right=false; if ( _pos&Arts::posLeft ) left=true; if ( _pos&Arts::posRight ) right=true; // Setting the font - QFont font; + TQFont font; font.setPixelSize( 8 /*font.pixelSize()/2*/ ); // Maybe this could be adjusted... p->setFont( font ); // Determining the size of the largest text (currently the text at the minimum-scale) - QFontMetrics fontmetric( font ); - QRect fontrect = fontmetric.boundingRect( QString::number( dbmin ) ); + TQFontMetrics fontmetric( font ); + TQRect fontrect = fontmetric.boundingRect( TQString::number( dbmin ) ); // Calculating stepsizes float _minstepcount = ( dbmax-dbmin )/minstep; float _minstep = minstep; // this value gets changed @@ -75,8 +75,8 @@ void KTickmarks_Widget::drawContents( QPainter* p ) { int _minsize; // Shorcuts int w,h; - QColor colornormal = colorGroup().foreground(); - QColor colordiff = colorGroup().buttonText(); + TQColor colornormal = colorGroup().foreground(); + TQColor colordiff = colorGroup().buttonText(); if ( _dir == Arts::BottomToTop || _dir == Arts::TopToBottom ) { p->translate( contentsRect().left(), contentsRect().bottom() ); @@ -95,7 +95,7 @@ void KTickmarks_Widget::drawContents( QPainter* p ) { w = contentsRect().width(); // Just a shortcut h=0; // Painting substep marks - p->setPen( QPen( colordiff, 1 ) ); + p->setPen( TQPen( colordiff, 1 ) ); for ( float i=dbmax; i>=dbmin; i-=_substep ) { h = int( -contentsRect().height() * dbtondb( i ) ); if ( _dir==Arts::TopToBottom ) h = 1 - h; @@ -103,7 +103,7 @@ void KTickmarks_Widget::drawContents( QPainter* p ) { if ( right ) p->drawLine( w-3, h, w, h ); } // Painting step marks and texts - p->setPen( QPen( colornormal, 1 ) ); + p->setPen( TQPen( colornormal, 1 ) ); for ( float i=0; i>=dbmin; i-=_minstep ) { h = int( -contentsRect().height() * dbtondb( i ) ); if ( _dir==Arts::TopToBottom ) h = 1 - h; @@ -111,7 +111,7 @@ void KTickmarks_Widget::drawContents( QPainter* p ) { p->drawText( ( w - (left)*6 - (right)*6 - fontrect.width() )/2 + (left)*6 , h-fontrect.height()/2, fontrect.width(), fontrect.height()+2, - Qt::AlignRight|Qt::AlignTop, QString::number( i ) ); + Qt::AlignRight|Qt::AlignTop, TQString::number( i ) ); if ( right ) p->drawLine( w-6, h, w, h ); } for ( float i=_minstep; i<=dbmax; i+=_minstep ) { @@ -121,7 +121,7 @@ void KTickmarks_Widget::drawContents( QPainter* p ) { p->drawText( ( w - (left)*6 - (right)*6 - fontrect.width() )/2 + (left)*6 , h-fontrect.height()/2, fontrect.width(), fontrect.height()+2, - Qt::AlignRight|Qt::AlignTop, QString::number( i ) ); + Qt::AlignRight|Qt::AlignTop, TQString::number( i ) ); if ( right ) p->drawLine( w-6, h, w, h ); } } else { @@ -141,7 +141,7 @@ void KTickmarks_Widget::drawContents( QPainter* p ) { w = 0; // Just a shortcut h = frameWidth() + contentsRect().height(); // Painting substep marks - p->setPen( QPen( colordiff, 1 ) ); + p->setPen( TQPen( colordiff, 1 ) ); for ( float i=dbmax; i>=dbmin; i-=_substep ) { w = this->frameWidth()+ int( contentsRect().width() * dbtondb( i ) ); if ( _dir==Arts::RightToLeft ) w = 1 - w; @@ -149,7 +149,7 @@ void KTickmarks_Widget::drawContents( QPainter* p ) { if ( right ) p->drawLine( w, h-3, w, h ); } // Painting step marks and texts - p->setPen( QPen( colornormal, 1 ) ); + p->setPen( TQPen( colornormal, 1 ) ); for ( float i=0; i>=dbmin; i-=_minstep ) { w = int( contentsRect().width() * dbtondb( i ) ); if ( _dir==Arts::RightToLeft ) w = 1 - w; @@ -157,7 +157,7 @@ void KTickmarks_Widget::drawContents( QPainter* p ) { p->drawText( w - fontrect.width()/2 , ( h - (left)*6 - (right)*6 - fontrect.height() )/2 + (left)*6, fontrect.width(), fontrect.height()+2, - Qt::AlignRight|Qt::AlignTop, QString::number( i ) ); + Qt::AlignRight|Qt::AlignTop, TQString::number( i ) ); if ( right ) p->drawLine( w, h-6, w, h ); } for ( float i=_minstep; i<=dbmax; i+=_minstep ) { @@ -167,7 +167,7 @@ void KTickmarks_Widget::drawContents( QPainter* p ) { p->drawText( w - fontrect.width()/2 , ( h - (left)*6 - (right)*6 - fontrect.height() )/2 + (left)*6, fontrect.width(), fontrect.height()+2, - Qt::AlignRight|Qt::AlignTop, QString::number( i ) ); + Qt::AlignRight|Qt::AlignTop, TQString::number( i ) ); if ( right ) p->drawLine( w, h-6, w, h ); } } diff --git a/arts/gui/kde/ktickmarks_impl.h b/arts/gui/kde/ktickmarks_impl.h index b85e302a..1d0006a1 100644 --- a/arts/gui/kde/ktickmarks_impl.h +++ b/arts/gui/kde/ktickmarks_impl.h @@ -21,7 +21,7 @@ #ifndef ARTS_KLEVELMETER_TICKMARKS_H #define ARTS_KLEVELMETER_TICKMARKS_H -#include <qframe.h> +#include <tqframe.h> #include <math.h> #include "artsgui.h" @@ -36,7 +36,7 @@ class KTickmarks_impl : virtual public Arts::Tickmarks_skel, virtual public Arts::KFrame_impl { public: - KTickmarks_impl( QFrame* =0 ); + KTickmarks_impl( TQFrame* =0 ); float min(); void min( float ); @@ -59,13 +59,13 @@ private: KTickmarks_Widget* _tmwidget; }; -class KTickmarks_Widget : public QFrame, public dB2VolCalc { +class KTickmarks_Widget : public TQFrame, public dB2VolCalc { Q_OBJECT private: KTickmarks_impl* _impl; public: - KTickmarks_Widget( KTickmarks_impl*, QWidget* =0, const char* =0 ); - void drawContents( QPainter* ); + KTickmarks_Widget( KTickmarks_impl*, TQWidget* =0, const char* =0 ); + void drawContents( TQPainter* ); long _pos; Arts::Direction _dir; diff --git a/arts/gui/kde/kvbox_impl.cpp b/arts/gui/kde/kvbox_impl.cpp index 6d1b0606..b1dc6dd4 100644 --- a/arts/gui/kde/kvbox_impl.cpp +++ b/arts/gui/kde/kvbox_impl.cpp @@ -22,15 +22,15 @@ */ #include "kvbox_impl.h" -#include <qvbox.h> +#include <tqvbox.h> using namespace Arts; -KVBox_impl::KVBox_impl( QVBox * widget ) - : KFrame_impl( widget ? widget : new QVBox ) +KVBox_impl::KVBox_impl( TQVBox * widget ) + : KFrame_impl( widget ? widget : new TQVBox ) , _spacing( 5 ) { - _qvbox = static_cast<QVBox*>( _qwidget ); + _qvbox = static_cast<TQVBox*>( _qwidget ); _qvbox->setSpacing( _spacing ); _qvbox->setMargin( 5 ); } diff --git a/arts/gui/kde/kvbox_impl.h b/arts/gui/kde/kvbox_impl.h index e9480419..8f9c5b48 100644 --- a/arts/gui/kde/kvbox_impl.h +++ b/arts/gui/kde/kvbox_impl.h @@ -34,10 +34,10 @@ private: long _spacing; protected: - QVBox * _qvbox; + TQVBox * _qvbox; public: - KVBox_impl( QVBox * w = 0 ); + KVBox_impl( TQVBox * w = 0 ); long spacing(); void spacing( long ); diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp index 1b5cf7fe..1c32f23d 100644 --- a/arts/gui/kde/kvolumefader_impl.cpp +++ b/arts/gui/kde/kvolumefader_impl.cpp @@ -21,17 +21,17 @@ #include "kvolumefader_impl.h" #include <kdebug.h> -#include <qpainter.h> -#include <qstyle.h> -#include <qfont.h> -#include <qfontmetrics.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqfont.h> +#include <tqfontmetrics.h> #include <kglobalsettings.h> #include <klocale.h> #include <kpopupmenu.h> #include <kaction.h> #include <kinputdialog.h> -KVolumeFader_impl::KVolumeFader_impl( QFrame* w ) +KVolumeFader_impl::KVolumeFader_impl( TQFrame* w ) : Arts::KFrame_impl( w ? w : new KVolumeFader_Widget( 0 ) ) , dB2VolCalc( -36, 6 ) , _dir( Arts::BottomToTop ) @@ -40,7 +40,7 @@ KVolumeFader_impl::KVolumeFader_impl( QFrame* w ) , direction_inupdate( false ) , ignoreUpdates( 0 ) { - //kdDebug()<<"KVolumeFader_impl::KVolumeFader_impl( QFrame* w="<<w<<" )"<<endl; + //kdDebug()<<"KVolumeFader_impl::KVolumeFader_impl( TQFrame* w="<<w<<" )"<<endl; _vfwidget = static_cast<KVolumeFader_Widget*>( _qwidget ); _vfwidget->setImpl( this ); } @@ -114,14 +114,14 @@ void KVolumeFader_impl::constructor( float dbmin, float dbmax, Arts::Direction d -KVolumeFader_Widget::KVolumeFader_Widget( QWidget* p, const char* n ) - : QFrame( p,n ) +KVolumeFader_Widget::KVolumeFader_Widget( TQWidget* p, const char* n ) + : TQFrame( p,n ) , _impl( 0 ) , _inupdate( false ) , _value( -1 ) , _dir( Arts::BottomToTop ) , _menu( new KPopupMenu( this ) ) - , _aExactValue( new KAction( i18n( "Set Exact Value..." ), KShortcut(), this, SLOT( exactValue() ), this ) ) + , _aExactValue( new KAction( i18n( "Set Exact Value..." ), KShortcut(), this, TQT_SLOT( exactValue() ), this ) ) { //kdDebug() << k_funcinfo << endl; setMinimumSize( 10,10 ); @@ -144,16 +144,16 @@ void KVolumeFader_Widget::setValue( float n ) { } } -QColor KVolumeFader_Widget::interpolate( QColor low, QColor high, float percent ) { +TQColor KVolumeFader_Widget::interpolate( TQColor low, TQColor high, float percent ) { if ( percent<=0 ) return low; else if ( percent>=1 ) return high; else - return QColor( + return TQColor( int( low.red() + ( high.red()-low.red() ) * percent ), int( low.green() + ( high.green()-low.green() ) * percent ), int( low.blue() + ( high.blue()-low.blue() ) * percent ) ); } -void KVolumeFader_Widget::drawContents( QPainter* p ){ +void KVolumeFader_Widget::drawContents( TQPainter* p ){ if ( _dir==Arts::BottomToTop || _dir==Arts::BottomToTop ) { float h; if ( _dir==Arts::BottomToTop ) h = contentsRect().height() * ( 1 - _value ); @@ -178,11 +178,11 @@ void KVolumeFader_Widget::drawContents( QPainter* p ){ } } -void KVolumeFader_Widget::mousePressEvent( QMouseEvent* ){ +void KVolumeFader_Widget::mousePressEvent( TQMouseEvent* ){ //kdDebug() << k_funcinfo << endl; } -void KVolumeFader_Widget::mouseReleaseEvent( QMouseEvent* qme ){ +void KVolumeFader_Widget::mouseReleaseEvent( TQMouseEvent* qme ){ bool setValue = false; if ( KGlobalSettings::mouseSettings().handed == 0 && qme->button() == Qt::LeftButton ) setValue=true; if ( KGlobalSettings::mouseSettings().handed == 1 && qme->button() == Qt::RightButton ) setValue=true; @@ -206,7 +206,7 @@ void KVolumeFader_Widget::mouseReleaseEvent( QMouseEvent* qme ){ } else _menu->exec( qme->globalPos() ); } -void KVolumeFader_Widget::mouseMoveEvent( QMouseEvent* qme ){ +void KVolumeFader_Widget::mouseMoveEvent( TQMouseEvent* qme ){ switch ( _dir ) { default: case Arts::BottomToTop: @@ -224,7 +224,7 @@ void KVolumeFader_Widget::mouseMoveEvent( QMouseEvent* qme ){ } } -void KVolumeFader_Widget::wheelEvent( QWheelEvent* qwe ){ +void KVolumeFader_Widget::wheelEvent( TQWheelEvent* qwe ){ //kdDebug() << k_funcinfo << endl; if ( qwe->delta() < 0 ) { if ( _impl ) _impl->normalizedvolume( _impl->dbtondb( _impl->dbvolume() - 1 ) ); } if ( qwe->delta() > 0 ) { if ( _impl ) _impl->normalizedvolume( _impl->dbtondb( _impl->dbvolume() + 1 ) ); } diff --git a/arts/gui/kde/kvolumefader_impl.h b/arts/gui/kde/kvolumefader_impl.h index 603ac28e..c2db6a0b 100644 --- a/arts/gui/kde/kvolumefader_impl.h +++ b/arts/gui/kde/kvolumefader_impl.h @@ -21,7 +21,7 @@ #ifndef ARTS_KVOLUMEFADER_TICKMARKS_H #define ARTS_KVOLUMEFADER_TICKMARKS_H -#include <qframe.h> +#include <tqframe.h> #include <math.h> #include "artsgui.h" @@ -37,7 +37,7 @@ class KVolumeFader_impl : virtual public Arts::VolumeFader_skel, public dB2VolCalc { public: - KVolumeFader_impl( QFrame* =0 ); + KVolumeFader_impl( TQFrame* =0 ); ~KVolumeFader_impl(); float dbmin(); @@ -67,7 +67,7 @@ private: class KPopupMenu; class KAction; -class KVolumeFader_Widget : public QFrame { +class KVolumeFader_Widget : public TQFrame { Q_OBJECT private: KVolumeFader_impl* _impl; @@ -76,19 +76,19 @@ private: Arts::Direction _dir; KPopupMenu *_menu; KAction *_aExactValue; - QColor interpolate( QColor, QColor, float ); + TQColor interpolate( TQColor, TQColor, float ); public: - KVolumeFader_Widget( QWidget* =0, const char* =0 ); + KVolumeFader_Widget( TQWidget* =0, const char* =0 ); ~KVolumeFader_Widget(); void setImpl( KVolumeFader_impl* ); void setValue( float ); void setDirection( Arts::Direction ); protected: - void drawContents( QPainter* ); - void mousePressEvent( QMouseEvent* ); - void mouseReleaseEvent( QMouseEvent* ); - void mouseMoveEvent( QMouseEvent* ); - void wheelEvent( QWheelEvent* ); + void drawContents( TQPainter* ); + void mousePressEvent( TQMouseEvent* ); + void mouseReleaseEvent( TQMouseEvent* ); + void mouseMoveEvent( TQMouseEvent* ); + void wheelEvent( TQWheelEvent* ); private slots: void exactValue(); }; diff --git a/arts/gui/kde/kwidget_impl.cpp b/arts/gui/kde/kwidget_impl.cpp index f5c47055..ede8ad38 100644 --- a/arts/gui/kde/kwidget_impl.cpp +++ b/arts/gui/kde/kwidget_impl.cpp @@ -28,8 +28,8 @@ using namespace Arts; -KWidget_impl::KWidget_impl( QWidget * widget ) - : _qwidget( widget ? widget : new QWidget ) +KWidget_impl::KWidget_impl( TQWidget * widget ) + : _qwidget( widget ? widget : new TQWidget ) { _widgetID = KWidgetRepo::the()->add( this, _qwidget ); @@ -39,8 +39,8 @@ KWidget_impl::KWidget_impl( QWidget * widget ) * the panel got deleted, our widget will be gone, too) */ _guard = new KWidgetGuard(this); - QObject::connect(_qwidget, SIGNAL(destroyed()), - _guard, SLOT(widgetDestroyed())); + TQObject::connect(_qwidget, TQT_SIGNAL(destroyed()), + _guard, TQT_SLOT(widgetDestroyed())); } KWidget_impl::~KWidget_impl() @@ -76,11 +76,11 @@ void KWidget_impl::parent(Arts::Widget newParent) { _parentID = newParent.widgetID(); - QWidget *qparent; + TQWidget *qparent; qparent = KWidgetRepo::the()->lookupQWidget(newParent.widgetID()); if( qparent != 0 ) { - QPoint pos(x(),y()); + TQPoint pos(x(),y()); bool showIt = visible(); _qwidget->reparent(qparent, pos, showIt); } @@ -148,8 +148,8 @@ SizePolicy KWidget_impl::hSizePolicy() void KWidget_impl::hSizePolicy( SizePolicy p ) { - QSizePolicy sp = _qwidget->sizePolicy(); - sp.setHorData( ( QSizePolicy::SizeType )p ); + TQSizePolicy sp = _qwidget->sizePolicy(); + sp.setHorData( ( TQSizePolicy::SizeType )p ); _qwidget->setSizePolicy( sp ); } @@ -160,8 +160,8 @@ SizePolicy KWidget_impl::vSizePolicy() void KWidget_impl::vSizePolicy( SizePolicy p ) { - QSizePolicy sp = _qwidget->sizePolicy(); - sp.setVerData( ( QSizePolicy::SizeType )p ); + TQSizePolicy sp = _qwidget->sizePolicy(); + sp.setVerData( ( TQSizePolicy::SizeType )p ); _qwidget->setSizePolicy( sp ); } diff --git a/arts/gui/kde/kwidget_impl.h b/arts/gui/kde/kwidget_impl.h index 46f29092..292f8cc8 100644 --- a/arts/gui/kde/kwidget_impl.h +++ b/arts/gui/kde/kwidget_impl.h @@ -24,7 +24,7 @@ #ifndef ARTS_GUI_KWIDGET_IMPL_H #define ARTS_GUI_KWIDGET_IMPL_H #include "artsgui.h" -#include <qwidget.h> +#include <tqwidget.h> #include <kwidgetrepo.h> #include <kdelibs_export.h> @@ -33,12 +33,12 @@ namespace Arts { class KWidgetGuard; class KDE_EXPORT KWidget_impl : virtual public Arts::Widget_skel { protected: - QWidget * _qwidget; + TQWidget * _qwidget; KWidgetGuard * _guard; long _parentID; long _widgetID; public: - KWidget_impl( QWidget * w = 0 ); + KWidget_impl( TQWidget * w = 0 ); ~KWidget_impl(); @@ -68,7 +68,7 @@ public: void widgetDestroyed(); }; -class KWidgetGuard : public QObject { +class KWidgetGuard : public TQObject { Q_OBJECT protected: KWidget_impl *impl; diff --git a/arts/gui/kde/kwidgetrepo.cpp b/arts/gui/kde/kwidgetrepo.cpp index e0d93bd6..120f9cc5 100644 --- a/arts/gui/kde/kwidgetrepo.cpp +++ b/arts/gui/kde/kwidgetrepo.cpp @@ -63,7 +63,7 @@ KWidgetRepo::~KWidgetRepo() } -long KWidgetRepo::add(KWidget_impl *widget, QWidget *qwidget) +long KWidgetRepo::add(KWidget_impl *widget, TQWidget *qwidget) { long ID = nextID++; widgets[ID] = widget; @@ -71,7 +71,7 @@ long KWidgetRepo::add(KWidget_impl *widget, QWidget *qwidget) return ID; } -QWidget *KWidgetRepo::lookupQWidget(long ID) +TQWidget *KWidgetRepo::lookupQWidget(long ID) { return qwidgets[ID]; } diff --git a/arts/gui/kde/kwidgetrepo.h b/arts/gui/kde/kwidgetrepo.h index adab8090..1bcb5870 100644 --- a/arts/gui/kde/kwidgetrepo.h +++ b/arts/gui/kde/kwidgetrepo.h @@ -24,7 +24,7 @@ #define KWIDGETREPO_H #include <map> -#include <qwidget.h> +#include <tqwidget.h> #include <weakreference.h> #include "artsgui.h" @@ -35,7 +35,7 @@ namespace Arts { class KWidgetRepo { protected: long nextID; - std::map<long, QWidget *> qwidgets; + std::map<long, TQWidget *> qwidgets; std::map<long, Arts::KWidget_impl *> widgets; static KWidgetRepo *instance; @@ -44,9 +44,9 @@ protected: public: - long add(Arts::KWidget_impl *widget, QWidget *qwidget); + long add(Arts::KWidget_impl *widget, TQWidget *qwidget); Arts::Widget lookupWidget(long ID); - QWidget *lookupQWidget(long ID); + TQWidget *lookupQWidget(long ID); void remove(long ID); static KWidgetRepo *the(); diff --git a/arts/modules/common/env_mixeritem_impl.cc b/arts/modules/common/env_mixeritem_impl.cc index 632d8187..0f4db5e8 100644 --- a/arts/modules/common/env_mixeritem_impl.cc +++ b/arts/modules/common/env_mixeritem_impl.cc @@ -49,7 +49,7 @@ public: if(newName != _name) { _name = newName; - amClient.title(i18n("Mixer (\"%1\")").arg(QString::fromUtf8(_name.c_str())).utf8().data()); + amClient.title(i18n("Mixer (\"%1\")").arg(TQString::fromUtf8(_name.c_str())).utf8().data()); amClient.autoRestoreID("mixer_"+_name); for(unsigned int i = 0; i < _inputs.size(); i++) _inputs[i].busname(channelName(i)); diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp index 3dca494c..b4db259a 100644 --- a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp +++ b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp @@ -21,15 +21,15 @@ #include "kstereovolumecontrolgui_impl.h" -#include <qframe.h> +#include <tqframe.h> #include <kdebug.h> #include <iostream> using namespace Arts; -KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( QFrame* w ) : KLayoutBox_impl( w ? w : new QFrame( 0 ) ) +KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* w ) : KLayoutBox_impl( w ? w : new TQFrame( 0 ) ) { - //kdDebug()<<"KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( QFrame* "<<w<<" )"<<endl; + //kdDebug()<<"KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* "<<w<<" )"<<endl; _mapper = new KStereoVolumeControlGui_EventMapper( this, _qframe ); this->addWidget( _label, -100 ); _label.bottom( Arts::East ); diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.h b/arts/modules/effects/kstereovolumecontrolgui_impl.h index 1681b07c..8729232f 100644 --- a/arts/modules/effects/kstereovolumecontrolgui_impl.h +++ b/arts/modules/effects/kstereovolumecontrolgui_impl.h @@ -46,7 +46,7 @@ protected: float _dbmin, _dbmax; Arts::Direction _dir; public: - KStereoVolumeControlGui_impl( QFrame* =0 ); + KStereoVolumeControlGui_impl( TQFrame* =0 ); void constructor( Arts::StereoVolumeControl ); @@ -76,18 +76,18 @@ private: } // namespace Arts -#include <qobject.h> -#include <qtimer.h> +#include <tqobject.h> +#include <tqtimer.h> -class KStereoVolumeControlGui_EventMapper : public QObject { +class KStereoVolumeControlGui_EventMapper : public TQObject { Q_OBJECT public: - QTimer* _timer; + TQTimer* _timer; Arts::KStereoVolumeControlGui_impl* _impl; public: - KStereoVolumeControlGui_EventMapper( Arts::KStereoVolumeControlGui_impl* impl, QObject* parent, const char* name=0 ) : QObject( parent,name ), _impl( impl ) { - _timer = new QTimer( this ); - connect( _timer, SIGNAL( timeout() ), this, SLOT( slotTimerSignal() ) ); + KStereoVolumeControlGui_EventMapper( Arts::KStereoVolumeControlGui_impl* impl, TQObject* parent, const char* name=0 ) : TQObject( parent,name ), _impl( impl ) { + _timer = new TQTimer( this ); + connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimerSignal() ) ); } public slots: void slotTimerSignal() { _impl->updateValues(); } diff --git a/arts/modules/synth/c_filter_stuff.h b/arts/modules/synth/c_filter_stuff.h index 1729cf08..edd7a4af 100644 --- a/arts/modules/synth/c_filter_stuff.h +++ b/arts/modules/synth/c_filter_stuff.h @@ -150,12 +150,12 @@ typedef struct { int buflen; } ty_afmethod; -#define C_FLOWOUTMETHOD 0 -#define C_RBMETHOD 1 -#define C_SWAPROMETHOD 2 -#define C_SWAPRWMETHOD 3 -#define C_AIMROMETHOD 4 -#define C_AIMRWMETHOD 5 +#define C_FLOWOUQT_METHOD 0 +#define C_RBQT_METHOD 1 +#define C_SWAPROQT_METHOD 2 +#define C_SWAPRWQT_METHOD 3 +#define C_AIMROQT_METHOD 4 +#define C_AIMRWQT_METHOD 5 typedef struct { char *filename; diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp index 213c81bb..c483beb0 100644 --- a/arts/tools/artsactions.cpp +++ b/arts/tools/artsactions.cpp @@ -36,8 +36,8 @@ #include "environmentview.h" #include "mediatypesview.h" -ArtsActions::ArtsActions( KArtsServer* server, KActionCollection* col, QWidget* parent, const char* name ) - : QObject( parent,name ) +ArtsActions::ArtsActions( KArtsServer* server, KActionCollection* col, TQWidget* parent, const char* name ) + : TQObject( parent,name ) , _kartsserver( server ) , _actioncollection( col ) , _a_sv( 0 ), _a_am( 0 ), _a_asv( 0 ), _a_mmv( 0 ), _a_ev( 0 ), _a_mtv( 0 ) @@ -62,52 +62,52 @@ ArtsActions::~ArtsActions() { } KAction* ArtsActions::actionScopeView() { - if ( !_a_sv ) _a_sv = new KAction( i18n( "&FFT Scope" ), "artsfftscope", KShortcut(), this, SLOT( viewScopeView() ), _actioncollection, "artssupport_view_scopeview" ); + if ( !_a_sv ) _a_sv = new KAction( i18n( "&FFT Scope" ), "artsfftscope", KShortcut(), this, TQT_SLOT( viewScopeView() ), _actioncollection, "artssupport_view_scopeview" ); return _a_sv; } KAction* ArtsActions::actionAudioManager() { - if ( !_a_am ) _a_am = new KAction( i18n( "&Audio Manager" ), "artsaudiomanager", KShortcut(), this, SLOT( viewAudioManager() ), _actioncollection, "artssupport_view_audiomanager" ); + if ( !_a_am ) _a_am = new KAction( i18n( "&Audio Manager" ), "artsaudiomanager", KShortcut(), this, TQT_SLOT( viewAudioManager() ), _actioncollection, "artssupport_view_audiomanager" ); return _a_am; } KAction* ArtsActions::actionArtsStatusView() { - if ( !_a_asv ) _a_asv = new KAction( i18n( "aRts &Status" ), "artscontrol", KShortcut(), this, SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" ); + if ( !_a_asv ) _a_asv = new KAction( i18n( "aRts &Status" ), "artscontrol", KShortcut(), this, TQT_SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" ); return _a_asv; } KAction* ArtsActions::actionMidiManagerView() { - if ( !_a_mmv ) _a_mmv = new KAction( i18n( "&MIDI Manager" ), "artsmidimanager", KShortcut(), this, SLOT( viewMidiManagerView() ), _actioncollection, "artssupport_view_midimanager" ); + if ( !_a_mmv ) _a_mmv = new KAction( i18n( "&MIDI Manager" ), "artsmidimanager", KShortcut(), this, TQT_SLOT( viewMidiManagerView() ), _actioncollection, "artssupport_view_midimanager" ); return _a_mmv; } KAction* ArtsActions::actionEnvironmentView() { - if ( !_a_ev ) _a_ev = new KAction( i18n( "&Environment" ), "artsenvironment", KShortcut(), this, SLOT( viewEnvironmentView() ), _actioncollection, "artssupport_view_environment" ); + if ( !_a_ev ) _a_ev = new KAction( i18n( "&Environment" ), "artsenvironment", KShortcut(), this, TQT_SLOT( viewEnvironmentView() ), _actioncollection, "artssupport_view_environment" ); return _a_ev; } KAction* ArtsActions::actionMediaTypesView() { - if ( !_a_mtv ) _a_mtv = new KAction( i18n( "Available Media &Types" ), "artsmediatypes", KShortcut(), this, SLOT( viewMediaTypesView() ), _actioncollection, "artssupport_view_mediatypes" ); + if ( !_a_mtv ) _a_mtv = new KAction( i18n( "Available Media &Types" ), "artsmediatypes", KShortcut(), this, TQT_SLOT( viewMediaTypesView() ), _actioncollection, "artssupport_view_mediatypes" ); return _a_mtv; } KAction* ArtsActions::actionStyleNormal() { - if ( !_a_style_normal ) _a_style_normal = new KAction( i18n( "Style: NormalBars" ), "", KShortcut(), this, SLOT( _p_style_normal() ), _actioncollection, "artssupport_style_normal" ); + if ( !_a_style_normal ) _a_style_normal = new KAction( i18n( "Style: NormalBars" ), "", KShortcut(), this, TQT_SLOT( _p_style_normal() ), _actioncollection, "artssupport_style_normal" ); return _a_style_normal; } KAction* ArtsActions::actionStyleFire() { - if ( !_a_style_fire ) _a_style_fire = new KAction( i18n( "Style: FireBars" ), "", KShortcut(), this, SLOT( _p_style_fire() ), _actioncollection, "artssupport_style_fire" ); + if ( !_a_style_fire ) _a_style_fire = new KAction( i18n( "Style: FireBars" ), "", KShortcut(), this, TQT_SLOT( _p_style_fire() ), _actioncollection, "artssupport_style_fire" ); return _a_style_fire; } KAction* ArtsActions::actionStyleLine() { - if ( !_a_style_line ) _a_style_line = new KAction( i18n( "Style: LineBars" ), "", KShortcut(), this, SLOT( _p_style_line() ), _actioncollection, "artssupport_style_line" ); + if ( !_a_style_line ) _a_style_line = new KAction( i18n( "Style: LineBars" ), "", KShortcut(), this, TQT_SLOT( _p_style_line() ), _actioncollection, "artssupport_style_line" ); return _a_style_line; } KAction* ArtsActions::actionStyleLED() { - if ( !_a_style_led ) _a_style_led = new KAction( i18n( "Style: LEDs" ), "", KShortcut(), this, SLOT( _p_style_led() ), _actioncollection, "artssupport_style_led" ); + if ( !_a_style_led ) _a_style_led = new KAction( i18n( "Style: LEDs" ), "", KShortcut(), this, TQT_SLOT( _p_style_led() ), _actioncollection, "artssupport_style_led" ); return _a_style_led; } KAction* ArtsActions::actionStyleAnalog() { - if ( !_a_style_analog ) _a_style_analog = new KAction( i18n( "Style: Analog" ), "", KShortcut(), this, SLOT( _p_style_analog() ), _actioncollection, "artssupport_style_analog" ); + if ( !_a_style_analog ) _a_style_analog = new KAction( i18n( "Style: Analog" ), "", KShortcut(), this, TQT_SLOT( _p_style_analog() ), _actioncollection, "artssupport_style_analog" ); return _a_style_analog; } KAction* ArtsActions::actionStyleSmall() { - if ( !_a_style_small ) _a_style_small = new KAction( i18n( "Style: Small" ), "", KShortcut(), this, SLOT( _p_style_small() ), _actioncollection, "artssupport_style_small" ); + if ( !_a_style_small ) _a_style_small = new KAction( i18n( "Style: Small" ), "", KShortcut(), this, TQT_SLOT( _p_style_small() ), _actioncollection, "artssupport_style_small" ); return _a_style_small; } KPopupMenu* ArtsActions::stylemenu() { @@ -124,11 +124,11 @@ KPopupMenu* ArtsActions::stylemenu() { return _stylemenu; } -KAction* ArtsActions::actionMoreBars( const QObject* receiver, const char* slot, KActionCollection *actioncollection ) { +KAction* ArtsActions::actionMoreBars( const TQObject* receiver, const char* slot, KActionCollection *actioncollection ) { static KAction *_a_morebars = new KAction( i18n( "More Bars in VU-Meters" ), "up", KShortcut(), receiver, slot, actioncollection, "artssupport_morebars" ); return _a_morebars; } -KAction* ArtsActions::actionLessBars( const QObject* receiver, const char* slot, KActionCollection *actioncollection ) { +KAction* ArtsActions::actionLessBars( const TQObject* receiver, const char* slot, KActionCollection *actioncollection ) { static KAction *_a_lessbars = new KAction( i18n( "Less Bars in VU-Meters" ), "down", KShortcut(), receiver, slot, actioncollection, "artssupport_lessbars" ); return _a_lessbars; } @@ -136,7 +136,7 @@ KAction* ArtsActions::actionLessBars( const QObject* receiver, const char* slot, void ArtsActions::viewScopeView() { if ( !_sv ) { _sv = new FFTScopeView( _kartsserver->server() ); - connect( _sv, SIGNAL( closed() ), this, SLOT( viewScopeView() ) ); + connect( _sv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewScopeView() ) ); } else { delete _sv; _sv = 0; @@ -145,7 +145,7 @@ void ArtsActions::viewScopeView() { void ArtsActions::viewAudioManager() { if ( !_am ) { _am = new Gui_AUDIO_MANAGER(); - connect( _am, SIGNAL( closed() ), this, SLOT( viewAudioManager() ) ); + connect( _am, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewAudioManager() ) ); } else { delete _am; _am = 0; @@ -154,7 +154,7 @@ void ArtsActions::viewAudioManager() { void ArtsActions::viewArtsStatusView() { if ( !_asv ) { _asv = new ArtsStatusView( _kartsserver->server() ); - connect( _asv, SIGNAL( closed() ), this, SLOT( viewArtsStatusView() ) ); + connect( _asv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewArtsStatusView() ) ); } else { delete _asv; _asv = 0; @@ -163,7 +163,7 @@ void ArtsActions::viewArtsStatusView() { void ArtsActions::viewMidiManagerView() { if ( !_mmv ) { _mmv = new MidiManagerView(); - connect( _mmv, SIGNAL( closed() ), this, SLOT( viewMidiManagerView() ) ); + connect( _mmv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewMidiManagerView() ) ); } else { delete _mmv; _mmv = 0; @@ -172,7 +172,7 @@ void ArtsActions::viewMidiManagerView() { void ArtsActions::viewEnvironmentView() { if ( !_ev ) { _ev = new EnvironmentView( defaultEnvironment() ); - connect( _ev, SIGNAL( closed() ), this, SLOT( viewEnvironmentView() ) ); + connect( _ev, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewEnvironmentView() ) ); } else { delete _ev; _ev = 0; @@ -181,7 +181,7 @@ void ArtsActions::viewEnvironmentView() { void ArtsActions::viewMediaTypesView() { if ( !_mtv ) { _mtv = new MediaTypesView(); - connect( _mtv, SIGNAL( closed() ), this, SLOT( viewMediaTypesView() ) ); + connect( _mtv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewMediaTypesView() ) ); } else { delete _mtv; _mtv = 0; diff --git a/arts/tools/artsactions.h b/arts/tools/artsactions.h index 15a19f64..441d7373 100644 --- a/arts/tools/artsactions.h +++ b/arts/tools/artsactions.h @@ -21,7 +21,7 @@ #ifndef ARTS_ACTIONS_H #define ARTS_ACTIONS_H -#include <qwidget.h> +#include <tqwidget.h> #include <kdelibs_export.h> class KArtsServer; class KAction; @@ -50,7 +50,7 @@ public: @param qwidget the parent QWidget @param name the name of the object */ - ArtsActions( KArtsServer* artsserver, KActionCollection* actioncollection, QWidget* qwidget, const char* name=0 ); + ArtsActions( KArtsServer* artsserver, KActionCollection* actioncollection, TQWidget* qwidget, const char* name=0 ); /** Destructor */ ~ArtsActions(); @@ -75,8 +75,8 @@ public: KAction* actionStyleSmall(); KPopupMenu* stylemenu(); - static KAction* actionMoreBars( const QObject*, const char*, KActionCollection* ); - static KAction* actionLessBars( const QObject*, const char*, KActionCollection* ); + static KAction* actionMoreBars( const TQObject*, const char*, KActionCollection* ); + static KAction* actionLessBars( const TQObject*, const char*, KActionCollection* ); public slots: void viewScopeView(); diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp index a178c2d3..e4a7e16a 100644 --- a/arts/tools/artscontrolapplet.cpp +++ b/arts/tools/artscontrolapplet.cpp @@ -21,15 +21,15 @@ #include <kapplication.h> #include <kmessagebox.h> #include <kdebug.h> -#include <qcursor.h> -#include <qtimer.h> +#include <tqcursor.h> +#include <tqtimer.h> #include "artscontrolapplet.h" #include "artscontrolapplet_private.h" extern "C" { - KDE_EXPORT KPanelApplet* init( QWidget *parent, const QString configFile) + KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile) { KGlobal::locale()->insertCatalogue("artscontrol"); return new ArtsControlApplet(configFile, KPanelApplet::Normal, @@ -38,9 +38,9 @@ extern "C" } } -ArtsControlApplet::ArtsControlApplet(const QString& configFile, Type type, int actions, QWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name) +ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name) { - //kdDebug()<<"ArtsControlApplet::ArtsControlApplet( const QString& "<<configFile<<", Type "<<type<<", int "<<actions<<", QWidget* "<<parent<<", const char* "<<name<<" )"<<endl; + //kdDebug()<<"ArtsControlApplet::ArtsControlApplet( const TQString& "<<configFile<<", Type "<<type<<", int "<<actions<<", TQWidget* "<<parent<<", const char* "<<name<<" )"<<endl; // Get the current application configuration handle ksConfig = config(); @@ -48,7 +48,7 @@ ArtsControlApplet::ArtsControlApplet(const QString& configFile, Type type, int a if( !p->barts ) KMessageBox::information(0, i18n("Something with the ArtsServer went wrong. You probably need to restart aRts and then reload this applet.")); setCustomMenu(p->menu); - p->layout = new QBoxLayout( this, QBoxLayout::LeftToRight ); + p->layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); p->layout->setSpacing( 2 ); if( p->barts ) { @@ -61,7 +61,7 @@ ArtsControlApplet::ArtsControlApplet(const QString& configFile, Type type, int a p->layout->activate(); - QTimer::singleShot( 100, this, SLOT( supdatelayout() ) ); + TQTimer::singleShot( 100, this, TQT_SLOT( supdatelayout() ) ); kdDebug()<<"ArtsControlApplet::ArtsControlApplet() finished."<<endl; } @@ -101,14 +101,14 @@ kdDebug()<<"ArtsControlApplet::heightForWidth( int "<<w<<" )"<<endl; return p->layout->sizeHint().height(); } -void ArtsControlApplet::resizeEvent( QResizeEvent * /*_Event*/ ) { - kdDebug()<<"ArtsControlApplet::resizeEvent( QResizeEvent * )"<<endl; +void ArtsControlApplet::resizeEvent( TQResizeEvent * /*_Event*/ ) { + kdDebug()<<"ArtsControlApplet::resizeEvent( TQResizeEvent * )"<<endl; } -void ArtsControlApplet::mousePressEvent( QMouseEvent* ev ) { - //kdDebug()<<"ArtsControlApplet::mousePressEvent( QMouseEvent* "<<ev<<" )"<<endl; +void ArtsControlApplet::mousePressEvent( TQMouseEvent* ev ) { + //kdDebug()<<"ArtsControlApplet::mousePressEvent( TQMouseEvent* "<<ev<<" )"<<endl; if ( Qt::RightButton == ev->button() /*|| Qt::LeftButton == ev->button()*/ ) - p->menu->exec( QCursor::pos() ); + p->menu->exec( TQCursor::pos() ); } void ArtsControlApplet::positionChange( Position ) { @@ -122,12 +122,12 @@ kdDebug()<<k_funcinfo<<" position()="<<position()<<endl; { case pTop: case pBottom: - p->layout->setDirection( QBoxLayout::LeftToRight ); + p->layout->setDirection( TQBoxLayout::LeftToRight ); if ( p->barts ) p->vu.direction( Arts::LeftToRight ); break; case pRight: case pLeft: - p->layout->setDirection( QBoxLayout::TopToBottom ); + p->layout->setDirection( TQBoxLayout::TopToBottom ); if ( p->barts ) p->vu.direction( Arts::TopToBottom ); break; default: break; @@ -138,8 +138,8 @@ void ArtsControlAppletPrivate::SVinline() { kdDebug() << k_funcinfo << endl; if ( !svinline ) { svinline = new FFTScopeView( arts->server(), _parent ); - svinline->setMargin( 2 ); svinline->setLineWidth( 2 ); svinline->setFrameStyle( QFrame::Panel|QFrame::Sunken ); - connect( svinline, SIGNAL( closed() ), this, SLOT( SVinline() ) ); + svinline->setMargin( 2 ); svinline->setLineWidth( 2 ); svinline->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); + connect( svinline, TQT_SIGNAL( closed() ), this, TQT_SLOT( SVinline() ) ); layout->addWidget( svinline ); } else { delete svinline; diff --git a/arts/tools/artscontrolapplet.h b/arts/tools/artscontrolapplet.h index 09ff15fe..9efe5eb5 100644 --- a/arts/tools/artscontrolapplet.h +++ b/arts/tools/artscontrolapplet.h @@ -23,7 +23,7 @@ #endif #include <kpanelapplet.h> -#include <qstring.h> +#include <tqstring.h> #include <kconfig.h> class ArtsControlAppletPrivate; @@ -41,8 +41,8 @@ public: * @param parent The pointer to the parent widget handed over in the factory function. * @param name A Qt object name for your applet. **/ - ArtsControlApplet(const QString& configFile, Type t = Normal, int = 0, - QWidget * = 0, const char * = 0); + ArtsControlApplet(const TQString& configFile, Type t = Normal, int = 0, + TQWidget * = 0, const char * = 0); /** destructor */ ~ArtsControlApplet(); /** @@ -112,9 +112,9 @@ public: protected: - void resizeEvent( QResizeEvent* ); + void resizeEvent( TQResizeEvent* ); - virtual void mousePressEvent( QMouseEvent* ); + virtual void mousePressEvent( TQMouseEvent* ); void positionChange( Position ); diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h index 044a156b..2b681b92 100644 --- a/arts/tools/artscontrolapplet_private.h +++ b/arts/tools/artscontrolapplet_private.h @@ -20,15 +20,15 @@ #include "artscontrolapplet.h" -#include <qobject.h> +#include <tqobject.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qslider.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqslider.h> +#include <tqpushbutton.h> #include <kpopupmenu.h> #include <kaction.h> -#include <qfont.h> +#include <tqfont.h> #include <kartsserver.h> #include <kartsdispatcher.h> @@ -45,13 +45,13 @@ class VolumeSlider; -class KDE_EXPORT ArtsControlAppletPrivate : public QObject { +class KDE_EXPORT ArtsControlAppletPrivate : public TQObject { Q_OBJECT private: ArtsControlApplet *_parent; ArtsActions* _artsactions; public: - QBoxLayout *layout; + TQBoxLayout *layout; KArtsServer *arts; KArtsDispatcher *dispatcher; Arts::StereoVolumeControl volume; @@ -66,7 +66,7 @@ public: KAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall; ArtsControlAppletPrivate( ArtsControlApplet *parent ) - : QObject(parent) + : TQObject(parent) , _parent( parent ) , barts( false ) , bInUpdate( false ) @@ -82,7 +82,7 @@ public: menu = new KPopupMenu( 0 ); _showSV = _artsactions->actionScopeView(); _showSV->plug( menu ); - _showSVinline = new KAction( i18n( "Toggle &Inline FFT Scope" ), "artscontrol", KShortcut(), this, SLOT( SVinline() ), this ); + _showSVinline = new KAction( i18n( "Toggle &Inline FFT Scope" ), "artscontrol", KShortcut(), this, TQT_SLOT( SVinline() ), this ); _showSVinline->plug( menu ); _showAM = _artsactions->actionAudioManager(); _showAM->plug( menu ); @@ -96,12 +96,12 @@ public: _showMediaTypes->plug( menu ); menu->insertSeparator(); menu->insertItem( i18n( "VU-Style" ), _artsactions->stylemenu() ); - connect( _artsactions, SIGNAL( styleNormal() ), this, SLOT( styleNormalBars() ) ); - connect( _artsactions, SIGNAL( styleFire() ), this, SLOT( styleFireBars() ) ); - connect( _artsactions, SIGNAL( styleLine() ), this, SLOT( styleLineBars() ) ); - connect( _artsactions, SIGNAL( styleLED() ), this, SLOT( styleLEDs() ) ); - connect( _artsactions, SIGNAL( styleAnalog() ), this, SLOT( styleAnalog() ) ); - connect( _artsactions, SIGNAL( styleSmall() ), this, SLOT( styleSmall() ) ); + connect( _artsactions, TQT_SIGNAL( styleNormal() ), this, TQT_SLOT( styleNormalBars() ) ); + connect( _artsactions, TQT_SIGNAL( styleFire() ), this, TQT_SLOT( styleFireBars() ) ); + connect( _artsactions, TQT_SIGNAL( styleLine() ), this, TQT_SLOT( styleLineBars() ) ); + connect( _artsactions, TQT_SIGNAL( styleLED() ), this, TQT_SLOT( styleLEDs() ) ); + connect( _artsactions, TQT_SIGNAL( styleAnalog() ), this, TQT_SLOT( styleAnalog() ) ); + connect( _artsactions, TQT_SIGNAL( styleSmall() ), this, TQT_SLOT( styleSmall() ) ); } ~ArtsControlAppletPrivate() { if ( svinline ) SVinline(); diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp index 1216e192..3e3789ae 100644 --- a/arts/tools/audiomanager.cpp +++ b/arts/tools/audiomanager.cpp @@ -24,8 +24,8 @@ #include "audiomanager.h" #include "choosebusdlg.h" -#include <qtimer.h> -#include <qlayout.h> +#include <tqtimer.h> +#include <tqlayout.h> #include <klocale.h> #include <klistview.h> @@ -37,7 +37,7 @@ using namespace std; * as this is an 1:1 port of an old arts-0.3.4.1 artsbuilable visual widget, * you'll see some porting artefacts, and it's not elegance itself ;) */ -Gui_AUDIO_MANAGER::Gui_AUDIO_MANAGER( QWidget* parent, const char* name ) : Template_ArtsView( parent,name ) +Gui_AUDIO_MANAGER::Gui_AUDIO_MANAGER( TQWidget* parent, const char* name ) : Template_ArtsView( parent,name ) { this->setCaption( i18n( "Audio Manager" ) ); this->setIcon( MainBarIcon( "artsaudiomanager", 32 ) ); @@ -53,9 +53,9 @@ Gui_AUDIO_MANAGER::Gui_AUDIO_MANAGER( QWidget* parent, const char* name ) : Temp tick(); show(); - QTimer *updatetimer = new QTimer(this); + TQTimer *updatetimer = new TQTimer(this); updatetimer->start(500); - QObject::connect(updatetimer,SIGNAL(timeout()),this,SLOT(tick())); + TQObject::connect(updatetimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(tick())); } Gui_AUDIO_MANAGER::~Gui_AUDIO_MANAGER() @@ -65,14 +65,14 @@ Gui_AUDIO_MANAGER::~Gui_AUDIO_MANAGER() } #if 0 -void Gui_AUDIO_MANAGER::widgetDestroyed(QWidget *widget) +void Gui_AUDIO_MANAGER::widgetDestroyed(TQWidget *widget) { assert(widget == listview); listview = 0; } #endif -void Gui_AUDIO_MANAGER::setParent(QWidget *parent, QBoxLayout * /*layout*/) +void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/) { /************************************************************************ * From Gui_INSTRUMENT_MAPPER: @@ -90,8 +90,8 @@ void Gui_AUDIO_MANAGER::setParent(QWidget *parent, QBoxLayout * /*layout*/) * else would be appropriate. Check that. FIXME ************************************************************************/ - QVBoxLayout *mainlayout = new QVBoxLayout(parent); - /*QHBoxLayout *contentslayout = new QHBoxLayout;*/ + TQVBoxLayout *mainlayout = new TQVBoxLayout(parent); + /*TQHBoxLayout *contentslayout = new QHBoxLayout;*/ // list @@ -103,8 +103,8 @@ void Gui_AUDIO_MANAGER::setParent(QWidget *parent, QBoxLayout * /*layout*/) listview->setMinimumSize(300,100); - QObject::connect(listview,SIGNAL(executed(QListViewItem *)),proxy, - SLOT(edit(QListViewItem *))); + TQObject::connect(listview,TQT_SIGNAL(executed(TQListViewItem *)),proxy, + TQT_SLOT(edit(TQListViewItem *))); mainlayout->addWidget(listview); @@ -128,13 +128,13 @@ void Gui_AUDIO_MANAGER::tick() for(c=0;c<acs->size();c++) { //char status[2][10] = {"init","running"}; - QString description = QString::fromUtf8( (*acs)[c].title.c_str() ); - QString type; + TQString description = TQString::fromUtf8( (*acs)[c].title.c_str() ); + TQString type; if((*acs)[c].direction == Arts::amPlay) type = i18n("play"); else type = i18n("record"); - QString destination = QString::fromUtf8( (*acs)[c].destination.c_str() ); + TQString destination = TQString::fromUtf8( (*acs)[c].destination.c_str() ); long ID = (*acs)[c].ID; (void)new AudioManagerItem(listview, description, type, destination, ID); @@ -143,7 +143,7 @@ void Gui_AUDIO_MANAGER::tick() //Widget->show(); } -void Gui_AUDIO_MANAGER::edit(QListViewItem *item) +void Gui_AUDIO_MANAGER::edit(TQListViewItem *item) { AudioManagerItem *ai = (AudioManagerItem *)item; ChooseBusDlg *cd = new ChooseBusDlg(0); @@ -153,9 +153,9 @@ void Gui_AUDIO_MANAGER::edit(QListViewItem *item) int accept = cd->exec(); inDialog = false; - if( accept == QDialog::Accepted ) + if( accept == TQDialog::Accepted ) { - QString result = cd->result(); + TQString result = cd->result(); if(!result.isNull()) { //lukas: I hope UTF-8 is OK here... @@ -173,13 +173,13 @@ GuiAudioManagerProxy::GuiAudioManagerProxy(Gui_AUDIO_MANAGER *gim) this->gim = gim; } -void GuiAudioManagerProxy::edit(QListViewItem *item) +void GuiAudioManagerProxy::edit(TQListViewItem *item) { gim->edit(item); } -AudioManagerItem::AudioManagerItem(QListView *parent, QString a, - QString b, QString c, long ID) :QListViewItem(parent,a,b,c) +AudioManagerItem::AudioManagerItem(TQListView *parent, TQString a, + TQString b, TQString c, long ID) :TQListViewItem(parent,a,b,c) { _ID = ID; } diff --git a/arts/tools/audiomanager.h b/arts/tools/audiomanager.h index c8e00e4e..8b08184f 100644 --- a/arts/tools/audiomanager.h +++ b/arts/tools/audiomanager.h @@ -25,8 +25,8 @@ #define _AUDIOMANAGER_H_ #include <artsflow.h> -#include <qwidget.h> -#include <qlistview.h> +#include <tqwidget.h> +#include <tqlistview.h> #include "templateview.h" @@ -38,7 +38,7 @@ class Gui_AUDIO_MANAGER : public Template_ArtsView { Q_OBJECT protected: - QWidget *ParentWidget; + TQWidget *ParentWidget; KListView *listview; GuiAudioManagerProxy *proxy; Arts::AudioManager AudioManager; @@ -47,30 +47,30 @@ protected: unsigned long changes; int x,y; public: - Gui_AUDIO_MANAGER( QWidget* =0, const char* =0 ); + Gui_AUDIO_MANAGER( TQWidget* =0, const char* =0 ); ~Gui_AUDIO_MANAGER(); - void setParent(QWidget *Parent,QBoxLayout *layout); + void setParent(TQWidget *Parent,TQBoxLayout *layout); - void edit(QListViewItem *item); + void edit(TQListViewItem *item); public slots: void tick(); }; -class GuiAudioManagerProxy :public QObject { +class GuiAudioManagerProxy :public TQObject { Q_OBJECT Gui_AUDIO_MANAGER *gim; public: GuiAudioManagerProxy(Gui_AUDIO_MANAGER *gim); public slots: - void edit(QListViewItem *item); + void edit(TQListViewItem *item); }; -class AudioManagerItem : public QListViewItem { +class AudioManagerItem : public TQListViewItem { long _ID; public: - AudioManagerItem(QListView *parent, QString a, QString b, - QString c, long ID); + AudioManagerItem(TQListView *parent, TQString a, TQString b, + TQString c, long ID); ~AudioManagerItem(); long ID(); diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp index ad6adeb8..cb005f4c 100644 --- a/arts/tools/choosebusdlg.cpp +++ b/arts/tools/choosebusdlg.cpp @@ -23,10 +23,10 @@ #include <artsflow.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qlistbox.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqlistbox.h> +#include <tqpushbutton.h> #include <kbuttonbox.h> #include <kseparator.h> @@ -38,26 +38,26 @@ using namespace std; -static void min_size(QWidget *w) { +static void min_size(TQWidget *w) { w->setMinimumSize(w->sizeHint()); } -ChooseBusDlg::ChooseBusDlg(QWidget *parent) +ChooseBusDlg::ChooseBusDlg(TQWidget *parent) : KDialog(parent,"X", TRUE) , _newbusitemindex( -1 ) { setCaption(i18n("Choose Bus")); - QVBoxLayout *mainlayout = new QVBoxLayout(this); + TQVBoxLayout *mainlayout = new TQVBoxLayout(this); // caption label: "Synthesis running..." mainlayout->addSpacing(5); - QLabel *captionlabel = new QLabel(this); - QFont labelfont(captionlabel->font()); + TQLabel *captionlabel = new TQLabel(this); + TQFont labelfont(captionlabel->font()); labelfont.setPointSize(labelfont.pointSize()*3/2); captionlabel->setFont(labelfont); - captionlabel->setText(QString(" ")+i18n("Available busses:")+QString(" ")); + captionlabel->setText(TQString(" ")+i18n("Available busses:")+TQString(" ")); captionlabel->setAlignment(AlignCenter); min_size(captionlabel); mainlayout->addWidget(captionlabel); @@ -73,7 +73,7 @@ ChooseBusDlg::ChooseBusDlg(QWidget *parent) // listwidget - listbox = new QListBox(this); + listbox = new TQListBox(this); listbox->setMinimumSize(300,200); Arts::AudioManager aman = Arts::Reference("global:Arts_AudioManager"); @@ -100,12 +100,12 @@ ChooseBusDlg::ChooseBusDlg(QWidget *parent) // new bus lineedit - QBoxLayout * layout2 = new QHBoxLayout( mainlayout ); + TQBoxLayout * layout2 = new TQHBoxLayout( mainlayout ); //mainlayout->addLayout( layout2 ); - QLabel * newbuslabel = new QLabel( i18n( "New bus:" ), this ); + TQLabel * newbuslabel = new TQLabel( i18n( "New bus:" ), this ); layout2->addWidget( newbuslabel ); lineedit = new KLineEdit( this ); - connect( lineedit, SIGNAL( textChanged( const QString & ) ), SLOT( textChanged( const QString & ) ) ); + connect( lineedit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( textChanged( const TQString & ) ) ); layout2->addWidget( lineedit ); // hruler @@ -119,22 +119,22 @@ ChooseBusDlg::ChooseBusDlg(QWidget *parent) // buttons mainlayout->addSpacing(5); - QHBoxLayout *buttonlayout = new QHBoxLayout( mainlayout ); + TQHBoxLayout *buttonlayout = new TQHBoxLayout( mainlayout ); //mainlayout->addLayout(buttonlayout); mainlayout->addSpacing(5); buttonlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - bbox->addButton(KStdGuiItem::help(), this, SLOT( help() )); + bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() )); bbox->addStretch(1); - QPushButton * okbutton = bbox->addButton(KStdGuiItem::ok()); + TQPushButton * okbutton = bbox->addButton(KStdGuiItem::ok()); okbutton->setDefault( true ); - connect( okbutton, SIGNAL( clicked() ), SLOT(accept() ) ); + connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) ); - QButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel()); - connect( cancelbutton, SIGNAL( clicked() ), SLOT(reject() ) ); + TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel()); + connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) ); bbox->layout(); @@ -144,7 +144,7 @@ ChooseBusDlg::ChooseBusDlg(QWidget *parent) mainlayout->freeze(); } -QString ChooseBusDlg::result() +TQString ChooseBusDlg::result() { if(listbox->currentItem() != -1) { @@ -158,7 +158,7 @@ void ChooseBusDlg::help() KApplication::kApplication()->invokeHelp("", "artsbuilder"); } -void ChooseBusDlg::textChanged( const QString & busname ) +void ChooseBusDlg::textChanged( const TQString & busname ) { if( ! busname.isEmpty() ) { diff --git a/arts/tools/choosebusdlg.h b/arts/tools/choosebusdlg.h index 320df6e3..252226bd 100644 --- a/arts/tools/choosebusdlg.h +++ b/arts/tools/choosebusdlg.h @@ -30,19 +30,19 @@ class QPushButton; class ChooseBusDlg :public KDialog { Q_OBJECT - QListBox *listbox; + TQListBox *listbox; KLineEdit * lineedit; int _newbusitemindex; public: - ChooseBusDlg(QWidget *parent); + ChooseBusDlg(TQWidget *parent); public slots: - QString result(); + TQString result(); void help(); protected slots: - void textChanged( const QString & ); + void textChanged( const TQString & ); }; #endif diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp index 0b8a7457..9cedfed1 100644 --- a/arts/tools/environmentview.cpp +++ b/arts/tools/environmentview.cpp @@ -22,9 +22,9 @@ */ #include "environmentview.h" -#include <qdir.h> -#include <qfile.h> -#include <qpushbutton.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqpushbutton.h> #include <klistbox.h> #include <kartswidget.h> @@ -34,7 +34,7 @@ #include <fstream> #include <vector> -#include <qlayout.h> +#include <tqlayout.h> #define DEFAULT_ENV_FILENAME "~/default.arts-env" @@ -42,12 +42,12 @@ using namespace Arts; using Environment::Container; using Environment::Item; -class ItemView : public QListBoxText { +class ItemView : public TQListBoxText { public: Item item; KArtsWidget *widget; - ItemView(QListBox *listBox, Item item) - : QListBoxText(listBox), item(item), widget(0) + ItemView(TQListBox *listBox, Item item) + : TQListBoxText(listBox), item(item), widget(0) { } ~ItemView() @@ -56,44 +56,44 @@ public: widget = 0; printf("~ItemView()\n"); } - QString text() const { - return QString::fromLatin1(item._interfaceName().c_str()); + TQString text() const { + return TQString::fromLatin1(item._interfaceName().c_str()); } }; -EnvironmentView::EnvironmentView( Container container, QWidget* parent, const char* name ) : Template_ArtsView( parent,name ), container(container) +EnvironmentView::EnvironmentView( Container container, TQWidget* parent, const char* name ) : Template_ArtsView( parent,name ), container(container) { this->setCaption( i18n( "Environment" ) ); this->setIcon( MainBarIcon( "artsenvironment", 32 ) ); - QVBoxLayout* _layout = new QVBoxLayout( this ); + TQVBoxLayout* _layout = new TQVBoxLayout( this ); _layout->setAutoAdd( true ); defaultEnvFileName = DEFAULT_ENV_FILENAME; - defaultEnvFileName.replace('~', QDir::homeDirPath()); + defaultEnvFileName.replace('~', TQDir::homeDirPath()); listBox = new KListBox(this); update(); - connect(listBox,SIGNAL(executed(QListBoxItem*)), - this,SLOT(view(QListBoxItem*))); + connect(listBox,TQT_SIGNAL(executed(TQListBoxItem*)), + this,TQT_SLOT(view(TQListBoxItem*))); - QPushButton *mixerButton = new QPushButton(i18n("Add Mixer"), this); - connect(mixerButton, SIGNAL(clicked()), this, SLOT(addMixer())); + TQPushButton *mixerButton = new TQPushButton(i18n("Add Mixer"), this); + connect(mixerButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addMixer())); - QPushButton *effectRackButton = new QPushButton(i18n("Add Effect Rack"), this); - connect(effectRackButton, SIGNAL(clicked()), this, SLOT(addEffectRack())); + TQPushButton *effectRackButton = new TQPushButton(i18n("Add Effect Rack"), this); + connect(effectRackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addEffectRack())); - QPushButton *delButton = new QPushButton(i18n("Delete Item"), this); - connect(delButton, SIGNAL(clicked()), this, SLOT(delItem())); + TQPushButton *delButton = new TQPushButton(i18n("Delete Item"), this); + connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(delItem())); - QPushButton *loadButton = new - QPushButton(i18n("Load %1").arg(DEFAULT_ENV_FILENAME), this); - connect(loadButton, SIGNAL(clicked()), this, SLOT(load())); + TQPushButton *loadButton = new + TQPushButton(i18n("Load %1").arg(DEFAULT_ENV_FILENAME), this); + connect(loadButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(load())); - QPushButton *saveButton = new - QPushButton(i18n("Save %1").arg(DEFAULT_ENV_FILENAME), this); - connect(saveButton, SIGNAL(clicked()), this, SLOT(save())); + TQPushButton *saveButton = new + TQPushButton(i18n("Save %1").arg(DEFAULT_ENV_FILENAME), this); + connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(save())); show(); } -void EnvironmentView::view(QListBoxItem *i) +void EnvironmentView::view(TQListBoxItem *i) { ItemView *iv = static_cast<ItemView*>(i); @@ -148,7 +148,7 @@ void EnvironmentView::update() void EnvironmentView::load() { - std::ifstream infile(QFile::encodeName(defaultEnvFileName).data()); + std::ifstream infile(TQFile::encodeName(defaultEnvFileName).data()); std::string line; std::vector<std::string> strseq; @@ -163,7 +163,7 @@ void EnvironmentView::save() std::vector<std::string> *strseq; strseq = defaultEnvironment().saveToList(); - std::ofstream outfile(QFile::encodeName(defaultEnvFileName).data()); + std::ofstream outfile(TQFile::encodeName(defaultEnvFileName).data()); for(std::vector<std::string>::iterator i = strseq->begin(); i != strseq->end(); i++) outfile << ( *i ) << std::endl; delete strseq; diff --git a/arts/tools/environmentview.h b/arts/tools/environmentview.h index 7da8a240..351a5df0 100644 --- a/arts/tools/environmentview.h +++ b/arts/tools/environmentview.h @@ -36,13 +36,13 @@ class EnvironmentView : public Template_ArtsView { protected: Arts::Environment::Container container; KListBox *listBox; - QString defaultEnvFileName; + TQString defaultEnvFileName; public: - EnvironmentView( Arts::Environment::Container container, QWidget* =0, const char* =0 ); + EnvironmentView( Arts::Environment::Container container, TQWidget* =0, const char* =0 ); public slots: - void view(QListBoxItem *i); + void view(TQListBoxItem *i); void addMixer(); void addEffectRack(); void delItem(); diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp index 20d9fb70..fcaa5304 100644 --- a/arts/tools/fftscopeview.cpp +++ b/arts/tools/fftscopeview.cpp @@ -22,9 +22,9 @@ #include "fftscopeview.h" -#include <qlayout.h> -#include <qcursor.h> -#include <qtimer.h> +#include <tqlayout.h> +#include <tqcursor.h> +#include <tqtimer.h> #include <kaction.h> #include <kpopupmenu.h> #include <kartswidget.h> @@ -37,7 +37,7 @@ using namespace std; using namespace Arts; -FFTScopeView::FFTScopeView( SimpleSoundServer server, QWidget* parent ) +FFTScopeView::FFTScopeView( SimpleSoundServer server, TQWidget* parent ) : Template_ArtsView( parent ) , server( server ) , scopeData( 0 ) @@ -59,7 +59,7 @@ kdDebug()<<k_funcinfo<<endl; } updateScopeData(); - QBoxLayout * l = new QHBoxLayout( this ); + TQBoxLayout * l = new TQHBoxLayout( this ); l->setAutoAdd( TRUE ); for ( unsigned int i=0;i<scopeData->size();i++ ) @@ -75,25 +75,25 @@ kdDebug()<<k_funcinfo<<endl; l->activate(); show(); - updatetimer = new QTimer( this ); + updatetimer = new TQTimer( this ); updatetimer->start( 100 ); - connect( updatetimer,SIGNAL( timeout() ),this,SLOT( updateScope() ) ); + connect( updatetimer,TQT_SIGNAL( timeout() ),this,TQT_SLOT( updateScope() ) ); _artsactions = new ArtsActions( 0, 0, this ); - _moreBars = ArtsActions::actionMoreBars( this, SLOT( moreBars() ), 0 ); - _lessBars = ArtsActions::actionLessBars( this, SLOT( lessBars() ), 0 ); + _moreBars = ArtsActions::actionMoreBars( this, TQT_SLOT( moreBars() ), 0 ); + _lessBars = ArtsActions::actionLessBars( this, TQT_SLOT( lessBars() ), 0 ); _menu = new KPopupMenu( 0 ); _moreBars->plug( _menu ); _lessBars->plug( _menu ); - _substyle = new KAction( i18n( "Substyle" ), "", KShortcut(), this, SLOT( substyle() ), this ); + _substyle = new KAction( i18n( "Substyle" ), "", KShortcut(), this, TQT_SLOT( substyle() ), this ); _substyle->plug( _menu ); _menu->insertItem( i18n("VU-Style"), _artsactions->stylemenu() ); - connect( _artsactions, SIGNAL( styleNormal() ), this, SLOT( styleNormalBars() ) ); - connect( _artsactions, SIGNAL( styleFire() ), this, SLOT( styleFireBars() ) ); - connect( _artsactions, SIGNAL( styleLine() ), this, SLOT( styleLineBars() ) ); - connect( _artsactions, SIGNAL( styleLED() ), this, SLOT( styleLEDs() ) ); - connect( _artsactions, SIGNAL( styleAnalog() ), this, SLOT( styleAnalog() ) ); - connect( _artsactions, SIGNAL( styleSmall() ), this, SLOT( styleSmall() ) ); + connect( _artsactions, TQT_SIGNAL( styleNormal() ), this, TQT_SLOT( styleNormalBars() ) ); + connect( _artsactions, TQT_SIGNAL( styleFire() ), this, TQT_SLOT( styleFireBars() ) ); + connect( _artsactions, TQT_SIGNAL( styleLine() ), this, TQT_SLOT( styleLineBars() ) ); + connect( _artsactions, TQT_SIGNAL( styleLED() ), this, TQT_SLOT( styleLEDs() ) ); + connect( _artsactions, TQT_SIGNAL( styleAnalog() ), this, TQT_SLOT( styleAnalog() ) ); + connect( _artsactions, TQT_SIGNAL( styleSmall() ), this, TQT_SLOT( styleSmall() ) ); } FFTScopeView::~FFTScopeView() { @@ -121,9 +121,9 @@ void FFTScopeView::updateScope() { } } -void FFTScopeView::mousePressEvent( QMouseEvent* ev ) { +void FFTScopeView::mousePressEvent( TQMouseEvent* ev ) { if ( Qt::RightButton == ev->button() /*|| Qt::LeftButton == ev->button()*/ ) - _menu->exec( QCursor::pos() ); + _menu->exec( TQCursor::pos() ); } void FFTScopeView::moreBars() { diff --git a/arts/tools/fftscopeview.h b/arts/tools/fftscopeview.h index 504bec88..a6e14f57 100644 --- a/arts/tools/fftscopeview.h +++ b/arts/tools/fftscopeview.h @@ -49,7 +49,7 @@ protected: std::vector<float> scopeDraw; std::vector<Arts::LevelMeter> scopeScales; std::vector<KArtsWidget*> aw; - QTimer *updatetimer; + TQTimer *updatetimer; ArtsActions* _artsactions; KPopupMenu *_menu, *_stylemenu; @@ -57,10 +57,10 @@ protected: KAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall; KAction *_substyle; - void mousePressEvent( QMouseEvent* ); + void mousePressEvent( TQMouseEvent* ); public: void updateScopeData(); - FFTScopeView( Arts::SimpleSoundServer server, QWidget* =0 ); + FFTScopeView( Arts::SimpleSoundServer server, TQWidget* =0 ); ~FFTScopeView(); public slots: diff --git a/arts/tools/levelmeters.cpp b/arts/tools/levelmeters.cpp index 3b2ca1ac..1d0b080c 100644 --- a/arts/tools/levelmeters.cpp +++ b/arts/tools/levelmeters.cpp @@ -1,13 +1,13 @@ -#include <qlayout.h> -#include <qpainter.h> -#include <qfontmetrics.h> -#include <qptrlist.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqfontmetrics.h> +#include <tqptrlist.h> #include <kled.h> #include "levelmeters.h" const int PeakBar::peakMillis=1500; -PeakBar::PeakBar(QWidget *parent) +PeakBar::PeakBar(TQWidget *parent) : ACLevelMeter(parent) , maxValue( 0.0f ) , minValue( 0.0f ) @@ -19,19 +19,19 @@ PeakBar::PeakBar(QWidget *parent) lastValues.setAutoDelete( TRUE ); - setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); - setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred)); + setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); + setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); setBackgroundMode(NoBackground); setMinimumSize(frameWidth()+7, 70); } void PeakBar::frameChanged() { setMinimumSize(frameWidth()+7, 70); - QFrame::frameChanged(); + TQFrame::frameChanged(); } -QSize PeakBar::sizeHint() const { - return QSize(13, 250); +TQSize PeakBar::sizeHint() const { + return TQSize(13, 250); } void PeakBar::checkMinMax() { @@ -47,7 +47,7 @@ void PeakBar::checkMinMax() { maxValue= 0.f; minValue= 1.f; clipped = false; - for (QPtrListIterator<Observation> it(lastValues); it.current(); ++it) { + for (TQPtrListIterator<Observation> it(lastValues); it.current(); ++it) { float value= it.current()->value; if (value>maxValue) maxValue= value; @@ -59,9 +59,9 @@ void PeakBar::checkMinMax() { } } -void PeakBar::drawContents(QPainter *p) +void PeakBar::drawContents(TQPainter *p) { - QRect size= contentsRect(); + TQRect size= contentsRect(); checkMinMax(); @@ -69,7 +69,7 @@ void PeakBar::drawContents(QPainter *p) p->setPen(NoPen); p->drawRect(size); - QRect bar= size; + TQRect bar= size; p->setBrush(clipped ? red : blue); if (horizontalMode) { bar.setWidth((int)(bar.width()*currentValue)); @@ -109,10 +109,10 @@ void PeakBar::setValue(float f) { // ------------------------------------------------------------- -PeakLevelMeters::PeakLevelMeters(QWidget *parent): +PeakLevelMeters::PeakLevelMeters(TQWidget *parent): StereoLevelMeter(parent), left(this), right(this), scaleView(this) { - QBoxLayout *layout= new QHBoxLayout(this); + TQBoxLayout *layout= new TQHBoxLayout(this); layout->addWidget(&left); // layout->setStretchFactor(&left, 0); layout->addWidget(&right); @@ -122,7 +122,7 @@ PeakLevelMeters::PeakLevelMeters(QWidget *parent): left.setLineWidth(2); right.setLineWidth(2); scaleView.setScaleMargins(right.frameWidth()); - setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); setDbRange(36); } @@ -142,9 +142,9 @@ void PeakLevelMeters::setValues(float leftVal, float rightVal) { right.setValue(f); } -ScaleView::ScaleView(QWidget *parent): QFrame(parent) { +ScaleView::ScaleView(TQWidget *parent): TQFrame(parent) { font.setPixelSize(10); - setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred)); } void ScaleView::setDbRange(int db) { @@ -152,16 +152,16 @@ void ScaleView::setDbRange(int db) { repaint(); } -QSize ScaleView::sizeHint() const { - return QSize(QFontMetrics(font).width("-88")+8, 250); +TQSize ScaleView::sizeHint() const { + return TQSize(TQFontMetrics(font).width("-88")+8, 250); } -void ScaleView::drawContents(QPainter *p) { - QRect size= contentsRect(); +void ScaleView::drawContents(TQPainter *p) { + TQRect size= contentsRect(); size.rTop()+= upperMargin; size.rBottom()-= lowerMargin; - QFrame::drawContents(p); // clear background + TQFrame::drawContents(p); // clear background int step=3; while (dbRange/step*20>size.height()) @@ -173,7 +173,7 @@ void ScaleView::drawContents(QPainter *p) { p->setPen(black); p->setFont(font); - QString numStr; + TQString numStr; for (int i=0; i<=dbRange; i++) { int y= size.top()+(size.height()-1)*i/dbRange; if (i%step==0) { @@ -187,12 +187,12 @@ void ScaleView::drawContents(QPainter *p) { // ------------------------------------------------------------- -LedMeter::LedMeter(QWidget *parent, bool blueState) : ACLevelMeter(parent) { +LedMeter::LedMeter(TQWidget *parent, bool blueState) : ACLevelMeter(parent) { setBackgroundColor(black); - QBoxLayout * l = new QVBoxLayout( this ); + TQBoxLayout * l = new TQVBoxLayout( this ); l->setAutoAdd(TRUE); for(int i=0;i<12;i++) { - QColor c; + TQColor c; if(blueState) c = blue; else { @@ -202,8 +202,8 @@ LedMeter::LedMeter(QWidget *parent, bool blueState) : ACLevelMeter(parent) { } // put each led in its own frame, since it seems to be broken - QFrame *lframe = new QFrame(this); - QBoxLayout *lfl = new QVBoxLayout( lframe ); + TQFrame *lframe = new TQFrame(this); + TQBoxLayout *lfl = new TQVBoxLayout( lframe ); lfl->setAutoAdd(TRUE); leds[i] = new KLed(c,KLed::Off, KLed::Sunken, KLed::Circular,lframe); @@ -223,10 +223,10 @@ void LedMeter::setValue(float f) // ------------------------------------------------------------- -StereoLedMeters::StereoLedMeters(QWidget *parent) +StereoLedMeters::StereoLedMeters(TQWidget *parent) : StereoLevelMeter(parent), left(this), right(this) { - QBoxLayout *layout= new QHBoxLayout(this); + TQBoxLayout *layout= new TQHBoxLayout(this); layout->addWidget(&left); layout->addWidget(&right); } diff --git a/arts/tools/levelmeters.h b/arts/tools/levelmeters.h index 14f8a1ff..638d0d9a 100644 --- a/arts/tools/levelmeters.h +++ b/arts/tools/levelmeters.h @@ -22,10 +22,10 @@ #ifndef ARTS_TOOLS_LEVELMETERS_H #define ARTS_TOOLS_LEVELMETERS_H -#include <qobject.h> -#include <qframe.h> -#include <qdatetime.h> -#include <qptrlist.h> +#include <tqobject.h> +#include <tqframe.h> +#include <tqdatetime.h> +#include <tqptrlist.h> #include <math.h> // helper functions @@ -42,10 +42,10 @@ inline float DBToLevel(float db) { /** * Base class for a single volume / value bar. */ -class ACLevelMeter : public QFrame { +class ACLevelMeter : public TQFrame { Q_OBJECT public: - ACLevelMeter(QWidget *parent): QFrame(parent) {} + ACLevelMeter(TQWidget *parent): TQFrame(parent) {} public slots: virtual void setValue(float f) = 0; }; @@ -53,10 +53,10 @@ public slots: /** * Base class for a pair of volume / value bars. */ -class StereoLevelMeter : public QFrame { +class StereoLevelMeter : public TQFrame { Q_OBJECT public: - StereoLevelMeter(QWidget *parent): QFrame(parent) {} + StereoLevelMeter(TQWidget *parent): TQFrame(parent) {} public slots: virtual void setValues(float left, float right) = 0; }; @@ -74,11 +74,11 @@ protected: class Observation { public: - QTime time; + TQTime time; float value; Observation(float aValue): value(aValue) { time.start(); } }; - QPtrList<Observation> lastValues; + TQPtrList<Observation> lastValues; float currentValue, maxValue, minValue; void checkMinMax(); @@ -89,29 +89,29 @@ protected: void frameChanged(); public: - PeakBar(QWidget *parent); + PeakBar(TQWidget *parent); - QSize sizeHint() const; + TQSize sizeHint() const; - void drawContents(QPainter *p); + void drawContents(TQPainter *p); virtual void setValue(float f); }; /** * Special class which draws the Db scale with ticks, numbers and so on. */ -class ScaleView : public QFrame { +class ScaleView : public TQFrame { Q_OBJECT protected: - QFont font; + TQFont font; int dbRange; int upperMargin, lowerMargin; public: - ScaleView(QWidget *parent); + ScaleView(TQWidget *parent); void setDbRange(int db); void setScaleMargins(int margins) { upperMargin= margins; lowerMargin=margins; } - QSize sizeHint() const; - void drawContents(QPainter *p); + TQSize sizeHint() const; + void drawContents(TQPainter *p); }; /** @@ -127,7 +127,7 @@ protected: ScaleView scaleView; public: - PeakLevelMeters(QWidget *parent); + PeakLevelMeters(TQWidget *parent); public slots: void setValues(float leftVal, float rightVal); @@ -147,7 +147,7 @@ protected: KLed *leds[12]; public: - LedMeter(QWidget *parent, bool blueState = false); + LedMeter(TQWidget *parent, bool blueState = false); void setValue(float f); }; @@ -160,7 +160,7 @@ protected: LedMeter left, right; public: - StereoLedMeters(QWidget *parent); + StereoLedMeters(TQWidget *parent); public slots: void setValues(float left, float right); }; diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp index 90674b30..60df8f1d 100644 --- a/arts/tools/main.cpp +++ b/arts/tools/main.cpp @@ -35,9 +35,9 @@ #include <artsversion.h> #include <kartsfloatwatch.h> -#include <qlabel.h> -#include <qslider.h> -#include <qpushbutton.h> +#include <tqlabel.h> +#include <tqslider.h> +#include <tqpushbutton.h> #include <kaction.h> #include <kled.h> #include <kmessagebox.h> @@ -51,7 +51,7 @@ using namespace std; using namespace Arts; -void FreeVerbView::closeEvent(QCloseEvent *e) { +void FreeVerbView::closeEvent(TQCloseEvent *e) { e->accept(); emit closed(); } @@ -67,11 +67,11 @@ FreeVerbView::FreeVerbView(SimpleSoundServer server) : server(server) { GenericGuiFactory factory; Widget gui = factory.createGui(freeverb); - QBoxLayout * l = new QHBoxLayout( this ); + TQBoxLayout * l = new TQHBoxLayout( this ); if(!gui.isNull()) l->add(new KArtsWidget(gui, this)); else - l->add(new QLabel(i18n("No GUI found for this effect."), this)); + l->add(new TQLabel(i18n("No GUI found for this effect."), this)); l->freeze(); show(); } @@ -82,18 +82,18 @@ FreeVerbView::~FreeVerbView() { } -VControl::VControl( KArtsServer* artsserver, QWidget *parent) : QFrame(parent) +VControl::VControl( KArtsServer* artsserver, TQWidget *parent) : TQFrame(parent) , freeVerbView(0) , server( artsserver ) { - connect( server, SIGNAL( restartedServer() ), this, SLOT( initaRtsConnections() ) ); + connect( server, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( initaRtsConnections() ) ); /* if(server.isNull()) { KMessageBox::error( 0, i18n("Connection to the soundserver failed - make sure that artsd is really running and that your kdelibs version is not older than kdemultimedia.")); exit(1); }*/ - boxLayout = new QHBoxLayout( this ); + boxLayout = new TQHBoxLayout( this ); // 0 => 4.0 // 200 => 2.0 @@ -136,7 +136,7 @@ void VControl::useOldVolumeBar(int old) { void VControl::showFreeVerbView() { if(!freeVerbView) { freeVerbView = new FreeVerbView(server->server()); - connect(freeVerbView,SIGNAL(closed()),this,SLOT(showFreeVerbView())); + connect(freeVerbView,TQT_SIGNAL(closed()),this,TQT_SLOT(showFreeVerbView())); } else { delete freeVerbView; freeVerbView = 0; @@ -160,7 +160,7 @@ void MainWindow::toggleVolumeBar() { MainWindow::MainWindow() : KMainWindow(0), kartsserver( new KArtsServer( this ) ) { kdDebug() << k_funcinfo << endl; - connect( kartsserver, SIGNAL( restartedServer() ), this, SLOT( serverRestarted() ) ); + connect( kartsserver, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( serverRestarted() ) ); vc = new VControl( kartsserver, this ); setCentralWidget( vc ); @@ -172,11 +172,11 @@ kdDebug() << k_funcinfo << endl; ( void ) artsactions->actionMidiManagerView(); ( void ) artsactions->actionEnvironmentView(); ( void ) artsactions->actionMediaTypesView(); - ( void ) new KAction( i18n("Toggle Free&Verb"), 0, vc, SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" ); + ( void ) new KAction( i18n("Toggle Free&Verb"), 0, vc, TQT_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" ); showOldVolumeDisplay= new KToggleAction( i18n( "Old aRts-Control-Style for VU-Meter" /*"&LED-Style Volume Display"*/ ), 0, this, - SLOT( toggleVolumeBar() ), actionCollection(), "old_volume_display" ); - ( void ) KStdAction::quit( this, SLOT( close() ), actionCollection(), "quit_artscontrol" ); + TQT_SLOT( toggleVolumeBar() ), actionCollection(), "old_volume_display" ); + ( void ) KStdAction::quit( this, TQT_SLOT( close() ), actionCollection(), "quit_artscontrol" ); createGUI("artscontrol.rc"); resize(20,300); diff --git a/arts/tools/main.h b/arts/tools/main.h index 4e74d4af..2770b054 100644 --- a/arts/tools/main.h +++ b/arts/tools/main.h @@ -24,19 +24,19 @@ #define MAIN_H #include <qiomanager.h> #include <dispatcher.h> -#include <qmessagebox.h> +#include <tqmessagebox.h> #include <kapplication.h> -#include <qframe.h> +#include <tqframe.h> #include <kmainwindow.h> #include <kcmdlineargs.h> #include <kaboutdata.h> #include <klocale.h> #include <kstdaction.h> -#include <qlayout.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqpushbutton.h> #include <artsflow.h> #include <soundserver.h> -#include <qobject.h> +#include <tqobject.h> #include <kartswidget.h> #include <flowsystem.h> #include <artsmodules.h> @@ -47,14 +47,14 @@ class PeakBar; class PeakLevelMeter; class VScale; -class FreeVerbView : public QWidget { +class FreeVerbView : public TQWidget { Q_OBJECT protected: Arts::Synth_FREEVERB freeverb; Arts::SimpleSoundServer server; long effectID; - void closeEvent(QCloseEvent *e); + void closeEvent(TQCloseEvent *e); public: FreeVerbView(Arts::SimpleSoundServer server); ~FreeVerbView(); @@ -64,7 +64,7 @@ signals: class KArtsWidget; -class VControl : public QFrame { +class VControl : public TQFrame { Q_OBJECT protected: class StereoLevelMeter *stereoMeter; @@ -74,10 +74,10 @@ protected: KArtsWidget *svcguiw; KArtsServer *server; - QBoxLayout *boxLayout; + TQBoxLayout *boxLayout; public: - VControl( KArtsServer*, QWidget *parent); + VControl( KArtsServer*, TQWidget *parent); ~VControl(); public slots: diff --git a/arts/tools/mediatypesview.cpp b/arts/tools/mediatypesview.cpp index 40d7984b..9353cda6 100644 --- a/arts/tools/mediatypesview.cpp +++ b/arts/tools/mediatypesview.cpp @@ -21,7 +21,7 @@ */ -#include <qlayout.h> +#include <tqlayout.h> #include <klistview.h> #include <klocale.h> #include <kartsserver.h> @@ -33,11 +33,11 @@ using namespace std; using namespace Arts; -MediaTypesView::MediaTypesView( QWidget* parent, const char* name ) : Template_ArtsView( parent,name ) +MediaTypesView::MediaTypesView( TQWidget* parent, const char* name ) : Template_ArtsView( parent,name ) { this->setCaption( i18n( "Available Media Types" ) ); this->setIcon( MainBarIcon( "artsmediatypes", 32 ) ); - QBoxLayout *l= new QHBoxLayout(this); + TQBoxLayout *l= new TQHBoxLayout(this); l->setAutoAdd(true); KListView *listView = new KListView(this); @@ -46,7 +46,7 @@ MediaTypesView::MediaTypesView( QWidget* parent, const char* name ) : Template_A Arts::TraderQuery q; std::vector<Arts::TraderOffer> *results = q.query(); std::map<std::string, bool> done; - QString str; + TQString str; for(std::vector<Arts::TraderOffer>::iterator i = results->begin(); i != results->end(); i++) { @@ -58,7 +58,7 @@ MediaTypesView::MediaTypesView( QWidget* parent, const char* name ) : Template_A continue; done[*it] = true; - (void) new QListViewItem(listView, (*it).c_str()); + (void) new TQListViewItem(listView, (*it).c_str()); } delete ext; } diff --git a/arts/tools/mediatypesview.h b/arts/tools/mediatypesview.h index 1e2500b3..e61338c6 100644 --- a/arts/tools/mediatypesview.h +++ b/arts/tools/mediatypesview.h @@ -29,7 +29,7 @@ class MediaTypesView : public Template_ArtsView { Q_OBJECT public: - MediaTypesView( QWidget* =0, const char* =0 ); + MediaTypesView( TQWidget* =0, const char* =0 ); ~MediaTypesView(); }; diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp index 519d6b85..f606bbae 100644 --- a/arts/tools/midiinstdlg.cpp +++ b/arts/tools/midiinstdlg.cpp @@ -24,36 +24,36 @@ #include <kstandarddirs.h> #include <kapplication.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qfile.h> -#include <qdir.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqfile.h> +#include <tqdir.h> #include <kbuttonbox.h> #include <kseparator.h> #include <kdebug.h> -#include <qbutton.h> -#include <qpushbutton.h> +#include <tqbutton.h> +#include <tqpushbutton.h> #include <kstdguiitem.h> -static QStringList getArtsPath() +static TQStringList getArtsPath() { - QStringList artsPath; - QString dir = locate("data", "artsbuilder/examples/"); + TQStringList artsPath; + TQString dir = locate("data", "artsbuilder/examples/"); artsPath += dir; - QString home = QDir::homeDirPath() + "/arts/structures/"; + TQString home = TQDir::homeDirPath() + "/arts/structures/"; artsPath += home; return artsPath; } -static QStringList listFiles(QString directory, QString extension) +static TQStringList listFiles(TQString directory, TQString extension) { - QStringList result; - QStringList artsPath = getArtsPath(); + TQStringList result; + TQStringList artsPath = getArtsPath(); - QStringList::Iterator it; + TQStringList::Iterator it; for ( it = artsPath.begin(); it != artsPath.end(); it++ ) { - QString pathname = *it + "/" + directory; - QDir dir(pathname, extension); + TQString pathname = *it + "/" + directory; + TQDir dir(pathname, extension); if (dir.exists()) { //kdDebug() << "found dir " << dir.absPath() << endl; result += dir.entryList(); @@ -63,19 +63,19 @@ static QStringList listFiles(QString directory, QString extension) return result; } -MidiInstDlg::MidiInstDlg(QWidget *parent) - :QDialog(parent,"instrument",TRUE) +MidiInstDlg::MidiInstDlg(TQWidget *parent) + :TQDialog(parent,"instrument",TRUE) { - QVBoxLayout *mainlayout = new QVBoxLayout(this); + TQVBoxLayout *mainlayout = new TQVBoxLayout(this); // caption label: title mainlayout->addSpacing(5); - QLabel *captionlabel = new QLabel(this); - QFont labelfont(captionlabel->font()); + TQLabel *captionlabel = new TQLabel(this); + TQFont labelfont(captionlabel->font()); labelfont.setPointSize(labelfont.pointSize()*3/2); captionlabel->setFont(labelfont); - captionlabel->setText(QString(" ")+i18n("Instrument")+QString(" ")); + captionlabel->setText(TQString(" ")+i18n("Instrument")+TQString(" ")); captionlabel->setAlignment(AlignCenter); //min_size(captionlabel); mainlayout->addWidget(captionlabel); @@ -89,13 +89,13 @@ MidiInstDlg::MidiInstDlg(QWidget *parent) // combobox - box = new QComboBox(this); + box = new TQComboBox(this); - QStringList instruments = listFiles(".","*.arts"); - QStringList::Iterator it; + TQStringList instruments = listFiles(".","*.arts"); + TQStringList::Iterator it; for ( it = instruments.begin(); it != instruments.end(); it++ ) { - QString modname = *it; - QString prefix = QString::fromLatin1("instrument_"); + TQString modname = *it; + TQString prefix = TQString::fromLatin1("instrument_"); if (modname.length() > 5) modname.truncate(modname.length()-5); // kill .arts extension if ( (modname.startsWith(prefix)) && (!modname.contains("_GUI")) ) @@ -104,11 +104,11 @@ MidiInstDlg::MidiInstDlg(QWidget *parent) } - QStringList maps = listFiles(".","*.arts-map"); + TQStringList maps = listFiles(".","*.arts-map"); for ( it = maps.begin(); it != maps.end(); it++ ) { - QString modname = *it; - QString prefix = QString::fromLatin1("instrument_"); + TQString modname = *it; + TQString prefix = TQString::fromLatin1("instrument_"); if (modname.length() > 9) modname.truncate(modname.length()-9); // kill .arts-map extension if (modname.startsWith(prefix)) @@ -127,7 +127,7 @@ MidiInstDlg::MidiInstDlg(QWidget *parent) // buttons - QHBoxLayout *buttonlayout = new QHBoxLayout; + TQHBoxLayout *buttonlayout = new QHBoxLayout; mainlayout->addSpacing(5); mainlayout->addLayout(buttonlayout); mainlayout->addSpacing(5); @@ -135,11 +135,11 @@ MidiInstDlg::MidiInstDlg(QWidget *parent) buttonlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - bbox->addButton(KStdGuiItem::help(), this, SLOT( help() )); + bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() )); bbox->addStretch(1); - QButton *okbutton = bbox->addButton(KStdGuiItem::ok()); - connect( okbutton, SIGNAL( clicked() ), SLOT(accept() ) ); + TQButton *okbutton = bbox->addButton(KStdGuiItem::ok()); + connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) ); bbox->layout(); @@ -149,23 +149,23 @@ MidiInstDlg::MidiInstDlg(QWidget *parent) mainlayout->freeze(); } -QCString MidiInstDlg::filename() +TQCString MidiInstDlg::filename() { - QStringList artsPath = getArtsPath(); - QString instrument = box->currentText(); + TQStringList artsPath = getArtsPath(); + TQString instrument = box->currentText(); - QStringList::Iterator it; + TQStringList::Iterator it; for ( it = artsPath.begin(); it != artsPath.end(); it++ ) { - QString pathname = *it + QString::fromLatin1("/instrument_") + instrument + QString::fromLatin1(".arts"); - QFileInfo fi(pathname); + TQString pathname = *it + TQString::fromLatin1("/instrument_") + instrument + TQString::fromLatin1(".arts"); + TQFileInfo fi(pathname); if (fi.exists() && fi.isReadable()) - return QFile::encodeName(pathname); + return TQFile::encodeName(pathname); - pathname = *it + QString::fromLatin1("/instrument_") + instrument + QString::fromLatin1(".arts-map"); + pathname = *it + TQString::fromLatin1("/instrument_") + instrument + TQString::fromLatin1(".arts-map"); fi.setFile(pathname); if (fi.exists() && fi.isReadable()) - return QFile::encodeName(pathname); + return TQFile::encodeName(pathname); } return ""; diff --git a/arts/tools/midiinstdlg.h b/arts/tools/midiinstdlg.h index 45bf6b93..57735513 100644 --- a/arts/tools/midiinstdlg.h +++ b/arts/tools/midiinstdlg.h @@ -22,16 +22,16 @@ #ifndef ARTS_TOOLS_MIDIINSTDLG_H #define ARTS_TOOLS_MIDIINSTDLG_H -#include <qdialog.h> -#include <qcombobox.h> -#include <qcstring.h> +#include <tqdialog.h> +#include <tqcombobox.h> +#include <tqcstring.h> -class MidiInstDlg :public QDialog { +class MidiInstDlg :public TQDialog { Q_OBJECT - QComboBox *box; + TQComboBox *box; public: - MidiInstDlg(QWidget *parent); - QCString filename(); + MidiInstDlg(TQWidget *parent); + TQCString filename(); public slots: void help(); }; diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp index 6b40aad4..4849af78 100644 --- a/arts/tools/midimanagerview.cpp +++ b/arts/tools/midimanagerview.cpp @@ -27,10 +27,10 @@ #define protected public #include "midimanagerwidget.h" #undef protected -#include <qpushbutton.h> -#include <qlistbox.h> -#include <qlayout.h> -#include <qpainter.h> +#include <tqpushbutton.h> +#include <tqlistbox.h> +#include <tqlayout.h> +#include <tqpainter.h> #include <stdio.h> #include <kaction.h> #include <klocale.h> @@ -62,28 +62,28 @@ Arts::Environment::Container defaultEnvironment() return d; } -class MidiManagerItem : public QListBoxText { +class MidiManagerItem : public TQListBoxText { public: MidiClientInfo info; MidiManagerItem(const MidiClientInfo &info) :info(info) { } - QString text () const { - return QString::fromUtf8(info.title.c_str()); + TQString text () const { + return TQString::fromUtf8(info.title.c_str()); } }; -class ConnectionWidget : public QWidget { +class ConnectionWidget : public TQWidget { public: MidiManagerView *v; - ConnectionWidget(MidiManagerView *v, QWidget *parent) : QWidget(parent), v(v) + ConnectionWidget(MidiManagerView *v, TQWidget *parent) : TQWidget(parent), v(v) { } - void paintEvent(QPaintEvent * /*event*/) + void paintEvent(TQPaintEvent * /*event*/) { - QPainter painter; + TQPainter painter; painter.begin(this); // painter.fillRect(event->rect(),white); @@ -96,8 +96,8 @@ public: conn != item->info.connections.end(); conn++) { MidiManagerItem *outitem = v->itemMap[*conn]; - QRect r1 = v->widget->inputsListBox->itemRect(item); - QRect r2 = v->widget->outputsListBox->itemRect(outitem); + TQRect r1 = v->widget->inputsListBox->itemRect(item); + TQRect r2 = v->widget->outputsListBox->itemRect(outitem); if(r1.height() > 0 && r2.height() > 0) { @@ -113,23 +113,23 @@ public: MidiManagerView::MidiManagerView() : manager(Reference("global:Arts_MidiManager")) { - QTimer *updatetimer = new QTimer(this); + TQTimer *updatetimer = new TQTimer(this); updatetimer->start(5000); - connect(updatetimer,SIGNAL(timeout()),this,SLOT(updateLists())); + connect(updatetimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(updateLists())); widget = new MidiManagerWidget(this); setCentralWidget(widget); setCaption(i18n("MIDI Manager")); setIcon( MainBarIcon( "artsfftscope", 32 ) ); - (void)new KAction(i18n("&System MIDI Port (OSS)"), 0, this, SLOT(addOSSMidiPort()), + (void)new KAction(i18n("&System MIDI Port (OSS)"), 0, this, TQT_SLOT(addOSSMidiPort()), actionCollection(), "add_oss_midi_port"); (void)new KAction(i18n("&aRts Synthesis MIDI Output"), 0, this, - SLOT(addArtsMidiOutput()), actionCollection(), "add_arts_midi_output"); + TQT_SLOT(addArtsMidiOutput()), actionCollection(), "add_arts_midi_output"); - (void) KStdAction::quit( this, SLOT(close()), actionCollection()); - connect(widget->connectButton,SIGNAL(clicked()), this, SLOT(slotConnect())); - connect(widget->disconnectButton,SIGNAL(clicked()), this, SLOT(slotDisconnect())); + (void) KStdAction::quit( this, TQT_SLOT(close()), actionCollection()); + connect(widget->connectButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConnect())); + connect(widget->disconnectButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDisconnect())); connectionWidget = new ConnectionWidget(this, widget->connectionFrame); connectionWidget->setMinimumSize(60,10); @@ -142,7 +142,7 @@ MidiManagerView::MidiManagerView() setIcon( MainBarIcon( "artsfftscope", 32 ) ); } -void MidiManagerView::closeEvent(QCloseEvent *e) +void MidiManagerView::closeEvent(TQCloseEvent *e) { e->accept(); emit closed(); @@ -168,7 +168,7 @@ void MidiManagerView::updateLists() widget->outputsListBox->clear(); for(i = clients->begin(); i != clients->end(); i++) { - QListBox *box; + TQListBox *box; if(i->direction == mcdPlay) box = widget->inputsListBox; else diff --git a/arts/tools/midimanagerview.h b/arts/tools/midimanagerview.h index 9a7b773e..546e1cef 100644 --- a/arts/tools/midimanagerview.h +++ b/arts/tools/midimanagerview.h @@ -46,7 +46,7 @@ protected: public: MidiManagerView(); - void closeEvent(QCloseEvent *e); + void closeEvent(TQCloseEvent *e); public slots: void updateLists(); void slotConnect(); diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp index 2819d00a..8dd71d2b 100644 --- a/arts/tools/midiportdlg.cpp +++ b/arts/tools/midiportdlg.cpp @@ -23,24 +23,24 @@ #include <klocale.h> #include <kapplication.h> -#include <qlayout.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqlabel.h> #include <kseparator.h> #include <kbuttonbox.h> -#include <qlineedit.h> -#include <qbutton.h> -#include <qpushbutton.h> +#include <tqlineedit.h> +#include <tqbutton.h> +#include <tqpushbutton.h> #include <kstdguiitem.h> -MidiPortDlg::MidiPortDlg(QWidget *parent, const char *oldname, const char *title) :QDialog(parent,title,TRUE) +MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *title) :TQDialog(parent,title,TRUE) { - QVBoxLayout *mainlayout = new QVBoxLayout(this); + TQVBoxLayout *mainlayout = new TQVBoxLayout(this); // caption label: title mainlayout->addSpacing(5); - QLabel *captionlabel = new QLabel(this); - QFont labelfont(captionlabel->font()); + TQLabel *captionlabel = new TQLabel(this); + TQFont labelfont(captionlabel->font()); labelfont.setPointSize(labelfont.pointSize()*3/2); captionlabel->setFont(labelfont); captionlabel->setText(i18n("OSS MIDI Port")); @@ -57,7 +57,7 @@ MidiPortDlg::MidiPortDlg(QWidget *parent, const char *oldname, const char *title // editwidget - edit = new QLineEdit(this); + edit = new TQLineEdit(this); edit->setText(oldname); //min_size(edit); @@ -72,7 +72,7 @@ MidiPortDlg::MidiPortDlg(QWidget *parent, const char *oldname, const char *title // buttons - QHBoxLayout *buttonlayout = new QHBoxLayout; + TQHBoxLayout *buttonlayout = new QHBoxLayout; mainlayout->addSpacing(5); mainlayout->addLayout(buttonlayout); mainlayout->addSpacing(5); @@ -80,13 +80,13 @@ MidiPortDlg::MidiPortDlg(QWidget *parent, const char *oldname, const char *title buttonlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - QPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), this, SLOT( help() )); + TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() )); bbox->addStretch(1); helpbutton->setAutoDefault( true ); helpbutton->setDefault( true ); - QPushButton *okbutton = bbox->addButton(KStdGuiItem::ok()); - connect( okbutton, SIGNAL( clicked() ), SLOT(accept() ) ); + TQPushButton *okbutton = bbox->addButton(KStdGuiItem::ok()); + connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) ); okbutton->setAutoDefault( true ); okbutton->setDefault( true ); diff --git a/arts/tools/midiportdlg.h b/arts/tools/midiportdlg.h index ac616f84..8992776b 100644 --- a/arts/tools/midiportdlg.h +++ b/arts/tools/midiportdlg.h @@ -22,18 +22,18 @@ #ifndef ARTS_TOOLS_MIDIPORTDLG_H #define ARTS_TOOLS_MIDIPORTDLG_H -#include <qdialog.h> -#include <qtimer.h> -#include <qlabel.h> -#include <qscrollbar.h> -#include <qlineedit.h> -#include <qlayout.h> - -class MidiPortDlg :public QDialog { +#include <tqdialog.h> +#include <tqtimer.h> +#include <tqlabel.h> +#include <tqscrollbar.h> +#include <tqlineedit.h> +#include <tqlayout.h> + +class MidiPortDlg :public TQDialog { Q_OBJECT - QLineEdit *edit; + TQLineEdit *edit; public: - MidiPortDlg(QWidget *parent, const char *device, const char *title); + MidiPortDlg(TQWidget *parent, const char *device, const char *title); const char *device(); public slots: diff --git a/arts/tools/statusview.cpp b/arts/tools/statusview.cpp index 7c1454e1..c29cf4ed 100644 --- a/arts/tools/statusview.cpp +++ b/arts/tools/statusview.cpp @@ -21,28 +21,28 @@ */ -#include <qlayout.h> +#include <tqlayout.h> #include <klocale.h> -#include <qpushbutton.h> -#include <qwidget.h> -#include <qtimer.h> -#include <qlabel.h> +#include <tqpushbutton.h> +#include <tqwidget.h> +#include <tqtimer.h> +#include <tqlabel.h> #include "statusview.h" using namespace std; using namespace Arts; -ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, QWidget* parent, const char* name ) +ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, const char* name ) : Template_ArtsView( parent,name ) , server(a_server) { this->setCaption( i18n( "aRts Status" ) ); - QBoxLayout *l= new QVBoxLayout(this); + TQBoxLayout *l= new TQVBoxLayout(this); //l->setAutoAdd(TRUE); RealtimeStatus rs= server.realtimeStatus(); - l->addWidget(new QLabel(rs==rtRealtime? + l->addWidget(new TQLabel(rs==rtRealtime? i18n("Artsd is running with realtime scheduling."): rs==rtNoSupport? i18n("Your system does not support realtime scheduling."): @@ -54,19 +54,19 @@ ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, QWidget* parent, cons this, "realtimeLabel")); l->addSpacing(10); - suspendLabel= new QLabel(i18n("Determining suspend status..."), + suspendLabel= new TQLabel(i18n("Determining suspend status..."), this, "suspendLabel"); l->addWidget(suspendLabel); l->addSpacing(6); l->setMargin(6); - suspendButton= new QPushButton(this, "suspendButton"); + suspendButton= new TQPushButton(this, "suspendButton"); suspendButton->setText(i18n("&Suspend Now")); l->addWidget(suspendButton); - connect(suspendButton, SIGNAL(clicked()), this, SLOT(suspendButtonClicked())); + connect(suspendButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(suspendButtonClicked())); - artsPollStatusTimer= new QTimer(this); - connect(artsPollStatusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); + artsPollStatusTimer= new TQTimer(this); + connect(artsPollStatusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateStatus())); artsPollStatusTimer->start(1000); //l->activate(); show(); diff --git a/arts/tools/statusview.h b/arts/tools/statusview.h index 7fa17357..e1f167ab 100644 --- a/arts/tools/statusview.h +++ b/arts/tools/statusview.h @@ -24,7 +24,7 @@ #ifndef STATUSVIEW_H #define STATUSVIEW_H -#include <qwidget.h> +#include <tqwidget.h> #include <arts/soundserver.h> #include "templateview.h" @@ -36,17 +36,17 @@ class QLabel; class ArtsStatusView : public Template_ArtsView { Q_OBJECT public: - ArtsStatusView(Arts::SoundServer server, QWidget* =0, const char* =0 ); + ArtsStatusView(Arts::SoundServer server, TQWidget* =0, const char* =0 ); public slots: void updateStatus(); void suspendButtonClicked(); protected: - QTimer *artsPollStatusTimer; + TQTimer *artsPollStatusTimer; Arts::SoundServer server; - QLabel *suspendLabel; - QButton *suspendButton; + TQLabel *suspendLabel; + TQButton *suspendButton; }; #endif diff --git a/arts/tools/templateview.cpp b/arts/tools/templateview.cpp index 6f5a5fd6..a589ff46 100644 --- a/arts/tools/templateview.cpp +++ b/arts/tools/templateview.cpp @@ -22,7 +22,7 @@ //#include <kdebug.h> -Template_ArtsView::Template_ArtsView( QWidget* parent, const char* name ) : QFrame( parent,name ){ +Template_ArtsView::Template_ArtsView( TQWidget* parent, const char* name ) : TQFrame( parent,name ){ //kdDebug()<<k_funcinfo<<endl; } @@ -30,7 +30,7 @@ Template_ArtsView::~Template_ArtsView() { //kdDebug()<<k_funcinfo<<endl; } -void Template_ArtsView::closeEvent( QCloseEvent *e ) { +void Template_ArtsView::closeEvent( TQCloseEvent *e ) { //kdDebug()<<k_funcinfo<<endl; e->accept(); emit closed(); diff --git a/arts/tools/templateview.h b/arts/tools/templateview.h index a3badea8..efdd35f4 100644 --- a/arts/tools/templateview.h +++ b/arts/tools/templateview.h @@ -22,16 +22,16 @@ #define ARTS_TEMPLATEVIEW_H //#include <artsflow.h> -#include <qframe.h> +#include <tqframe.h> class Template_ArtsView : public QFrame { Q_OBJECT public: - Template_ArtsView( QWidget* =0, const char* =0 ); + Template_ArtsView( TQWidget* =0, const char* =0 ); ~Template_ArtsView(); - void closeEvent( QCloseEvent* ); + void closeEvent( TQCloseEvent* ); signals: void closed(); }; |