diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:43:15 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:43:15 +0000 |
commit | e654398e46e37abf457b2b1122ab898d2c51c49f (patch) | |
tree | d39ee6440f3c3663c3ead84a2d4cc2d034667e96 /arts/builder | |
parent | e4f29b18e19394b9352f52a6c0d0d0e3932cf511 (diff) | |
download | tdemultimedia-e654398e46e37abf457b2b1122ab898d2c51c49f.tar.gz tdemultimedia-e654398e46e37abf457b2b1122ab898d2c51c49f.zip |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1157644 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'arts/builder')
31 files changed, 551 insertions, 551 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 |