diff options
Diffstat (limited to 'arts')
147 files changed, 1045 insertions, 974 deletions
diff --git a/arts/builder/TODO b/arts/builder/TODO index 139f22b2..0c8a0859 100644 --- a/arts/builder/TODO +++ b/arts/builder/TODO @@ -41,10 +41,10 @@ Wishlist for the artsbuilder app: this should be very useful in editing objects with lots of properties (widgets) -- make _changed signals visible so you can connect the value_changed of a +- make _changed Q_SIGNALS visible so you can connect the value_changed of a poti to the frequency of a filter -- make it possible to edit parent property of widgets (i.e. to insert one +- make it possible to edit tqparent property of widgets (i.e. to insert one widget into another) - add structure property dialog with structure meta information, at least diff --git a/arts/builder/createtool.cpp b/arts/builder/createtool.cpp index 77781483..f8d5c7e5 100644 --- a/arts/builder/createtool.cpp +++ b/arts/builder/createtool.cpp @@ -43,7 +43,7 @@ CreateTool::CreateTool(ModuleWidget *mwidget) : MWidgetTool(mwidget) { oldCursor = mwidget->cursor(); - mwidget->setCursor(Qt::crossCursor); + mwidget->setCursor(TQt::crossCursor); oldMouseTracking = mwidget->hasMouseTracking(); mwidget->setMouseTracking(true); @@ -55,7 +55,7 @@ CreateTool::CreateTool(ModuleWidget *mwidget) CreateTool::~CreateTool() { - mwidget->repaint(componentRect); + mwidget->tqrepaint(componentRect); mwidget->setCursor(oldCursor); mwidget->setMouseTracking(oldMouseTracking); } @@ -89,7 +89,7 @@ void CreateTool::mouseMoveEvent(TQMouseEvent *e) && mwidget->colXPos(x + width, &cellx2) && mwidget->rowYPos(y + height, &celly2); if(!posok) return; - mwidget->repaint(componentRect); + mwidget->tqrepaint(componentRect); componentRect = TQRect(cellx, celly, cellx2 - cellx, celly2 - celly); TQPainter *p = new TQPainter; @@ -302,8 +302,8 @@ void ConnectPortsTool::mousePressEvent(TQMouseEvent *e) void ConnectPortsTool::mouseMoveEvent(TQMouseEvent *e) { TQPainter painter(mwidget); - painter.setPen(Qt::white); - mwidget->repaint(TQRect(firstPos, lastPos).normalize()); + painter.setPen(TQt::white); + mwidget->tqrepaint(TQRect(firstPos, lastPos).normalize()); painter.drawLine(firstPos, e->pos()); lastPos = e->pos(); } @@ -334,6 +334,6 @@ void ConnectPortsTool::mouseReleaseEvent(TQMouseEvent *e) } } } - mwidget->repaint(TQRect(firstPos, lastPos).normalize()); + mwidget->tqrepaint(TQRect(firstPos, lastPos).normalize()); mwidget->leaveTool(this); } diff --git a/arts/builder/dirmanager.cpp b/arts/builder/dirmanager.cpp index 2f22f104..dae660b2 100644 --- a/arts/builder/dirmanager.cpp +++ b/arts/builder/dirmanager.cpp @@ -83,7 +83,7 @@ char *DirManager::directory(const char *subdir, const TQString &desc) 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); + .tqarg(dir).tqarg(desc); if(KMessageBox::questionYesNo(0,message,i18n("aRts Folder Missing"),i18n("Create Folder"),i18n("Do Not Create")) == KMessageBox::Yes) diff --git a/arts/builder/drawutils.cpp b/arts/builder/drawutils.cpp index c2c0ef3f..74dac440 100644 --- a/arts/builder/drawutils.cpp +++ b/arts/builder/drawutils.cpp @@ -26,7 +26,7 @@ TQString DrawUtils::cropText(TQPainter *p, TQString text, int maxlen, int& textw TQString label = text; while(p->fontMetrics().width(label) > maxlen && label.length() > 0) { - int i = label.find('_'); + int i = label.tqfind('_'); if(i != -1) label = label.mid(i+1); diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp index 6d2ea2bf..bad531aa 100644 --- a/arts/builder/execdlg.cpp +++ b/arts/builder/execdlg.cpp @@ -41,31 +41,31 @@ #ifndef KDE_USE_FINAL static void min_size(TQWidget *w) { - w->setMinimumSize(w->sizeHint()); + w->setMinimumSize(w->tqsizeHint()); } #endif -ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure) - :TQDialog(parent,"X") +ExecDlg::ExecDlg(TQWidget *tqparent, ExecutableStructure *structure) + :TQDialog(tqparent,"X") /*, TRUE)*/ { this->structure = structure; setCaption(i18n("aRts Module Execution")); - mainlayout = new TQVBoxLayout(this); + maintqlayout = new TQVBoxLayout(this); // caption label: "Synthesis running..." - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); TQLabel *captionlabel = new TQLabel(this); TQFont labelfont(captionlabel->font()); labelfont.setPointSize(labelfont.pointSize()*3/2); captionlabel->setFont(labelfont); captionlabel->setText(TQString(" ")+i18n("Synthesis running...")+TQString(" ")); - captionlabel->setAlignment(AlignCenter); + captionlabel->tqsetAlignment(AlignCenter); min_size(captionlabel); - mainlayout->addWidget(captionlabel); + maintqlayout->addWidget(captionlabel); cpuusagelabel = new TQLabel(this); cpuusagelabel->setText(i18n("CPU usage: unknown")); @@ -78,44 +78,44 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure) cpuusagetimer->start( 2000, false ); min_size(cpuusagelabel); - mainlayout->addWidget(cpuusagelabel); + maintqlayout->addWidget(cpuusagelabel); -// ruler above the sliderlayout +// ruler above the slidertqlayout - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); KSeparator* sep = new KSeparator( KSeparator::HLine, this); - mainlayout->addWidget(sep); - mainlayout->addSpacing(5); + maintqlayout->addWidget(sep); + maintqlayout->addSpacing(5); // sliders, controlpanels - sliderlayout = new TQVBoxLayout; - mainlayout->addLayout(sliderlayout); + slidertqlayout = new TQVBoxLayout; + maintqlayout->addLayout(slidertqlayout); #if 0 /* PORT */ this->GUIServer = GUIServer; GUIServer->setGlobalParent(this); - GUIServer->setGlobalLayout(sliderlayout); + GUIServer->setGlobalLayout(slidertqlayout); #endif -// hruler below the sliderlayout +// hruler below the slidertqlayout - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); sep = new KSeparator( KSeparator::HLine, this); - mainlayout->addWidget(sep); - mainlayout->addSpacing(5); + maintqlayout->addWidget(sep); + maintqlayout->addSpacing(5); // buttons - TQHBoxLayout *buttonlayout = new TQHBoxLayout; - mainlayout->addSpacing(5); - mainlayout->addLayout(buttonlayout); - mainlayout->addSpacing(5); + TQHBoxLayout *buttontqlayout = new TQHBoxLayout; + maintqlayout->addSpacing(5); + maintqlayout->addLayout(buttontqlayout); + maintqlayout->addSpacing(5); - buttonlayout->addSpacing(5); + buttontqlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() )); + bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() )); bbox->addStretch(1); @@ -125,18 +125,18 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure) TQButton *okbutton = bbox->addButton(KStdGuiItem::ok()); connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) ); - bbox->layout(); + bbox->tqlayout(); //min_size(bbox); - buttonlayout->addWidget(bbox); - buttonlayout->addSpacing(5); + buttontqlayout->addWidget(bbox); + buttontqlayout->addSpacing(5); -// mainlayout->freeze(); +// maintqlayout->freeze(); } void ExecDlg::start() { - mainlayout->freeze(); + maintqlayout->freeze(); } void ExecDlg::guiServerTick() @@ -151,7 +151,7 @@ void ExecDlg::updateCpuUsage() #if 0 /* TODO:PORT */ char cpuusage[100]; - ArtsCorba::Status s = Synthesizer->getStatus(); + ArtsCorba::tqStatus s = Synthesizer->gettqStatus(); if(s.halted) { cpuusagetimer->stop(); diff --git a/arts/builder/execdlg.h b/arts/builder/execdlg.h index 1fbd8069..d916a4ff 100644 --- a/arts/builder/execdlg.h +++ b/arts/builder/execdlg.h @@ -31,15 +31,16 @@ class ExecDlg :public TQDialog { Q_OBJECT + TQ_OBJECT public: TQTimer *cpuusagetimer; TQLabel *cpuusagelabel; - TQVBoxLayout *mainlayout,*sliderlayout; + TQVBoxLayout *maintqlayout,*slidertqlayout; ExecutableStructure *structure; void start(); void done(int r); - ExecDlg(TQWidget *parent, ExecutableStructure *structure); + ExecDlg(TQWidget *tqparent, ExecutableStructure *structure); protected slots: void updateCpuUsage(); diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp index 706576d1..9680fc7e 100644 --- a/arts/builder/interfacedlg.cpp +++ b/arts/builder/interfacedlg.cpp @@ -41,50 +41,50 @@ using namespace std; -InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE) +InterfaceDlg::InterfaceDlg(TQWidget *tqparent) :TQDialog(tqparent,"Props", TRUE) { setCaption(i18n("aRts: Structureport View")); - TQVBoxLayout *mainlayout = new TQVBoxLayout(this); - //TQHBoxLayout *contentslayout = new TQHBoxLayout; + TQVBoxLayout *maintqlayout = new TQVBoxLayout(this); + //TQHBoxLayout *contentstqlayout = new TQHBoxLayout; // object type /* - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); TQLabel *objectlabel = new TQLabel(this); TQFont labelfont(objectlabel->font()); labelfont.setPointSize(labelfont.pointSize()*3/2); objectlabel->setFont(labelfont); objectlabel->setText(TQString(" ")+i18n("Object type: ")+TQString(port->owner->name())+TQString(" ")); - objectlabel->setAlignment(AlignCenter); + objectlabel->tqsetAlignment(AlignCenter); min_size(objectlabel); - mainlayout->addWidget(objectlabel); + maintqlayout->addWidget(objectlabel); */ // port description /* - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); TQLabel *portlabel = new TQLabel(this); labelfont.setPointSize(labelfont.pointSize()*4/5); portlabel->setFont(labelfont); portlabel->setText(i18n("Port description: ")+ port->description); min_size(portlabel); - portlabel->setAlignment(AlignCenter); - mainlayout->addWidget(portlabel); + portlabel->tqsetAlignment(AlignCenter); + maintqlayout->addWidget(portlabel); - int labelwidth = imax(portlabel->sizeHint().width(),objectlabel->sizeHint().width()); + int labelwidth = imax(portlabel->tqsizeHint().width(),objectlabel->tqsizeHint().width()); portlabel->setMinimumWidth(labelwidth); objectlabel->setMinimumWidth(labelwidth); // hruler - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); KSeparator *ruler = new KSeparator( KSeparator::HLine, this); - mainlayout->addWidget(ruler); - mainlayout->addSpacing(5); - mainlayout->addLayout(contentslayout); + maintqlayout->addWidget(ruler); + maintqlayout->addSpacing(5); + maintqlayout->addLayout(contentstqlayout); */ // list @@ -93,26 +93,26 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE) update(); listbox->setMinimumSize(340,400); - mainlayout->addWidget(listbox); + maintqlayout->addWidget(listbox); connect( listbox, TQT_SIGNAL( doubleClicked ( TQListBoxItem *)), this, TQT_SLOT(accept())); // hruler - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this); - mainlayout->addWidget(ruler2); + maintqlayout->addWidget(ruler2); // buttons - TQHBoxLayout *buttonlayout = new TQHBoxLayout; - mainlayout->addSpacing(5); - mainlayout->addLayout(buttonlayout); - mainlayout->addSpacing(5); + TQHBoxLayout *buttontqlayout = new TQHBoxLayout; + maintqlayout->addSpacing(5); + maintqlayout->addLayout(buttontqlayout); + maintqlayout->addSpacing(5); - buttonlayout->addSpacing(5); + buttontqlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() )); + bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() )); bbox->addStretch(1); TQButton *okbutton = bbox->addButton(KStdGuiItem::ok()); @@ -121,14 +121,14 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE) TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel()); connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) ); - bbox->layout(); + bbox->tqlayout(); //min_size(bbox); - buttonlayout->addWidget(bbox); - buttonlayout->addSpacing(5); + buttontqlayout->addWidget(bbox); + buttontqlayout->addSpacing(5); - //mainlayout->activate(); - mainlayout->freeze(); + //maintqlayout->activate(); + maintqlayout->freeze(); } string InterfaceDlg::interfaceName() @@ -159,10 +159,10 @@ void InterfaceDlg::update(const string& interface, const string& indent) { listbox->insertItem((indent + interface).c_str()); - vector<string> *children = Arts::Dispatcher::the()->interfaceRepo().queryChildren(interface); - for (vector<string>::iterator ci = children->begin(); ci != children->end(); ++ci) + vector<string> *tqchildren = Arts::Dispatcher::the()->interfaceRepo().queryChildren(interface); + for (vector<string>::iterator ci = tqchildren->begin(); ci != tqchildren->end(); ++ci) update(ci->c_str(), indent+" "); - delete children; + delete tqchildren; } void InterfaceDlg::update() diff --git a/arts/builder/interfacedlg.h b/arts/builder/interfacedlg.h index 4524eaaa..235245a7 100644 --- a/arts/builder/interfacedlg.h +++ b/arts/builder/interfacedlg.h @@ -32,11 +32,12 @@ class InterfaceDlg :public TQDialog { Q_OBJECT + TQ_OBJECT protected: TQListBox *listbox; public: - InterfaceDlg(TQWidget *parent); + InterfaceDlg(TQWidget *tqparent); 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 4630f2f7..558f650c 100644 --- a/arts/builder/main.cpp +++ b/arts/builder/main.cpp @@ -251,17 +251,17 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name) */ #if 000 - connect(menubar, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(activateMenu(int))); + connect(menubar, TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(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_ports, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addPort(int))); + connect(m_file_new, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(fileNew(int))); - //connect(m_modules, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int))); + //connect(m_modules, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_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(m_modules_synth, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int))); + connect(m_modules_gui, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int))); + connect(m_modules_instruments, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int))); + connect(m_modules_other, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int))); */ connect(kapp, TQT_SIGNAL(lastWindowClosed()), this , TQT_SLOT(quit())); @@ -269,7 +269,7 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name) #endif arts_debug("PORT: activatemenu"); - connect(menumaker, TQT_SIGNAL(activated(const char *)), this, TQT_SLOT(addModule(const char *))); + connect(menumaker, TQT_SIGNAL(activated(const char *)), TQT_TQOBJECT(this), TQT_SLOT(addModule(const char *))); fillModuleMenu(); arts_debug("PORT: activatemenu ok"); setupActions(); @@ -279,11 +279,11 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name) // connect to aboutToShow to correctly show state of dockwidget there: TQPopupMenu *viewmenu = (TQPopupMenu*)factory()->container("view", this); if (viewmenu) - connect(viewmenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(viewMenuAboutToShow())); + connect(viewmenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(viewMenuAboutToShow())); else arts_debug("view menu not found!"); - m_filename = TQString::null; + m_filename = TQString(); setModified(false); installEventFilter(propertyPanel); @@ -292,55 +292,55 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name) void ArtsBuilderWindow::setupActions() { // File menu - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); - (void)new KAction(i18n("Open Session..."), 0, this, TQT_SLOT(openSession()), + (void)new KAction(i18n("Open Session..."), 0, TQT_TQOBJECT(this), TQT_SLOT(openSession()), actionCollection(), "file_open_session"); - KStdAction::open(this, TQT_SLOT(open()), actionCollection()); - (void)new KAction(i18n("Open E&xample..."), Qt::CTRL + Qt::Key_X, this, TQT_SLOT(openExample()), + KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection()); + (void)new KAction(i18n("Open E&xample..."), TQt::CTRL + TQt::Key_X, TQT_TQOBJECT(this), TQT_SLOT(openExample()), actionCollection(), "file_open_example"); - 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()), + KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); + KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection()); + (void)new KAction(i18n("&Retrieve From Server..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(retrieve()), actionCollection(), "file_retrieve_from_server"); - (void)new KAction(i18n("&Execute Structure"), "artsbuilderexecute", Qt::CTRL + Qt::Key_E, this, TQT_SLOT(execute()), + (void)new KAction(i18n("&Execute Structure"), "artsbuilderexecute", TQt::CTRL + TQt::Key_E, TQT_TQOBJECT(this), TQT_SLOT(execute()), actionCollection(), "file_execute_structure"); - (void)new KAction(i18n("&Rename Structure..."), Qt::CTRL + Qt::Key_R, this, TQT_SLOT(rename()), + (void)new KAction(i18n("&Rename Structure..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(rename()), actionCollection(), "file_rename_structure"); - (void)new KAction(i18n("&Publish Structure"), Qt::CTRL + Qt::Key_P, this, TQT_SLOT(publish()), + (void)new KAction(i18n("&Publish Structure"), TQt::CTRL + TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT(publish()), actionCollection(), "file_publish_structure"); - KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); // Edit menu - (void)new KAction(i18n("&Delete"), Qt::Key_Delete, modulewidget, TQT_SLOT(delModule()), + (void)new KAction(i18n("&Delete"), TQt::Key_Delete, TQT_TQOBJECT(modulewidget), TQT_SLOT(delModule()), actionCollection(), "edit_delete"); - KStdAction::selectAll(modulewidget, TQT_SLOT(selectAll()), actionCollection()); + KStdAction::selectAll(TQT_TQOBJECT(modulewidget), TQT_SLOT(selectAll()), actionCollection()); // View menu viewPropertiesAction= new KToggleAction(i18n("&Property Panel"), 0, - propertyDock, TQT_SLOT(changeHideShowState()), + TQT_TQOBJECT(propertyDock), TQT_SLOT(changeHideShowState()), actionCollection(), "view_properties"); - (void)new KAction(i18n("200%"), 0, this, TQT_SLOT(viewAt200()), + (void)new KAction(i18n("200%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt200()), actionCollection(), "view_200"); - (void)new KAction(i18n("150%"), 0, this, TQT_SLOT(viewAt150()), + (void)new KAction(i18n("150%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt150()), actionCollection(), "view_150"); - (void)new KAction(i18n("100%"), 0, this, TQT_SLOT(viewAt100()), + (void)new KAction(i18n("100%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt100()), actionCollection(), "view_100"); - (void)new KAction(i18n("50%"), 0, this, TQT_SLOT(viewAt50()), + (void)new KAction(i18n("50%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt50()), actionCollection(), "view_50"); // Ports menu - (void)new KAction(i18n("Create IN Audio Signal"), 0, this, TQT_SLOT(createInAudioSignal()), + (void)new KAction(i18n("Create IN Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioSignal()), actionCollection(), "ports_create_in_audio_signal"); - (void)new KAction(i18n("Create OUT Audio Signal"), 0, this, TQT_SLOT(createOutAudioSignal()), + (void)new KAction(i18n("Create OUT Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createOutAudioSignal()), actionCollection(), "ports_create_out_audio_signal"); - (void)new KAction(i18n("Create IN String Property"), 0, this, TQT_SLOT(createInStringProperty()), + (void)new KAction(i18n("Create IN String Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInStringProperty()), actionCollection(), "ports_create_in_string_property"); - (void)new KAction(i18n("Create IN Audio Property"), 0, this, TQT_SLOT(createInAudioProperty()), + (void)new KAction(i18n("Create IN Audio Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioProperty()), actionCollection(), "ports_create_in_audio_property"); - (void)new KAction(i18n("Implement Interface..."), 0, this, TQT_SLOT(addInterface()), + (void)new KAction(i18n("Implement Interface..."), 0, TQT_TQOBJECT(this), TQT_SLOT(addInterface()), actionCollection(), "ports_implement_interface"); - (void)new KAction(i18n("Change Positions/Names..."), 0, this, TQT_SLOT(changePortPositions()), + (void)new KAction(i18n("Change Positions/Names..."), 0, TQT_TQOBJECT(this), TQT_SLOT(changePortPositions()), actionCollection(), "ports_change_positions"); } @@ -441,7 +441,7 @@ void ArtsBuilderWindow::publish() checkName(); structure->publish(); KMessageBox::information(this, - i18n("The structure has been published as: '%1' on the server.").arg( structure->name().c_str() )); + i18n("The structure has been published as: '%1' on the server.").tqarg( structure->name().c_str() )); } TQString ArtsBuilderWindow::getOpenFilename(const char *pattern, const char *initialDir) @@ -474,7 +474,7 @@ void ArtsBuilderWindow::fileNew() propertyPanel->setSelectedComponent(0); structure->clear(); modulewidget->reInit(); - m_filename = TQString::null; + m_filename = TQString(); setModified(false); } @@ -532,7 +532,7 @@ void ArtsBuilderWindow::openSession() execDlg->start(); execDlg->show(); - connect(execDlg, TQT_SIGNAL(ready()), this, TQT_SLOT(endexecute())); + connect(execDlg, TQT_SIGNAL(ready()), TQT_TQOBJECT(this), TQT_SLOT(endexecute())); hide(); // m_filename = filename; FIXME: DOESN'T THIS BELONG HERE? @@ -587,7 +587,7 @@ bool ArtsBuilderWindow::save(TQString filename) if(file.status()) { KMessageBox::sorry(this, i18n("The file '%1' could not be opened for writing: %2") - .arg(filename).arg(strerror(file.status())), + .tqarg(filename).tqarg(strerror(file.status())), i18n("aRts Warning")); return false; } @@ -597,7 +597,7 @@ bool ArtsBuilderWindow::save(TQString filename) if(!file.close()) { KMessageBox::sorry(this, i18n("Saving to file '%1' could not be finished correctly: %2") - .arg(filename).arg(strerror(file.status())), + .tqarg(filename).tqarg(strerror(file.status())), i18n("aRts Warning")); return false; } @@ -674,7 +674,7 @@ void ArtsBuilderWindow::execute() execDlg->start(); execDlg->show(); - connect(execDlg, TQT_SIGNAL(ready()), this, TQT_SLOT(endexecute())); + connect(execDlg, TQT_SIGNAL(ready()), TQT_TQOBJECT(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?"), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard()); + i18n("The current structure has been modified.\nWould you like to save it?"), TQString(), KStdGuiItem::save(), KStdGuiItem::discard()); result = false; switch(query) @@ -872,7 +872,7 @@ ArtsBuilderApp::ArtsBuilderApp(TQString filename) mainWindow->open(filename); } else { KMessageBox::sorry(0, - i18n("The specified file '%1' does not exist.").arg(filename), + i18n("The specified file '%1' does not exist.").tqarg(filename), i18n("aRts Warning")); } } diff --git a/arts/builder/main.h b/arts/builder/main.h index e9c17391..b11cf224 100644 --- a/arts/builder/main.h +++ b/arts/builder/main.h @@ -40,6 +40,7 @@ class KToggleAction; class ArtsBuilderWindow: public KDockMainWindow { Q_OBJECT + TQ_OBJECT protected: KDockWidget* mainDock; diff --git a/arts/builder/menumaker.cpp b/arts/builder/menumaker.cpp index 2aed8401..dd08589d 100644 --- a/arts/builder/menumaker.cpp +++ b/arts/builder/menumaker.cpp @@ -5,11 +5,11 @@ using namespace std; -MenuEntry::MenuEntry(MenuMaker *menumaker, KActionMenu *parent, const char *text) +MenuEntry::MenuEntry(MenuMaker *menumaker, KActionMenu *tqparent, const char *text) : menumaker(menumaker), text(text) { action = new KAction(TQString::fromLocal8Bit(text)); - parent->insert(action); + tqparent->insert(action); connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(activated())); } @@ -95,7 +95,7 @@ void MenuMaker::addCategory(const TQString& name, const char *prefix) /* 000 */ /*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'", + arts_debug("inserting a menu called '%s' in the tqparent menu '%s'", catname(name).local8Bit().data(),pc->name().local8Bit().data()); categories.push_back(new MenuCategory(name,prefix,newMenu)); } @@ -148,7 +148,7 @@ TQString MenuMaker::basename(const TQString& name) { TQString result = ""; - int i = name.findRev('/'); + int i = name.tqfindRev('/'); if(i != -1) result = name.left(i); @@ -159,7 +159,7 @@ TQString MenuMaker::basename(const TQString& name) TQString MenuMaker::catname(const TQString& name) { - int i = name.findRev('/'); + int i = name.tqfindRev('/'); if(i >= 0) return name.mid(i+1); diff --git a/arts/builder/menumaker.h b/arts/builder/menumaker.h index f2481a2f..583854f6 100644 --- a/arts/builder/menumaker.h +++ b/arts/builder/menumaker.h @@ -8,9 +8,10 @@ class MenuMaker; -class MenuEntry : public QObject +class MenuEntry : public TQObject { Q_OBJECT + TQ_OBJECT protected: MenuMaker *menumaker; @@ -18,7 +19,7 @@ protected: TQCString text; public: - MenuEntry(MenuMaker *menumaker, KActionMenu *parent, const char *text); + MenuEntry(MenuMaker *menumaker, KActionMenu *tqparent, const char *text); public slots: void activated(); @@ -43,9 +44,10 @@ public: bool matches(const char *item); }; -class MenuMaker :public QObject +class MenuMaker :public TQObject { Q_OBJECT + TQ_OBJECT std::list<MenuCategory *> categories; public: diff --git a/arts/builder/module.cpp b/arts/builder/module.cpp index 5432492e..7d9581bf 100644 --- a/arts/builder/module.cpp +++ b/arts/builder/module.cpp @@ -128,7 +128,7 @@ void Module::initModule() _pixmap = new TQPixmap(iconloader.loadIcon(iconname, KIcon::User)); if(!_pixmap->height()) { - iconname.replace( iconname.length() - 4, 3, "png" ); + iconname.tqreplace( iconname.length() - 4, 3, "png" ); delete _pixmap; _pixmap = new TQPixmap(iconloader.loadIcon(iconname, KIcon::User)); if( !_pixmap->height() ) @@ -243,8 +243,8 @@ void Module::drawSegment(TQPainter *p, int cellsize, int segment) mcolor = TQColor(100, 100, 100); mcolorlight = TQColor(160, 160, 160); } - TQColorGroup g( Qt::white, Qt::blue, mcolorlight, mcolor.dark(), mcolor, - Qt::black, Qt::black ); + TQColorGroup g( TQt::white, TQt::blue, mcolorlight, mcolor.dark(), mcolor, + TQt::black, TQt::black ); TQBrush fill( mcolor ); TQPen textpen(TQColor(255, 255, 180), 1); @@ -373,7 +373,7 @@ void Module::drawSegment(TQPainter *p, int cellsize, int segment) if(selected()) { - TQPen pen(Qt::white, 1, Qt::DotLine); + TQPen pen(TQt::white, 1, TQt::DotLine); p->setPen(pen); p->drawLine(0, 0, cellsize - 1, 0); @@ -413,7 +413,7 @@ ModulePort *Module::portAt(int segment, int x, int y) if(port) { TQPoint clickpoint(x, y); - if(port->clickrect.contains(clickpoint)) return port; + if(port->clickrect.tqcontains(clickpoint)) return port; } } return 0; diff --git a/arts/builder/module.h b/arts/builder/module.h index 6fbff74d..44466bc0 100644 --- a/arts/builder/module.h +++ b/arts/builder/module.h @@ -46,8 +46,8 @@ public: bool selected; StructureComponent *owner; - QString description; - QRect clickrect; + TQString description; + TQRect clickrect; ConnType conntype; Direction direction; int drawsegment; diff --git a/arts/builder/mwidget.cpp b/arts/builder/mwidget.cpp index 808b3bcf..5ab19fe7 100644 --- a/arts/builder/mwidget.cpp +++ b/arts/builder/mwidget.cpp @@ -133,7 +133,7 @@ void ModuleWidget::mousePressEvent( TQMouseEvent *e ) return; } - if( e->button() == LeftButton ) + if( e->button() == Qt::LeftButton ) { StructureComponent *component; ModulePort *port; @@ -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), TQString::null, i18n("&Delete")) == KMessageBox::Continue) + numSelected), TQString(), i18n("&Delete")) == KMessageBox::Continue) { selectPort(0L); emit componentSelected(0); @@ -608,8 +608,8 @@ void ModuleWidget::autoRedrawRouter() if(autorouter->needRedraw()) redrawAll(); } -ModuleWidget::ModuleWidget(Structure *structure, TQWidget *parent, const char *name, WFlags f) - : QtTableView( parent, name, f), +ModuleWidget::ModuleWidget(Structure *structure, TQWidget *tqparent, const char *name, WFlags f) + : QtTableView( tqparent, name, f), updateDepth( 0 ), activeTool( 0L ), structure( structure ), @@ -627,7 +627,7 @@ ModuleWidget::ModuleWidget(Structure *structure, TQWidget *parent, const char *n setTableFlags(Tbl_autoScrollBars); setZoom(100); - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); arts_debug("PORT: mw; bgmode"); setBackgroundMode(NoBackground); diff --git a/arts/builder/mwidget.h b/arts/builder/mwidget.h index 8f92c946..b3b41b78 100644 --- a/arts/builder/mwidget.h +++ b/arts/builder/mwidget.h @@ -34,6 +34,7 @@ class MWidgetTool; class ModuleWidget :public QtTableView, public StructureCanvas { Q_OBJECT + TQ_OBJECT friend class MWidgetTool; friend class CreateTool; friend class CreateInterfaceTool; @@ -108,7 +109,7 @@ public: TQPoint componentPos(const StructureComponent *component) const; TQPoint portPos(const ModulePort *port) const; - ModuleWidget( Structure *structure, TQWidget *parent = 0, + ModuleWidget( Structure *structure, TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); ~ModuleWidget(); diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp index 72bd4379..ecd877c9 100644 --- a/arts/builder/portposdlg.cpp +++ b/arts/builder/portposdlg.cpp @@ -40,52 +40,52 @@ using namespace std; -PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,"Props", TRUE) +PortPosDlg::PortPosDlg(TQWidget *tqparent, Structure *structure) :TQDialog(tqparent,"Props", TRUE) { this->structure = structure; setCaption(i18n("aRts: Structureport View")); - TQVBoxLayout *mainlayout = new TQVBoxLayout(this); - //TQHBoxLayout *contentslayout = new TQHBoxLayout; + TQVBoxLayout *maintqlayout = new TQVBoxLayout(this); + //TQHBoxLayout *contentstqlayout = new TQHBoxLayout; // object type /* - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); TQLabel *objectlabel = new TQLabel(this); TQFont labelfont(objectlabel->font()); labelfont.setPointSize(labelfont.pointSize()*3/2); objectlabel->setFont(labelfont); objectlabel->setText(TQString(" ")+i18n("Object type: ")+TQString(port->owner->name())+TQString(" ")); - objectlabel->setAlignment(AlignCenter); + objectlabel->tqsetAlignment(AlignCenter); min_size(objectlabel); - mainlayout->addWidget(objectlabel); + maintqlayout->addWidget(objectlabel); */ // port description /* - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); TQLabel *portlabel = new TQLabel(this); labelfont.setPointSize(labelfont.pointSize()*4/5); portlabel->setFont(labelfont); portlabel->setText(i18n("Port description: ")+ port->description); min_size(portlabel); - portlabel->setAlignment(AlignCenter); - mainlayout->addWidget(portlabel); + portlabel->tqsetAlignment(AlignCenter); + maintqlayout->addWidget(portlabel); - int labelwidth = imax(portlabel->sizeHint().width(),objectlabel->sizeHint().width()); + int labelwidth = imax(portlabel->tqsizeHint().width(),objectlabel->tqsizeHint().width()); portlabel->setMinimumWidth(labelwidth); objectlabel->setMinimumWidth(labelwidth); // hruler - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); KSeparator *ruler = new KSeparator( KSeparator::HLine, this); - mainlayout->addWidget(ruler); - mainlayout->addSpacing(5); - mainlayout->addLayout(contentslayout); + maintqlayout->addWidget(ruler); + maintqlayout->addSpacing(5); + maintqlayout->addLayout(contentstqlayout); */ // list @@ -94,24 +94,24 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent, update(); listbox->setMinimumSize(100,200); - mainlayout->addWidget(listbox); + maintqlayout->addWidget(listbox); // hruler - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this); - mainlayout->addWidget(ruler2); + maintqlayout->addWidget(ruler2); // buttons - TQHBoxLayout *buttonlayout = new TQHBoxLayout; - mainlayout->addSpacing(5); - mainlayout->addLayout(buttonlayout); - mainlayout->addSpacing(5); + TQHBoxLayout *buttontqlayout = new TQHBoxLayout; + maintqlayout->addSpacing(5); + maintqlayout->addLayout(buttontqlayout); + maintqlayout->addSpacing(5); - buttonlayout->addSpacing(5); + buttontqlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() )); + bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() )); bbox->addStretch(1); KIconLoader iconloader; @@ -133,14 +133,14 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent, TQButton *cancelbutton = bbox->addButton(i18n("Cancel")); connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) ); */ - bbox->layout(); + bbox->tqlayout(); //min_size(bbox); - buttonlayout->addWidget(bbox); - buttonlayout->addSpacing(5); + buttontqlayout->addWidget(bbox); + buttontqlayout->addSpacing(5); - //mainlayout->activate(); - mainlayout->freeze(); + //maintqlayout->activate(); + maintqlayout->freeze(); } void PortPosDlg::raise() @@ -247,7 +247,7 @@ void PortPosDlg::update() } } } - listbox->repaint(); + listbox->tqrepaint(); } void PortPosDlg::help() diff --git a/arts/builder/portposdlg.h b/arts/builder/portposdlg.h index 1adc997c..aa61bad1 100644 --- a/arts/builder/portposdlg.h +++ b/arts/builder/portposdlg.h @@ -32,13 +32,14 @@ class PortPosDlg :public TQDialog { Q_OBJECT + TQ_OBJECT protected: Structure *structure; TQListBox *listbox; std::vector<StructurePort *> listports; public: - PortPosDlg(TQWidget *parent, Structure *structure); + PortPosDlg(TQWidget *tqparent, Structure *structure); void update(); public slots: diff --git a/arts/builder/propertypanel.cpp b/arts/builder/propertypanel.cpp index cca2ee5d..8e543a5f 100644 --- a/arts/builder/propertypanel.cpp +++ b/arts/builder/propertypanel.cpp @@ -36,8 +36,8 @@ #include <arts/debug.h> -PropertyPanel::PropertyPanel( TQWidget* parent, const char* name, WFlags fl ) - : PropertyPanelBase( parent, name, fl ), +PropertyPanel::PropertyPanel( TQWidget* tqparent, const char* name, WFlags fl ) + : PropertyPanelBase( tqparent, name, fl ), component(0L), port(0L) { @@ -115,7 +115,7 @@ void PropertyPanel::setSelectedComponent( StructureComponent *component ) if(component->pixmap()) { moduleIconLabel->setPixmap( *component->pixmap() ); - moduleIconLabel->setMinimumSize( moduleIconLabel->sizeHint() ); + moduleIconLabel->setMinimumSize( moduleIconLabel->tqsizeHint() ); moduleIconLabel->show(); } else @@ -128,11 +128,11 @@ void PropertyPanel::setSelectedComponent( StructureComponent *component ) it != modulePorts.end(); it++) { TQString portTitle = (*it)->description - + TQString(" (%1)").arg( (*it)->PortDesc.type().direction == Arts::output ? + + TQString(" (%1)").tqarg( (*it)->PortDesc.type().direction == Arts::output ? i18n("OUTPUT") : i18n("INPUT") ); portCombo->insertItem( portTitle ); } - //portCombo->setMinimumSize( portCombo->sizeHint() ); + //portCombo->setMinimumSize( portCombo->tqsizeHint() ); setEnabled(true); } } @@ -156,7 +156,7 @@ void PropertyPanel::setSelectedPort( ModulePort *port ) // select port in combobox - bah, should be easier ;-) portCombo->setCurrentItem( portCombo->listBox()->index( - portCombo->listBox()->findItem( port->description + " (" ) ) ); + portCombo->listBox()->tqfindItem( port->description + " (" ) ) ); } else { @@ -341,10 +341,10 @@ bool PropertyPanel::eventFilter( TQObject *o, TQEvent *e ) { if( port && !constantValueEdit->hasFocus() && (e->type() == TQEvent::KeyPress) ) { // kdDebug() << TQString(" ..is KeyPress") << endl; - TQString entered = static_cast<TQKeyEvent *>(e)->text(); + TQString entered = TQT_TQKEYEVENT(e)->text(); bool goodString = entered.length() > 0; -// kdDebug() << TQString("pressed '%1'").arg(entered) << endl; +// kdDebug() << TQString("pressed '%1'").tqarg(entered) << endl; for( unsigned int i = 0; i < entered.length(); i++) goodString = goodString && entered[i].isLetterOrNumber(); diff --git a/arts/builder/propertypanel.h b/arts/builder/propertypanel.h index 3603ddad..07ce3f90 100644 --- a/arts/builder/propertypanel.h +++ b/arts/builder/propertypanel.h @@ -33,9 +33,10 @@ class ModulePort; class PropertyPanel: public PropertyPanelBase { Q_OBJECT + TQ_OBJECT public: - PropertyPanel( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + PropertyPanel( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); public slots: void setSelectedComponent( StructureComponent *component ); diff --git a/arts/builder/propertypanelbase.ui b/arts/builder/propertypanelbase.ui index c89abcc6..b71d0bdb 100644 --- a/arts/builder/propertypanelbase.ui +++ b/arts/builder/propertypanelbase.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>PropertyPanelBase</class> <author>Hans Meine <hans_meine@gmx.net></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>propertyPanelBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -13,9 +13,9 @@ <height>484</height> </rect> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <vbox> <property name="name"> @@ -27,7 +27,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>titleFrame</cstring> </property> @@ -37,7 +37,7 @@ <property name="frameShadow"> <enum>Plain</enum> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> <vbox> <property name="name"> @@ -49,7 +49,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>selectedLabel</cstring> </property> @@ -59,11 +59,11 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>spacerLayout</cstring> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> <vbox> <property name="name"> @@ -75,7 +75,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>mainBoxLayout</cstring> </property> @@ -89,7 +89,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout17</cstring> </property> @@ -103,7 +103,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout13</cstring> </property> @@ -117,14 +117,14 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>moduleIconLabel</cstring> </property> </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout16</cstring> </property> @@ -138,12 +138,12 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>moduleNameLabel</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout10</cstring> </property> @@ -157,7 +157,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>portComboLabel</cstring> </property> @@ -168,7 +168,7 @@ <cstring>portCombo</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>portCombo</cstring> </property> @@ -198,7 +198,7 @@ </widget> </hbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>portValueGroup</cstring> </property> @@ -215,7 +215,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>pvNotSetButton</cstring> </property> @@ -223,7 +223,7 @@ <string>&Not set</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -237,7 +237,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>pvConstantButton</cstring> </property> @@ -245,7 +245,7 @@ <string>Constant &value:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>constantValueComboBox</cstring> </property> @@ -253,7 +253,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>constantValueEdit</cstring> </property> @@ -263,7 +263,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>connectionLayout</cstring> </property> @@ -277,7 +277,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>pvConnectionButton</cstring> </property> @@ -296,7 +296,7 @@ <enum>Expanding</enum> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>connectButton</cstring> </property> @@ -310,11 +310,11 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>tipLabel</cstring> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -355,8 +355,8 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">setTitleFont()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/arts/builder/qttableview.cpp b/arts/builder/qttableview.cpp index dee8cb99..ca488ffb 100644 --- a/arts/builder/qttableview.cpp +++ b/arts/builder/qttableview.cpp @@ -7,14 +7,14 @@ ** ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. ** -** This file contains a class moved out of the Qt GUI Toolkit API. It +** This file contains a class moved out of the TQt GUI Toolkit API. It ** may be used, distributed and modified without limitation. ** **********************************************************************/ #include "qttableview.h" #include "qttableview.moc" -#ifndef QT_NO_QTTABLEVIEW +#ifndef TQT_NO_TQTTABLEVIEW #include "tqscrollbar.h" #include "tqpainter.h" #include "tqdrawutil.h" @@ -34,23 +34,23 @@ enum ScrollBarDirtyFlags { }; -#define HSBEXT horizontalScrollBar()->sizeHint().height() -#define VSBEXT verticalScrollBar()->sizeHint().width() +#define HSBEXT horizontalScrollBar()->tqsizeHint().height() +#define VSBEXT verticalScrollBar()->tqsizeHint().width() -class QCornerSquare : public QWidget // internal class +class TQCornerSquare : public TQWidget // internal class { public: - QCornerSquare( TQWidget *, const char* = 0 ); + TQCornerSquare( TQWidget *, const char* = 0 ); void paintEvent( TQPaintEvent * ); }; -QCornerSquare::QCornerSquare( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +TQCornerSquare::TQCornerSquare( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { } -void QCornerSquare::paintEvent( TQPaintEvent * ) +void TQCornerSquare::paintEvent( TQPaintEvent * ) { } @@ -88,7 +88,7 @@ void QCornerSquare::paintEvent( TQPaintEvent * ) used by functions such as setXOffset() or maxYOffset(). \i The \e widget coordinates. (0,0) is the top-left corner of the widget, - \e including the frame. They are used by functions such as repaint(). + \e including the frame. They are used by functions such as tqrepaint(). \i The \e view coordinates. (0,0) is the top-left corner of the view, \e excluding the frame. This is the least-used coordinate system; it is used by @@ -119,13 +119,13 @@ void QCornerSquare::paintEvent( TQPaintEvent * ) it easy to have child widgets inside tables, which QtTableView doesn't support at all. - \sa QScrollView + \sa TQScrollView \link guibooks.html#fowler GUI Design Handbook: Table\endlink */ /*! - Constructs a table view. The \a parent, \a name and \f arguments + Constructs a table view. The \a tqparent, \a name and \f arguments are passed to the TQFrame constructor. The \link setTableFlags() table flags\endlink are all cleared (set to 0). @@ -135,7 +135,7 @@ void QCornerSquare::paintEvent( TQPaintEvent * ) The \link setCellHeight() cell height\endlink and \link setCellWidth() cell width\endlink are set to 0. - Frame line shapes (TQFrame::HLink and TQFrame::VLine) are disallowed; + Frame line tqshapes (TQFrame::HLink and TQFrame::VLine) are disallowed; see TQFrame::setFrameStyle(). Note that the \a f argument is \e not \link setTableFlags() table @@ -144,8 +144,8 @@ void QCornerSquare::paintEvent( TQPaintEvent * ) */ -QtTableView::QtTableView( TQWidget *parent, const char *name, WFlags f ) - : TQFrame( parent, name, f ) +QtTableView::QtTableView( TQWidget *tqparent, const char *name, WFlags f ) + : TQFrame( tqparent, name, f ) { nRows = nCols = 0; // zero rows/cols xCellOffs = yCellOffs = 0; // zero offset @@ -207,7 +207,7 @@ void QtTableView::show() /*! - \overload void QtTableView::repaint( bool erase ) + \overload void QtTableView::tqrepaint( bool erase ) Repaints the entire view. */ @@ -221,16 +221,16 @@ void QtTableView::show() If \a w is negative, it is replaced with <code>width() - x</code>. If \a h is negative, it is replaced with <code>height() - y</code>. - Doing a repaint() usually is faster than doing an update(), but + Doing a tqrepaint() usually is faster than doing an update(), but calling update() many times in a row will generate a single paint event. At present, QtTableView is the only widget that reimplements \link - TQWidget::repaint() repaint()\endlink. It does this because by - clearing and then repainting one cell at at time, it can make the + TQWidget::tqrepaint() tqrepaint()\endlink. It does this because by + clearing and then tqrepainting one cell at at time, it can make the screen flicker less than it would otherwise. */ -void QtTableView::repaint( int x, int y, int w, int h, bool erase ) +void QtTableView::tqrepaint( int x, int y, int w, int h, bool erase ) { if ( !isVisible() || testWState(WState_BlockUpdates) ) return; @@ -249,7 +249,7 @@ void QtTableView::repaint( int x, int y, int w, int h, bool erase ) } /*! - \overload void QtTableView::repaint( const TQRect &r, bool erase ) + \overload void QtTableView::tqrepaint( const TQRect &r, bool erase ) Replaints rectangle \a r. If \a erase is TRUE draws the background using the palette's background. */ @@ -265,7 +265,7 @@ void QtTableView::repaint( int x, int y, int w, int h, bool erase ) Sets the number of rows of the table to \a rows (must be non-negative). Does not change topCell(). - The table repaints itself automatically if autoUpdate() is set. + The table tqrepaints itself automatically if autoUpdate() is set. \sa numCols(), setNumCols(), numRows() */ @@ -273,7 +273,7 @@ void QtTableView::repaint( int x, int y, int w, int h, bool erase ) void QtTableView::setNumRows( int rows ) { if ( rows < 0 ) { -#if defined(QT_CHECK_RANGE) +#if defined(TQT_CHECK_RANGE) qWarning( "QtTableView::setNumRows: (%s) Negative argument %d.", name( "unnamed" ), rows ); #endif @@ -288,7 +288,7 @@ void QtTableView::setNumRows( int rows ) nRows = rows; if ( autoUpdate() && isVisible() && ( oldLastVisible != lastRowVisible() || oldTopCell != topCell() ) ) - repaint( oldTopCell != topCell() ); + tqrepaint( oldTopCell != topCell() ); } else { // Be more careful - if destructing, bad things might happen. nRows = rows; @@ -307,7 +307,7 @@ void QtTableView::setNumRows( int rows ) Sets the number of columns of the table to \a cols (must be non-negative). Does not change leftCell(). - The table repaints itself automatically if autoUpdate() is set. + The table tqrepaints itself automatically if autoUpdate() is set. \sa numCols(), numRows(), setNumRows() */ @@ -315,7 +315,7 @@ void QtTableView::setNumRows( int rows ) void QtTableView::setNumCols( int cols ) { if ( cols < 0 ) { -#if defined(QT_CHECK_RANGE) +#if defined(TQT_CHECK_RANGE) qWarning( "QtTableView::setNumCols: (%s) Negative argument %d.", name( "unnamed" ), cols ); #endif @@ -328,7 +328,7 @@ void QtTableView::setNumCols( int cols ) if ( autoUpdate() && isVisible() ) { int maxCol = lastColVisible(); if ( maxCol >= oldCols || maxCol >= nCols ) - repaint(); + tqrepaint(); } updateScrollBars( horRange ); updateFrameSize(); @@ -580,7 +580,7 @@ void QtTableView::setCellWidth( int cellWidth ) { if ( cellW == cellWidth ) return; -#if defined(QT_CHECK_RANGE) +#if defined(TQT_CHECK_RANGE) if ( cellWidth < 0 || cellWidth > SHRT_MAX ) { qWarning( "QtTableView::setCellWidth: (%s) Argument out of range (%d)", name( "unnamed" ), cellWidth ); @@ -591,7 +591,7 @@ void QtTableView::setCellWidth( int cellWidth ) updateScrollBars( horSteps | horRange ); if ( autoUpdate() && isVisible() ) - repaint(); + tqrepaint(); } @@ -634,7 +634,7 @@ void QtTableView::setCellHeight( int cellHeight ) { if ( cellH == cellHeight ) return; -#if defined(QT_CHECK_RANGE) +#if defined(TQT_CHECK_RANGE) if ( cellHeight < 0 || cellHeight > SHRT_MAX ) { qWarning( "QtTableView::setCellHeight: (%s) Argument out of range (%d)", name( "unnamed" ), cellHeight ); @@ -643,7 +643,7 @@ void QtTableView::setCellHeight( int cellHeight ) #endif cellH = (short)cellHeight; if ( autoUpdate() && isVisible() ) - repaint(); + tqrepaint(); updateScrollBars( verSteps | verRange ); } @@ -717,7 +717,7 @@ int QtTableView::totalHeight() Sets the table flags to \a f. If a flag setting changes the appearance of the table, the table is - repainted if - and only if - autoUpdate() is TRUE. + tqrepainted if - and only if - autoUpdate() is TRUE. The table flags are mostly single bits, though there are some multibit flags for convenience. Here is a complete list: @@ -786,7 +786,7 @@ void QtTableView::setTableFlags( uint f ) bool updateOn = autoUpdate(); setAutoUpdate( FALSE ); - uint repaintMask = Tbl_cutCellsV | Tbl_cutCellsH; + uint tqrepaintMask = Tbl_cutCellsV | Tbl_cutCellsH; if ( f & Tbl_vScrollBar ) { setVerScrollBar( TRUE ); @@ -817,15 +817,15 @@ void QtTableView::setTableFlags( uint f ) (f & Tbl_snapToVGrid) != 0 && yCellDelta != 0 ) { snapToGrid( (f & Tbl_snapToHGrid) != 0, // do snapping (f & Tbl_snapToVGrid) != 0 ); - repaintMask |= Tbl_snapToGrid; // repaint table + tqrepaintMask |= Tbl_snapToGrid; // tqrepaint table } } if ( updateOn ) { setAutoUpdate( TRUE ); updateScrollBars(); - if ( isVisible() && (f & repaintMask) ) - repaint(); + if ( isVisible() && (f & tqrepaintMask) ) + tqrepaint(); } } @@ -852,7 +852,7 @@ void QtTableView::clearTableFlags( uint f ) bool updateOn = autoUpdate(); setAutoUpdate( FALSE ); - uint repaintMask = Tbl_cutCellsV | Tbl_cutCellsH; + uint tqrepaintMask = Tbl_cutCellsV | Tbl_cutCellsH; if ( f & Tbl_vScrollBar ) { setVerScrollBar( FALSE ); @@ -864,7 +864,7 @@ void QtTableView::clearTableFlags( uint f ) int maxX = maxXOffset(); if ( xOffs > maxX ) { setOffset( maxX, yOffs ); - repaintMask |= Tbl_scrollLastHCell; + tqrepaintMask |= Tbl_scrollLastHCell; } updateScrollBars( horRange ); } @@ -872,7 +872,7 @@ void QtTableView::clearTableFlags( uint f ) int maxY = maxYOffset(); if ( yOffs > maxY ) { setOffset( xOffs, maxY ); - repaintMask |= Tbl_scrollLastVCell; + tqrepaintMask |= Tbl_scrollLastVCell; } updateScrollBars( verRange ); } @@ -881,7 +881,7 @@ void QtTableView::clearTableFlags( uint f ) (f & Tbl_smoothVScrolling) != 0 && yCellDelta != 0 ) { snapToGrid( (f & Tbl_smoothHScrolling) != 0, // do snapping (f & Tbl_smoothVScrolling) != 0 ); - repaintMask |= Tbl_smoothScrolling; // repaint table + tqrepaintMask |= Tbl_smoothScrolling; // tqrepaint table } } if ( f & Tbl_snapToHGrid ) { @@ -893,8 +893,8 @@ void QtTableView::clearTableFlags( uint f ) if ( updateOn ) { setAutoUpdate( TRUE ); updateScrollBars(); // returns immediately if nothing to do - if ( isVisible() && (f & repaintMask) ) - repaint(); + if ( isVisible() && (f & tqrepaintMask) ) + tqrepaint(); } } @@ -916,20 +916,20 @@ void QtTableView::clearTableFlags( uint f ) automatically whenever it has changed in some way (for example, when a \link setTableFlags() flag\endlink is changed). - If \a enable is FALSE, the view does NOT repaint itself or update + If \a enable is FALSE, the view does NOT tqrepaint itself or update its internal state variables when it is changed. This can be useful to avoid flicker during large changes and is singularly useless otherwise. Disable auto-update, do the changes, re-enable - auto-update and call repaint(). + auto-update and call tqrepaint(). \warning Do not leave the view in this state for a long time (i.e., between events). If, for example, the user interacts with the view when auto-update is off, strange things can happen. - Setting auto-update to TRUE does not repaint the view; you must call - repaint() to do this. + Setting auto-update to TRUE does not tqrepaint the view; you must call + tqrepaint() to do this. - \sa autoUpdate(), repaint() + \sa autoUpdate(), tqrepaint() */ void QtTableView::setAutoUpdate( bool enable ) @@ -948,7 +948,7 @@ void QtTableView::setAutoUpdate( bool enable ) Repaints the cell at row \a row, column \a col if it is inside the view. If \a erase is TRUE, the relevant part of the view is cleared to the - background color/pixmap before the contents are repainted. + background color/pixmap before the contents are tqrepainted. \sa isVisible() */ @@ -963,7 +963,7 @@ void QtTableView::updateCell( int row, int col, bool erase ) TQRect uR = TQRect( xPos, yPos, cellW ? cellW : cellWidth(col), cellH ? cellH : cellHeight(row) ); - repaint( uR.intersect(viewRect()), erase ); + tqrepaint( uR.intersect(viewRect()), erase ); } @@ -1073,7 +1073,7 @@ void QtTableView::coverCornerSquare( bool enable ) { coveringCornerSquare = enable; if ( !cornerSquare && enable ) { - cornerSquare = new QCornerSquare( this ); + cornerSquare = new TQCornerSquare( this ); Q_CHECK_PTR( cornerSquare ); cornerSquare->setGeometry( maxViewX() + frameWidth() + 1, maxViewY() + frameWidth() + 1, @@ -1266,7 +1266,7 @@ void QtTableView::setupPainter( TQPainter * ) /*! Handles paint events, \a e, for the table view. - Calls paintCell() for the cells that needs to be repainted. + Calls paintCell() for the cells that needs to be tqrepainted. */ void QtTableView::paintEvent( TQPaintEvent *e ) @@ -1280,7 +1280,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) TQPainter paint( this ); - if ( !contentsRect().contains( updateR, TRUE ) ) {// update frame ? + if ( !contentsRect().tqcontains( updateR, TRUE ) ) {// update frame ? drawFrame( &paint ); if ( updateR.left() < frameWidth() ) //### updateR.setLeft( frameWidth() ); @@ -1315,7 +1315,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) TQRect winR = viewRect(); TQRect cellR; TQRect cellUR; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQWMatrix matrix; #endif @@ -1339,11 +1339,11 @@ void QtTableView::paintEvent( TQPaintEvent *e ) if ( eraseInPaint ) paint.eraseRect( cellUR ); -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS matrix.translate( xPos, yPos ); paint.setWorldMatrix( matrix ); if ( testTableFlags(Tbl_clipCellPainting) || - frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt + frameWidth() > 0 && !winR.tqcontains( cellR ) ) { //##arnt paint.setClipRect( cellUR ); paintCell( &paint, row, col ); paint.setClipping( FALSE ); @@ -1355,7 +1355,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) #else paint.translate( xPos, yPos ); if ( testTableFlags(Tbl_clipCellPainting) || - frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt + frameWidth() > 0 && !winR.tqcontains( cellR ) ) { //##arnt paint.setClipRect( cellUR ); paintCell( &paint, row, col ); paint.setClipping( FALSE ); @@ -1379,13 +1379,13 @@ void QtTableView::paintEvent( TQPaintEvent *e ) // Note that this needs to be done regardless whether we do // eraseInPaint or not. Reason: a subclass may implement - // flicker-freeness and encourage the use of repaint(FALSE). + // flicker-freeness and encourage the use of tqrepaint(FALSE). // The subclass, however, cannot draw all pixels, just those // inside the cells. So QtTableView is reponsible for all pixels // outside the cells. TQRect viewR = viewRect(); - const TQColorGroup g = colorGroup(); + const TQColorGroup g = tqcolorGroup(); if ( xPos <= maxX ) { TQRect r = viewR; @@ -1414,8 +1414,8 @@ void QtTableView::resizeEvent( TQResizeEvent * ) verSteps | verGeometry | verRange ); showOrHideScrollBars(); updateFrameSize(); - int maxX = QMIN( xOffs, maxXOffset() ); // ### can be slow - int maxY = QMIN( yOffs, maxYOffset() ); + int maxX = TQMIN( xOffs, maxXOffset() ); // ### can be slow + int maxY = TQMIN( yOffs, maxYOffset() ); setOffset( maxX, maxY ); } @@ -1426,7 +1426,7 @@ void QtTableView::resizeEvent( TQResizeEvent * ) void QtTableView::updateView() { - repaint( viewRect() ); + tqrepaint( viewRect() ); } /*! @@ -1439,14 +1439,14 @@ TQScrollBar *QtTableView::verticalScrollBar() const { QtTableView *that = (QtTableView*)this; // semantic const if ( !vScrollBar ) { - TQScrollBar *sb = new TQScrollBar( TQScrollBar::Vertical, that ); -#ifndef QT_NO_CURSOR + TQScrollBar *sb = new TQScrollBar( Qt::Vertical, that ); +#ifndef TQT_NO_CURSOR sb->setCursor( arrowCursor ); #endif - sb->resize( sb->sizeHint() ); // height is irrelevant + sb->resize( sb->tqsizeHint() ); // height is irrelevant Q_CHECK_PTR(sb); sb->setTracking( FALSE ); - sb->setFocusPolicy( NoFocus ); + sb->setFocusPolicy( TQ_NoFocus ); connect( sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(verSbValue(int))); connect( sb, TQT_SIGNAL(sliderMoved(int)), @@ -1470,12 +1470,12 @@ TQScrollBar *QtTableView::horizontalScrollBar() const { QtTableView *that = (QtTableView*)this; // semantic const if ( !hScrollBar ) { - TQScrollBar *sb = new TQScrollBar( TQScrollBar::Horizontal, that ); -#ifndef QT_NO_CURSOR + TQScrollBar *sb = new TQScrollBar( Qt::Horizontal, that ); +#ifndef TQT_NO_CURSOR sb->setCursor( arrowCursor ); #endif - sb->resize( sb->sizeHint() ); // width is irrelevant - sb->setFocusPolicy( NoFocus ); + sb->resize( sb->tqsizeHint() ); // width is irrelevant + sb->setFocusPolicy( TQ_NoFocus ); Q_CHECK_PTR(sb); sb->setTracking( FALSE ); connect( sb, TQT_SIGNAL(valueChanged(int)), @@ -1522,7 +1522,7 @@ void QtTableView::setHorScrollBar( bool on, bool update ) else sbDirty = sbDirty | verMask; if ( hideScrollBar && isVisible() ) - repaint( hScrollBar->x(), hScrollBar->y(), + tqrepaint( hScrollBar->x(), hScrollBar->y(), width() - hScrollBar->x(), hScrollBar->height() ); } if ( update ) @@ -1561,7 +1561,7 @@ void QtTableView::setVerScrollBar( bool on, bool update ) else sbDirty = sbDirty | horMask; if ( hideScrollBar && isVisible() ) - repaint( vScrollBar->x(), vScrollBar->y(), + tqrepaint( vScrollBar->x(), vScrollBar->y(), vScrollBar->width(), height() - vScrollBar->y() ); } if ( update ) @@ -1579,7 +1579,7 @@ int QtTableView::findRawRow( int yPos, int *cellMaxY, int *cellMinY, return r; if ( goOutsideView || yPos >= minViewY() && yPos <= maxViewY() ) { if ( yPos < minViewY() ) { -#if defined(QT_CHECK_RANGE) +#if defined(TQT_CHECK_RANGE) qWarning( "QtTableView::findRawRow: (%s) internal error: " "yPos < minViewY() && goOutsideView " "not supported. (%d,%d)", @@ -1626,7 +1626,7 @@ int QtTableView::findRawCol( int xPos, int *cellMaxX, int *cellMinX , return c; if ( goOutsideView || xPos >= minViewX() && xPos <= maxViewX() ) { if ( xPos < minViewX() ) { -#if defined(QT_CHECK_RANGE) +#if defined(TQT_CHECK_RANGE) qWarning( "QtTableView::findRawCol: (%s) internal error: " "xPos < minViewX() && goOutsideView " "not supported. (%d,%d)", @@ -1995,7 +1995,7 @@ void QtTableView::updateScrollBars( uint f ) if ( sbDirty & horSteps ) { if ( cellW ) - hScrollBar->setSteps( QMIN(cellW,viewWidth()/2), viewWidth() ); + hScrollBar->setSteps( TQMIN(cellW,viewWidth()/2), viewWidth() ); else hScrollBar->setSteps( 16, viewWidth() ); } @@ -2006,7 +2006,7 @@ void QtTableView::updateScrollBars( uint f ) if ( sbDirty & horValue ) hScrollBar->setValue( xOffs ); - // show scrollbar only when it has a sane geometry + // show scrollbar only when it has a sane tqgeometry if ( !hScrollBar->isVisible() ) hScrollBar->show(); } @@ -2019,7 +2019,7 @@ void QtTableView::updateScrollBars( uint f ) if ( sbDirty & verSteps ) { if ( cellH ) - vScrollBar->setSteps( QMIN(cellH,viewHeight()/2), viewHeight() ); + vScrollBar->setSteps( TQMIN(cellH,viewHeight()/2), viewHeight() ); else vScrollBar->setSteps( 16, viewHeight() ); // fttb! ### } @@ -2030,7 +2030,7 @@ void QtTableView::updateScrollBars( uint f ) if ( sbDirty & verValue ) vScrollBar->setValue( yOffs ); - // show scrollbar only when it has a sane geometry + // show scrollbar only when it has a sane tqgeometry if ( !vScrollBar->isVisible() ) vScrollBar->show(); } @@ -2061,9 +2061,9 @@ void QtTableView::updateFrameSize() setFrameRect( TQRect(0,0,rw,rh) ); if ( rw != fw ) - update( QMIN(fw,rw) - frameWidth() - 2, 0, frameWidth()+4, rh ); + update( TQMIN(fw,rw) - frameWidth() - 2, 0, frameWidth()+4, rh ); if ( rh != fh ) - update( 0, QMIN(fh,rh) - frameWidth() - 2, rw, frameWidth()+4 ); + update( 0, TQMIN(fh,rh) - frameWidth() - 2, rw, frameWidth()+4 ); } } @@ -2253,7 +2253,7 @@ void QtTableView::showOrHideScrollBars() Call this function when the table view's total size is changed; typically because the result of cellHeight() or cellWidth() have changed. - This function does not repaint the widget. + This function does not tqrepaint the widget. */ void QtTableView::updateTableSize() diff --git a/arts/builder/qttableview.h b/arts/builder/qttableview.h index ab83d152..a6e868b6 100644 --- a/arts/builder/qttableview.h +++ b/arts/builder/qttableview.h @@ -7,38 +7,37 @@ ** ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. ** -** This file contains a class moved out of the Qt GUI Toolkit API. It +** This file contains a class moved out of the TQt GUI Toolkit API. It ** may be used, distributed and modified without limitation. ** **********************************************************************/ -#ifndef QTTABLEVIEW_H -#define QTTABLEVIEW_H +#ifndef TQTTABLEVIEW_H +#define TQTTABLEVIEW_H -#ifndef QT_H #include "tqframe.h" -#endif // QT_H -#ifndef QT_NO_QTTABLEVIEW +#ifndef TQT_NO_TQTTABLEVIEW class TQScrollBar; -class QCornerSquare; +class TQCornerSquare; -class QtTableView : public QFrame +class QtTableView : public TQFrame { Q_OBJECT + TQ_OBJECT public: 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 TQRect &, bool erase=TRUE ); + void tqrepaint( bool erase=TRUE ); + void tqrepaint( int x, int y, int w, int h, bool erase=TRUE ); + void tqrepaint( const TQRect &, bool erase=TRUE ); protected: - QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 ); + QtTableView( TQWidget *tqparent=0, const char *name=0, WFlags f=0 ); ~QtTableView(); int numRows() const; @@ -78,8 +77,8 @@ protected: void updateCell( int row, int column, bool erase=TRUE ); - QRect cellUpdateRect() const; - QRect viewRect() const; + TQRect cellUpdateRect() const; + TQRect viewRect() const; int lastRowVisible() const; int lastColVisible() const; @@ -162,14 +161,14 @@ private: uint inSbUpdate : 1; uint tFlags; - QRect cellUpdateR; + TQRect cellUpdateR; TQScrollBar *vScrollBar; TQScrollBar *hScrollBar; - QCornerSquare *cornerSquare; + TQCornerSquare *cornerSquare; private: // Disabled copy constructor and operator= -#if defined(Q_DISABLE_COPY) +#if defined(TQ_DISABLE_COPY) QtTableView( const QtTableView & ); QtTableView &operator=( const QtTableView & ); #endif @@ -236,16 +235,16 @@ inline TQRect QtTableView::cellUpdateRect() const inline bool QtTableView::autoUpdate() const { return isUpdatesEnabled(); } -inline void QtTableView::repaint( bool erase ) -{ repaint( 0, 0, width(), height(), erase ); } +inline void QtTableView::tqrepaint( bool erase ) +{ tqrepaint( 0, 0, width(), height(), erase ); } -inline void QtTableView::repaint( const TQRect &r, bool erase ) -{ repaint( r.x(), r.y(), r.width(), r.height(), erase ); } +inline void QtTableView::tqrepaint( const TQRect &r, bool erase ) +{ tqrepaint( r.x(), r.y(), r.width(), r.height(), erase ); } inline void QtTableView::updateScrollBars() { updateScrollBars( 0 ); } -#endif // QT_NO_QTTABLEVIEW +#endif // TQT_NO_TQTTABLEVIEW -#endif // QTTABLEVIEW_H +#endif // TQTTABLEVIEW_H diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp index 57cfde36..c54cbabd 100644 --- a/arts/builder/retrievedlg.cpp +++ b/arts/builder/retrievedlg.cpp @@ -37,33 +37,33 @@ #include <tqpushbutton.h> static void min_size(TQWidget *w) { - w->setMinimumSize(w->sizeHint()); + w->setMinimumSize(w->tqsizeHint()); } -RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE) +RetrieveDlg::RetrieveDlg(TQWidget *tqparent) :TQDialog(tqparent,"X", TRUE) { setCaption(i18n("Retrieve Structure From Server")); - TQVBoxLayout *mainlayout = new TQVBoxLayout(this); + TQVBoxLayout *maintqlayout = new TQVBoxLayout(this); // caption label: "Synthesis running..." - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); TQLabel *captionlabel = new TQLabel(this); TQFont labelfont(captionlabel->font()); labelfont.setPointSize(labelfont.pointSize()*3/2); captionlabel->setFont(labelfont); captionlabel->setText(TQString(" ")+i18n("Published structures")+TQString(" ")); - captionlabel->setAlignment(AlignCenter); + captionlabel->tqsetAlignment(AlignCenter); min_size(captionlabel); - mainlayout->addWidget(captionlabel); + maintqlayout->addWidget(captionlabel); // hruler - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this); - mainlayout->addWidget(ruler2); - mainlayout->addSpacing(5); + maintqlayout->addWidget(ruler2); + maintqlayout->addSpacing(5); // listwidget @@ -85,26 +85,26 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE) listbox->insertItem((*ni).c_str()); #endif - mainlayout->addWidget(listbox); + maintqlayout->addWidget(listbox); // hruler - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); KSeparator *ruler = new KSeparator( KSeparator::HLine, this); - mainlayout->addWidget(ruler); - mainlayout->addSpacing(5); + maintqlayout->addWidget(ruler); + maintqlayout->addSpacing(5); // buttons - TQHBoxLayout *buttonlayout = new TQHBoxLayout; - mainlayout->addSpacing(5); - mainlayout->addLayout(buttonlayout); - mainlayout->addSpacing(5); + TQHBoxLayout *buttontqlayout = new TQHBoxLayout; + maintqlayout->addSpacing(5); + maintqlayout->addLayout(buttontqlayout); + maintqlayout->addSpacing(5); - buttonlayout->addSpacing(5); + buttontqlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() )); + bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() )); bbox->addStretch(1); TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel()); @@ -113,12 +113,12 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE) TQButton *okbutton = bbox->addButton(KStdGuiItem::ok()); connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) ); - bbox->layout(); + bbox->tqlayout(); - buttonlayout->addWidget(bbox); - buttonlayout->addSpacing(5); + buttontqlayout->addWidget(bbox); + buttontqlayout->addSpacing(5); - mainlayout->freeze(); + maintqlayout->freeze(); } TQString RetrieveDlg::result() @@ -127,7 +127,7 @@ TQString RetrieveDlg::result() { return(listbox->text(listbox->currentItem())); } - return TQString::null; + return TQString(); } void RetrieveDlg::help() diff --git a/arts/builder/retrievedlg.h b/arts/builder/retrievedlg.h index e0a6eb0c..3ffa57ee 100644 --- a/arts/builder/retrievedlg.h +++ b/arts/builder/retrievedlg.h @@ -35,9 +35,10 @@ class RetrieveDlg :public TQDialog { Q_OBJECT + TQ_OBJECT TQListBox *listbox; public: - RetrieveDlg(TQWidget *parent); + RetrieveDlg(TQWidget *tqparent); TQString result(); public slots: void help(); diff --git a/arts/builder/structureport.cpp b/arts/builder/structureport.cpp index 35b36b45..55c15211 100644 --- a/arts/builder/structureport.cpp +++ b/arts/builder/structureport.cpp @@ -104,8 +104,8 @@ void StructurePort::drawSegment(TQPainter *dest, int cellsize, int segment) TQColor mcolor(43,43,168); TQColor mcolorlight(164,176,242); - TQColorGroup g( Qt::white, Qt::blue, mcolorlight, mcolor.dark(), mcolor, - Qt::black, Qt::black ); + TQColorGroup g( TQt::white, TQt::blue, mcolorlight, mcolor.dark(), mcolor, + TQt::black, TQt::black ); TQBrush fill( mcolor ); TQPen textpen(TQColor(255,255,180),1); int border = cellsize/10; @@ -117,7 +117,7 @@ void StructurePort::drawSegment(TQPainter *dest, int cellsize, int segment) // Selection box if(_selected) { - TQPen pen(Qt::white,1,Qt::DotLine); + TQPen pen(TQt::white,1,TQt::DotLine); p.setPen(pen); p.drawRect(0,boxtop,cellsize,cellsize/2); @@ -126,7 +126,7 @@ void StructurePort::drawSegment(TQPainter *dest, int cellsize, int segment) int 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); + TQt::AlignCenter,label); int arrowwidth = cellsize/4; @@ -195,7 +195,7 @@ d | | a.setPoint(8,t,b+w+l); a.setPoint(9,t,b+l); */ - p.setPen(Qt::NoPen); + p.setPen(TQt::NoPen); p.setBrush(fbrush); p.drawPolygon(a); if(delta==1 && direction==0) @@ -224,7 +224,7 @@ ModulePort *StructurePort::portAt(int segment, int x, int y) assert(segment == 0); TQPoint clickpoint(x,y); - if(_port->clickrect.contains(clickpoint)) return _port; + if(_port->clickrect.tqcontains(clickpoint)) return _port; return 0; } diff --git a/arts/examples/README b/arts/examples/README index 2132bfc3..425da5c0 100644 --- a/arts/examples/README +++ b/arts/examples/README @@ -172,7 +172,7 @@ example_xfade.arts This example mixes 440 and 880 Hz sine waves using a cross fader. Adjust the value of the cross fader's percentage input from -1 to 1 to -control the mixing of the two signals. +control the mixing of the two Q_SIGNALS. example_pscale.arts diff --git a/arts/examples/instrument_flexible_slide_GUI.arts b/arts/examples/instrument_flexible_slide_GUI.arts index 3b0f0bca..92523fa0 100644 --- a/arts/examples/instrument_flexible_slide_GUI.arts +++ b/arts/examples/instrument_flexible_slide_GUI.arts @@ -8,7 +8,7 @@ module=Arts::Poti { id=1 } - port=parent + port=tqparent { id=2 } @@ -71,7 +71,7 @@ module=Arts::Widget { id=14 } - port=parent + port=tqparent { id=15 } @@ -110,7 +110,7 @@ module=Arts::Poti { id=22 } - port=parent + port=tqparent { id=23 } @@ -169,7 +169,7 @@ module=Arts::Poti { id=35 } - port=parent + port=tqparent { id=36 } @@ -230,7 +230,7 @@ module=Arts::Poti { id=48 } - port=parent + port=tqparent { id=49 } @@ -291,7 +291,7 @@ module=Arts::Poti { id=61 } - port=parent + port=tqparent { id=62 } @@ -345,7 +345,7 @@ module=Arts::Poti } structureport { - name=parent + name=tqparent x=2 y=1 position=0 diff --git a/arts/examples/instrument_moog_vcf_tune_GUI.arts b/arts/examples/instrument_moog_vcf_tune_GUI.arts index 6db62f60..0aff72a8 100644 --- a/arts/examples/instrument_moog_vcf_tune_GUI.arts +++ b/arts/examples/instrument_moog_vcf_tune_GUI.arts @@ -8,7 +8,7 @@ module=Arts::Widget { id=1 } - port=parent + port=tqparent { id=2 } @@ -47,7 +47,7 @@ module=Arts::Poti { id=9 } - port=parent + port=tqparent { id=10 } @@ -110,7 +110,7 @@ module=Arts::Poti { id=22 } - port=parent + port=tqparent { id=23 } @@ -173,7 +173,7 @@ module=Arts::Poti { id=35 } - port=parent + port=tqparent { id=36 } @@ -229,7 +229,7 @@ module=Arts::Poti } structureport { - name=parent + name=tqparent x=2 y=1 position=0 diff --git a/arts/examples/mixer_element_eq.arts b/arts/examples/mixer_element_eq.arts index 6123bb24..c798166f 100644 --- a/arts/examples/mixer_element_eq.arts +++ b/arts/examples/mixer_element_eq.arts @@ -8,7 +8,7 @@ module=Arts::Widget { id=1 } - port=parent + port=tqparent { id=2 } @@ -550,7 +550,7 @@ structureport } structureport { - name=parent + name=tqparent x=7 y=0 position=0 diff --git a/arts/examples/mixer_element_eqfx.arts b/arts/examples/mixer_element_eqfx.arts index b7248fcb..8bde0f61 100644 --- a/arts/examples/mixer_element_eqfx.arts +++ b/arts/examples/mixer_element_eqfx.arts @@ -4,7 +4,7 @@ module=Gui_SUB_PANEL id=147 x=6 y=1 - port=parent + port=tqparent { id=148 connect_to=279 @@ -52,7 +52,7 @@ module=Gui_POTI id=155 x=0 y=3 - port=parent + port=tqparent { id=156 connect_to=154 @@ -193,7 +193,7 @@ module=Gui_LABEL id=182 x=13 y=4 - port=parent + port=tqparent { id=183 connect_to=154 @@ -313,7 +313,7 @@ module=Gui_POTI id=205 x=14 y=9 - port=parent + port=tqparent { id=206 connect_to=154 @@ -365,7 +365,7 @@ module=Gui_POTI id=215 x=14 y=11 - port=parent + port=tqparent { id=216 connect_to=154 @@ -417,7 +417,7 @@ module=Gui_POTI id=225 x=14 y=7 - port=parent + port=tqparent { id=226 connect_to=154 @@ -469,7 +469,7 @@ module=Gui_POTI id=235 x=14 y=13 - port=parent + port=tqparent { id=236 connect_to=154 @@ -521,7 +521,7 @@ module=Gui_POTI id=245 x=14 y=15 - port=parent + port=tqparent { id=246 connect_to=154 @@ -573,7 +573,7 @@ module=Gui_POTI id=255 x=14 y=17 - port=parent + port=tqparent { id=256 connect_to=154 @@ -722,7 +722,7 @@ structureport } structureport { - name=parent + name=tqparent x=7 y=0 position=0 diff --git a/arts/examples/mixer_element_simple.arts b/arts/examples/mixer_element_simple.arts index 01246090..be572011 100644 --- a/arts/examples/mixer_element_simple.arts +++ b/arts/examples/mixer_element_simple.arts @@ -8,7 +8,7 @@ module=Arts::Widget { id=1 } - port=parent + port=tqparent { id=2 } @@ -47,7 +47,7 @@ module=Arts::Poti { id=9 } - port=parent + port=tqparent { id=10 } @@ -218,7 +218,7 @@ structureport } structureport { - name=parent + name=tqparent x=7 y=0 position=0 diff --git a/arts/examples/template_Instrument_GUI.arts b/arts/examples/template_Instrument_GUI.arts index 67db385e..751d4cc4 100644 --- a/arts/examples/template_Instrument_GUI.arts +++ b/arts/examples/template_Instrument_GUI.arts @@ -8,7 +8,7 @@ module=Arts::Widget { id=1 } - port=parent + port=tqparent { id=2 } @@ -40,7 +40,7 @@ module=Arts::Widget } structureport { - name=parent + name=tqparent x=2 y=1 position=0 diff --git a/arts/examples/template_Mixer_Element.arts b/arts/examples/template_Mixer_Element.arts index 40c3e63c..caa885ed 100644 --- a/arts/examples/template_Mixer_Element.arts +++ b/arts/examples/template_Mixer_Element.arts @@ -4,7 +4,7 @@ module=Gui_SUB_PANEL id=0 x=0 y=1 - port=parent + port=tqparent { id=1 connect_to=26 @@ -88,7 +88,7 @@ module=Gui_LABEL id=17 x=6 y=4 - port=parent + port=tqparent { id=18 connect_to=7 @@ -158,7 +158,7 @@ structureport } structureport { - name=parent + name=tqparent x=1 y=0 position=0 diff --git a/arts/gui/common/artsgui.idl b/arts/gui/common/artsgui.idl index a9a3950a..2cf5b614 100644 --- a/arts/gui/common/artsgui.idl +++ b/arts/gui/common/artsgui.idl @@ -48,7 +48,7 @@ module Arts { interface Widget { readonly attribute long widgetID; - attribute Widget parent; + attribute Widget tqparent; attribute long x,y,width,height; attribute boolean visible; attribute SizePolicy hSizePolicy; @@ -82,19 +82,19 @@ module Arts { }; interface Frame : Widget { - void constructor( Widget parent ); + void constructor( Widget tqparent ); attribute long margin; attribute long linewidth; attribute long midlinewidth; attribute long framestyle; - attribute Shape frameshape; + attribute Shape frametqshape; attribute Shadow frameshadow; }; /** - Some alignmentflags used by various widgets. + Some tqalignmentflags used by various widgets. Taken from Qt. (akrille) */ enum Align { @@ -117,8 +117,8 @@ module Arts { /** The LayoutBox. - Arrange your widgets vertical or horizontal. Usage is quite simple: Add the widgets you have in the right order - to the layoutbox by calling addWidget(). - Thats it, no ._addChild or .parent with this widget. + to the tqlayoutbox by calling addWidget(). + Thats it, no ._addChild or .tqparent with this widget. For more information see QBoxLayout. (akrille) @@ -126,7 +126,7 @@ module Arts { interface LayoutBox : Frame { /// Sets the direction of the widgets. Can be changed on-the-fly. attribute Direction direction; - /// Adds a widget with the stretch-factor and the alignment. + /// Adds a widget with the stretch-factor and the tqalignment. void addWidget( Widget widget, long stretch, long align ); void addWidget( Widget widget, long stretch ); void addWidget( Widget widget ); @@ -156,7 +156,7 @@ module Arts { /// The spacing between all widgets. attribute long spacing; /// The margin at the outsideborder. - attribute long layoutmargin; + attribute long tqlayoutmargin; }; /** IMHO (akrille) this should be removed and everywhere replaced with the LayoutBox... */ @@ -173,7 +173,7 @@ module Arts { Usage is quite simple: Create the Widget you want to be hidable inside a container like LayoutBox or a normal widget. Then create the PopupBox and call <Name_of_PopupBox>.widget( <Name_of_your_Container> ). - Thats it, no ._addChild or .parent with this widget. + Thats it, no ._addChild or .tqparent with this widget. (akrille) */ interface PopupBox : Frame { @@ -186,8 +186,8 @@ module Arts { }; interface Button : Widget { - void constructor( Widget parent ); - void constructor( string text, Widget parent ); + void constructor( Widget tqparent ); + void constructor( string text, Widget tqparent ); attribute string text; attribute boolean toggle; @@ -205,7 +205,7 @@ module Arts { }; interface Fader : Widget { - void constructor( Widget parent ); + void constructor( Widget tqparent ); attribute string caption, color; attribute float min, max, value; @@ -213,21 +213,21 @@ module Arts { }; interface LineEdit : Widget { - void constructor( Widget parent ); + void constructor( Widget tqparent ); attribute string caption; attribute string text; }; interface SpinBox : Widget { - void constructor( Widget parent ); + void constructor( Widget tqparent ); attribute string caption; attribute long min, max, value; }; interface ComboBox : Widget { - void constructor( Widget parent ); + void constructor( Widget tqparent ); attribute string caption; attribute sequence<string> choices; @@ -235,7 +235,7 @@ module Arts { }; interface Graph : Widget { - void constructor( Widget parent ); + void constructor( Widget tqparent ); attribute string caption; attribute float minx, maxx, miny, maxy; @@ -256,7 +256,7 @@ module Arts { interface Label : Frame { /// The text to show. attribute string text; - /// The alignment of the text. See enum Align + /// The tqalignment of the text. See enum Align attribute long align; /// Fontsize [pixel] /*writeonly*/ attribute long fontsize; diff --git a/arts/gui/kde/artstestgui.cpp b/arts/gui/kde/artstestgui.cpp index 6d1b798e..9464ac7a 100644 --- a/arts/gui/kde/artstestgui.cpp +++ b/arts/gui/kde/artstestgui.cpp @@ -31,7 +31,7 @@ using namespace Arts; int main(int argc, char **argv) { - QIOManager iomanager; + TQIOManager iomanager; Dispatcher dispatcher(&iomanager); KApplication application(argc, argv, "testgui"); @@ -41,7 +41,7 @@ int main(int argc, char **argv) w.width(500); w.height(350); w.show(); Button b; - b.parent(w); + b.tqparent(w); b.x(10); b.y(10); b.width(100); @@ -50,7 +50,7 @@ int main(int argc, char **argv) b.show(); Button b2; - b2.parent(w); + b2.tqparent(w); b2.x(10); b2.y(30); b2.width(100); @@ -59,7 +59,7 @@ int main(int argc, char **argv) b2.show(); Poti p; - p.parent(w); + p.tqparent(w); p.x(150); p.y(10); p.caption("delay (ms)"); @@ -70,7 +70,7 @@ int main(int argc, char **argv) p.show(); Poti q; - q.parent(w); + q.tqparent(w); q.x(250); q.y(10); q.caption("delay (ms)"); @@ -81,7 +81,7 @@ int main(int argc, char **argv) q.show(); Graph g; - g.parent(w); + g.tqparent(w); g.x(50); g.y(70); g.width(400); diff --git a/arts/gui/kde/dbtest.h b/arts/gui/kde/dbtest.h index 085ee7a0..23163973 100644 --- a/arts/gui/kde/dbtest.h +++ b/arts/gui/kde/dbtest.h @@ -8,6 +8,7 @@ class dBTestWidget : public TQWidget, public dB2VolCalc { Q_OBJECT + TQ_OBJECT public: dBTestWidget( TQWidget*, const char* =0 ); ~dBTestWidget(); diff --git a/arts/gui/kde/kartswidget.cpp b/arts/gui/kde/kartswidget.cpp index dde61820..5188e81a 100644 --- a/arts/gui/kde/kartswidget.cpp +++ b/arts/gui/kde/kartswidget.cpp @@ -28,43 +28,43 @@ class KArtsWidgetPrivate { public: - TQHBoxLayout *layout; + TQHBoxLayout *tqlayout; }; -KArtsWidget::KArtsWidget( TQWidget* parent, const char* name ) - :TQWidget( parent, name ), _content( Arts::Widget::null() ) +KArtsWidget::KArtsWidget( TQWidget* tqparent, const char* name ) + :TQWidget( tqparent, name ), _content( Arts::Widget::null() ) { d = new KArtsWidgetPrivate; - d->layout = new TQHBoxLayout(this); + d->tqlayout = new TQHBoxLayout(this); } -KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name ) - :TQWidget( parent, name ), _content( Arts::Widget::null()) +KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* tqparent, const char* name ) + :TQWidget( tqparent, name ), _content( Arts::Widget::null()) { d = new KArtsWidgetPrivate; - d->layout = new TQHBoxLayout(this); + d->tqlayout = new TQHBoxLayout(this); setContent(content); } -KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name, WFlags wflags ) - :TQWidget( parent, name, wflags ), _content( Arts::Widget::null() ) +KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* tqparent, const char* name, WFlags wflags ) + :TQWidget( tqparent, name, wflags ), _content( Arts::Widget::null() ) { d = new KArtsWidgetPrivate; - d->layout = new TQHBoxLayout( this ); + d->tqlayout = new TQHBoxLayout( this ); setContent( content ); } -KArtsWidget::KArtsWidget(TQWidget* parent, const char* name, WFlags wflags ) - :TQWidget(parent, name, wflags ), _content(Arts::Widget::null()) +KArtsWidget::KArtsWidget(TQWidget* tqparent, const char* name, WFlags wflags ) + :TQWidget(tqparent, name, wflags ), _content(Arts::Widget::null()) { d = new KArtsWidgetPrivate; - d->layout = new TQHBoxLayout(this); + d->tqlayout = new TQHBoxLayout(this); } KArtsWidget::~KArtsWidget() { TQWidget *contentAsWidget - = KWidgetRepo::the()->lookupQWidget(_content.widgetID()); + = KWidgetRepo::the()->lookupTQWidget(_content.widgetID()); contentAsWidget->reparent(0,TQPoint(0,0),_content.visible()); delete d; d = 0; @@ -75,12 +75,12 @@ void KArtsWidget::setContent(Arts::Widget content) { arts_return_if_fail(!content.isNull()); TQWidget *contentAsWidget - = KWidgetRepo::the()->lookupQWidget(content.widgetID()); + = KWidgetRepo::the()->lookupTQWidget(content.widgetID()); arts_return_if_fail(contentAsWidget != 0); _content = content; contentAsWidget->reparent(this,TQPoint(0,0),content.visible()); - d->layout->addWidget(contentAsWidget); + d->tqlayout->addWidget(contentAsWidget); } Arts::Widget KArtsWidget::content() diff --git a/arts/gui/kde/kartswidget.h b/arts/gui/kde/kartswidget.h index 2cd072bc..7e745bf6 100644 --- a/arts/gui/kde/kartswidget.h +++ b/arts/gui/kde/kartswidget.h @@ -31,17 +31,17 @@ class KArtsWidgetPrivate; /** * KArtsWidget provides a simple way to treat Arts::Widget classes like - * native Qt widgets. Suppose you use Qt, and want to put an Arts::Widget - * type into a layout, you can do so using this code + * native TQt widgets. Suppose you use TQt, and want to put an Arts::Widget + * type into a tqlayout, you can do so using this code * * <pre> * Arts::Widget widget = ...get widget from somewhere...; * KArtsWidget *w = new KArtsWidget(widget, this); - * layout->addWidget(w); + * tqlayout->addWidget(w); * </pre> * - * In line 2 of the code, the "this" is the parent widget (which is usually - * this in Qt code). + * In line 2 of the code, the "this" is the tqparent widget (which is usually + * this in TQt code). * * The KArtsWidget class keeps a reference to the content widget, so the * content widget will not be freed until the KArtsWidget gets destroyed. @@ -57,12 +57,12 @@ public: /** * creates a new KArtsWidget */ - KArtsWidget( TQWidget* parent, const char* name ); + KArtsWidget( TQWidget* tqparent, const char* name ); /** * creates a new KArtsWidget and sets the content to an Arts::Widget */ - KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name ); + KArtsWidget( Arts::Widget content, TQWidget* tqparent, const char* name ); /** * creates a new KArtsWidget with WidgetFlags and content diff --git a/arts/gui/kde/kbutton_impl.cpp b/arts/gui/kde/kbutton_impl.cpp index 34c5791b..95f7699f 100644 --- a/arts/gui/kde/kbutton_impl.cpp +++ b/arts/gui/kde/kbutton_impl.cpp @@ -72,12 +72,12 @@ KButton_impl::KButton_impl( TQPushButton * widget ) void KButton_impl::constructor( Widget p ) { - parent( p ); + tqparent( p ); } void KButton_impl::constructor( const string & t, Widget p ) { - parent( p ); + tqparent( p ); text( t ); } diff --git a/arts/gui/kde/kbutton_impl.h b/arts/gui/kde/kbutton_impl.h index 723c5023..4db27c84 100644 --- a/arts/gui/kde/kbutton_impl.h +++ b/arts/gui/kde/kbutton_impl.h @@ -32,6 +32,7 @@ namespace Arts { class KButton_impl; class KButtonMapper : public TQObject { Q_OBJECT + TQ_OBJECT KButton_impl *impl; TQPushButton * button; public: @@ -54,7 +55,7 @@ protected: public: KButton_impl( TQPushButton * w = 0 ); - void constructor( Widget parent ); + void constructor( Widget tqparent ); void constructor( const std::string &, Widget ); void emitClicked(); diff --git a/arts/gui/kde/kcombobox_impl.cpp b/arts/gui/kde/kcombobox_impl.cpp index eab55d0d..58c401ce 100644 --- a/arts/gui/kde/kcombobox_impl.cpp +++ b/arts/gui/kde/kcombobox_impl.cpp @@ -31,7 +31,7 @@ using namespace Arts; using namespace std; ComboBoxIntMapper::ComboBoxIntMapper(KComboBox_impl *impl, KComboBox *co) - : TQObject( co, "map Qt signal to aRts" ) + : TQObject( co, "map TQt signal to aRts" ) ,impl(impl) { connect(co, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(activated(const TQString &))); diff --git a/arts/gui/kde/kcombobox_impl.h b/arts/gui/kde/kcombobox_impl.h index 3041d352..ad8e5739 100644 --- a/arts/gui/kde/kcombobox_impl.h +++ b/arts/gui/kde/kcombobox_impl.h @@ -36,6 +36,7 @@ namespace Arts { class KComboBox_impl; class ComboBoxIntMapper :public TQObject { Q_OBJECT + TQ_OBJECT KComboBox_impl *impl; public: ComboBoxIntMapper(KComboBox_impl *impl, KComboBox *co); @@ -56,7 +57,7 @@ protected: public: KComboBox_impl( KComboBox * w = 0 ); - void constructor( Widget p ) { parent( p ); } + void constructor( Widget p ) { tqparent( p ); } std::string caption(); void caption(const std::string & newCaption); diff --git a/arts/gui/kde/kfader.cpp b/arts/gui/kde/kfader.cpp index e5179f9f..239d303a 100644 --- a/arts/gui/kde/kfader.cpp +++ b/arts/gui/kde/kfader.cpp @@ -5,14 +5,14 @@ void KFader::init() { } -KFader::KFader( TQWidget * parent, const char * name ) - : TQSlider( Qt::Vertical, parent, name ) +KFader::KFader( TQWidget * tqparent, const char * name ) + : TQSlider( Qt::Vertical, tqparent, name ) { init(); } -KFader::KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * parent, const char * name ) - : TQSlider( minValue, maxValue, pageStep, value, Qt::Vertical, parent, name ) +KFader::KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * tqparent, const char * name ) + : TQSlider( minValue, maxValue, pageStep, value, Qt::Vertical, tqparent, name ) { init(); } diff --git a/arts/gui/kde/kfader.h b/arts/gui/kde/kfader.h index 603ad7cd..33df0d40 100644 --- a/arts/gui/kde/kfader.h +++ b/arts/gui/kde/kfader.h @@ -25,14 +25,15 @@ #include <tqslider.h> -class KFader : public QSlider +class KFader : public TQSlider { Q_OBJECT + TQ_OBJECT protected: void init(); public: - KFader( TQWidget * parent = 0, const char * name = 0 ); - KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * parent = 0, const char * name = 0 ); + KFader( TQWidget * tqparent = 0, const char * name = 0 ); + KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * tqparent = 0, const char * name = 0 ); virtual ~KFader(); diff --git a/arts/gui/kde/kfader_impl.h b/arts/gui/kde/kfader_impl.h index 0d1b81ed..e15695f0 100644 --- a/arts/gui/kde/kfader_impl.h +++ b/arts/gui/kde/kfader_impl.h @@ -37,6 +37,7 @@ class KFader_impl; class FaderIntMapper :public TQObject { Q_OBJECT + TQ_OBJECT KFader_impl *impl; public: FaderIntMapper(KFader_impl *impl, KFader *kp); @@ -62,7 +63,7 @@ protected: public: KFader_impl( KFader * w = 0 ); - void constructor( Widget p ) { parent( p ); } + void constructor( Widget p ) { tqparent( p ); } std::string caption(); void caption(const std::string& newText); diff --git a/arts/gui/kde/kframe_impl.cpp b/arts/gui/kde/kframe_impl.cpp index d95da549..478d8ec4 100644 --- a/arts/gui/kde/kframe_impl.cpp +++ b/arts/gui/kde/kframe_impl.cpp @@ -73,12 +73,12 @@ void KFrame_impl::framestyle( long fs ) _qframe->setFrameStyle( fs ); } -Shape KFrame_impl::frameshape() +Shape KFrame_impl::frametqshape() { return ( Shape )_qframe->frameShape(); } -void KFrame_impl::frameshape( Shape fs ) +void KFrame_impl::frametqshape( Shape fs ) { _qframe->setFrameShape( ( TQFrame::Shape )fs ); } diff --git a/arts/gui/kde/kframe_impl.h b/arts/gui/kde/kframe_impl.h index febc0057..ae2e79a4 100644 --- a/arts/gui/kde/kframe_impl.h +++ b/arts/gui/kde/kframe_impl.h @@ -34,7 +34,7 @@ class KDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel, public: KFrame_impl( TQFrame * widget = 0 ); - inline void constructor( Widget p ) { parent( p ); } + inline void constructor( Widget p ) { tqparent( p ); } long margin(); void margin( long m ); @@ -44,8 +44,8 @@ class KDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel, void midlinewidth( long mlw ); long framestyle(); void framestyle( long fs ); - Shape frameshape(); - void frameshape( Shape fs ); + Shape frametqshape(); + void frametqshape( Shape fs ); Shadow frameshadow(); void frameshadow( Shadow fs ); }; //class diff --git a/arts/gui/kde/kgraph.cpp b/arts/gui/kde/kgraph.cpp index 21d3d8cf..96d18c5c 100644 --- a/arts/gui/kde/kgraph.cpp +++ b/arts/gui/kde/kgraph.cpp @@ -31,8 +31,8 @@ using namespace Arts; using namespace std; -KGraph::KGraph( TQWidget * parent, const char * name ) - : TQWidget( parent, name ) +KGraph::KGraph( TQWidget * tqparent, const char * name ) + : TQWidget( tqparent, name ) { setBackgroundColor(white); @@ -52,7 +52,7 @@ void KGraph::addLine(Arts::KGraphLine_impl *line) void KGraph::redrawLine(Arts::KGraphLine_impl * /*line*/) { - repaint(); + tqrepaint(); } void KGraph::removeLine(Arts::KGraphLine_impl *line) @@ -111,7 +111,7 @@ void KGraph::paintEvent( TQPaintEvent *e ) void KGraph::mousePressEvent(TQMouseEvent *e) { - if(e->button() == LeftButton || e->button() == RightButton) + if(e->button() == Qt::LeftButton || e->button() == Qt::RightButton) { std::list<KGraphLine_impl *>::iterator li; for(li = lines.begin(); li != lines.end(); li++) @@ -140,7 +140,7 @@ void KGraph::mousePressEvent(TQMouseEvent *e) if(selectedIndex >= 0) { // erase point - if(e->button() == RightButton) + if(e->button() == Qt::RightButton) { if(selectedIndex != 0 && selectedIndex != (( int )( selectedLine->_points.size() )-1)) { @@ -159,7 +159,7 @@ void KGraph::mousePressEvent(TQMouseEvent *e) selectedIndex = -1; } } - else if(e->button() == LeftButton) + else if(e->button() == Qt::LeftButton) { // try to insert a point std::list<KGraphLine_impl *>::iterator li; diff --git a/arts/gui/kde/kgraph.h b/arts/gui/kde/kgraph.h index 83c1aa7c..e9f772ff 100644 --- a/arts/gui/kde/kgraph.h +++ b/arts/gui/kde/kgraph.h @@ -31,9 +31,10 @@ namespace Arts { class KGraphLine_impl; -class KGraph : public QWidget +class KGraph : public TQWidget { Q_OBJECT + TQ_OBJECT protected: std::list<KGraphLine_impl *> lines; @@ -46,7 +47,7 @@ protected: inline GraphPoint q2gPoint(const TQPoint &qp); inline TQPoint g2qPoint(const GraphPoint &gp); public: - KGraph( TQWidget * parent = 0, const char * name = 0 ); + KGraph( TQWidget * tqparent = 0, const char * name = 0 ); virtual ~KGraph(); void addLine(Arts::KGraphLine_impl *line); diff --git a/arts/gui/kde/kgraph_impl.h b/arts/gui/kde/kgraph_impl.h index 408ad961..2a603208 100644 --- a/arts/gui/kde/kgraph_impl.h +++ b/arts/gui/kde/kgraph_impl.h @@ -44,7 +44,7 @@ protected: public: KGraph_impl( KGraph * w = 0 ); - void constructor( Widget p ) { parent( p ); } + void constructor( Widget p ) { tqparent( p ); } std::string caption(); void caption(const std::string& newCaption); diff --git a/arts/gui/kde/kgraphline_impl.cpp b/arts/gui/kde/kgraphline_impl.cpp index ccb6ed1f..9fcd4507 100644 --- a/arts/gui/kde/kgraphline_impl.cpp +++ b/arts/gui/kde/kgraphline_impl.cpp @@ -112,7 +112,7 @@ void KGraphLine_impl::points(const vector<GraphPoint>& newPoints) KGraph *KGraphLine_impl::getKGraph() { - TQWidget *widget = KWidgetRepo::the()->lookupQWidget(_graphID); + TQWidget *widget = KWidgetRepo::the()->lookupTQWidget(_graphID); if(!widget) return 0; diff --git a/arts/gui/kde/klabel_impl.cpp b/arts/gui/kde/klabel_impl.cpp index dd0a9557..e6a008c4 100644 --- a/arts/gui/kde/klabel_impl.cpp +++ b/arts/gui/kde/klabel_impl.cpp @@ -92,13 +92,13 @@ void RotateLabel::title( TQString n ) { void RotateLabel::align( long n ) { _align=n; - repaint(); + tqrepaint(); } void RotateLabel::bottom( Arts::TextBottom bottom ) { _bottom = bottom; title( _title ); - repaint(); + tqrepaint(); } // vim: sw=4 ts=4 diff --git a/arts/gui/kde/klabel_impl.h b/arts/gui/kde/klabel_impl.h index 7822e960..8b78bedc 100644 --- a/arts/gui/kde/klabel_impl.h +++ b/arts/gui/kde/klabel_impl.h @@ -42,7 +42,7 @@ protected: RotateLabel* _label; public: KLabel_impl( TQFrame* w=0 ); - void constructor( Widget p ) { parent( p ); } + void constructor( Widget p ) { tqparent( p ); } std::string text(); void text( const std::string& newtext ); @@ -65,6 +65,7 @@ public: class RotateLabel : public TQFrame { Q_OBJECT + TQ_OBJECT public: RotateLabel( TQWidget*, const char* =0 ); void paintEvent( TQPaintEvent* ); diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp index 847e803a..e94ed1ec 100644 --- a/arts/gui/kde/klayoutbox_impl.cpp +++ b/arts/gui/kde/klayoutbox_impl.cpp @@ -40,16 +40,16 @@ KLayoutBox_impl::~KLayoutBox_impl() { } void KLayoutBox_impl::addWidget( Arts::Widget widget, long stretch, long align ) { - widget.parent( self() ); - this->_addChild( widget, "layoutbox_item" ); - TQWidget * tmp = KWidgetRepo::the()->lookupQWidget( widget.widgetID() ); + widget.tqparent( self() ); + this->_addChild( widget, "tqlayoutbox_item" ); + TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() ); _layout->addWidget( tmp, stretch, align ); } void KLayoutBox_impl::insertWidget( long index, Arts::Widget widget, long stretch, long align ) { - widget.parent( self() ); - this->_addChild( widget, "layoutbox_item" ); - TQWidget * tmp = KWidgetRepo::the()->lookupQWidget( widget.widgetID() ); + widget.tqparent( self() ); + this->_addChild( widget, "tqlayoutbox_item" ); + TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() ); _layout->insertWidget( index, tmp, stretch, align ); } @@ -66,8 +66,8 @@ void KLayoutBox_impl::addLine( long width, long space, long stretch, long align long KLayoutBox_impl::spacing() { return _layout->spacing(); } void KLayoutBox_impl::spacing( long n ) { _layout->setSpacing( n ); } -long KLayoutBox_impl::layoutmargin() { return _layout->margin(); } -void KLayoutBox_impl::layoutmargin( long n ) { _layout->setMargin( n ); this->margin( n ); } +long KLayoutBox_impl::tqlayoutmargin() { return _layout->margin(); } +void KLayoutBox_impl::tqlayoutmargin( long n ) { _layout->setMargin( n ); this->margin( n ); } Direction KLayoutBox_impl::direction() { return Arts::Direction( _layout->direction() ); } void KLayoutBox_impl::direction( Direction d ) { _layout->setDirection( TQBoxLayout::Direction( d ) ); } @@ -85,11 +85,11 @@ void KLayoutBox_Separator::paintEvent( TQPaintEvent* ) { TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; if ( width() < height() ) flags |= TQStyle::Style_Horizontal; - style().drawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), flags ); + tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), tqcolorGroup(), flags ); } -TQSize KLayoutBox_Separator::minimumSizeHint() const { - int wh = style().pixelMetric( TQStyle::PM_SplitterWidth, this ); +TQSize KLayoutBox_Separator::tqminimumSizeHint() const { + int wh = tqstyle().tqpixelMetric( TQStyle::PM_SplitterWidth, this ); return TQSize( wh, wh ); } @@ -105,12 +105,12 @@ KLayoutBox_Line::KLayoutBox_Line( int width, int space, TQWidget* p, const char* void KLayoutBox_Line::paintEvent( TQPaintEvent* ) { //kdDebug() << k_funcinfo << size() << endl; TQPainter p( this ); - p.setPen( TQPen( colorGroup().foreground(), _width ) ); + p.setPen( TQPen( tqcolorGroup().foreground(), _width ) ); if ( width() > height() ) p.drawLine( 0, height()/2, width(), height()/2 ); else p.drawLine( width()/2, 0, width()/2, height() ); } -TQSize KLayoutBox_Line::minimumSizeHint() const { +TQSize KLayoutBox_Line::tqminimumSizeHint() const { //kdDebug() << k_funcinfo << size() << endl; int wh = _width + 2* _space; return TQSize( wh, wh ); diff --git a/arts/gui/kde/klayoutbox_impl.h b/arts/gui/kde/klayoutbox_impl.h index bb5302ea..a8272fe3 100644 --- a/arts/gui/kde/klayoutbox_impl.h +++ b/arts/gui/kde/klayoutbox_impl.h @@ -72,29 +72,31 @@ public: long spacing(); void spacing( long ); - long layoutmargin(); - void layoutmargin( long ); + long tqlayoutmargin(); + void tqlayoutmargin( long ); }; // class } // namespace class KDE_EXPORT KLayoutBox_Separator : public TQWidget { Q_OBJECT + TQ_OBJECT public: KLayoutBox_Separator( TQWidget*, const char* =0 ); void resizeEvent( TQResizeEvent* ); void paintEvent( TQPaintEvent* ); - TQSize minimumSizeHint() const; + TQSize tqminimumSizeHint() const; }; class KLayoutBox_Line : public TQWidget { Q_OBJECT + TQ_OBJECT private: int _width, _space; public: KLayoutBox_Line( int, int, TQWidget*, const char* =0 ); void paintEvent( TQPaintEvent* ); - TQSize minimumSizeHint() const; + TQSize tqminimumSizeHint() const; }; #endif diff --git a/arts/gui/kde/klevelmeter_firebars.cpp b/arts/gui/kde/klevelmeter_firebars.cpp index 9a78804c..ffb99c3e 100644 --- a/arts/gui/kde/klevelmeter_firebars.cpp +++ b/arts/gui/kde/klevelmeter_firebars.cpp @@ -59,8 +59,8 @@ kdDebug() << k_funcinfo << dir << endl; p.end(); } -KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) { -//kdDebug()<<"KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; +KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* impl, TQWidget* tqparent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, tqparent, substyle, count, dir, _dbmin, _dbmax ) { +//kdDebug()<<"KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<tqparent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; this->setMinimumSize( 5, 5 ); _bar = new KLevelMeter_FireBars_private( this, 0 ); _peakwidget = new TQWidget( this ); @@ -91,7 +91,7 @@ void KLevelMeter_FireBars::invalue( float n, float p ) { _bar->setGeometry( int( this->width()-_value*this->width() ), 0, this->width(), this->height() ); break; } - repaint(); + tqrepaint(); } void KLevelMeter_FireBars::paintEvent( TQPaintEvent* ) { diff --git a/arts/gui/kde/klevelmeter_firebars.h b/arts/gui/kde/klevelmeter_firebars.h index da740961..4313004e 100644 --- a/arts/gui/kde/klevelmeter_firebars.h +++ b/arts/gui/kde/klevelmeter_firebars.h @@ -28,6 +28,7 @@ class KLevelMeter_FireBars; class KLevelMeter_FireBars_private : public TQWidget { Q_OBJECT + TQ_OBJECT public: KLevelMeter_FireBars_private( KLevelMeter_FireBars*, const char* ); void paintEvent( TQPaintEvent* ); @@ -40,6 +41,7 @@ private: class KLevelMeter_FireBars : public KLevelMeter_Template { Q_OBJECT + TQ_OBJECT public: KLevelMeter_FireBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); diff --git a/arts/gui/kde/klevelmeter_impl.cpp b/arts/gui/kde/klevelmeter_impl.cpp index 418108ad..b6845dc4 100644 --- a/arts/gui/kde/klevelmeter_impl.cpp +++ b/arts/gui/kde/klevelmeter_impl.cpp @@ -41,8 +41,8 @@ using namespace Arts; using namespace std; -KLevelMeter_Private::KLevelMeter_Private( KLevelMeter_impl* impl, TQFrame* frame, LevelMeterStyle defstyle, TQObject* parent, const char* name ) - : TQObject( parent, name ) +KLevelMeter_Private::KLevelMeter_Private( KLevelMeter_impl* impl, TQFrame* frame, LevelMeterStyle defstyle, TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) , _impl( impl ) , _frame( frame ) , _levelmeter( 0 ) diff --git a/arts/gui/kde/klevelmeter_linebars.cpp b/arts/gui/kde/klevelmeter_linebars.cpp index 6d63a18c..5d8b4b3c 100644 --- a/arts/gui/kde/klevelmeter_linebars.cpp +++ b/arts/gui/kde/klevelmeter_linebars.cpp @@ -24,21 +24,21 @@ #include <tqpainter.h> #include <tqpixmap.h> -KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) +KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* impl, TQWidget* tqparent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, tqparent, substyle, count, dir, _dbmin, _dbmax ) , _value( 0.0 ) , _peak( 0.0 ) { -//kdDebug()<<"KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", Arts::Direction "<<dir<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; +//kdDebug()<<"KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<tqparent<<", long "<<substyle<<", long "<<count<<", Arts::Direction "<<dir<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; this->setMinimumSize( 5, 5 ); this->substyle( substyle ); - _stdcolors = colorGroup(); - setBackgroundMode( Qt::NoBackground ); + _stdcolors = tqcolorGroup(); + setBackgroundMode( TQt::NoBackground ); } void KLevelMeter_LineBars::invalue( float n, float p ) { _value = amptondb( n ); _peak = amptondb( p ); - repaint(); + tqrepaint(); } void KLevelMeter_LineBars::substyle( long n ) { @@ -73,7 +73,7 @@ void KLevelMeter_LineBars::paintEvent( TQPaintEvent* ) { else p.setBrush( ( _peak<1 )?color( _value ):TQColor( 255,0,0 ) ); - TQColor bgcolor = ( _substyle & 2 ) ? p.brush().color().dark() : _stdcolors.background(); + TQColor bgcolor = ( _substyle & 2 ) ? p.brush().color().dark() : TQColor(_stdcolors.background()); pm.fill( bgcolor ); p.setPen( NoPen ); @@ -94,7 +94,7 @@ void KLevelMeter_LineBars::paintEvent( TQPaintEvent* ) { p.drawLine( 0, top, w, top ); } - bitBlt( this, 0, 0, &pm, 0, 0, pm.width(), pm.height(), CopyROP, true ); + bitBlt( TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&pm), 0, 0, pm.width(), pm.height(), CopyROP, true ); } /** diff --git a/arts/gui/kde/klevelmeter_linebars.h b/arts/gui/kde/klevelmeter_linebars.h index cf0c4217..996b2c68 100644 --- a/arts/gui/kde/klevelmeter_linebars.h +++ b/arts/gui/kde/klevelmeter_linebars.h @@ -25,6 +25,7 @@ class KLevelMeter_LineBars : public KLevelMeter_Template { Q_OBJECT + TQ_OBJECT public: KLevelMeter_LineBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); diff --git a/arts/gui/kde/klevelmeter_normalbars.cpp b/arts/gui/kde/klevelmeter_normalbars.cpp index 29593551..9263737a 100644 --- a/arts/gui/kde/klevelmeter_normalbars.cpp +++ b/arts/gui/kde/klevelmeter_normalbars.cpp @@ -24,8 +24,8 @@ #include <tqpainter.h> #include <tqlayout.h> -KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) { -//kdDebug()<<"KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; +KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* impl, TQWidget* tqparent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, tqparent, substyle, count, dir, _dbmin, _dbmax ) { +//kdDebug()<<"KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<tqparent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; _layout = new TQBoxLayout( this, TQBoxLayout::BottomToTop ); } diff --git a/arts/gui/kde/klevelmeter_normalbars.h b/arts/gui/kde/klevelmeter_normalbars.h index b0e1c81a..b141f2fc 100644 --- a/arts/gui/kde/klevelmeter_normalbars.h +++ b/arts/gui/kde/klevelmeter_normalbars.h @@ -30,6 +30,7 @@ class TQBoxLayout; class KLevelMeter_NormalBars : public KLevelMeter_Template { Q_OBJECT + TQ_OBJECT public: KLevelMeter_NormalBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=25, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); @@ -48,12 +49,13 @@ private: class Bar : public TQWidget { Q_OBJECT + TQ_OBJECT private: float _min, _max; TQColor _color; bool _on; public: - Bar( float min, float max, TQColor color, TQWidget* parent ) : TQWidget( parent ), _min( min ), _max( max ), _color( color ), _on( false ) { + Bar( float min, float max, TQColor color, TQWidget* tqparent ) : TQWidget( tqparent ), _min( min ), _max( max ), _color( color ), _on( false ) { setBackgroundColor( _color.dark() ); } void setValue( float n ) { diff --git a/arts/gui/kde/klevelmeter_private.h b/arts/gui/kde/klevelmeter_private.h index 213ade38..6c49c4c6 100644 --- a/arts/gui/kde/klevelmeter_private.h +++ b/arts/gui/kde/klevelmeter_private.h @@ -31,6 +31,7 @@ class KArtsWidget; class KLevelMeter_Private : public TQObject { Q_OBJECT + TQ_OBJECT public: Arts::KLevelMeter_impl* _impl; TQFrame* _frame; diff --git a/arts/gui/kde/klevelmeter_small.cpp b/arts/gui/kde/klevelmeter_small.cpp index c74dfa44..3c07bc6b 100644 --- a/arts/gui/kde/klevelmeter_small.cpp +++ b/arts/gui/kde/klevelmeter_small.cpp @@ -23,8 +23,8 @@ #include <kdebug.h> #include <tqpainter.h> -KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) { -//kdDebug()<<"KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; +KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* impl, TQWidget* tqparent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, tqparent, substyle, count, dir, _dbmin, _dbmax ) { +//kdDebug()<<"KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<tqparent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; } void KLevelMeter_Small::invalue( float n, float p ) { diff --git a/arts/gui/kde/klevelmeter_small.h b/arts/gui/kde/klevelmeter_small.h index 1c2c20e6..34d0080a 100644 --- a/arts/gui/kde/klevelmeter_small.h +++ b/arts/gui/kde/klevelmeter_small.h @@ -25,6 +25,7 @@ class KLevelMeter_Small : public KLevelMeter_Template { Q_OBJECT + TQ_OBJECT public: KLevelMeter_Small( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); diff --git a/arts/gui/kde/klevelmeter_template.h b/arts/gui/kde/klevelmeter_template.h index c822be40..e7f3e104 100644 --- a/arts/gui/kde/klevelmeter_template.h +++ b/arts/gui/kde/klevelmeter_template.h @@ -31,6 +31,7 @@ class KLevelMeter_Template : public TQWidget, public dB2VolCalc { Q_OBJECT + TQ_OBJECT public: Arts::KLevelMeter_impl* _impl; diff --git a/arts/gui/kde/klineedit_impl.h b/arts/gui/kde/klineedit_impl.h index 2bd6b693..12ab7532 100644 --- a/arts/gui/kde/klineedit_impl.h +++ b/arts/gui/kde/klineedit_impl.h @@ -38,7 +38,7 @@ protected: public: KLineEdit_impl( KLineEdit * w = 0 ); - void constructor( Widget p ) { parent( p ); } + void constructor( Widget p ) { tqparent( p ); } std::string caption(); void caption(const std::string& newCaption); @@ -49,6 +49,7 @@ public: class KLineEditStringMapper :public TQObject { Q_OBJECT + TQ_OBJECT KLineEdit_impl *impl; public: KLineEditStringMapper(KLineEdit_impl *impl, KLineEdit *ed); diff --git a/arts/gui/kde/kpopupbox_impl.cpp b/arts/gui/kde/kpopupbox_impl.cpp index 23de74fc..5438d131 100644 --- a/arts/gui/kde/kpopupbox_impl.cpp +++ b/arts/gui/kde/kpopupbox_impl.cpp @@ -43,7 +43,7 @@ Direction KPopupBox_impl::direction() { return _widget->direction(); } void KPopupBox_impl::direction( Direction n ) { _widget->direction( n ); } void KPopupBox_impl::widget( Arts::Widget widget ) { - widget.parent( self() ); + widget.tqparent( self() ); this->_addChild( widget, "PopupBox_child" ); _widget->setWidget( widget ); } @@ -54,14 +54,14 @@ void KPopupBox_impl::name( const std::string& n ) { _name = ""; _name = n; _widg // Following the private class: -KPopupBox_widget::KPopupBox_widget( TQWidget *parent, const char* name ) : TQFrame( parent,name ) +KPopupBox_widget::KPopupBox_widget( TQWidget *tqparent, const char* name ) : TQFrame( tqparent,name ) { this->setFrameShape( TQFrame::Box ); this->setMargin( 1 ); this->setLineWidth( 1 ); _titlebar = new TQFrame( this ); - _titlebarlayout = new TQBoxLayout( _titlebar, TQBoxLayout::BottomToTop ); - _titlebarlayout->setAutoAdd( true ); + _titlebartqlayout = new TQBoxLayout( _titlebar, TQBoxLayout::BottomToTop ); + _titlebartqlayout->setAutoAdd( true ); _showbutton = new ShowButton( _titlebar ); connect( _showbutton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( hide( bool ) ) ); @@ -90,13 +90,13 @@ void KPopupBox_widget::direction( Arts::Direction n ) { switch( n ) { case LeftToRight: case RightToLeft: - _titlebarlayout->setDirection( TQBoxLayout::BottomToTop ); + _titlebartqlayout->setDirection( TQBoxLayout::BottomToTop ); _drag->setMinimumHeight( 30 ); _drag->setMinimumWidth( 0 ); break; case TopToBottom: case BottomToTop: - _titlebarlayout->setDirection( TQBoxLayout::RightToLeft ); + _titlebartqlayout->setDirection( TQBoxLayout::RightToLeft ); _drag->setMinimumHeight( 0 ); _drag->setMinimumWidth( 30 ); } diff --git a/arts/gui/kde/kpopupbox_private.h b/arts/gui/kde/kpopupbox_private.h index 8fb25bea..06a58ebc 100644 --- a/arts/gui/kde/kpopupbox_private.h +++ b/arts/gui/kde/kpopupbox_private.h @@ -32,9 +32,10 @@ class TQBoxLayout; #include <tqframe.h> -class KPopupBox_widget : public QFrame +class KPopupBox_widget : public TQFrame { Q_OBJECT + TQ_OBJECT public: KPopupBox_widget( TQWidget* =0, const char* =0); ~KPopupBox_widget(); @@ -53,7 +54,7 @@ private: TQBoxLayout *_layout; TQFrame *_titlebar; - TQBoxLayout *_titlebarlayout; + TQBoxLayout *_titlebartqlayout; HandleDrag *_drag; ShowButton *_showbutton; OwnButton *_ownbutton; @@ -65,6 +66,7 @@ private: /*class KPopupBoxEventMapper : public TQObject { Q_OBJECT + TQ_OBJECT public: KPopupBoxEventMapper( KPopupBox_widget *widget, Arts::KPopupBox_impl *impl ) : TQObject( widget,"" ), _widget( widget ), _impl( impl ) @@ -79,13 +81,14 @@ private: class HandleDrag : public TQWidget { Q_OBJECT + TQ_OBJECT public: - HandleDrag( TQWidget *parent, const char* name=0 ) : TQWidget( parent,name ) {} + HandleDrag( TQWidget *tqparent, const char* name=0 ) : TQWidget( tqparent,name ) {} void paintEvent( TQPaintEvent * ) { TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; if( width() < height() ) flags |= TQStyle::Style_Horizontal; - style().drawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), colorGroup(), flags ); + tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), tqcolorGroup(), flags ); } signals: void clicked(); @@ -108,11 +111,12 @@ static const char* const own_xpm[] = { "5 5 2 1", "# c black", ". c None", "# class ShowButton : public TQPushButton { Q_OBJECT + TQ_OBJECT private: TQBoxLayout::Direction _dir; TQPixmap _pmleft, _pmright, _pmup, _pmdown; public: - ShowButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ), _dir( TQBoxLayout::LeftToRight ) + ShowButton( TQWidget *tqparent, const char* name=0 ) : TQPushButton( tqparent,name ), _dir( TQBoxLayout::LeftToRight ) { connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( owntoggle( bool ) ) ); setToggleButton( true ); @@ -147,27 +151,28 @@ public slots: } } public: - TQSize minimumSizeHint() const { - int wh = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + TQSize tqminimumSizeHint() const { + int wh = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); return TQSize( wh, wh ); } TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } - TQSize minimumSize() const { return minimumSizeHint(); } - TQSize sizeHint() const { return minimumSize(); } + TQSize tqminimumSize() const { return tqminimumSizeHint(); } + TQSize tqsizeHint() const { return tqminimumSize(); } void drawButton( TQPainter * p ) { - p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); + p->fillRect( 0,0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) ); p->drawPixmap( ( width() - pixmap()->width() ) / 2, ( height() - pixmap()->height() ) / 2, *pixmap() ); } }; class OwnButton : public TQPushButton { Q_OBJECT + TQ_OBJECT private: TQPixmap _pmown, _pminside; public: - OwnButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ) + OwnButton( TQWidget *tqparent, const char* name=0 ) : TQPushButton( tqparent,name ) { connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggle( bool ) ) ); setToggleButton( true ); @@ -182,17 +187,17 @@ public slots: else setPixmap( _pmown ); } public: - TQSize minimumSizeHint() const { - int wh = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + TQSize tqminimumSizeHint() const { + int wh = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); return TQSize( wh, wh ); } TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } - TQSize minimumSize() const { return minimumSizeHint(); } - TQSize sizeHint() const { return minimumSize(); } + TQSize tqminimumSize() const { return tqminimumSizeHint(); } + TQSize tqsizeHint() const { return tqminimumSize(); } void drawButton( TQPainter * p ) { - p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); + p->fillRect( 0,0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) ); p->drawPixmap( ( width() - pixmap()->width() ) / 2, ( height() - pixmap()->height() ) / 2, *pixmap() ); } }; @@ -202,6 +207,7 @@ public: class OwnWidget : public KArtsWidget { Q_OBJECT + TQ_OBJECT ShowButton *_b; public: OwnWidget( ShowButton* b, TQWidget* p, const char* n=0, WFlags f=0 ) : KArtsWidget( p,n,f ) { _b = b; } diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp index 462d640b..dd4e484b 100644 --- a/arts/gui/kde/kpoti.cpp +++ b/arts/gui/kde/kpoti.cpp @@ -53,28 +53,28 @@ struct KPoti::KPotiPrivate bool bgDirty; KPixmap bgdb; - KPixmap bgPixmap( const TQColorGroup & colorGroup ) + KPixmap bgPixmap( const TQColorGroup & tqcolorGroup ) { if( bgDirty || bgdb.isNull() ) { bgdb.resize( buttonRect.size() ); TQPainter dbp( &bgdb ); - dbp.setPen( Qt::NoPen ); + dbp.setPen( TQt::NoPen ); TQRect drawRect = bgdb.rect(); - // create mask - TQBitmap mask( bgdb.size(), true ); - TQPainter maskpainter( &mask ); - maskpainter.setPen( Qt::NoPen ); - maskpainter.setBrush( Qt::color1 ); - maskpainter.drawEllipse( drawRect ); - maskpainter.end(); - bgdb.setMask( mask ); + // create tqmask + TQBitmap tqmask( bgdb.size(), true ); + TQPainter tqmaskpainter( &tqmask ); + tqmaskpainter.setPen( TQt::NoPen ); + tqmaskpainter.setBrush( TQt::color1 ); + tqmaskpainter.drawEllipse( drawRect ); + tqmaskpainter.end(); + bgdb.setMask( tqmask ); // inset shadow KPixmap gradient( bgdb.size() ); - KPixmapEffect::gradient( gradient, colorGroup.light(), colorGroup.dark(), KPixmapEffect::DiagonalGradient ); - dbp.setBrush( TQBrush( colorGroup.button(), gradient ) ); + KPixmapEffect::gradient( gradient, tqcolorGroup.light(), tqcolorGroup.dark(), KPixmapEffect::DiagonalGradient ); + dbp.setBrush( TQBrush( tqcolorGroup.button(), gradient ) ); dbp.drawEllipse( drawRect ); potiRect.setSize( drawRect.size() * 0.9 ); @@ -99,17 +99,17 @@ struct KPoti::KPotiPrivate { potidb.resize( potiRect.size() ); TQPainter dbp( &potidb ); - dbp.setPen( Qt::NoPen ); + dbp.setPen( TQt::NoPen ); TQRect drawRect( potidb.rect() ); - // create mask - TQBitmap mask( potidb.size(), true ); - TQPainter maskpainter( &mask ); - maskpainter.setPen( Qt::NoPen ); - maskpainter.setBrush( Qt::color1 ); - maskpainter.drawEllipse( drawRect ); - maskpainter.end(); - potidb.setMask( mask ); + // create tqmask + TQBitmap tqmask( potidb.size(), true ); + TQPainter tqmaskpainter( &tqmask ); + tqmaskpainter.setPen( TQt::NoPen ); + tqmaskpainter.setBrush( TQt::color1 ); + tqmaskpainter.drawEllipse( drawRect ); + tqmaskpainter.end(); + potidb.setMask( tqmask ); KPixmap gradient( potidb.size() ); KPixmapEffect::gradient( gradient, potiColor.dark( 130 ), potiColor.light( 130 ), KPixmapEffect::DiagonalGradient ); @@ -133,12 +133,12 @@ TQSizePolicy KPoti::sizePolicy() const return TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ); } -TQSize KPoti::sizeHint() const +TQSize KPoti::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } -TQSize KPoti::minimumSizeHint() const +TQSize KPoti::tqminimumSizeHint() const { int width = 40; int height = 40; @@ -162,17 +162,17 @@ TQString KPoti::text() const void KPoti::setText( const TQString & text ) { d->label = text; - setMinimumSize( minimumSizeHint() ); + setMinimumSize( tqminimumSizeHint() ); updateGeometry(); } /** Constructs a poti. - The \e parent and \e name arguments are sent to the TQWidget constructor. + The \e tqparent and \e name arguments are sent to the TQWidget constructor. */ -KPoti::KPoti( TQWidget *parent, const char *name ) - : TQFrame( parent, name, WResizeNoErase | WRepaintNoErase ) +KPoti::KPoti( TQWidget *tqparent, const char *name ) + : TQFrame( tqparent, name, WResizeNoErase | WRepaintNoErase ) , d( 0 ) { init(); @@ -188,12 +188,12 @@ KPoti::KPoti( TQWidget *parent, const char *name ) \arg \e step is the page step value. \arg \e value is the initial value. - The \e parent and \e name arguments are sent to the TQWidget constructor. + The \e tqparent and \e name arguments are sent to the TQWidget constructor. */ KPoti::KPoti( int minValue, int maxValue, int step, - int value, TQWidget *parent, const char *name ) - : TQFrame( parent, name, WResizeNoErase | WRepaintNoErase ) + int value, TQWidget *tqparent, const char *name ) + : TQFrame( tqparent, name, WResizeNoErase | WRepaintNoErase ) , TQRangeControl( minValue, maxValue, 1, step, value ) , d( 0 ) { @@ -209,7 +209,7 @@ KPoti::~KPoti() void KPoti::init(int value) { d = new KPotiPrivate; - font().setPointSize( 8 ); + const_cast<QFont&>(font()).setPointSize( 8 ); d->potiColor.setNamedColor( "red" ); timer = 0; @@ -222,7 +222,7 @@ void KPoti::init(int value) m_bLabel = true; tickInt = 0; - setFocusPolicy( TabFocus ); + setFocusPolicy( TQ_TabFocus ); initTicks(); } @@ -391,7 +391,7 @@ void KPoti::setColor( const TQColor &c ) { d->potiColor = c; d->potiDirty = true; - repaint(); + tqrepaint(); } @@ -407,8 +407,8 @@ void KPoti::paintPoti( TQPainter * p ) p2.translate( db.rect().center().x(), db.rect().center().y() ); p2.rotate( potiPos * 180.0 / PI ); TQRect pointer( db.width() / -20, db.width() / -2, db.width() / 10, db.width() / 2 ); - TQBrush buttonbrush( colorGroup().button() ); - qDrawShadePanel( &p2, pointer, colorGroup(), true, 1, &buttonbrush ); + TQBrush buttonbrush( tqcolorGroup().button() ); + qDrawShadePanel( &p2, pointer, tqcolorGroup(), true, 1, &buttonbrush ); p2.end(); p->drawPixmap( d->potiRect, db ); @@ -439,7 +439,7 @@ void KPoti::reallyMovePoti( float newPos ) void KPoti::drawContents( TQPainter * p ) { TQPixmap doublebuffer( contentsRect().size() ); - doublebuffer.fill( colorGroup().background() ); + doublebuffer.fill( tqcolorGroup().background() ); TQPainter dbp( &doublebuffer ); if( m_bLabel ) { @@ -454,10 +454,10 @@ void KPoti::drawContents( TQPainter * p ) if( ticks ) drawTicks( &dbp, buttonRadius, tickLength, interval ); - dbp.drawPixmap( d->buttonRect, d->bgPixmap( colorGroup() ) ); + dbp.drawPixmap( d->buttonRect, d->bgPixmap( tqcolorGroup() ) ); if( hasFocus() ) - style().drawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, tqcolorGroup() ); paintPoti( &dbp ); dbp.end(); @@ -473,13 +473,13 @@ void KPoti::mousePressEvent( TQMouseEvent *e ) { resetState(); - if ( e->button() == MidButton ) { + if ( e->button() == Qt::MidButton ) { double pos = atan2( double(e->pos().x()-d->center.x()), double(- e->pos().y() + d->center.y()) ); movePoti( pos ); return; } - if ( e->button() != LeftButton ) + if ( e->button() != Qt::LeftButton ) return; @@ -512,13 +512,13 @@ void KPoti::mousePressEvent( TQMouseEvent *e ) void KPoti::mouseMoveEvent( TQMouseEvent *e ) { - if ( (e->state() & MidButton) ) { // middle button wins + if ( (e->state() & Qt::MidButton) ) { // middle button wins double pos = atan2( double(e->pos().x()-d->center.x()), double(- e->pos().y()+d->center.y()) ); movePoti( pos ); return; } - if ( !(e->state() & LeftButton) ) + if ( !(e->state() & Qt::LeftButton) ) return; // left mouse button is up if ( state != Dragging ) return; @@ -534,7 +534,7 @@ void KPoti::mouseMoveEvent( TQMouseEvent *e ) void KPoti::mouseReleaseEvent( TQMouseEvent *e ) { - if ( !(e->button() & LeftButton) ) + if ( !(e->button() & Qt::LeftButton) ) return; resetState(); } @@ -567,7 +567,7 @@ void KPoti::enterEvent( TQEvent * ) void KPoti::movePoti( float pos ) { - float newPos = QMIN( maxAngle, QMAX( -maxAngle, pos ) ); + float newPos = TQMIN( maxAngle, TQMAX( -maxAngle, pos ) ); int newVal = valueFromPosition( newPos ); if ( potiVal != newVal ) { potiVal = newVal; @@ -710,7 +710,7 @@ void KPoti::repeatTimeout() void KPoti::drawTicks( TQPainter *p, double dist, double w, int i ) const { - p->setPen( colorGroup().foreground() ); + p->setPen( tqcolorGroup().foreground() ); double angle,s,c; double x, y; for (int v=0; v<=i; v++) @@ -765,7 +765,7 @@ void KPoti::setTickmarks( bool s ) void KPoti::setTickInterval( int i ) { - tickInt = QMAX( 0, i ); + tickInt = TQMAX( 0, i ); update(); } diff --git a/arts/gui/kde/kpoti.h b/arts/gui/kde/kpoti.h index 2994dd1e..80e32add 100644 --- a/arts/gui/kde/kpoti.h +++ b/arts/gui/kde/kpoti.h @@ -25,17 +25,18 @@ class TQTimer; -struct QPotiData; +struct TQPotiData; -class KPoti : public TQFrame, public QRangeControl +class KPoti : public TQFrame, public TQRangeControl { Q_OBJECT + TQ_OBJECT public: - KPoti( TQWidget *parent=0, const char *name=0 ); + KPoti( TQWidget *tqparent=0, const char *name=0 ); KPoti( int minValue, int maxValue, int step, int value, - TQWidget *parent=0, const char *name=0 ); + TQWidget *tqparent=0, const char *name=0 ); ~KPoti(); @@ -52,8 +53,8 @@ public: int tickInterval() const { return tickInt; } virtual TQSizePolicy sizePolicy() const; - virtual TQSize sizeHint() const; - virtual TQSize minimumSizeHint() const; + virtual TQSize tqsizeHint() const; + virtual TQSize tqminimumSizeHint() const; TQString text() const; public slots: @@ -108,7 +109,7 @@ private: int potiRadius() const; void initTicks(); - QTimer *timer; + TQTimer *timer; float potiPos; int potiVal; int clickOffset; diff --git a/arts/gui/kde/kpoti_impl.h b/arts/gui/kde/kpoti_impl.h index 0502cdc8..92d7a101 100644 --- a/arts/gui/kde/kpoti_impl.h +++ b/arts/gui/kde/kpoti_impl.h @@ -36,6 +36,7 @@ class KPoti_impl; class PotiIntMapper :public TQObject { Q_OBJECT + TQ_OBJECT KPoti_impl *impl; public: PotiIntMapper(KPoti_impl *impl, KPoti *kp); diff --git a/arts/gui/kde/kspinbox_impl.h b/arts/gui/kde/kspinbox_impl.h index d200c6f3..714da93f 100644 --- a/arts/gui/kde/kspinbox_impl.h +++ b/arts/gui/kde/kspinbox_impl.h @@ -35,6 +35,7 @@ namespace Arts { class KSpinBox_impl; class SpinBoxIntMapper :public TQObject { Q_OBJECT + TQ_OBJECT KSpinBox_impl *impl; public: SpinBoxIntMapper(KSpinBox_impl *impl, TQSpinBox *sp); @@ -54,7 +55,7 @@ protected: public: KSpinBox_impl( TQSpinBox * w = 0 ); - void constructor( Widget p ) { parent( p ); } + void constructor( Widget p ) { tqparent( p ); } std::string caption(); void caption(const std::string& newCaption); diff --git a/arts/gui/kde/ktickmarks_impl.cpp b/arts/gui/kde/ktickmarks_impl.cpp index 1a95c2a6..4988ad7b 100644 --- a/arts/gui/kde/ktickmarks_impl.cpp +++ b/arts/gui/kde/ktickmarks_impl.cpp @@ -75,8 +75,8 @@ void KTickmarks_Widget::drawContents( TQPainter* p ) { int _minsize; // Shorcuts int w,h; - TQColor colornormal = colorGroup().foreground(); - TQColor colordiff = colorGroup().buttonText(); + TQColor colornormal = tqcolorGroup().foreground(); + TQColor colordiff = tqcolorGroup().buttonText(); if ( _dir == Arts::BottomToTop || _dir == Arts::TopToBottom ) { p->translate( contentsRect().left(), contentsRect().bottom() ); @@ -111,7 +111,7 @@ void KTickmarks_Widget::drawContents( TQPainter* p ) { p->drawText( ( w - (left)*6 - (right)*6 - fontrect.width() )/2 + (left)*6 , h-fontrect.height()/2, fontrect.width(), fontrect.height()+2, - Qt::AlignRight|Qt::AlignTop, TQString::number( i ) ); + TQt::AlignRight|TQt::AlignTop, TQString::number( i ) ); if ( right ) p->drawLine( w-6, h, w, h ); } for ( float i=_minstep; i<=dbmax; i+=_minstep ) { @@ -121,7 +121,7 @@ void KTickmarks_Widget::drawContents( TQPainter* p ) { p->drawText( ( w - (left)*6 - (right)*6 - fontrect.width() )/2 + (left)*6 , h-fontrect.height()/2, fontrect.width(), fontrect.height()+2, - Qt::AlignRight|Qt::AlignTop, TQString::number( i ) ); + TQt::AlignRight|TQt::AlignTop, TQString::number( i ) ); if ( right ) p->drawLine( w-6, h, w, h ); } } else { @@ -157,7 +157,7 @@ void KTickmarks_Widget::drawContents( TQPainter* p ) { p->drawText( w - fontrect.width()/2 , ( h - (left)*6 - (right)*6 - fontrect.height() )/2 + (left)*6, fontrect.width(), fontrect.height()+2, - Qt::AlignRight|Qt::AlignTop, TQString::number( i ) ); + TQt::AlignRight|TQt::AlignTop, TQString::number( i ) ); if ( right ) p->drawLine( w, h-6, w, h ); } for ( float i=_minstep; i<=dbmax; i+=_minstep ) { @@ -167,7 +167,7 @@ void KTickmarks_Widget::drawContents( TQPainter* p ) { p->drawText( w - fontrect.width()/2 , ( h - (left)*6 - (right)*6 - fontrect.height() )/2 + (left)*6, fontrect.width(), fontrect.height()+2, - Qt::AlignRight|Qt::AlignTop, TQString::number( i ) ); + TQt::AlignRight|TQt::AlignTop, TQString::number( i ) ); if ( right ) p->drawLine( w, h-6, w, h ); } } diff --git a/arts/gui/kde/ktickmarks_impl.h b/arts/gui/kde/ktickmarks_impl.h index 1d0006a1..a54baf5a 100644 --- a/arts/gui/kde/ktickmarks_impl.h +++ b/arts/gui/kde/ktickmarks_impl.h @@ -61,6 +61,7 @@ private: class KTickmarks_Widget : public TQFrame, public dB2VolCalc { Q_OBJECT + TQ_OBJECT private: KTickmarks_impl* _impl; public: diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp index 1c32f23d..fca3466e 100644 --- a/arts/gui/kde/kvolumefader_impl.cpp +++ b/arts/gui/kde/kvolumefader_impl.cpp @@ -121,7 +121,7 @@ KVolumeFader_Widget::KVolumeFader_Widget( TQWidget* p, const char* n ) , _value( -1 ) , _dir( Arts::BottomToTop ) , _menu( new KPopupMenu( this ) ) - , _aExactValue( new KAction( i18n( "Set Exact Value..." ), KShortcut(), this, TQT_SLOT( exactValue() ), this ) ) + , _aExactValue( new KAction( i18n( "Set Exact Value..." ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( exactValue() ), TQT_TQOBJECT(this) ) ) { //kdDebug() << k_funcinfo << endl; setMinimumSize( 10,10 ); @@ -159,10 +159,10 @@ void KVolumeFader_Widget::drawContents( TQPainter* p ){ if ( _dir==Arts::BottomToTop ) h = contentsRect().height() * ( 1 - _value ); else h = contentsRect().height() * _value; for ( int i=int( h ); i<contentsRect().height(); i++ ) { - p->setPen( interpolate( colorGroup().light(), colorGroup().highlight(), float( i )/contentsRect().height() ) ); + p->setPen( interpolate( tqcolorGroup().light(), tqcolorGroup().highlight(), float( i )/contentsRect().height() ) ); p->drawLine( contentsRect().left(), this->frameWidth() + i, contentsRect().right(), this->frameWidth() + i ); } - p->setPen( colorGroup().dark() ); + p->setPen( tqcolorGroup().dark() ); p->drawLine( contentsRect().left(), this->frameWidth() + int( h ), contentsRect().right(), this->frameWidth() + int( h ) ); } else { float w; @@ -170,10 +170,10 @@ void KVolumeFader_Widget::drawContents( TQPainter* p ){ if ( _dir==Arts::LeftToRight ) w = - contentsRect().width() * ( 1 - _value ); else w = - contentsRect().width() * _value; for ( int i=int( w ); i>=-contentsRect().width(); i-- ) { - p->setPen( interpolate( colorGroup().light(), colorGroup().highlight(), float( -i )/contentsRect().width() ) ); + p->setPen( interpolate( tqcolorGroup().light(), tqcolorGroup().highlight(), float( -i )/contentsRect().width() ) ); p->drawLine( this->frameWidth() + i, contentsRect().top(), this->frameWidth() + i, contentsRect().bottom() ); } - p->setPen( colorGroup().dark() ); + p->setPen( tqcolorGroup().dark() ); p->drawLine( this->frameWidth() + int( w ), contentsRect().top(), this->frameWidth() + int( w ), contentsRect().bottom() ); } } diff --git a/arts/gui/kde/kvolumefader_impl.h b/arts/gui/kde/kvolumefader_impl.h index c2db6a0b..354c483a 100644 --- a/arts/gui/kde/kvolumefader_impl.h +++ b/arts/gui/kde/kvolumefader_impl.h @@ -69,6 +69,7 @@ class KAction; class KVolumeFader_Widget : public TQFrame { Q_OBJECT + TQ_OBJECT private: KVolumeFader_impl* _impl; bool _inupdate; diff --git a/arts/gui/kde/kwidget_impl.cpp b/arts/gui/kde/kwidget_impl.cpp index ede8ad38..b899f0cd 100644 --- a/arts/gui/kde/kwidget_impl.cpp +++ b/arts/gui/kde/kwidget_impl.cpp @@ -34,7 +34,7 @@ KWidget_impl::KWidget_impl( TQWidget * widget ) _widgetID = KWidgetRepo::the()->add( this, _qwidget ); /* - * KWidgetGuard will protect us against deleting the widget if Qt already + * KWidgetGuard will protect us against deleting the widget if TQt already * has done so (for instance if our widget was inside a panel, and * the panel got deleted, our widget will be gone, too) */ @@ -65,24 +65,24 @@ long KWidget_impl::widgetID() return _widgetID; } -Widget KWidget_impl::parent() +Widget KWidget_impl::tqparent() { return KWidgetRepo::the()->lookupWidget(_parentID); } -void KWidget_impl::parent(Arts::Widget newParent) +void KWidget_impl::tqparent(Arts::Widget newParent) { if(!newParent.isNull()) { _parentID = newParent.widgetID(); - TQWidget *qparent; - qparent = KWidgetRepo::the()->lookupQWidget(newParent.widgetID()); - if( qparent != 0 ) + TQWidget *qtqparent; + qtqparent = KWidgetRepo::the()->lookupTQWidget(newParent.widgetID()); + if( qtqparent != 0 ) { TQPoint pos(x(),y()); bool showIt = visible(); - _qwidget->reparent(qparent, pos, showIt); + _qwidget->reparent(qtqparent, pos, showIt); } } else @@ -143,26 +143,26 @@ void KWidget_impl::visible(bool newVisible) SizePolicy KWidget_impl::hSizePolicy() { - return ( SizePolicy )_qwidget->sizePolicy().horData(); + return ( SizePolicy )_qwidget->tqsizePolicy().horData(); } void KWidget_impl::hSizePolicy( SizePolicy p ) { - TQSizePolicy sp = _qwidget->sizePolicy(); + TQSizePolicy sp = _qwidget->tqsizePolicy(); sp.setHorData( ( TQSizePolicy::SizeType )p ); - _qwidget->setSizePolicy( sp ); + _qwidget->tqsetSizePolicy( sp ); } SizePolicy KWidget_impl::vSizePolicy() { - return ( SizePolicy )_qwidget->sizePolicy().verData(); + return ( SizePolicy )_qwidget->tqsizePolicy().verData(); } void KWidget_impl::vSizePolicy( SizePolicy p ) { - TQSizePolicy sp = _qwidget->sizePolicy(); + TQSizePolicy sp = _qwidget->tqsizePolicy(); sp.setVerData( ( TQSizePolicy::SizeType )p ); - _qwidget->setSizePolicy( sp ); + _qwidget->tqsetSizePolicy( sp ); } void KWidget_impl::show() diff --git a/arts/gui/kde/kwidget_impl.h b/arts/gui/kde/kwidget_impl.h index 292f8cc8..40d7216c 100644 --- a/arts/gui/kde/kwidget_impl.h +++ b/arts/gui/kde/kwidget_impl.h @@ -43,8 +43,8 @@ public: ~KWidget_impl(); long widgetID(); - Widget parent(); - void parent(Arts::Widget); + Widget tqparent(); + void tqparent(Arts::Widget); long x(); void x(long newX); long y(); @@ -70,6 +70,7 @@ public: class KWidgetGuard : public TQObject { Q_OBJECT + TQ_OBJECT protected: KWidget_impl *impl; diff --git a/arts/gui/kde/kwidgetrepo.cpp b/arts/gui/kde/kwidgetrepo.cpp index 120f9cc5..9c7a99de 100644 --- a/arts/gui/kde/kwidgetrepo.cpp +++ b/arts/gui/kde/kwidgetrepo.cpp @@ -71,7 +71,7 @@ long KWidgetRepo::add(KWidget_impl *widget, TQWidget *qwidget) return ID; } -TQWidget *KWidgetRepo::lookupQWidget(long ID) +TQWidget *KWidgetRepo::lookupTQWidget(long ID) { return qwidgets[ID]; } diff --git a/arts/gui/kde/kwidgetrepo.h b/arts/gui/kde/kwidgetrepo.h index 1bcb5870..bfc9206d 100644 --- a/arts/gui/kde/kwidgetrepo.h +++ b/arts/gui/kde/kwidgetrepo.h @@ -46,7 +46,7 @@ public: long add(Arts::KWidget_impl *widget, TQWidget *qwidget); Arts::Widget lookupWidget(long ID); - TQWidget *lookupQWidget(long ID); + TQWidget *lookupTQWidget(long ID); void remove(long ID); static KWidgetRepo *the(); diff --git a/arts/midi/Makefile.am b/arts/midi/Makefile.am index b5719649..b7d655a1 100644 --- a/arts/midi/Makefile.am +++ b/arts/midi/Makefile.am @@ -9,12 +9,12 @@ bin_PROGRAMS = midisend noinst_PROGRAMS = midisynctest midisend_SOURCES = midisend.cc midimsg.c -midisend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBPTHREAD) +midisend_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_RPATH) $(LIBPTHREAD) midisend_LDADD = libartsmidi_idl.la midisend_COMPILE_FIRST = artsmidi.h midisynctest_SOURCES = midisynctest.cc -midisynctest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBPTHREAD) +midisynctest_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_RPATH) $(LIBPTHREAD) midisynctest_LDADD = libartsmidi.la -lsoundserver_idl midisynctest_COMPILE_FIRST = artsmidi.h diff --git a/arts/midi/artsmidi.idl b/arts/midi/artsmidi.idl index 70157d95..82e6e9e4 100644 --- a/arts/midi/artsmidi.idl +++ b/arts/midi/artsmidi.idl @@ -54,7 +54,7 @@ struct TimeStamp { /** * different status of a midi command */ -enum MidiCommandStatus { +enum MidiCommandtqStatus { // Masks: mcsCommandMask = 0xf0, mcsChannelMask = 0x0f, diff --git a/arts/midi/audiosync_impl.cc b/arts/midi/audiosync_impl.cc index 20f089df..a75992c6 100644 --- a/arts/midi/audiosync_impl.cc +++ b/arts/midi/audiosync_impl.cc @@ -188,7 +188,7 @@ void AudioSync_impl::synchronizeTo(const TimeStamp& time) #endif } -AudioSync_impl *AudioSync_impl::find(AudioSync audioSync) +AudioSync_impl *AudioSync_impl::tqfind(AudioSync audioSync) { list<AudioSync_impl *>::iterator i; diff --git a/arts/midi/audiosync_impl.h b/arts/midi/audiosync_impl.h index 302c93cb..dde1aed0 100644 --- a/arts/midi/audiosync_impl.h +++ b/arts/midi/audiosync_impl.h @@ -67,7 +67,7 @@ public: void updateTime(); // interface to MidiSyncGroup - static AudioSync_impl *find(AudioSync audioSync); + static AudioSync_impl *tqfind(AudioSync audioSync); void synchronizeTo(const TimeStamp& time); void setSyncGroup(MidiSyncGroup_impl *syncGroup); diff --git a/arts/midi/midisyncgroup_impl.cc b/arts/midi/midisyncgroup_impl.cc index 5d5305dd..f446899f 100644 --- a/arts/midi/midisyncgroup_impl.cc +++ b/arts/midi/midisyncgroup_impl.cc @@ -68,7 +68,7 @@ void MidiSyncGroup_impl::removeClient(MidiClient client) void MidiSyncGroup_impl::addAudioSync(AudioSync audioSync) { - AudioSync_impl *impl = AudioSync_impl::find(audioSync); + AudioSync_impl *impl = AudioSync_impl::tqfind(audioSync); impl->setSyncGroup(this); audioSyncs.push_back(impl); @@ -77,7 +77,7 @@ void MidiSyncGroup_impl::addAudioSync(AudioSync audioSync) void MidiSyncGroup_impl::removeAudioSync(AudioSync audioSync) { - AudioSync_impl *impl = AudioSync_impl::find(audioSync); + AudioSync_impl *impl = AudioSync_impl::tqfind(audioSync); impl->setSyncGroup(0); audioSyncs.remove(impl); } diff --git a/arts/modules/README.environments b/arts/modules/README.environments index 0ac64df5..5dc6c66e 100644 --- a/arts/modules/README.environments +++ b/arts/modules/README.environments @@ -155,7 +155,7 @@ to tell the Item in which environment it lives. It also uses setContainer( Container::null()) once the Item gets removed. Which container the Item is in can be seen in the - readonly attribute Container parent; + readonly attribute Container tqparent; Upon serialization, the container uses diff --git a/arts/modules/common/artsmodulescommon.idl b/arts/modules/common/artsmodulescommon.idl index 10ccd218..7f657568 100644 --- a/arts/modules/common/artsmodulescommon.idl +++ b/arts/modules/common/artsmodulescommon.idl @@ -72,7 +72,7 @@ module Environment { /** * the container the item lives in */ - readonly attribute Container parent; + readonly attribute Container tqparent; /** * called by the container to insert/remove item from/to the @@ -150,7 +150,7 @@ interface EffectRackItemGui { }; interface EffectRackSlot { - void constructor( Widget parent, Widget effect, EffectRackItemGui effectrackgui ); + void constructor( Widget tqparent, Widget effect, EffectRackItemGui effectrackgui ); /*writeonly*/ attribute boolean removeslot; /*writeonly*/ attribute boolean tomaster; }; diff --git a/arts/modules/common/effectrackslot_impl.cc b/arts/modules/common/effectrackslot_impl.cc index 8e7e48e8..359c40a3 100644 --- a/arts/modules/common/effectrackslot_impl.cc +++ b/arts/modules/common/effectrackslot_impl.cc @@ -42,23 +42,23 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel { } - void constructor( Widget parent, Widget effect, EffectRackItemGui effectrackgui ) + void constructor( Widget tqparent, Widget effect, EffectRackItemGui effectrackgui ) { _effectrackgui = effectrackgui; - _hbox.parent( parent ); + _hbox.tqparent( tqparent ); _hbox.margin( 0 ); _hbox.spacing( 0 ); _hbox.framestyle( Sunken | Panel ); _hbox.linewidth( 1 ); _hbox.show(); - _buttonbox.parent( _hbox ); + _buttonbox.tqparent( _hbox ); _buttonbox.margin( 0 ); _buttonbox.spacing( 0 ); _buttonbox.show(); - _removeButton.parent( _buttonbox ); + _removeButton.tqparent( _buttonbox ); _removeButton.text( "x" ); _removeButton.hSizePolicy( spFixed ); _removeButton.width( 20 ); @@ -66,7 +66,7 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel connect( _removeButton, "clicked_changed", self(), "removeslot" ); _removeButton.show(); - _masterButton.parent( _buttonbox ); + _masterButton.tqparent( _buttonbox ); _masterButton.text( "MM" ); _masterButton.toggle( true ); _masterButton.hSizePolicy( spFixed ); @@ -75,7 +75,7 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel connect( _masterButton, "pressed_changed", self(), "tomaster" ); _masterButton.show(); - _frame.parent( _hbox ); + _frame.tqparent( _hbox ); _frame.margin( 5 ); _frame.spacing( 0 ); _frame.framestyle( Raised | Panel ); @@ -85,10 +85,10 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel _frame.show(); _effect = effect; - _effect.parent( _frame ); + _effect.tqparent( _frame ); _effect.show(); - _spacer.parent( _frame ); + _spacer.tqparent( _frame ); _spacer.hSizePolicy( spExpanding ); _spacer.show(); } diff --git a/arts/modules/common/env_effectrackitem_impl.cc b/arts/modules/common/env_effectrackitem_impl.cc index 50fb116e..ac76db70 100644 --- a/arts/modules/common/env_effectrackitem_impl.cc +++ b/arts/modules/common/env_effectrackitem_impl.cc @@ -226,7 +226,7 @@ public: name = LineEdit(); name.caption("name"); name.text(_effectRack.name()); - name.parent(hbox); + name.tqparent(hbox); connect(name,"text_changed", _effectRack, "name"); #endif @@ -248,7 +248,7 @@ public: typebox = ComboBox(); typebox.choices(choices); typebox.value(_type); - typebox.parent(hbox); + typebox.tqparent(hbox); connect(typebox,"value_changed", self(), "type"); addbutton = Button( "add", hbox ); @@ -260,7 +260,7 @@ public: effect_vbox.show(); Frame spacer; - spacer.parent( effect_vbox ); + spacer.tqparent( effect_vbox ); spacer.vSizePolicy( spExpanding ); spacer.show(); effect_vbox._addChild( spacer, "spacer" ); diff --git a/arts/modules/common/env_instrumentitem_impl.cc b/arts/modules/common/env_instrumentitem_impl.cc index 17959ca0..0b979b6c 100644 --- a/arts/modules/common/env_instrumentitem_impl.cc +++ b/arts/modules/common/env_instrumentitem_impl.cc @@ -98,7 +98,7 @@ public: LineEdit edit; edit.x(20); edit.y(10); edit.width(120); edit.height(40); edit.text(instrument.filename()); - edit.parent(panel); + edit.tqparent(panel); edit.show(); connect(edit,"text_changed", instrument, "filename"); panel._addChild(edit,"editWidget"); diff --git a/arts/modules/common/env_item_impl.cc b/arts/modules/common/env_item_impl.cc index 6bc960d8..da3a6941 100644 --- a/arts/modules/common/env_item_impl.cc +++ b/arts/modules/common/env_item_impl.cc @@ -16,7 +16,7 @@ Environment::Item_impl::~Item_impl() arts_assert(_active == false); } -Environment::Container Environment::Item_impl::parent() +Environment::Container Environment::Item_impl::tqparent() { Container p = _parent; return p; diff --git a/arts/modules/common/env_item_impl.h b/arts/modules/common/env_item_impl.h index dbdca1f9..4fcd1fc8 100644 --- a/arts/modules/common/env_item_impl.h +++ b/arts/modules/common/env_item_impl.h @@ -18,7 +18,7 @@ public: ~Item_impl(); bool active(); - Container parent(); + Container tqparent(); void setContainer(Container container); }; } diff --git a/arts/modules/common/env_mixeritem_impl.cc b/arts/modules/common/env_mixeritem_impl.cc index 0f4db5e8..db4bc18c 100644 --- a/arts/modules/common/env_mixeritem_impl.cc +++ b/arts/modules/common/env_mixeritem_impl.cc @@ -49,7 +49,7 @@ public: if(newName != _name) { _name = newName; - amClient.title(i18n("Mixer (\"%1\")").arg(TQString::fromUtf8(_name.c_str())).utf8().data()); + amClient.title(i18n("Mixer (\"%1\")").tqarg(TQString::fromUtf8(_name.c_str())).utf8().data()); amClient.autoRestoreID("mixer_"+_name); for(unsigned int i = 0; i < _inputs.size(); i++) _inputs[i].busname(channelName(i)); @@ -165,7 +165,7 @@ public: Widget w = guiFactory.createGui((*channels)[i]); if(!w.isNull()) { - w.parent(channel_hbox); + w.tqparent(channel_hbox); w.show(); channelWidgets.push_back(w); } @@ -183,21 +183,21 @@ public: if(!_item.isNull() && !vbox.isNull()) { hbox = HBox(); - hbox.parent(vbox); + hbox.tqparent(vbox); hbox.show(); spinbox = SpinBox(); spinbox.caption(i18n("channels").utf8().data()); spinbox.min(0); spinbox.max(32); spinbox.value(_item.channelCount()); - spinbox.parent(hbox); + spinbox.tqparent(hbox); spinbox.show(); connect(spinbox,"value_changed", _item, "channelCount"); name = LineEdit(); name.caption(i18n("name").utf8().data()); name.text(_item.name()); - name.parent(hbox); + name.tqparent(hbox); name.show(); connect(name,"text_changed", _item, "name"); @@ -212,12 +212,12 @@ public: delete queryResults; typebox.choices(choices); typebox.value(_type); - typebox.parent(hbox); + typebox.tqparent(hbox); typebox.show(); connect(typebox,"value_changed", _item, "type"); channel_hbox = HBox(); - channel_hbox.parent(vbox); + channel_hbox.tqparent(vbox); channel_hbox.show(); channelWidgets.clear(); @@ -320,14 +320,14 @@ public: HBox hbox; hbox.show(); hbox.width(330); hbox.height(50); - hbox.parent(vbox); + hbox.tqparent(vbox); vbox._addChild(hbox,"hbox"); SpinBox spinbox; spinbox.caption(i18n("channels").utf8().data()); spinbox.min(0); spinbox.max(32); spinbox.value(mixerItem.channelCount()); - spinbox.parent(hbox); + spinbox.tqparent(hbox); spinbox.show(); connect(spinbox,"value_changed", mixerItem, "channelCount"); hbox._addChild(spinbox,"channelsWidget"); @@ -335,7 +335,7 @@ public: LineEdit name; name.caption(i18n("name").utf8().data()); name.caption(mixerItem.name()); - name.parent(hbox); + name.tqparent(hbox); name.show(); connect(name,"caption_changed", mixerItem, "name"); hbox._addChild(name,"nameWidget"); @@ -343,7 +343,7 @@ public: HBox channel_hbox; channel_hbox.show(); channel_hbox.width(330); hbox.height(450); - channel_hbox.parent(vbox); + channel_hbox.tqparent(vbox); vbox._addChild(channel_hbox,"channel_hbox"); GenericGuiFactory gf; @@ -353,7 +353,7 @@ public: for(i = channels->begin(); i != channels->end(); i++) { Widget w = gf.createGui(*i); - w.parent(channel_hbox); + w.tqparent(channel_hbox); channel_hbox._addChild(w,"channel"); } #endif diff --git a/arts/modules/effects/fivebandmonocomplexeq_impl.cc b/arts/modules/effects/fivebandmonocomplexeq_impl.cc index 56ca6037..0891458c 100644 --- a/arts/modules/effects/fivebandmonocomplexeq_impl.cc +++ b/arts/modules/effects/fivebandmonocomplexeq_impl.cc @@ -110,7 +110,7 @@ public: Arts::LayoutBox hbox; hbox.direction( Arts::LeftToRight ); - hbox.layoutmargin( 5 ); hbox.spacing( 5 ); + hbox.tqlayoutmargin( 5 ); hbox.spacing( 5 ); Arts::Poti lowgain; lowgain.caption( i18n( "Low Gain" ).utf8().data() ); lowgain.min( -24 ); lowgain.max( 24 ); @@ -123,11 +123,11 @@ public: Arts::Poti lowfreq; lowfreq.color( "grey" ); lowfreq.caption( i18n( "Low Freq" ).utf8().data() ); lowfreq.min( 20 ); lowfreq.max( 1000 ); lowfreq.value( ch.lowfreq() ); connect( lowfreq, "value_changed", ch, "lowfreq" ); - lowfreq.parent( lowbox ); lowbox._addChild( lowfreq , "" ); + lowfreq.tqparent( lowbox ); lowbox._addChild( lowfreq , "" ); Arts::Poti lowq; lowq.color( "grey" ); lowq.caption( i18n( "Low Q" ).utf8().data() ); lowq.min( 0.01 ); lowq.max( 10 ); lowq.value( ch.lowq() ); connect( lowq, "value_changed", ch, "lowq" ); - lowq.parent( lowbox ); lowbox._addChild( lowq , "" ); + lowq.tqparent( lowbox ); lowbox._addChild( lowq , "" ); Arts::Poti mid1gain; mid1gain.caption( i18n( "Mid1 Gain" ).utf8().data() ); mid1gain.min( -24 ); mid1gain.max( 24 ); @@ -140,11 +140,11 @@ public: Arts::Poti mid1freq; mid1freq.color( "grey" ); mid1freq.caption( i18n( "Mid1 Freq" ).utf8().data() ); mid1freq.min( 20 ); mid1freq.max( 5000 ); mid1freq.value( ch.mid1freq() ); connect( mid1freq, "value_changed", ch, "mid1freq" ); - mid1freq.parent( mid1box ); mid1box._addChild( mid1freq , "" ); + mid1freq.tqparent( mid1box ); mid1box._addChild( mid1freq , "" ); Arts::Poti mid1q; mid1q.color( "grey" ); mid1q.caption( i18n( "Mid1 Q" ).utf8().data() ); mid1q.min( 0.01 ); mid1q.max( 10 ); mid1q.value( ch.mid1q() ); connect( mid1q, "value_changed", ch, "mid1q" ); - mid1q.parent( mid1box ); mid1box._addChild( mid1q , "" ); + mid1q.tqparent( mid1box ); mid1box._addChild( mid1q , "" ); Arts::Poti mid2gain; mid2gain.caption( i18n( "Mid2 Gain" ).utf8().data() ); mid2gain.min( -24 ); mid2gain.max( 24 ); @@ -157,11 +157,11 @@ public: Arts::Poti mid2freq; mid2freq.color( "grey" ); mid2freq.caption( i18n( "Mid2 Freq" ).utf8().data() ); mid2freq.min( 20 ); mid2freq.max( 10000 ); mid2freq.value( ch.mid2freq() ); connect( mid2freq, "value_changed", ch, "mid2freq" ); - mid2freq.parent( mid2box ); mid2box._addChild( mid2freq , "" ); + mid2freq.tqparent( mid2box ); mid2box._addChild( mid2freq , "" ); Arts::Poti mid2q; mid2q.color( "grey" ); mid2q.caption( i18n( "Mid2 Q" ).utf8().data() ); mid2q.min( 0.01 ); mid2q.max( 10 ); mid2q.value( ch.mid2q() ); connect( mid2q, "value_changed", ch, "mid2q" ); - mid2q.parent( mid2box ); mid2box._addChild( mid2q , "" ); + mid2q.tqparent( mid2box ); mid2box._addChild( mid2q , "" ); Arts::Poti mid3gain; mid3gain.caption( i18n( "Mid3 Gain" ).utf8().data() ); mid3gain.min( -24 ); mid3gain.max( 24 ); @@ -174,11 +174,11 @@ public: Arts::Poti mid3freq; mid3freq.color( "grey" ); mid3freq.caption( i18n( "Mid3 Freq" ).utf8().data() ); mid3freq.min( 1000 ); mid3freq.max( 10000 ); mid3freq.value( ch.mid3freq() ); connect( mid3freq, "value_changed", ch, "mid3freq" ); - mid3freq.parent( mid3box ); mid3box._addChild( mid3freq , "" ); + mid3freq.tqparent( mid3box ); mid3box._addChild( mid3freq , "" ); Arts::Poti mid3q; mid3q.color( "grey" ); mid3q.caption( i18n( "Mid3 Q" ).utf8().data() ); mid3q.min( 0.01 ); mid3q.max( 10 ); mid3q.value( ch.mid3q() ); connect( mid3q, "value_changed", ch, "mid3q" ); - mid3q.parent( mid3box ); mid3box._addChild( mid3q , "" ); + mid3q.tqparent( mid3box ); mid3box._addChild( mid3q , "" ); Arts::Poti highgain; highgain.caption( i18n( "High Gain" ).utf8().data() ); highgain.min( -24 ); highgain.max( 24 ); @@ -191,11 +191,11 @@ public: Arts::Poti highfreq; highfreq.color( "grey" ); highfreq.caption( i18n( "High Freq" ).utf8().data() ); highfreq.min( 5000 ); highfreq.max( 16000 ); highfreq.value( ch.highfreq() ); connect( highfreq, "value_changed", ch, "highfreq" ); - highfreq.parent( highbox ); highbox._addChild( highfreq , "" ); + highfreq.tqparent( highbox ); highbox._addChild( highfreq , "" ); Arts::Poti highq; highq.color( "grey" ); highq.caption( i18n( "High Q" ).utf8().data() ); highq.min( 0.01 ); highq.max( 10 ); highq.value( ch.highq() ); connect( highq, "value_changed", ch, "highq" ); - highq.parent( highbox ); highbox._addChild( highq , "" ); + highq.tqparent( highbox ); highbox._addChild( highq , "" ); hbox.addStretch( 100 ); diff --git a/arts/modules/effects/freeverb/Makefile.am b/arts/modules/effects/freeverb/Makefile.am index 42d70f20..bb2d6fac 100644 --- a/arts/modules/effects/freeverb/Makefile.am +++ b/arts/modules/effects/freeverb/Makefile.am @@ -1,3 +1,11 @@ +INCLUDES = \ + -I$(top_builddir)/arts/modules \ + -I$(top_srcdir)/arts/modules \ + -I$(top_builddir)/arts/gui/common \ + -I$(top_builddir)/arts/midi \ + -I$(top_builddir)/arts/runtime \ + -I$(arts_includes) \ + $(ARTSC_INCLUDE) $(all_includes) noinst_LTLIBRARIES = libfreeverb.la diff --git a/arts/modules/effects/freeverb/revmodel.cpp b/arts/modules/effects/freeverb/revmodel.cpp index 23a766cc..feacaf64 100644 --- a/arts/modules/effects/freeverb/revmodel.cpp +++ b/arts/modules/effects/freeverb/revmodel.cpp @@ -73,7 +73,7 @@ void revmodel::mute() } } -void revmodel::processreplace(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip) +void revmodel::processtqreplace(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip) { float outL,outR,input; diff --git a/arts/modules/effects/freeverb/revmodel.hpp b/arts/modules/effects/freeverb/revmodel.hpp index ca6c89a0..8fb37cd6 100644 --- a/arts/modules/effects/freeverb/revmodel.hpp +++ b/arts/modules/effects/freeverb/revmodel.hpp @@ -17,7 +17,7 @@ public: revmodel(); void mute(); void processmix(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip); - void processreplace(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip); + void processtqreplace(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip); void setroomsize(float value); float getroomsize(); void setdamp(float value); diff --git a/arts/modules/effects/freeverbguifactory_impl.cc b/arts/modules/effects/freeverbguifactory_impl.cc index 7af1f471..17878daa 100644 --- a/arts/modules/effects/freeverbguifactory_impl.cc +++ b/arts/modules/effects/freeverbguifactory_impl.cc @@ -58,7 +58,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object) roomsize.color("red"); roomsize.min(0); roomsize.max(1); roomsize.value(freeverb.roomsize()); roomsize.range(100); - roomsize.parent(hbox); + roomsize.tqparent(hbox); roomsize.show(); connect(roomsize,"value_changed", freeverb, "roomsize"); hbox._addChild(roomsize,"roomsizeWidget"); @@ -68,7 +68,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object) damp.color("red"); damp.min(0); damp.max(1); damp.value(freeverb.damp()); damp.range(100); - damp.parent(hbox); + damp.tqparent(hbox); damp.show(); connect(damp,"value_changed", freeverb, "damp"); hbox._addChild(damp,"dampWidget"); @@ -78,7 +78,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object) wet.color("red"); wet.min(0); wet.max(1); wet.value(freeverb.wet()); wet.range(100); - wet.parent(hbox); + wet.tqparent(hbox); wet.show(); connect(wet,"value_changed", freeverb, "wet"); hbox._addChild(wet,"wetWidget"); @@ -88,7 +88,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object) dry.color("red"); dry.min(0); dry.max(1); dry.value(freeverb.dry()); dry.range(100); - dry.parent(hbox); + dry.tqparent(hbox); dry.show(); connect(dry,"value_changed", freeverb, "dry"); hbox._addChild(dry,"dryWidget"); @@ -98,7 +98,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object) width.color("red"); width.min(0); width.max(1); width.value(freeverb.width()); width.range(100); - width.parent(hbox); + width.tqparent(hbox); width.show(); connect(width,"value_changed", freeverb, "width"); hbox._addChild(width,"widthWidget"); diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp index b4db259a..f0fa3690 100644 --- a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp +++ b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp @@ -30,7 +30,7 @@ using namespace Arts; KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* w ) : KLayoutBox_impl( w ? w : new TQFrame( 0 ) ) { //kdDebug()<<"KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* "<<w<<" )"<<endl; - _mapper = new KStereoVolumeControlGui_EventMapper( this, _qframe ); + _mapper = new KStereoVolumeControlGui_EventMapper( this, TQT_TQOBJECT(_qframe) ); this->addWidget( _label, -100 ); _label.bottom( Arts::East ); _label.text( "Volume" ); @@ -47,7 +47,7 @@ KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* w ) : KLayo this->dbmax( 6 ); _left.framestyle( Arts::Raised|Arts::Panel ); _left.linewidth( 4 ); _right.framestyle( Arts::Raised|Arts::Panel ); _right.linewidth( 4 ); - this->layoutmargin( 1 ); this->linewidth( 1 ); this->framestyle( Arts::Panel|Arts::Raised ); + this->tqlayoutmargin( 1 ); this->linewidth( 1 ); this->framestyle( Arts::Panel|Arts::Raised ); } void KStereoVolumeControlGui_impl::constructor( Arts::StereoVolumeControl svc ) { diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.h b/arts/modules/effects/kstereovolumecontrolgui_impl.h index 8729232f..855c979c 100644 --- a/arts/modules/effects/kstereovolumecontrolgui_impl.h +++ b/arts/modules/effects/kstereovolumecontrolgui_impl.h @@ -81,11 +81,12 @@ private: class KStereoVolumeControlGui_EventMapper : public TQObject { Q_OBJECT + TQ_OBJECT public: TQTimer* _timer; Arts::KStereoVolumeControlGui_impl* _impl; public: - KStereoVolumeControlGui_EventMapper( Arts::KStereoVolumeControlGui_impl* impl, TQObject* parent, const char* name=0 ) : TQObject( parent,name ), _impl( impl ) { + KStereoVolumeControlGui_EventMapper( Arts::KStereoVolumeControlGui_impl* impl, TQObject* tqparent, const char* name=0 ) : TQObject( tqparent,name ), _impl( impl ) { _timer = new TQTimer( this ); connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimerSignal() ) ); } diff --git a/arts/modules/effects/stereocompressorguifactory_impl.cc b/arts/modules/effects/stereocompressorguifactory_impl.cc index e5a985fc..d5209ebd 100644 --- a/arts/modules/effects/stereocompressorguifactory_impl.cc +++ b/arts/modules/effects/stereocompressorguifactory_impl.cc @@ -85,7 +85,7 @@ public: connect( bon, "pressed_changed", comp, "thru" ); LayoutBox hbox; - hbox.direction( LeftToRight ); hbox.layoutmargin( 5 ); hbox.spacing( 5 ); + hbox.direction( LeftToRight ); hbox.tqlayoutmargin( 5 ); hbox.spacing( 5 ); PopupBox timesbox; timesbox.name( "Timings" ); timesbox.direction( LeftToRight ); LayoutBox times; diff --git a/arts/modules/effects/synth_freeverb_impl.cc b/arts/modules/effects/synth_freeverb_impl.cc index a1f35d06..e6cb1b07 100644 --- a/arts/modules/effects/synth_freeverb_impl.cc +++ b/arts/modules/effects/synth_freeverb_impl.cc @@ -57,7 +57,7 @@ public: void calculateBlock(unsigned long samples) { - model->processreplace(inleft, inright, outleft, outright, samples,1); + model->processtqreplace(inleft, inright, outleft, outright, samples,1); // don't add the original signal - that's what the "dry" argument is for //for(unsigned long i = 0;i < samples; i++) //{ diff --git a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc index ece106c2..86f7c1bb 100644 --- a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc +++ b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc @@ -186,7 +186,7 @@ Widget StereoFirEqualizerGuiFactory_impl::createGui(Object object) vbox.show(); Graph g; - g.parent(vbox); + g.tqparent(vbox); g.width(400); g.height(230); g.caption(i18n("a graph").utf8().data()); @@ -211,7 +211,7 @@ Widget StereoFirEqualizerGuiFactory_impl::createGui(Object object) spinbox.caption(i18n("channels").utf8().data()); spinbox.min(3); spinbox.max(255); spinbox.value(equalizer.taps()); - spinbox.parent(vbox); + spinbox.tqparent(vbox); spinbox.show(); connect(spinbox,"value_changed", equalizer, "taps"); vbox._addChild(spinbox,"spinbox"); diff --git a/arts/modules/effects/voiceremovalguifactory_impl.cc b/arts/modules/effects/voiceremovalguifactory_impl.cc index d4879b87..4a4011be 100644 --- a/arts/modules/effects/voiceremovalguifactory_impl.cc +++ b/arts/modules/effects/voiceremovalguifactory_impl.cc @@ -53,7 +53,7 @@ Widget VoiceRemovalGuiFactory_impl::createGui( Object object ) position.color( "grey" ); position.min( -1 ); position.max( 1 ); position.value( voiceremoval.position() ); position.range( 100 ); - position.parent( hbox ); + position.tqparent( hbox ); position.show(); connect( position, "value_changed", voiceremoval, "position" ); hbox._addChild( position, "positionWidget" ); @@ -64,7 +64,7 @@ Widget VoiceRemovalGuiFactory_impl::createGui( Object object ) freq.value( voiceremoval.frequency() ); freq.range( 400 ); freq.logarithmic( 2.0 ); - freq.parent( hbox ); + freq.tqparent( hbox ); freq.show(); connect( freq, "value_changed", voiceremoval, "frequency" ); hbox._addChild( freq, "freqWidget" ); diff --git a/arts/modules/synth/Makefile.am b/arts/modules/synth/Makefile.am index 3995f402..c9922aaa 100644 --- a/arts/modules/synth/Makefile.am +++ b/arts/modules/synth/Makefile.am @@ -31,10 +31,10 @@ libartsmodulessynth_la_COMPILE_FIRST = artsmodulessynth.h ../../midi/artsmidi.h libartsmodulessynth_la_LIBADD = \ $(top_builddir)/arts/runtime/libartsbuilder.la \ $(top_builddir)/arts/midi/libartsmidi_idl.la \ - -lartsflow -lartsflow_idl -lmcop + -lartsflow -lgsl -lartsflow_idl -lmcop #libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_KDEUI) $(LIB_KDECORE) -libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined +libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lgsl -no-undefined artsmodulessynth.cc artsmodulessynth.h artsmodulessynth.mcoptype artsmodulessynth.mcopclass: $(srcdir)/artsmodulessynth.idl $(MCOPIDL) $(MCOPIDL) -t $(MCOP_INCLUDES) $(srcdir)/artsmodulessynth.idl diff --git a/arts/modules/synth/c_filter_stuff.h b/arts/modules/synth/c_filter_stuff.h index edd7a4af..89e93de3 100644 --- a/arts/modules/synth/c_filter_stuff.h +++ b/arts/modules/synth/c_filter_stuff.h @@ -150,12 +150,12 @@ typedef struct { int buflen; } ty_afmethod; -#define C_FLOWOUQT_METHOD 0 -#define C_RBQT_METHOD 1 -#define C_SWAPROQT_METHOD 2 -#define C_SWAPRWQT_METHOD 3 -#define C_AIMROQT_METHOD 4 -#define C_AIMRWQT_METHOD 5 +#define C_FLOWOUTQT_METHOD 0 +#define C_RBTQT_METHOD 1 +#define C_SWAPROTQT_METHOD 2 +#define C_SWAPRWTQT_METHOD 3 +#define C_AIMROTQT_METHOD 4 +#define C_AIMRWTQT_METHOD 5 typedef struct { char *filename; diff --git a/arts/modules/synth/synth_cdelay_impl.cc b/arts/modules/synth/synth_cdelay_impl.cc index 28f4d12f..267daab8 100644 --- a/arts/modules/synth/synth_cdelay_impl.cc +++ b/arts/modules/synth/synth_cdelay_impl.cc @@ -43,14 +43,14 @@ class Synth_CDELAY_impl : virtual public Synth_CDELAY_skel, { protected: unsigned long _buffersize; - unsigned long _bitmask; + unsigned long _bittqmask; float *_buffer; // holds the data to be delayed (variable size) float _delaytime; unsigned int _readpos; unsigned int _writepos; public: - Synth_CDELAY_impl() : _buffersize( 0 ), _bitmask( 0 ), _buffer( 0 ), _delaytime( 0 ), _readpos( 0 ), _writepos( 0 ) + Synth_CDELAY_impl() : _buffersize( 0 ), _bittqmask( 0 ), _buffer( 0 ), _delaytime( 0 ), _readpos( 0 ), _writepos( 0 ) { } @@ -66,7 +66,7 @@ public: _delaytime = newTime; double n = ceil( log( double(_delaytime * samplingRateFloat )) / log( 2. ) ); unsigned long newbuffersize = (unsigned long)( pow( 2, n ) ); - unsigned long newbitmask = newbuffersize - 1; + unsigned long newbittqmask = newbuffersize - 1; if( newbuffersize != _buffersize ) { float *newbuffer = new float[newbuffersize]; @@ -74,24 +74,24 @@ public: for( unsigned long i = 0; i < _buffersize; i++ ) { newbuffer[i] = _buffer[_writepos]; _writepos++; - _writepos &= newbitmask; + _writepos &= newbittqmask; } for( unsigned long i = _buffersize; i < newbuffersize; i++ ) newbuffer[i] = 0; } else { _writepos -= newbuffersize; - _writepos &= newbitmask; + _writepos &= newbittqmask; for( unsigned long i = 0; i < newbuffersize; i++ ) { newbuffer[i] = _buffer[_writepos]; _writepos++; - _writepos &= newbitmask; + _writepos &= newbittqmask; } } _buffer = newbuffer; _buffersize = newbuffersize; - _bitmask = newbitmask; + _bittqmask = newbittqmask; } - _readpos = (unsigned long)rint( _writepos - _delaytime * samplingRateFloat ) & _bitmask; + _readpos = (unsigned long)rint( _writepos - _delaytime * samplingRateFloat ) & _bittqmask; time_changed( _delaytime ); } @@ -113,9 +113,9 @@ public: _buffer[_writepos] = invalue[i]; outvalue[i] = _buffer[_readpos]; _readpos++; - _readpos &= _bitmask; + _readpos &= _bittqmask; _writepos++; - _writepos &= _bitmask; + _writepos &= _bittqmask; } } }; diff --git a/arts/modules/synth/synth_delay_impl.cc b/arts/modules/synth/synth_delay_impl.cc index 92c23fd1..57285118 100644 --- a/arts/modules/synth/synth_delay_impl.cc +++ b/arts/modules/synth/synth_delay_impl.cc @@ -56,13 +56,13 @@ class Synth_DELAY_impl : virtual public Synth_DELAY_skel, { protected: unsigned long _buffersize; - unsigned long _bitmask; + unsigned long _bittqmask; float * _buffer; float _maxdelay; unsigned int _writepos; public: - Synth_DELAY_impl() : _buffersize( 0 ), _bitmask( 0 ), _buffer( 0 ), _maxdelay( 0 ), _writepos( 0 ) + Synth_DELAY_impl() : _buffersize( 0 ), _bittqmask( 0 ), _buffer( 0 ), _maxdelay( 0 ), _writepos( 0 ) { maxdelay( 1 ); // take a one second buffer if nothing else is specified } @@ -85,15 +85,15 @@ public: { double int_pos; double error = modf( time[i] * samplingRateFloat, &int_pos ); - unsigned long readpos1 = ( _writepos - (unsigned long)(int_pos) ) & _bitmask; - unsigned long readpos2 = ( readpos1 - 1 ) & _bitmask; // Shouldn't this be +1? (mkretz) + unsigned long readpos1 = ( _writepos - (unsigned long)(int_pos) ) & _bittqmask; + unsigned long readpos2 = ( readpos1 - 1 ) & _bittqmask; // Shouldn't this be +1? (mkretz) // No, it's right this way: // ( 1 - error ) needs to be multiplied with the second // sample; error with the first _buffer[_writepos] = invalue[i]; outvalue[i] = _buffer[readpos1] * ( 1 - error ) + _buffer[readpos2] * error; _writepos++; - _writepos &= _bitmask; + _writepos &= _bittqmask; } } @@ -106,7 +106,7 @@ public: _maxdelay = newmaxdelay; double n = ceil( log( double(_maxdelay * samplingRateFloat) ) / log( 2. ) ); unsigned long newbuffersize = (unsigned long)( pow( 2, n ) ); - unsigned long newbitmask = newbuffersize - 1; + unsigned long newbittqmask = newbuffersize - 1; if( newbuffersize != _buffersize ) { float *newbuffer = new float[newbuffersize]; @@ -114,22 +114,22 @@ public: for( unsigned long i = 0; i < _buffersize; i++ ) { newbuffer[i] = _buffer[_writepos]; _writepos++; - _writepos &= newbitmask; + _writepos &= newbittqmask; } for( unsigned long i = _buffersize; i < newbuffersize; i++ ) newbuffer[i] = 0; } else { _writepos -= newbuffersize; - _writepos &= newbitmask; + _writepos &= newbittqmask; for( unsigned long i = 0; i < newbuffersize; i++ ) { newbuffer[i] = _buffer[_writepos]; _writepos++; - _writepos &= newbitmask; + _writepos &= newbittqmask; } } _buffer = newbuffer; _buffersize = newbuffersize; - _bitmask = newbitmask; + _bittqmask = newbittqmask; } maxdelay_changed( _maxdelay ); } diff --git a/arts/runtime/artsbuilder.idl b/arts/runtime/artsbuilder.idl index 42ff393a..17332ee5 100644 --- a/arts/runtime/artsbuilder.idl +++ b/arts/runtime/artsbuilder.idl @@ -42,7 +42,7 @@ module Arts { * isMultiPort specifies if the port can take multiple incoming * connections or not. This is only relevant/allowed for input ports, * the output of all output ports may be connected to any amount of - * receivers. + * tqreceivers. * * Ports which can take multiple connections are handled differently * internally. (Also, artsbuilder needs to know whether to allow multi- @@ -76,11 +76,11 @@ module Arts { interface PortDesc { // internal: - void constructor(ModuleDesc parent, string name, PortType type); + void constructor(ModuleDesc tqparent, string name, PortType type); // ID is guaranteed to be unique in the structure the port belongs to readonly attribute long ID; - readonly attribute ModuleDesc parent; + readonly attribute ModuleDesc tqparent; // Name is guaranteed to be unique for each module (no two in/out- // ports with the same name allowed) @@ -123,11 +123,11 @@ module Arts { interface ModuleDesc { // internal - void constructor(StructureDesc parent, ModuleInfo info); + void constructor(StructureDesc tqparent, ModuleInfo info); // ID is guaranteed to be unique in the structure the module belongs to readonly attribute long ID; - readonly attribute StructureDesc parent; + readonly attribute StructureDesc tqparent; readonly attribute string name; readonly attribute sequence<PortDesc> ports; @@ -184,15 +184,15 @@ module Arts { interface StructurePortDesc : PortDesc { // internal - void constructor(StructureDesc parent, string name, PortType type); + void constructor(StructureDesc tqparent, string name, PortType type); // Position: how the port is positioned when the structure is used // as module - 0 is leftmost, higher numbers are more right readonly attribute long x, y, position; - readonly attribute StructureDesc parentStructure; + readonly attribute StructureDesc tqparentStructure; // if the port is associated with an inherited interface of the - // parent structure, then it should be setup here + // tqparent structure, then it should be setup here attribute string inheritedInterface; boolean moveTo(long x, long y); // returns true when successful diff --git a/arts/runtime/moduleinfo.cc b/arts/runtime/moduleinfo.cc index 1d20b585..7bef4464 100644 --- a/arts/runtime/moduleinfo.cc +++ b/arts/runtime/moduleinfo.cc @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the Qt - library, treating Qt like a library that normally accompanies the + Permission is also granted to link this program with the TQt + library, treating TQt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ diff --git a/arts/runtime/moduleinfo.h b/arts/runtime/moduleinfo.h index 2e8e64bc..2caea78f 100644 --- a/arts/runtime/moduleinfo.h +++ b/arts/runtime/moduleinfo.h @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the Qt - library, treating Qt like a library that normally accompanies the + Permission is also granted to link this program with the TQt + library, treating TQt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ diff --git a/arts/runtime/structurebuilder_impl.cc b/arts/runtime/structurebuilder_impl.cc index 43e5485c..c2e217e8 100644 --- a/arts/runtime/structurebuilder_impl.cc +++ b/arts/runtime/structurebuilder_impl.cc @@ -96,7 +96,7 @@ ModuleDef StructureBuilder_impl::createTypeInfo(StructureDesc structure) { const Arts::PortType& type = pi->type(); - // if we inherited the port from a parent interface, we don't need to + // if we inherited the port from a tqparent interface, we don't need to // list it in our interface description if(pi->inheritedInterface().empty()) { @@ -236,12 +236,12 @@ Structure_impl::Structure_impl(StructureDesc structureDesc, for(ci = connections->begin(); ci != connections->end(); ci++) { - if(!ci->parent().isNull()) // structureport otherwise + if(!ci->tqparent().isNull()) // structureport otherwise { - Object& dest = moduleMap[ci->parent().ID()]; + Object& dest = moduleMap[ci->tqparent().ID()]; #ifdef STRUCTBUILDER_DEBUG cout << "connect " << mi->name() << "." << pi->name() - << " to " << ci->parent().name() + << " to " << ci->tqparent().name() << "." << ci->name() << endl; #endif connect(object,pd.name(),dest,ci->name()); @@ -271,10 +271,10 @@ Structure_impl::Structure_impl(StructureDesc structureDesc, for(ci = connections->begin(); ci != connections->end(); ci++) { - Object& dest = moduleMap[ci->parent().ID()]; + Object& dest = moduleMap[ci->tqparent().ID()]; #ifdef STRUCTBUILDER_DEBUG cout << "virtualize " << pi->name() - << " to " << ci->parent().name() << "." << ci->name() + << " to " << ci->tqparent().name() << "." << ci->name() << endl; #endif diff --git a/arts/runtime/structures_impl.cc b/arts/runtime/structures_impl.cc index 7c5a5e05..72de0de7 100644 --- a/arts/runtime/structures_impl.cc +++ b/arts/runtime/structures_impl.cc @@ -32,11 +32,11 @@ public: ~PortDesc_impl(); inline PortDesc self() { return PortDesc::_from_base(_copy()); } - void constructor(ModuleDesc parent, const string& name, const PortType& type); + void constructor(ModuleDesc tqparent, const string& name, const PortType& type); void disconnectAll(); long ID(); - ModuleDesc parent(); + ModuleDesc tqparent(); string name(); PortType type(); bool isConnected(); @@ -78,7 +78,7 @@ private: public: long ID(); - StructureDesc parent(); + StructureDesc tqparent(); string name(); vector<PortDesc> *ports(); long height(); @@ -86,7 +86,7 @@ public: long x(); long y(); bool moveTo( long x, long y ); - void constructor( StructureDesc parent, const ModuleInfo& info ); + void constructor( StructureDesc tqparent, const ModuleInfo& info ); void loadFromList(const vector<string>& list); vector<string> *saveToList(); @@ -155,7 +155,7 @@ protected: return StructurePortDesc::_from_base(_copy()); } public: - void constructor(StructureDesc parent, const string& name, + void constructor(StructureDesc tqparent, const string& name, const PortType& type); ~StructurePortDesc_impl(); @@ -169,7 +169,7 @@ public: void inheritedInterface(const string& iface); void internalSetPosition(long position); - StructureDesc parentStructure(); + StructureDesc tqparentStructure(); bool moveTo( long X, long Y ); void loadFromList(const vector<string>& list); @@ -192,13 +192,13 @@ REGISTER_IMPLEMENTATION(StructurePortDesc_impl); #define pstat \ printf("port name %s, direction %s, id %d\n",_Name.c_str(),dname(_Type.direction),_ID); -void PortDesc_impl::constructor(ModuleDesc parent, const string& name, +void PortDesc_impl::constructor(ModuleDesc tqparent, const string& name, const PortType& type) { #if 0 - if(parent) + if(tqparent) { - char * pname = parent->Name(); + char * pname = tqparent->Name(); describe("PortDesc."+string(pname)+string(".")+name); } else @@ -208,14 +208,14 @@ void PortDesc_impl::constructor(ModuleDesc parent, const string& name, #endif _name = name; _type = type; - _parent = parent; + _parent = tqparent; _isConnected = false; _hasValue = false; _value.type = _type.dataType; - if(!parent.isNull()) + if(!tqparent.isNull()) { - StructureDesc sd = parent.parent(); + StructureDesc sd = tqparent.tqparent(); _ID = sd.obtainID(); } // else: assume that some smart object which derives from us will set the ID accordingly @@ -276,7 +276,7 @@ long PortDesc_impl::ID() return _ID; } -ModuleDesc PortDesc_impl::parent() +ModuleDesc PortDesc_impl::tqparent() { return _parent; } @@ -468,11 +468,11 @@ void PortDesc_impl::disconnectFrom( PortDesc port ) _isConnected = !_connections.empty(); - ModuleDesc parent = _parent; - if(parent.isNull()) + ModuleDesc tqparent = _parent; + if(tqparent.isNull()) artsdebug("_Parent = <some structure>, isConnected = %d\n",_isConnected); else - artsdebug("_Parent = %s, isConnected = %d\n",parent.name().c_str(),_isConnected); + artsdebug("_Parent = %s, isConnected = %d\n",tqparent.name().c_str(),_isConnected); if(found) port.disconnectFrom(self()); @@ -484,7 +484,7 @@ long ModuleDesc_impl::ID() return _ID; } -StructureDesc ModuleDesc_impl::parent() +StructureDesc ModuleDesc_impl::tqparent() { return _parent; } @@ -549,14 +549,14 @@ long StructureDesc_impl::height() * Query the module for it's paramenters */ -void ModuleDesc_impl::constructor( StructureDesc parent, +void ModuleDesc_impl::constructor( StructureDesc tqparent, const Arts::ModuleInfo& info ) { _name = info.name; _x = -1; // no position assigned _y = -1; - _ID = parent.obtainID(); - _parent = parent; + _ID = tqparent.obtainID(); + _parent = tqparent; _isInterface = info.isInterface; _isStructure = info.isStructure; @@ -1134,12 +1134,12 @@ void StructureDesc_impl::moveStructurePortDesc(StructurePortDesc portdesc.internalSetPosition(newposition); } -void StructurePortDesc_impl::constructor(StructureDesc parent, +void StructurePortDesc_impl::constructor(StructureDesc tqparent, const string& name, const PortType& type) { PortDesc_impl::constructor(ModuleDesc::null(),name,type); - _parentStructure = parent; - _ID = parent.obtainID(); + _parentStructure = tqparent; + _ID = tqparent.obtainID(); _x = 0; _y = 0; _position = 0; @@ -1167,18 +1167,18 @@ long StructurePortDesc_impl::position() void StructurePortDesc_impl::lowerPosition() { - StructureDesc parent = _parentStructure; // weak reference + StructureDesc tqparent = _parentStructure; // weak reference - if(!parent.isNull()) - parent.moveStructurePortDesc(self(), _position-1); + if(!tqparent.isNull()) + tqparent.moveStructurePortDesc(self(), _position-1); } void StructurePortDesc_impl::raisePosition() { - StructureDesc parent = _parentStructure; // weak reference + StructureDesc tqparent = _parentStructure; // weak reference - if(!parent.isNull()) - parent.moveStructurePortDesc(self(), _position+1); + if(!tqparent.isNull()) + tqparent.moveStructurePortDesc(self(), _position+1); } void StructurePortDesc_impl::rename(const string& newname) @@ -1202,7 +1202,7 @@ void StructurePortDesc_impl::internalSetPosition(long position) _position = position; } -StructureDesc StructurePortDesc_impl::parentStructure() +StructureDesc StructurePortDesc_impl::tqparentStructure() { return _parentStructure; } diff --git a/arts/tools/Makefile.am b/arts/tools/Makefile.am index e503d54a..806856ac 100644 --- a/arts/tools/Makefile.am +++ b/arts/tools/Makefile.am @@ -57,10 +57,10 @@ libartscontrolsupport_la_LIBADD = \ bin_PROGRAMS = artscontrol artscontrol_SOURCES = main.cpp levelmeters.cpp -artscontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) +artscontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lartsflow artscontrol_LDADD = libartscontrolsupport.la \ $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_KFILE) \ - -lqtmcop -lartsflow_idl -lsoundserver_idl -lartskde + -lqtmcop -lartsflow -lartsflow_idl -lsoundserver_idl -lartskde xdg_apps_DATA = artscontrol.desktop diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp index c483beb0..9075f87e 100644 --- a/arts/tools/artsactions.cpp +++ b/arts/tools/artsactions.cpp @@ -36,8 +36,8 @@ #include "environmentview.h" #include "mediatypesview.h" -ArtsActions::ArtsActions( KArtsServer* server, KActionCollection* col, TQWidget* parent, const char* name ) - : TQObject( parent,name ) +ArtsActions::ArtsActions( KArtsServer* server, KActionCollection* col, TQWidget* tqparent, const char* name ) + : TQObject( tqparent,name ) , _kartsserver( server ) , _actioncollection( col ) , _a_sv( 0 ), _a_am( 0 ), _a_asv( 0 ), _a_mmv( 0 ), _a_ev( 0 ), _a_mtv( 0 ) @@ -70,7 +70,7 @@ KAction* ArtsActions::actionAudioManager() { return _a_am; } KAction* ArtsActions::actionArtsStatusView() { - if ( !_a_asv ) _a_asv = new KAction( i18n( "aRts &Status" ), "artscontrol", KShortcut(), this, TQT_SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" ); + if ( !_a_asv ) _a_asv = new KAction( i18n( "aRts &tqStatus" ), "artscontrol", KShortcut(), this, TQT_SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" ); return _a_asv; } KAction* ArtsActions::actionMidiManagerView() { diff --git a/arts/tools/artsactions.h b/arts/tools/artsactions.h index 441d7373..b6f77839 100644 --- a/arts/tools/artsactions.h +++ b/arts/tools/artsactions.h @@ -34,9 +34,10 @@ class MidiManagerView; class EnvironmentView; class MediaTypesView; -class KDE_EXPORT ArtsActions : public QObject +class KDE_EXPORT ArtsActions : public TQObject { Q_OBJECT + TQ_OBJECT public: /** Constructs a ArtsActions-object. @@ -47,7 +48,7 @@ public: @param artsserver a pointer to a existing KArtsServer. If 0 a new is created. @param actioncollection the KActionCollection all the actions should belong to. Names of the actions are then: artssupport_* - @param qwidget the parent QWidget + @param qwidget the tqparent TQWidget @param name the name of the object */ ArtsActions( KArtsServer* artsserver, KActionCollection* actioncollection, TQWidget* qwidget, const char* name=0 ); diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp index e4a7e16a..490366d1 100644 --- a/arts/tools/artscontrolapplet.cpp +++ b/arts/tools/artscontrolapplet.cpp @@ -29,18 +29,18 @@ extern "C" { - KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile) + KDE_EXPORT KPanelApplet* init( TQWidget *tqparent, const TQString configFile) { KGlobal::locale()->insertCatalogue("artscontrol"); return new ArtsControlApplet(configFile, KPanelApplet::Normal, KPanelApplet::About /*| KPanelApplet::Help | KPanelApplet::Preferences*/, - parent, "artscontrolapplet"); + tqparent, "artscontrolapplet"); } } -ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name) +ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int actions, TQWidget *tqparent, const char *name) : KPanelApplet(configFile, type, actions, tqparent, name) { - //kdDebug()<<"ArtsControlApplet::ArtsControlApplet( const TQString& "<<configFile<<", Type "<<type<<", int "<<actions<<", TQWidget* "<<parent<<", const char* "<<name<<" )"<<endl; + //kdDebug()<<"ArtsControlApplet::ArtsControlApplet( const TQString& "<<configFile<<", Type "<<type<<", int "<<actions<<", TQWidget* "<<tqparent<<", const char* "<<name<<" )"<<endl; // Get the current application configuration handle ksConfig = config(); @@ -48,20 +48,20 @@ ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int if( !p->barts ) KMessageBox::information(0, i18n("Something with the ArtsServer went wrong. You probably need to restart aRts and then reload this applet.")); setCustomMenu(p->menu); - p->layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); - p->layout->setSpacing( 2 ); + p->tqlayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); + p->tqlayout->setSpacing( 2 ); if( p->barts ) { p->vu = Arts::StereoVolumeControlGui( p->volume ); p->vu.label().fontsize( 8 ); p->vuw = new KArtsWidget( p->vu, this ); p->vuw->setMinimumSize( 16,16 ); - p->layout->addWidget( p->vuw ); + p->tqlayout->addWidget( p->vuw ); } - p->layout->activate(); + p->tqlayout->activate(); - TQTimer::singleShot( 100, this, TQT_SLOT( supdatelayout() ) ); + TQTimer::singleShot( 100, this, TQT_SLOT( supdatetqlayout() ) ); kdDebug()<<"ArtsControlApplet::ArtsControlApplet() finished."<<endl; } @@ -93,12 +93,12 @@ kdDebug()<<k_funcinfo<<endl; int ArtsControlApplet::widthForHeight( int h ) const { kdDebug()<<"ArtsControlApplet::widthForHeight( int "<<h<<" )"<<endl; - return p->layout->sizeHint().width(); + return p->tqlayout->tqsizeHint().width(); } int ArtsControlApplet::heightForWidth( int w ) const { kdDebug()<<"ArtsControlApplet::heightForWidth( int "<<w<<" )"<<endl; - return p->layout->sizeHint().height(); + return p->tqlayout->tqsizeHint().height(); } void ArtsControlApplet::resizeEvent( TQResizeEvent * /*_Event*/ ) { @@ -122,12 +122,12 @@ kdDebug()<<k_funcinfo<<" position()="<<position()<<endl; { case pTop: case pBottom: - p->layout->setDirection( TQBoxLayout::LeftToRight ); + p->tqlayout->setDirection( TQBoxLayout::LeftToRight ); if ( p->barts ) p->vu.direction( Arts::LeftToRight ); break; case pRight: case pLeft: - p->layout->setDirection( TQBoxLayout::TopToBottom ); + p->tqlayout->setDirection( TQBoxLayout::TopToBottom ); if ( p->barts ) p->vu.direction( Arts::TopToBottom ); break; default: break; @@ -140,23 +140,23 @@ kdDebug() << k_funcinfo << endl; svinline = new FFTScopeView( arts->server(), _parent ); svinline->setMargin( 2 ); svinline->setLineWidth( 2 ); svinline->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); connect( svinline, TQT_SIGNAL( closed() ), this, TQT_SLOT( SVinline() ) ); - layout->addWidget( svinline ); + tqlayout->addWidget( svinline ); } else { delete svinline; svinline = 0; } - _parent->supdatelayout(); + _parent->supdatetqlayout(); } void ArtsControlAppletPrivate::moreBars() { vu.left().count( vu.left().count()+10 ); vu.right().count( vu.right().count()+10 ); } void ArtsControlAppletPrivate::lessBars() { vu.left().count( vu.left().count()-10 ); vu.right().count( vu.right().count()-10 ); } -void ArtsControlAppletPrivate::styleNormalBars() { vu.left().style( Arts::lmNormalBars ); vu.right().style( Arts::lmNormalBars ); _parent->supdatelayout(); } -void ArtsControlAppletPrivate::styleFireBars() { vu.left().style( Arts::lmFireBars ); vu.right().style( Arts::lmFireBars ); _parent->supdatelayout(); } -void ArtsControlAppletPrivate::styleLineBars() { vu.left().style( Arts::lmLineBars ); vu.right().style( Arts::lmLineBars ); _parent->supdatelayout(); } -void ArtsControlAppletPrivate::styleLEDs() { vu.left().style( Arts::lmLEDs ); vu.right().style( Arts::lmLEDs ); _parent->supdatelayout(); } -void ArtsControlAppletPrivate::styleAnalog() { vu.left().style( Arts::lmAnalog ); vu.right().style( Arts::lmAnalog ); _parent->supdatelayout(); } -void ArtsControlAppletPrivate::styleSmall() { vu.left().style( Arts::lmSmall ); vu.right().style( Arts::lmSmall ); _parent->supdatelayout(); } +void ArtsControlAppletPrivate::styleNormalBars() { vu.left().style( Arts::lmNormalBars ); vu.right().style( Arts::lmNormalBars ); _parent->supdatetqlayout(); } +void ArtsControlAppletPrivate::styleFireBars() { vu.left().style( Arts::lmFireBars ); vu.right().style( Arts::lmFireBars ); _parent->supdatetqlayout(); } +void ArtsControlAppletPrivate::styleLineBars() { vu.left().style( Arts::lmLineBars ); vu.right().style( Arts::lmLineBars ); _parent->supdatetqlayout(); } +void ArtsControlAppletPrivate::styleLEDs() { vu.left().style( Arts::lmLEDs ); vu.right().style( Arts::lmLEDs ); _parent->supdatetqlayout(); } +void ArtsControlAppletPrivate::styleAnalog() { vu.left().style( Arts::lmAnalog ); vu.right().style( Arts::lmAnalog ); _parent->supdatetqlayout(); } +void ArtsControlAppletPrivate::styleSmall() { vu.left().style( Arts::lmSmall ); vu.right().style( Arts::lmSmall ); _parent->supdatetqlayout(); } // vim: sw=4 ts=4 #include "artscontrolapplet.moc" diff --git a/arts/tools/artscontrolapplet.h b/arts/tools/artscontrolapplet.h index 9efe5eb5..ab683464 100644 --- a/arts/tools/artscontrolapplet.h +++ b/arts/tools/artscontrolapplet.h @@ -31,6 +31,7 @@ class ArtsControlAppletPrivate; class ArtsControlApplet : public KPanelApplet { Q_OBJECT + TQ_OBJECT public: /** * Construct a @ref KPanelApplet just like any other widget. @@ -38,8 +39,8 @@ public: * @param configFile The configFile handed over in the factory function. * @param Type The applet @ref type(). * @param actions Standard RMB menu actions supported by the applet (see @ref action() ). - * @param parent The pointer to the parent widget handed over in the factory function. - * @param name A Qt object name for your applet. + * @param tqparent The pointer to the tqparent widget handed over in the factory function. + * @param name A TQt object name for your applet. **/ ArtsControlApplet(const TQString& configFile, Type t = Normal, int = 0, TQWidget * = 0, const char * = 0); @@ -119,7 +120,7 @@ protected: void positionChange( Position ); public slots: - void supdatelayout() { emit updateLayout(); } + void supdatetqlayout() { emit updateLayout(); } protected slots: void resetLayout(); diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h index 2b681b92..2f7c553d 100644 --- a/arts/tools/artscontrolapplet_private.h +++ b/arts/tools/artscontrolapplet_private.h @@ -47,11 +47,12 @@ class VolumeSlider; class KDE_EXPORT ArtsControlAppletPrivate : public TQObject { Q_OBJECT + TQ_OBJECT private: ArtsControlApplet *_parent; ArtsActions* _artsactions; public: - TQBoxLayout *layout; + TQBoxLayout *tqlayout; KArtsServer *arts; KArtsDispatcher *dispatcher; Arts::StereoVolumeControl volume; @@ -62,12 +63,12 @@ public: Arts::StereoVolumeControlGui vu; KPopupMenu *menu; - KAction *_showSV, *_showSVinline, *_showAM, *_showArtsStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars; + KAction *_showSV, *_showSVinline, *_showAM, *_showArtstqStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars; KAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall; - ArtsControlAppletPrivate( ArtsControlApplet *parent ) - : TQObject(parent) - , _parent( parent ) + ArtsControlAppletPrivate( ArtsControlApplet *tqparent ) + : TQObject(tqparent) + , _parent( tqparent ) , barts( false ) , bInUpdate( false ) { @@ -77,7 +78,7 @@ public: if( barts ) volume = arts->server().outVolume(); svinline=0; - _artsactions = new ArtsActions( arts, 0, parent ); + _artsactions = new ArtsActions( arts, 0, tqparent ); menu = new KPopupMenu( 0 ); _showSV = _artsactions->actionScopeView(); @@ -86,8 +87,8 @@ public: _showSVinline->plug( menu ); _showAM = _artsactions->actionAudioManager(); _showAM->plug( menu ); - _showArtsStatus = _artsactions->actionArtsStatusView(); - _showArtsStatus->plug( menu ); + _showArtstqStatus = _artsactions->actionArtsStatusView(); + _showArtstqStatus->plug( menu ); _showMidiManager = _artsactions->actionMidiManagerView(); _showMidiManager->plug( menu ); _showEnvironment = _artsactions->actionEnvironmentView(); diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp index eff4f6f9..73debf80 100644 --- a/arts/tools/audiomanager.cpp +++ b/arts/tools/audiomanager.cpp @@ -37,7 +37,7 @@ using namespace std; * as this is an 1:1 port of an old arts-0.3.4.1 artsbuilable visual widget, * you'll see some porting artefacts, and it's not elegance itself ;) */ -Gui_AUDIO_MANAGER::Gui_AUDIO_MANAGER( TQWidget* parent, const char* name ) : Template_ArtsView( parent,name ) +Gui_AUDIO_MANAGER::Gui_AUDIO_MANAGER( TQWidget* tqparent, const char* name ) : Template_ArtsView( tqparent,name ) { this->setCaption( i18n( "Audio Manager" ) ); this->setIcon( MainBarIcon( "artsaudiomanager", 32 ) ); @@ -72,14 +72,14 @@ void Gui_AUDIO_MANAGER::widgetDestroyed(TQWidget *widget) } #endif -void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/) +void Gui_AUDIO_MANAGER::setParent(TQWidget *tqparent, TQBoxLayout * /*tqlayout*/) { /************************************************************************ * From Gui_INSTRUMENT_MAPPER: * - * I am still not sure wether this kind of putting yourself into a parent - * widget (with own layout etc.) is a good idea (there may not even be - * a singe call to setParent, because there is no parent). + * I am still not sure wether this kind of putting yourself into a tqparent + * widget (with own tqlayout etc.) is a good idea (there may not even be + * a singe call to setParent, because there is no tqparent). * * But the "how to write aRts widgets"-stuff will need some experiments, * so lets try that method... @@ -90,12 +90,12 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/) * else would be appropriate. Check that. FIXME ************************************************************************/ - TQVBoxLayout *mainlayout = new TQVBoxLayout(parent); - /*TQHBoxLayout *contentslayout = new TQHBoxLayout;*/ + TQVBoxLayout *maintqlayout = new TQVBoxLayout(tqparent); + /*TQHBoxLayout *contentstqlayout = new TQHBoxLayout;*/ // list - listview = new KListView(parent); + listview = new KListView(tqparent); listview->addColumn(i18n("Title"),175); listview->addColumn(i18n("Type"),50); @@ -106,11 +106,11 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/) TQObject::connect(listview,TQT_SIGNAL(executed(TQListViewItem *)),proxy, TQT_SLOT(edit(TQListViewItem *))); - mainlayout->addWidget(listview); + maintqlayout->addWidget(listview); - mainlayout->activate(); - //mainlayout->freeze(); - ParentWidget = parent; + maintqlayout->activate(); + //maintqlayout->freeze(); + ParentWidget = tqparent; } void Gui_AUDIO_MANAGER::tick() @@ -178,8 +178,8 @@ void GuiAudioManagerProxy::edit(TQListViewItem *item) gim->edit(item); } -AudioManagerItem::AudioManagerItem(TQListView *parent, TQString a, - TQString b, TQString c, long ID) :TQListViewItem(parent,a,b,c) +AudioManagerItem::AudioManagerItem(TQListView *tqparent, TQString a, + TQString b, TQString c, long ID) :TQListViewItem(tqparent,a,b,c) { _ID = ID; } diff --git a/arts/tools/audiomanager.h b/arts/tools/audiomanager.h index bef1c463..5a23092d 100644 --- a/arts/tools/audiomanager.h +++ b/arts/tools/audiomanager.h @@ -37,6 +37,7 @@ class TQBoxLayout; class Gui_AUDIO_MANAGER : public Template_ArtsView { Q_OBJECT + TQ_OBJECT protected: TQWidget *ParentWidget; KListView *listview; @@ -50,7 +51,7 @@ public: Gui_AUDIO_MANAGER( TQWidget* =0, const char* =0 ); ~Gui_AUDIO_MANAGER(); - void setParent(TQWidget *Parent,TQBoxLayout *layout); + void setParent(TQWidget *Parent,TQBoxLayout *tqlayout); void edit(TQListViewItem *item); public slots: @@ -59,6 +60,7 @@ public slots: class GuiAudioManagerProxy :public TQObject { Q_OBJECT + TQ_OBJECT Gui_AUDIO_MANAGER *gim; public: GuiAudioManagerProxy(Gui_AUDIO_MANAGER *gim); @@ -69,7 +71,7 @@ public slots: class AudioManagerItem : public TQListViewItem { long _ID; public: - AudioManagerItem(TQListView *parent, TQString a, TQString b, + AudioManagerItem(TQListView *tqparent, TQString a, TQString b, TQString c, long ID); ~AudioManagerItem(); diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp index cb005f4c..a4f96ba5 100644 --- a/arts/tools/choosebusdlg.cpp +++ b/arts/tools/choosebusdlg.cpp @@ -39,36 +39,36 @@ using namespace std; static void min_size(TQWidget *w) { - w->setMinimumSize(w->sizeHint()); + w->setMinimumSize(w->tqsizeHint()); } -ChooseBusDlg::ChooseBusDlg(TQWidget *parent) - : KDialog(parent,"X", TRUE) +ChooseBusDlg::ChooseBusDlg(TQWidget *tqparent) + : KDialog(tqparent,"X", TRUE) , _newbusitemindex( -1 ) { setCaption(i18n("Choose Bus")); - TQVBoxLayout *mainlayout = new TQVBoxLayout(this); + TQVBoxLayout *maintqlayout = new TQVBoxLayout(this); // caption label: "Synthesis running..." - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); TQLabel *captionlabel = new TQLabel(this); TQFont labelfont(captionlabel->font()); labelfont.setPointSize(labelfont.pointSize()*3/2); captionlabel->setFont(labelfont); captionlabel->setText(TQString(" ")+i18n("Available busses:")+TQString(" ")); - captionlabel->setAlignment(AlignCenter); + captionlabel->tqsetAlignment(AlignCenter); min_size(captionlabel); - mainlayout->addWidget(captionlabel); + maintqlayout->addWidget(captionlabel); // hruler - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this); - mainlayout->addWidget(ruler2); + maintqlayout->addWidget(ruler2); - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); // listwidget @@ -89,44 +89,44 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent) if( listbox->count() > 0 ) listbox->setCurrentItem( 0 ); - mainlayout->addWidget(listbox); + maintqlayout->addWidget(listbox); // hruler - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); KSeparator *ruler = new KSeparator( KSeparator::HLine, this); - mainlayout->addWidget(ruler); - mainlayout->addSpacing(5); + maintqlayout->addWidget(ruler); + maintqlayout->addSpacing(5); // new bus lineedit - TQBoxLayout * layout2 = new TQHBoxLayout( mainlayout ); - //mainlayout->addLayout( layout2 ); + TQBoxLayout * tqlayout2 = new TQHBoxLayout( maintqlayout ); + //maintqlayout->addLayout( tqlayout2 ); TQLabel * newbuslabel = new TQLabel( i18n( "New bus:" ), this ); - layout2->addWidget( newbuslabel ); + tqlayout2->addWidget( newbuslabel ); lineedit = new KLineEdit( this ); connect( lineedit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( textChanged( const TQString & ) ) ); - layout2->addWidget( lineedit ); + tqlayout2->addWidget( lineedit ); // hruler - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); KSeparator *ruler3 = new KSeparator( KSeparator::HLine, this); - mainlayout->addWidget(ruler3); + maintqlayout->addWidget(ruler3); - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); // buttons - mainlayout->addSpacing(5); - TQHBoxLayout *buttonlayout = new TQHBoxLayout( mainlayout ); - //mainlayout->addLayout(buttonlayout); - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); + TQHBoxLayout *buttontqlayout = new TQHBoxLayout( maintqlayout ); + //maintqlayout->addLayout(buttontqlayout); + maintqlayout->addSpacing(5); - buttonlayout->addSpacing(5); + buttontqlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() )); + bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() )); bbox->addStretch(1); TQPushButton * okbutton = bbox->addButton(KStdGuiItem::ok()); @@ -136,12 +136,12 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent) TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel()); connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) ); - bbox->layout(); + bbox->tqlayout(); - buttonlayout->addWidget(bbox); - buttonlayout->addSpacing(5); + buttontqlayout->addWidget(bbox); + buttontqlayout->addSpacing(5); - mainlayout->freeze(); + maintqlayout->freeze(); } TQString ChooseBusDlg::result() diff --git a/arts/tools/choosebusdlg.h b/arts/tools/choosebusdlg.h index 6f1a506d..9ba29b8a 100644 --- a/arts/tools/choosebusdlg.h +++ b/arts/tools/choosebusdlg.h @@ -30,12 +30,13 @@ class TQPushButton; class ChooseBusDlg :public KDialog { Q_OBJECT + TQ_OBJECT TQListBox *listbox; KLineEdit * lineedit; int _newbusitemindex; public: - ChooseBusDlg(TQWidget *parent); + ChooseBusDlg(TQWidget *tqparent); public slots: TQString result(); diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp index 9cedfed1..acbb2083 100644 --- a/arts/tools/environmentview.cpp +++ b/arts/tools/environmentview.cpp @@ -57,18 +57,18 @@ public: printf("~ItemView()\n"); } TQString text() const { - return TQString::fromLatin1(item._interfaceName().c_str()); + return TQString::tqfromLatin1(item._interfaceName().c_str()); } }; -EnvironmentView::EnvironmentView( Container container, TQWidget* parent, const char* name ) : Template_ArtsView( parent,name ), container(container) +EnvironmentView::EnvironmentView( Container container, TQWidget* tqparent, const char* name ) : Template_ArtsView( tqparent,name ), container(container) { this->setCaption( i18n( "Environment" ) ); this->setIcon( MainBarIcon( "artsenvironment", 32 ) ); TQVBoxLayout* _layout = new TQVBoxLayout( this ); _layout->setAutoAdd( true ); defaultEnvFileName = DEFAULT_ENV_FILENAME; - defaultEnvFileName.replace('~', TQDir::homeDirPath()); + defaultEnvFileName.tqreplace('~', TQDir::homeDirPath()); listBox = new KListBox(this); update(); connect(listBox,TQT_SIGNAL(executed(TQListBoxItem*)), @@ -84,11 +84,11 @@ EnvironmentView::EnvironmentView( Container container, TQWidget* parent, const c connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(delItem())); TQPushButton *loadButton = new - TQPushButton(i18n("Load %1").arg(DEFAULT_ENV_FILENAME), this); + TQPushButton(i18n("Load %1").tqarg(DEFAULT_ENV_FILENAME), this); connect(loadButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(load())); TQPushButton *saveButton = new - TQPushButton(i18n("Save %1").arg(DEFAULT_ENV_FILENAME), this); + TQPushButton(i18n("Save %1").tqarg(DEFAULT_ENV_FILENAME), this); connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(save())); show(); } diff --git a/arts/tools/environmentview.h b/arts/tools/environmentview.h index e4b3b908..f45347f1 100644 --- a/arts/tools/environmentview.h +++ b/arts/tools/environmentview.h @@ -33,6 +33,7 @@ class KListBox; class EnvironmentView : public Template_ArtsView { Q_OBJECT + TQ_OBJECT protected: Arts::Environment::Container container; KListBox *listBox; diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp index fcaa5304..1d5c5345 100644 --- a/arts/tools/fftscopeview.cpp +++ b/arts/tools/fftscopeview.cpp @@ -37,8 +37,8 @@ using namespace std; using namespace Arts; -FFTScopeView::FFTScopeView( SimpleSoundServer server, TQWidget* parent ) - : Template_ArtsView( parent ) +FFTScopeView::FFTScopeView( SimpleSoundServer server, TQWidget* tqparent ) + : Template_ArtsView( tqparent ) , server( server ) , scopeData( 0 ) { @@ -80,11 +80,11 @@ kdDebug()<<k_funcinfo<<endl; connect( updatetimer,TQT_SIGNAL( timeout() ),this,TQT_SLOT( updateScope() ) ); _artsactions = new ArtsActions( 0, 0, this ); - _moreBars = ArtsActions::actionMoreBars( this, TQT_SLOT( moreBars() ), 0 ); - _lessBars = ArtsActions::actionLessBars( this, TQT_SLOT( lessBars() ), 0 ); + _moreBars = ArtsActions::actionMoreBars( TQT_TQOBJECT(this), TQT_SLOT( moreBars() ), 0 ); + _lessBars = ArtsActions::actionLessBars( TQT_TQOBJECT(this), TQT_SLOT( lessBars() ), 0 ); _menu = new KPopupMenu( 0 ); _moreBars->plug( _menu ); _lessBars->plug( _menu ); - _substyle = new KAction( i18n( "Substyle" ), "", KShortcut(), this, TQT_SLOT( substyle() ), this ); + _substyle = new KAction( i18n( "Substyle" ), "", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( substyle() ), TQT_TQOBJECT(this) ); _substyle->plug( _menu ); _menu->insertItem( i18n("VU-Style"), _artsactions->stylemenu() ); diff --git a/arts/tools/fftscopeview.h b/arts/tools/fftscopeview.h index 945c52e3..de8ed7f5 100644 --- a/arts/tools/fftscopeview.h +++ b/arts/tools/fftscopeview.h @@ -40,6 +40,7 @@ class ArtsActions; class KDE_EXPORT FFTScopeView : public Template_ArtsView { Q_OBJECT + TQ_OBJECT protected: Arts::StereoFFTScope scopefx; Arts::SimpleSoundServer server; diff --git a/arts/tools/levelmeters.cpp b/arts/tools/levelmeters.cpp index 1d0b080c..ae7834a8 100644 --- a/arts/tools/levelmeters.cpp +++ b/arts/tools/levelmeters.cpp @@ -7,8 +7,8 @@ const int PeakBar::peakMillis=1500; -PeakBar::PeakBar(TQWidget *parent) - : ACLevelMeter(parent) +PeakBar::PeakBar(TQWidget *tqparent) + : ACLevelMeter(tqparent) , maxValue( 0.0f ) , minValue( 0.0f ) { @@ -20,7 +20,7 @@ PeakBar::PeakBar(TQWidget *parent) lastValues.setAutoDelete( TRUE ); setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); - setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); setBackgroundMode(NoBackground); setMinimumSize(frameWidth()+7, 70); } @@ -30,7 +30,7 @@ void PeakBar::frameChanged() { TQFrame::frameChanged(); } -TQSize PeakBar::sizeHint() const { +TQSize PeakBar::tqsizeHint() const { return TQSize(13, 250); } @@ -104,25 +104,25 @@ void PeakBar::setValue(float f) { lastValues.append(new Observation(f)); - repaint(); + tqrepaint(); } // ------------------------------------------------------------- -PeakLevelMeters::PeakLevelMeters(TQWidget *parent): - StereoLevelMeter(parent), left(this), right(this), scaleView(this) +PeakLevelMeters::PeakLevelMeters(TQWidget *tqparent): + StereoLevelMeter(tqparent), left(this), right(this), scaleView(this) { - TQBoxLayout *layout= new TQHBoxLayout(this); - layout->addWidget(&left); - // layout->setStretchFactor(&left, 0); - layout->addWidget(&right); - // layout->setStretchFactor(&right, 0); - layout->addWidget(&scaleView); - // layout->setStretchFactor(&scaleView, 0); + TQBoxLayout *tqlayout= new TQHBoxLayout(this); + tqlayout->addWidget(&left); + // tqlayout->setStretchFactor(&left, 0); + tqlayout->addWidget(&right); + // tqlayout->setStretchFactor(&right, 0); + tqlayout->addWidget(&scaleView); + // tqlayout->setStretchFactor(&scaleView, 0); left.setLineWidth(2); right.setLineWidth(2); scaleView.setScaleMargins(right.frameWidth()); - setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); setDbRange(36); } @@ -142,17 +142,17 @@ void PeakLevelMeters::setValues(float leftVal, float rightVal) { right.setValue(f); } -ScaleView::ScaleView(TQWidget *parent): TQFrame(parent) { +ScaleView::ScaleView(TQWidget *tqparent): TQFrame(tqparent) { font.setPixelSize(10); - setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred)); + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred)); } void ScaleView::setDbRange(int db) { dbRange= db; - repaint(); + tqrepaint(); } -TQSize ScaleView::sizeHint() const { +TQSize ScaleView::tqsizeHint() const { return TQSize(TQFontMetrics(font).width("-88")+8, 250); } @@ -187,7 +187,7 @@ void ScaleView::drawContents(TQPainter *p) { // ------------------------------------------------------------- -LedMeter::LedMeter(TQWidget *parent, bool blueState) : ACLevelMeter(parent) { +LedMeter::LedMeter(TQWidget *tqparent, bool blueState) : ACLevelMeter(tqparent) { setBackgroundColor(black); TQBoxLayout * l = new TQVBoxLayout( this ); l->setAutoAdd(TRUE); @@ -223,12 +223,12 @@ void LedMeter::setValue(float f) // ------------------------------------------------------------- -StereoLedMeters::StereoLedMeters(TQWidget *parent) - : StereoLevelMeter(parent), left(this), right(this) +StereoLedMeters::StereoLedMeters(TQWidget *tqparent) + : StereoLevelMeter(tqparent), left(this), right(this) { - TQBoxLayout *layout= new TQHBoxLayout(this); - layout->addWidget(&left); - layout->addWidget(&right); + TQBoxLayout *tqlayout= new TQHBoxLayout(this); + tqlayout->addWidget(&left); + tqlayout->addWidget(&right); } void StereoLedMeters::setValues(float leftVal, float rightVal) { diff --git a/arts/tools/levelmeters.h b/arts/tools/levelmeters.h index 638d0d9a..64c41c0b 100644 --- a/arts/tools/levelmeters.h +++ b/arts/tools/levelmeters.h @@ -44,8 +44,9 @@ inline float DBToLevel(float db) { */ class ACLevelMeter : public TQFrame { Q_OBJECT + TQ_OBJECT public: - ACLevelMeter(TQWidget *parent): TQFrame(parent) {} + ACLevelMeter(TQWidget *tqparent): TQFrame(tqparent) {} public slots: virtual void setValue(float f) = 0; }; @@ -55,8 +56,9 @@ public slots: */ class StereoLevelMeter : public TQFrame { Q_OBJECT + TQ_OBJECT public: - StereoLevelMeter(TQWidget *parent): TQFrame(parent) {} + StereoLevelMeter(TQWidget *tqparent): TQFrame(tqparent) {} public slots: virtual void setValues(float left, float right) = 0; }; @@ -67,6 +69,7 @@ public slots: */ class PeakBar : public ACLevelMeter { Q_OBJECT + TQ_OBJECT bool clipped; protected: @@ -89,9 +92,9 @@ protected: void frameChanged(); public: - PeakBar(TQWidget *parent); + PeakBar(TQWidget *tqparent); - TQSize sizeHint() const; + TQSize tqsizeHint() const; void drawContents(TQPainter *p); virtual void setValue(float f); @@ -102,15 +105,16 @@ public: */ class ScaleView : public TQFrame { Q_OBJECT + TQ_OBJECT protected: TQFont font; int dbRange; int upperMargin, lowerMargin; public: - ScaleView(TQWidget *parent); + ScaleView(TQWidget *tqparent); void setDbRange(int db); void setScaleMargins(int margins) { upperMargin= margins; lowerMargin=margins; } - TQSize sizeHint() const; + TQSize tqsizeHint() const; void drawContents(TQPainter *p); }; @@ -121,13 +125,14 @@ public: */ class PeakLevelMeters : public StereoLevelMeter { Q_OBJECT + TQ_OBJECT protected: int dbRange; PeakBar left, right; ScaleView scaleView; public: - PeakLevelMeters(TQWidget *parent); + PeakLevelMeters(TQWidget *tqparent); public slots: void setValues(float leftVal, float rightVal); @@ -143,11 +148,12 @@ class KLed; */ class LedMeter : public ACLevelMeter { Q_OBJECT + TQ_OBJECT protected: KLed *leds[12]; public: - LedMeter(TQWidget *parent, bool blueState = false); + LedMeter(TQWidget *tqparent, bool blueState = false); void setValue(float f); }; @@ -156,11 +162,12 @@ public: */ class StereoLedMeters : public StereoLevelMeter { Q_OBJECT + TQ_OBJECT protected: LedMeter left, right; public: - StereoLedMeters(TQWidget *parent); + StereoLedMeters(TQWidget *tqparent); public slots: void setValues(float left, float right); }; diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp index 60df8f1d..5492f38a 100644 --- a/arts/tools/main.cpp +++ b/arts/tools/main.cpp @@ -82,7 +82,7 @@ FreeVerbView::~FreeVerbView() { } -VControl::VControl( KArtsServer* artsserver, TQWidget *parent) : TQFrame(parent) +VControl::VControl( KArtsServer* artsserver, TQWidget *tqparent) : TQFrame(tqparent) , freeVerbView(0) , server( artsserver ) { @@ -158,7 +158,7 @@ void MainWindow::toggleVolumeBar() { vc->useOldVolumeBar(showOldVolumeDisplay->isChecked()); } -MainWindow::MainWindow() : KMainWindow(0), kartsserver( new KArtsServer( this ) ) { +MainWindow::MainWindow() : KMainWindow(0), kartsserver( new KArtsServer( TQT_TQOBJECT(this) ) ) { kdDebug() << k_funcinfo << endl; connect( kartsserver, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( serverRestarted() ) ); @@ -172,11 +172,11 @@ kdDebug() << k_funcinfo << endl; ( void ) artsactions->actionMidiManagerView(); ( void ) artsactions->actionEnvironmentView(); ( void ) artsactions->actionMediaTypesView(); - ( void ) new KAction( i18n("Toggle Free&Verb"), 0, vc, TQT_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" ); + ( void ) new KAction( i18n("Toggle Free&Verb"), 0, TQT_TQOBJECT(vc), TQT_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" ); showOldVolumeDisplay= - new KToggleAction( i18n( "Old aRts-Control-Style for VU-Meter" /*"&LED-Style Volume Display"*/ ), 0, this, + new KToggleAction( i18n( "Old aRts-Control-Style for VU-Meter" /*"&LED-Style Volume Display"*/ ), 0, TQT_TQOBJECT(this), TQT_SLOT( toggleVolumeBar() ), actionCollection(), "old_volume_display" ); - ( void ) KStdAction::quit( this, TQT_SLOT( close() ), actionCollection(), "quit_artscontrol" ); + ( void ) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit_artscontrol" ); createGUI("artscontrol.rc"); resize(20,300); diff --git a/arts/tools/main.h b/arts/tools/main.h index 2770b054..3b52dadb 100644 --- a/arts/tools/main.h +++ b/arts/tools/main.h @@ -49,6 +49,7 @@ class VScale; class FreeVerbView : public TQWidget { Q_OBJECT + TQ_OBJECT protected: Arts::Synth_FREEVERB freeverb; Arts::SimpleSoundServer server; @@ -66,6 +67,7 @@ class KArtsWidget; class VControl : public TQFrame { Q_OBJECT + TQ_OBJECT protected: class StereoLevelMeter *stereoMeter; FreeVerbView *freeVerbView; @@ -77,7 +79,7 @@ protected: TQBoxLayout *boxLayout; public: - VControl( KArtsServer*, TQWidget *parent); + VControl( KArtsServer*, TQWidget *tqparent); ~VControl(); public slots: @@ -91,6 +93,7 @@ private slots: class MainWindow : public KMainWindow { Q_OBJECT + TQ_OBJECT protected: VControl *vc; KToggleAction *showOldVolumeDisplay; diff --git a/arts/tools/mediatypesview.cpp b/arts/tools/mediatypesview.cpp index 9353cda6..fb8938d7 100644 --- a/arts/tools/mediatypesview.cpp +++ b/arts/tools/mediatypesview.cpp @@ -33,7 +33,7 @@ using namespace std; using namespace Arts; -MediaTypesView::MediaTypesView( TQWidget* parent, const char* name ) : Template_ArtsView( parent,name ) +MediaTypesView::MediaTypesView( TQWidget* tqparent, const char* name ) : Template_ArtsView( tqparent,name ) { this->setCaption( i18n( "Available Media Types" ) ); this->setIcon( MainBarIcon( "artsmediatypes", 32 ) ); diff --git a/arts/tools/mediatypesview.h b/arts/tools/mediatypesview.h index e61338c6..8a0b3afd 100644 --- a/arts/tools/mediatypesview.h +++ b/arts/tools/mediatypesview.h @@ -28,6 +28,7 @@ class MediaTypesView : public Template_ArtsView { Q_OBJECT + TQ_OBJECT public: MediaTypesView( TQWidget* =0, const char* =0 ); ~MediaTypesView(); diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp index 97867cd8..87cc2ea3 100644 --- a/arts/tools/midiinstdlg.cpp +++ b/arts/tools/midiinstdlg.cpp @@ -63,29 +63,29 @@ static TQStringList listFiles(TQString directory, TQString extension) return result; } -MidiInstDlg::MidiInstDlg(TQWidget *parent) - :TQDialog(parent,"instrument",TRUE) +MidiInstDlg::MidiInstDlg(TQWidget *tqparent) + :TQDialog(tqparent,"instrument",TRUE) { - TQVBoxLayout *mainlayout = new TQVBoxLayout(this); + TQVBoxLayout *maintqlayout = new TQVBoxLayout(this); // caption label: title - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); TQLabel *captionlabel = new TQLabel(this); TQFont labelfont(captionlabel->font()); labelfont.setPointSize(labelfont.pointSize()*3/2); captionlabel->setFont(labelfont); captionlabel->setText(TQString(" ")+i18n("Instrument")+TQString(" ")); - captionlabel->setAlignment(AlignCenter); + captionlabel->tqsetAlignment(AlignCenter); //min_size(captionlabel); - mainlayout->addWidget(captionlabel); + maintqlayout->addWidget(captionlabel); // hruler - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this); - mainlayout->addWidget(ruler2); - mainlayout->addSpacing(5); + maintqlayout->addWidget(ruler2); + maintqlayout->addSpacing(5); // combobox @@ -95,10 +95,10 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent) TQStringList::Iterator it; for ( it = instruments.begin(); it != instruments.end(); it++ ) { TQString modname = *it; - TQString prefix = TQString::fromLatin1("instrument_"); + TQString prefix = TQString::tqfromLatin1("instrument_"); if (modname.length() > 5) modname.truncate(modname.length()-5); // kill .arts extension - if ( (modname.startsWith(prefix)) && (!modname.contains("_GUI")) ) + if ( (modname.startsWith(prefix)) && (!modname.tqcontains("_GUI")) ) box->insertItem(modname.mid(prefix.length())); //kdDebug() << "inserted instrument: " << modname.mid(prefix.length()) << endl; } @@ -108,7 +108,7 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent) for ( it = maps.begin(); it != maps.end(); it++ ) { TQString modname = *it; - TQString prefix = TQString::fromLatin1("instrument_"); + TQString prefix = TQString::tqfromLatin1("instrument_"); if (modname.length() > 9) modname.truncate(modname.length()-9); // kill .arts-map extension if (modname.startsWith(prefix)) @@ -116,37 +116,37 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent) //kdDebug() << "inserted map: " << modname.mid(prefix.length()) << endl; } - mainlayout->addWidget(box); + maintqlayout->addWidget(box); // hruler - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); KSeparator *ruler = new KSeparator( KSeparator::HLine, this); - mainlayout->addWidget(ruler); - mainlayout->addSpacing(5); + maintqlayout->addWidget(ruler); + maintqlayout->addSpacing(5); // buttons - TQHBoxLayout *buttonlayout = new TQHBoxLayout; - mainlayout->addSpacing(5); - mainlayout->addLayout(buttonlayout); - mainlayout->addSpacing(5); + TQHBoxLayout *buttontqlayout = new TQHBoxLayout; + maintqlayout->addSpacing(5); + maintqlayout->addLayout(buttontqlayout); + maintqlayout->addSpacing(5); - buttonlayout->addSpacing(5); + buttontqlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() )); + bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() )); bbox->addStretch(1); TQButton *okbutton = bbox->addButton(KStdGuiItem::ok()); connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) ); - bbox->layout(); + bbox->tqlayout(); - buttonlayout->addWidget(bbox); - buttonlayout->addSpacing(5); + buttontqlayout->addWidget(bbox); + buttontqlayout->addSpacing(5); - mainlayout->freeze(); + maintqlayout->freeze(); } TQCString MidiInstDlg::filename() @@ -157,12 +157,12 @@ TQCString MidiInstDlg::filename() TQStringList::Iterator it; for ( it = artsPath.begin(); it != artsPath.end(); it++ ) { - TQString pathname = *it + TQString::fromLatin1("/instrument_") + instrument + TQString::fromLatin1(".arts"); + TQString pathname = *it + TQString::tqfromLatin1("/instrument_") + instrument + TQString::tqfromLatin1(".arts"); TQFileInfo fi(pathname); if (fi.exists() && fi.isReadable()) return TQFile::encodeName(pathname); - pathname = *it + TQString::fromLatin1("/instrument_") + instrument + TQString::fromLatin1(".arts-map"); + pathname = *it + TQString::tqfromLatin1("/instrument_") + instrument + TQString::tqfromLatin1(".arts-map"); fi.setFile(pathname); if (fi.exists() && fi.isReadable()) return TQFile::encodeName(pathname); diff --git a/arts/tools/midiinstdlg.h b/arts/tools/midiinstdlg.h index 57735513..0e425225 100644 --- a/arts/tools/midiinstdlg.h +++ b/arts/tools/midiinstdlg.h @@ -28,9 +28,10 @@ class MidiInstDlg :public TQDialog { Q_OBJECT + TQ_OBJECT TQComboBox *box; public: - MidiInstDlg(TQWidget *parent); + MidiInstDlg(TQWidget *tqparent); TQCString filename(); public slots: void help(); diff --git a/arts/tools/midimanagerdlg.ui b/arts/tools/midimanagerdlg.ui index 78941e4c..1a30f5d7 100644 --- a/arts/tools/midimanagerdlg.ui +++ b/arts/tools/midimanagerdlg.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>MidiManagerDlg</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>MidiManagerDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -33,7 +33,7 @@ <string>MIDI inputs:</string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -41,17 +41,17 @@ <string>MIDI outputs:</string> </property> </widget> - <widget class="QListBox" row="1" column="0"> + <widget class="TQListBox" row="1" column="0"> <property name="name"> <cstring>inputsListBox</cstring> </property> </widget> - <widget class="QListBox" row="1" column="2"> + <widget class="TQListBox" row="1" column="2"> <property name="name"> <cstring>outputsListBox</cstring> </property> </widget> - <widget class="QFrame" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQFrame" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Frame5</cstring> </property> @@ -64,9 +64,9 @@ <property name="lineWidth"> <number>0</number> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <grid> <property name="name"> @@ -78,7 +78,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton" row="0" column="0"> + <widget class="TQPushButton" row="0" column="0"> <property name="name"> <cstring>AddButton_2</cstring> </property> @@ -86,7 +86,7 @@ <string>&Add...</string> </property> </widget> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>RemoveButton_2</cstring> </property> @@ -94,7 +94,7 @@ <string>&Remove</string> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>connectButton</cstring> </property> @@ -102,7 +102,7 @@ <string>&Connect</string> </property> </widget> - <widget class="QPushButton" row="0" column="3"> + <widget class="TQPushButton" row="0" column="3"> <property name="name"> <cstring>disconnectButton</cstring> </property> @@ -112,7 +112,7 @@ </widget> </grid> </widget> - <widget class="QFrame" row="1" column="1"> + <widget class="TQFrame" row="1" column="1"> <property name="name"> <cstring>connectionFrame</cstring> </property> @@ -147,5 +147,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp index 4849af78..a9cefb07 100644 --- a/arts/tools/midimanagerview.cpp +++ b/arts/tools/midimanagerview.cpp @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the Qt - library, treating Qt like a library that normally accompanies the + Permission is also granted to link this program with the TQt + library, treating TQt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ @@ -78,7 +78,7 @@ public: class ConnectionWidget : public TQWidget { public: MidiManagerView *v; - ConnectionWidget(MidiManagerView *v, TQWidget *parent) : TQWidget(parent), v(v) + ConnectionWidget(MidiManagerView *v, TQWidget *tqparent) : TQWidget(tqparent), v(v) { } void paintEvent(TQPaintEvent * /*event*/) @@ -96,8 +96,8 @@ public: conn != item->info.connections.end(); conn++) { MidiManagerItem *outitem = v->itemMap[*conn]; - TQRect r1 = v->widget->inputsListBox->itemRect(item); - TQRect r2 = v->widget->outputsListBox->itemRect(outitem); + TQRect r1 = v->widget->inputsListBox->tqitemRect(item); + TQRect r2 = v->widget->outputsListBox->tqitemRect(outitem); if(r1.height() > 0 && r2.height() > 0) { @@ -122,14 +122,14 @@ MidiManagerView::MidiManagerView() setCaption(i18n("MIDI Manager")); setIcon( MainBarIcon( "artsfftscope", 32 ) ); - (void)new KAction(i18n("&System MIDI Port (OSS)"), 0, this, TQT_SLOT(addOSSMidiPort()), + (void)new KAction(i18n("&System MIDI Port (OSS)"), 0, TQT_TQOBJECT(this), TQT_SLOT(addOSSMidiPort()), actionCollection(), "add_oss_midi_port"); - (void)new KAction(i18n("&aRts Synthesis MIDI Output"), 0, this, + (void)new KAction(i18n("&aRts Synthesis MIDI Output"), 0, TQT_TQOBJECT(this), TQT_SLOT(addArtsMidiOutput()), actionCollection(), "add_arts_midi_output"); - (void) KStdAction::quit( this, TQT_SLOT(close()), actionCollection()); - connect(widget->connectButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConnect())); - connect(widget->disconnectButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDisconnect())); + (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + connect(widget->connectButton,TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotConnect())); + connect(widget->disconnectButton,TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDisconnect())); connectionWidget = new ConnectionWidget(this, widget->connectionFrame); connectionWidget->setMinimumSize(60,10); @@ -185,7 +185,7 @@ void MidiManagerView::updateLists() widget->inputsListBox->setSelected(itemMap[srcID],true); if(destID && itemMap[destID]) widget->outputsListBox->setSelected(itemMap[destID],true); - connectionWidget->repaint(); + connectionWidget->tqrepaint(); } void MidiManagerView::slotConnect() @@ -216,7 +216,7 @@ void MidiManagerView::slotDisconnect() void MidiManagerView::addOSSMidiPort() { - //lukas: no i18n here, QDialog's CTOR doesn't know about QString + //lukas: no i18n here, TQDialog's CTOR doesn't know about TQString //lukas: can't use that with const char *, i18n()'ed in the dialog itself MidiPortDlg *dlg = new MidiPortDlg(0,"/dev/midi","OSS Midi Port"); diff --git a/arts/tools/midimanagerview.h b/arts/tools/midimanagerview.h index 546e1cef..4b395bcd 100644 --- a/arts/tools/midimanagerview.h +++ b/arts/tools/midimanagerview.h @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the Qt - library, treating Qt like a library that normally accompanies the + Permission is also granted to link this program with the TQt + library, treating TQt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ @@ -36,6 +36,7 @@ class MidiManagerWidget; class MidiManagerView : public KMainWindow { Q_OBJECT + TQ_OBJECT protected: friend class ConnectionWidget; Arts::MidiManager manager; diff --git a/arts/tools/midimanagerwidget.ui b/arts/tools/midimanagerwidget.ui index 115626d0..88e34dbe 100644 --- a/arts/tools/midimanagerwidget.ui +++ b/arts/tools/midimanagerwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>MidiManagerWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MidiManagerWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -33,7 +33,7 @@ <string>MIDI inputs:</string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -41,17 +41,17 @@ <string>MIDI outputs:</string> </property> </widget> - <widget class="QListBox" row="1" column="0"> + <widget class="TQListBox" row="1" column="0"> <property name="name"> <cstring>inputsListBox</cstring> </property> </widget> - <widget class="QListBox" row="1" column="2"> + <widget class="TQListBox" row="1" column="2"> <property name="name"> <cstring>outputsListBox</cstring> </property> </widget> - <widget class="QFrame" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQFrame" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Frame5</cstring> </property> @@ -64,9 +64,9 @@ <property name="lineWidth"> <number>0</number> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <grid> <property name="name"> @@ -78,7 +78,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>connectButton</cstring> </property> @@ -86,7 +86,7 @@ <string>&Connect</string> </property> </widget> - <widget class="QPushButton" row="0" column="3"> + <widget class="TQPushButton" row="0" column="3"> <property name="name"> <cstring>disconnectButton</cstring> </property> @@ -96,7 +96,7 @@ </widget> </grid> </widget> - <widget class="QFrame" row="1" column="1"> + <widget class="TQFrame" row="1" column="1"> <property name="name"> <cstring>connectionFrame</cstring> </property> @@ -131,5 +131,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp index 33ca6bce..eaed97f1 100644 --- a/arts/tools/midiportdlg.cpp +++ b/arts/tools/midiportdlg.cpp @@ -32,28 +32,28 @@ #include <tqpushbutton.h> #include <kstdguiitem.h> -MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *title) :TQDialog(parent,title,TRUE) +MidiPortDlg::MidiPortDlg(TQWidget *tqparent, const char *oldname, const char *title) :TQDialog(tqparent,title,TRUE) { - TQVBoxLayout *mainlayout = new TQVBoxLayout(this); + TQVBoxLayout *maintqlayout = new TQVBoxLayout(this); // caption label: title - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); TQLabel *captionlabel = new TQLabel(this); TQFont labelfont(captionlabel->font()); labelfont.setPointSize(labelfont.pointSize()*3/2); captionlabel->setFont(labelfont); captionlabel->setText(i18n("OSS MIDI Port")); - captionlabel->setAlignment(AlignCenter); + captionlabel->tqsetAlignment(AlignCenter); //min_size(captionlabel); - mainlayout->addWidget(captionlabel); + maintqlayout->addWidget(captionlabel); // hruler - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this); - mainlayout->addWidget(ruler2); - mainlayout->addSpacing(5); + maintqlayout->addWidget(ruler2); + maintqlayout->addSpacing(5); // editwidget @@ -61,26 +61,26 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl edit->setText(oldname); //min_size(edit); - mainlayout->addWidget(edit); + maintqlayout->addWidget(edit); // hruler - mainlayout->addSpacing(5); + maintqlayout->addSpacing(5); KSeparator *ruler = new KSeparator( KSeparator::HLine, this); - mainlayout->addWidget(ruler); - mainlayout->addSpacing(5); + maintqlayout->addWidget(ruler); + maintqlayout->addSpacing(5); // buttons - TQHBoxLayout *buttonlayout = new TQHBoxLayout; - mainlayout->addSpacing(5); - mainlayout->addLayout(buttonlayout); - mainlayout->addSpacing(5); + TQHBoxLayout *buttontqlayout = new TQHBoxLayout; + maintqlayout->addSpacing(5); + maintqlayout->addLayout(buttontqlayout); + maintqlayout->addSpacing(5); - buttonlayout->addSpacing(5); + buttontqlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() )); + TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() )); bbox->addStretch(1); helpbutton->setAutoDefault( true ); helpbutton->setDefault( true ); @@ -90,12 +90,12 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl okbutton->setAutoDefault( true ); okbutton->setDefault( true ); - bbox->layout(); + bbox->tqlayout(); - buttonlayout->addWidget(bbox); - buttonlayout->addSpacing(5); + buttontqlayout->addWidget(bbox); + buttontqlayout->addSpacing(5); - mainlayout->freeze(); + maintqlayout->freeze(); } const char *MidiPortDlg::device() diff --git a/arts/tools/midiportdlg.h b/arts/tools/midiportdlg.h index 8992776b..b6b428bc 100644 --- a/arts/tools/midiportdlg.h +++ b/arts/tools/midiportdlg.h @@ -31,9 +31,10 @@ class MidiPortDlg :public TQDialog { Q_OBJECT + TQ_OBJECT TQLineEdit *edit; public: - MidiPortDlg(TQWidget *parent, const char *device, const char *title); + MidiPortDlg(TQWidget *tqparent, const char *device, const char *title); const char *device(); public slots: diff --git a/arts/tools/statusview.cpp b/arts/tools/statusview.cpp index c29cf4ed..6a9f0a25 100644 --- a/arts/tools/statusview.cpp +++ b/arts/tools/statusview.cpp @@ -33,15 +33,15 @@ using namespace std; using namespace Arts; -ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, const char* name ) - : Template_ArtsView( parent,name ) +ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* tqparent, const char* name ) + : Template_ArtsView( tqparent,name ) , server(a_server) { - this->setCaption( i18n( "aRts Status" ) ); + this->setCaption( i18n( "aRts tqStatus" ) ); TQBoxLayout *l= new TQVBoxLayout(this); //l->setAutoAdd(TRUE); - RealtimeStatus rs= server.realtimeStatus(); + RealtimetqStatus rs= server.realtimetqStatus(); l->addWidget(new TQLabel(rs==rtRealtime? i18n("Artsd is running with realtime scheduling."): rs==rtNoSupport? @@ -66,7 +66,7 @@ ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, con connect(suspendButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(suspendButtonClicked())); artsPollStatusTimer= new TQTimer(this); - connect(artsPollStatusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateStatus())); + connect(artsPollStatusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updatetqStatus())); artsPollStatusTimer->start(1000); //l->activate(); show(); @@ -77,7 +77,7 @@ void ArtsStatusView::suspendButtonClicked() (void)server.suspend(); // TODO: error msg if suspend not possible? } -void ArtsStatusView::updateStatus() +void ArtsStatusView::updatetqStatus() { long seconds= server.secondsUntilSuspend(); if (seconds<0) diff --git a/arts/tools/statusview.h b/arts/tools/statusview.h index ab5ff8e8..59f757c2 100644 --- a/arts/tools/statusview.h +++ b/arts/tools/statusview.h @@ -35,11 +35,12 @@ class TQLabel; class ArtsStatusView : public Template_ArtsView { Q_OBJECT + TQ_OBJECT public: ArtsStatusView(Arts::SoundServer server, TQWidget* =0, const char* =0 ); public slots: - void updateStatus(); + void updatetqStatus(); void suspendButtonClicked(); protected: diff --git a/arts/tools/templateview.cpp b/arts/tools/templateview.cpp index a589ff46..a89efac4 100644 --- a/arts/tools/templateview.cpp +++ b/arts/tools/templateview.cpp @@ -22,7 +22,7 @@ //#include <kdebug.h> -Template_ArtsView::Template_ArtsView( TQWidget* parent, const char* name ) : TQFrame( parent,name ){ +Template_ArtsView::Template_ArtsView( TQWidget* tqparent, const char* name ) : TQFrame( tqparent,name ){ //kdDebug()<<k_funcinfo<<endl; } diff --git a/arts/tools/templateview.h b/arts/tools/templateview.h index efdd35f4..ab1b3ec3 100644 --- a/arts/tools/templateview.h +++ b/arts/tools/templateview.h @@ -24,9 +24,10 @@ //#include <artsflow.h> #include <tqframe.h> -class Template_ArtsView : public QFrame +class Template_ArtsView : public TQFrame { Q_OBJECT + TQ_OBJECT public: Template_ArtsView( TQWidget* =0, const char* =0 ); ~Template_ArtsView(); |