diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 06:00:15 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 06:00:15 +0000 |
| commit | b1057f437bf65300831a0ccb45b920787c6b318d (patch) | |
| tree | f8a73db06ca1180d0da0ba6dfbe786197b4f4bc3 | |
| parent | 4ddfca384ced9ad654213aef9dc2c3973720b980 (diff) | |
| download | tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.tar.gz tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.zip | |
TQt4 port kdemultimedia
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
786 files changed, 5835 insertions, 5503 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(); diff --git a/juk/HACKING b/juk/HACKING index 2fb4d392..47ddf410 100644 --- a/juk/HACKING +++ b/juk/HACKING @@ -84,7 +84,7 @@ Spaces ================================================================================ Spaces should not be used between the conditional / loop type and the -conditional statement. They should also not be used after parenthesis. However +conditional statement. They should also not be used after tqparenthesis. However the should be to mark of mathematical or comparative operators. if ( foo == bar ) @@ -103,15 +103,15 @@ be inline in the headers. The organization of the members in a class should be roughly as follows: public: -public slots: +public Q_SLOTS: protected: -protected slots: -signals: +protected Q_SLOTS: +Q_SIGNALS: private: // member funtions -private slots: +private Q_SLOTS: private: // member variables -If there are no private slots there is no need for two private sections, however +If there are no private Q_SLOTS there is no need for two private sections, however private functions and private variables should be clearly separated. The implementations files -- .cpp files -- should follow (when possible) the diff --git a/juk/advancedsearchdialog.cpp b/juk/advancedsearchdialog.cpp index 711c1275..a7b73c65 100644 --- a/juk/advancedsearchdialog.cpp +++ b/juk/advancedsearchdialog.cpp @@ -36,9 +36,9 @@ AdvancedSearchDialog::AdvancedSearchDialog(const TQString &defaultName, const PlaylistSearch &defaultSearch, - TQWidget *parent, + TQWidget *tqparent, const char *name) : - KDialogBase(parent, name, true, i18n("Create Search Playlist"), Ok|Cancel) + KDialogBase(tqparent, name, true, i18n("Create Search Playlist"), Ok|Cancel) { makeVBoxMainWidget(); diff --git a/juk/advancedsearchdialog.h b/juk/advancedsearchdialog.h index 699d5eb8..65158273 100644 --- a/juk/advancedsearchdialog.h +++ b/juk/advancedsearchdialog.h @@ -27,6 +27,7 @@ class SearchLine; class AdvancedSearchDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: struct Result @@ -38,7 +39,7 @@ public: AdvancedSearchDialog(const TQString &defaultName, const PlaylistSearch &defaultSearch = PlaylistSearch(), - TQWidget *parent = 0, + TQWidget *tqparent = 0, const char *name = 0); virtual ~AdvancedSearchDialog(); diff --git a/juk/akodeplayer.h b/juk/akodeplayer.h index 07181ba5..fb78fb42 100644 --- a/juk/akodeplayer.h +++ b/juk/akodeplayer.h @@ -18,6 +18,10 @@ #include <config.h> +#ifdef Q_MOC_RUN +#define HAVE_AKODE +#endif // Q_MOC_RUN + #ifdef HAVE_AKODE #include <tqstring.h> @@ -33,6 +37,7 @@ namespace aKode { class KDE_EXPORT aKodePlayer : public Player { Q_OBJECT + TQ_OBJECT public: aKodePlayer(); diff --git a/juk/artsplayer.h b/juk/artsplayer.h index 73601b33..096074d9 100644 --- a/juk/artsplayer.h +++ b/juk/artsplayer.h @@ -21,6 +21,10 @@ #include <config.h> +#ifdef Q_MOC_RUN +#define HAVE_ARTS 1 +#endif // Q_MOC_RUN + #if HAVE_ARTS #include "player.h" @@ -43,6 +47,7 @@ namespace KDE { class ArtsPlayer : public Player { Q_OBJECT + TQ_OBJECT public: ArtsPlayer(); diff --git a/juk/cache.cpp b/juk/cache.cpp index ada9334b..6cfed63f 100644 --- a/juk/cache.cpp +++ b/juk/cache.cpp @@ -84,9 +84,9 @@ void Cache::save() TQDataStream fs(&f); - Q_INT32 checksum = qChecksum(data.data(), data.size()); + TQ_INT32 checksum = qChecksum(data.data(), data.size()); - fs << Q_INT32(m_currentVersion) + fs << TQ_INT32(m_currentVersion) << checksum << data; @@ -106,7 +106,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static TQDataStream fs(&f); - Q_INT32 version; + TQ_INT32 version; fs >> version; switch(version) { @@ -117,7 +117,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static // we want to get a byte array with just the checksummed data. TQByteArray data; - Q_UINT16 checksum; + TQ_UINT16 checksum; fs >> checksum >> data; if(checksum != qChecksum(data.data(), data.size())) @@ -129,7 +129,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static while(!s.atEnd()) { - Q_INT32 playlistType; + TQ_INT32 playlistType; s >> playlistType; Playlist *playlist = 0; @@ -175,7 +175,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static break; } if(version == 2) { - Q_INT32 sortColumn; + TQ_INT32 sortColumn; s >> sortColumn; if(playlist) playlist->setSorting(sortColumn); @@ -217,33 +217,33 @@ void Cache::savePlaylists(const PlaylistList &playlists) for(PlaylistList::ConstIterator it = playlists.begin(); it != playlists.end(); ++it) { if(*it) { if(dynamic_cast<HistoryPlaylist *>(*it)) { - s << Q_INT32(History) + s << TQ_INT32(History) << *static_cast<HistoryPlaylist *>(*it); } else if(dynamic_cast<SearchPlaylist *>(*it)) { - s << Q_INT32(Search) + s << TQ_INT32(Search) << *static_cast<SearchPlaylist *>(*it); } else if(dynamic_cast<UpcomingPlaylist *>(*it)) { if(!action<KToggleAction>("saveUpcomingTracks")->isChecked()) continue; - s << Q_INT32(Upcoming) + s << TQ_INT32(Upcoming) << *static_cast<UpcomingPlaylist *>(*it); } else if(dynamic_cast<FolderPlaylist *>(*it)) { - s << Q_INT32(Folder) + s << TQ_INT32(Folder) << *static_cast<FolderPlaylist *>(*it); } else { - s << Q_INT32(Normal) + s << TQ_INT32(Normal) << *(*it); } - s << Q_INT32((*it)->sortColumn()); + s << TQ_INT32((*it)->sortColumn()); } } TQDataStream fs(&f); - fs << Q_INT32(playlistCacheVersion); + fs << TQ_INT32(playlistCacheVersion); fs << qChecksum(data.data(), data.size()); fs << data; @@ -275,9 +275,9 @@ void Cache::load() if(!f.open(IO_ReadOnly)) return; - CacheDataStream s(&f); + CacheDataStream s(TQT_TQIODEVICE(&f)); - Q_INT32 version; + TQ_INT32 version; s >> version; TQBuffer buffer; @@ -288,7 +288,7 @@ void Cache::load() case 1: { s.setCacheVersion(1); - Q_INT32 checksum; + TQ_INT32 checksum; TQByteArray data; s >> checksum >> data; diff --git a/juk/cache.h b/juk/cache.h index 6d67f1fd..96fb83af 100644 --- a/juk/cache.h +++ b/juk/cache.h @@ -49,7 +49,7 @@ private: * version. */ -class CacheDataStream : public QDataStream +class CacheDataStream : public TQDataStream { public: CacheDataStream(TQIODevice *d) : TQDataStream(d), m_cacheVersion(0) {} diff --git a/juk/categoryreaderinterface.cpp b/juk/categoryreaderinterface.cpp index 3844fc21..103329b3 100644 --- a/juk/categoryreaderinterface.cpp +++ b/juk/categoryreaderinterface.cpp @@ -50,7 +50,7 @@ TQString CategoryReaderInterface::fixupTrack(const TQString &track, unsigned cat if(emptyAction(trackId) == TagRenamerOptions::UseReplacementValue) str = emptyText(trackId); else - return TQString::null; + return TQString(); } unsigned minimumWidth = trackWidth(categoryNum); diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp index 5c06049a..2f005009 100644 --- a/juk/collectionlist.cpp +++ b/juk/collectionlist.cpp @@ -90,7 +90,7 @@ PlaylistItem *CollectionList::createItem(const FileHandle &file, TQListViewItem // It's probably possible to optimize the line below away, but, well, right // now it's more important to not load duplicate items. - if(m_itemsDict.find(file.absFilePath())) + if(m_itemsDict.tqfind(file.absFilePath())) return 0; PlaylistItem *item = new CollectionListItem(file); @@ -162,7 +162,7 @@ void CollectionList::slotRefreshItems(const KFileItemList &items) // If the item is no longer on disk, remove it from the collection. if(item->file().fileInfo().exists()) - item->repaint(); + item->tqrepaint(); else clearItem(item); } @@ -228,7 +228,7 @@ CollectionList::CollectionList(PlaylistCollection *collection) : m_itemsDict(5003), m_columnTags(15, 0) { - new KAction(i18n("Show Playing"), KShortcut(), actions(), "showPlaying"); + new KAction(i18n("Show Playing"), KShortcut(), ActionCollection::actions(), "showPlaying"); connect(action("showPlaying"), TQT_SIGNAL(activated()), this, TQT_SLOT(slotShowPlaying())); @@ -284,9 +284,9 @@ void CollectionList::contentsDragMoveEvent(TQDragMoveEvent *e) TQString CollectionList::addStringToDict(const TQString &value, unsigned column) { if(column > m_columnTags.count() || value.stripWhiteSpace().isEmpty()) - return TQString::null; + return TQString(); - int *refCountPtr = m_columnTags[column]->find(value); + int *refCountPtr = m_columnTags[column]->tqfind(value); if(refCountPtr) ++(*refCountPtr); else { @@ -336,7 +336,7 @@ void CollectionList::removeStringFromDict(const TQString &value, unsigned column if(column > m_columnTags.count() || value.isEmpty()) return; - int *refCountPtr = m_columnTags[column]->find(value); + int *refCountPtr = m_columnTags[column]->tqfind(value); if(refCountPtr) { --(*refCountPtr); if(*refCountPtr == 0) { @@ -392,13 +392,13 @@ void CollectionListItem::refresh() file().coverInfo()->setCover(); if(listView()->isVisible()) - repaint(); + tqrepaint(); - for(PlaylistItemList::Iterator it = m_children.begin(); it != m_children.end(); ++it) { + for(PlaylistItemList::Iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) { (*it)->playlist()->update(); (*it)->playlist()->dataChanged(); if((*it)->listView()->isVisible()) - (*it)->repaint(); + (*it)->tqrepaint(); } CollectionList::instance()->dataChanged(); @@ -411,7 +411,7 @@ PlaylistItem *CollectionListItem::itemForPlaylist(const Playlist *playlist) return this; PlaylistItemList::ConstIterator it; - for(it = m_children.begin(); it != m_children.end(); ++it) + for(it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) if((*it)->playlist() == playlist) return *it; return 0; @@ -428,11 +428,11 @@ void CollectionListItem::updateCollectionDict(const TQString &oldPath, const TQS collection->addToDict(newPath, this); } -void CollectionListItem::repaint() const +void CollectionListItem::tqrepaint() const { - TQListViewItem::repaint(); - for(PlaylistItemList::ConstIterator it = m_children.begin(); it != m_children.end(); ++it) - (*it)->repaint(); + TQListViewItem::tqrepaint(); + for(PlaylistItemList::ConstIterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) + (*it)->tqrepaint(); } //////////////////////////////////////////////////////////////////////////////// @@ -468,8 +468,8 @@ CollectionListItem::~CollectionListItem() { m_shuttingDown = true; - for(PlaylistItemList::ConstIterator it = m_children.begin(); - it != m_children.end(); + for(PlaylistItemList::ConstIterator it = m_tqchildren.begin(); + it != m_tqchildren.end(); ++it) { (*it)->playlist()->clearItem(*it); @@ -486,13 +486,13 @@ CollectionListItem::~CollectionListItem() void CollectionListItem::addChildItem(PlaylistItem *child) { - m_children.append(child); + m_tqchildren.append(child); } void CollectionListItem::removeChildItem(PlaylistItem *child) { if(!m_shuttingDown) - m_children.remove(child); + m_tqchildren.remove(child); } bool CollectionListItem::checkCurrent() diff --git a/juk/collectionlist.h b/juk/collectionlist.h index 4143889c..82fa9c12 100644 --- a/juk/collectionlist.h +++ b/juk/collectionlist.h @@ -64,6 +64,7 @@ class CollectionList : public Playlist friend class CollectionListItem; Q_OBJECT + TQ_OBJECT public: /** @@ -80,7 +81,7 @@ public: */ TQStringList uniqueSet(UniqueSetType t) const; - CollectionListItem *lookup(const TQString &file) { return m_itemsDict.find(file); } + CollectionListItem *lookup(const TQString &file) { return m_itemsDict.tqfind(file); } virtual PlaylistItem *createItem(const FileHandle &file, TQListViewItem * = 0, @@ -95,7 +96,7 @@ public: virtual bool canReload() const { return true; } public slots: - virtual void paste() { decode(kapp->clipboard()->data()); } + virtual void paste() { decode(kapp->tqclipboard()->data()); } virtual void clear(); void slotCheckCache(); @@ -115,7 +116,7 @@ protected: // These methods are used by CollectionListItem, which is a friend class. - void addToDict(const TQString &file, CollectionListItem *item) { m_itemsDict.replace(file, item); } + void addToDict(const TQString &file, CollectionListItem *item) { m_itemsDict.tqreplace(file, item); } void removeFromDict(const TQString &file) { m_itemsDict.remove(file); } // These methods are also used by CollectionListItem, to manage the @@ -127,7 +128,7 @@ protected: void addWatched(const TQString &file) { m_dirWatch->addFile(file); } void removeWatched(const TQString &file) { m_dirWatch->removeFile(file); } - virtual bool hasItem(const TQString &file) const { return m_itemsDict.find(file); } + virtual bool hasItem(const TQString &file) const { return m_itemsDict.tqfind(file); } signals: void signalCollectionChanged(); @@ -171,8 +172,8 @@ public: virtual void refresh(); PlaylistItem *itemForPlaylist(const Playlist *playlist); void updateCollectionDict(const TQString &oldPath, const TQString &newPath); - void repaint() const; - PlaylistItemList children() const { return m_children; } + void tqrepaint() const; + PlaylistItemList tqchildren() const { return m_tqchildren; } protected: CollectionListItem(const FileHandle &file); @@ -191,7 +192,7 @@ protected: private: bool m_shuttingDown; - PlaylistItemList m_children; + PlaylistItemList m_tqchildren; }; #endif diff --git a/juk/coverdialog.cpp b/juk/coverdialog.cpp index 509f0695..2b04f3c1 100644 --- a/juk/coverdialog.cpp +++ b/juk/coverdialog.cpp @@ -34,8 +34,8 @@ using CoverUtility::CoverIconViewItem; class AllArtistsListViewItem : public KListViewItem { public: - AllArtistsListViewItem(TQListView *parent) : - KListViewItem(parent, i18n("<All Artists>")) + AllArtistsListViewItem(TQListView *tqparent) : + KListViewItem(tqparent, i18n("<All Artists>")) { } @@ -48,8 +48,8 @@ public: class CaseInsensitiveItem : public KListViewItem { public: - CaseInsensitiveItem(TQListView *parent, const TQString &text) : - KListViewItem(parent, text) + CaseInsensitiveItem(TQListView *tqparent, const TQString &text) : + KListViewItem(tqparent, text) { } @@ -60,8 +60,8 @@ public: } }; -CoverDialog::CoverDialog(TQWidget *parent) : - CoverDialogBase(parent, "juk_cover_dialog", WType_Dialog) +CoverDialog::CoverDialog(TQWidget *tqparent) : + CoverDialogBase(tqparent, "juk_cover_dialog", WType_Dialog) { m_covers->setResizeMode(TQIconView::Adjust); m_covers->setGridX(140); diff --git a/juk/coverdialog.h b/juk/coverdialog.h index 751f77c2..6bbbba4a 100644 --- a/juk/coverdialog.h +++ b/juk/coverdialog.h @@ -21,8 +21,9 @@ class CoverDialog : public CoverDialogBase { Q_OBJECT + TQ_OBJECT public: - CoverDialog(TQWidget *parent); + CoverDialog(TQWidget *tqparent); ~CoverDialog(); virtual void show(); diff --git a/juk/coverdialogbase.ui b/juk/coverdialogbase.ui index 180dc8b0..d220a5c9 100644 --- a/juk/coverdialogbase.ui +++ b/juk/coverdialogbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>CoverDialogBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CoverDialogBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -50,7 +50,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>164</width> <height>0</height> @@ -63,23 +63,23 @@ <bool>false</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_clearSearch</cstring> </property> @@ -164,7 +164,7 @@ <verstretch>0</verstretch> </sizepolicy> <pixmap>image0</pixmap> - <signal>contextMenuRequested(QIconViewItem *item, const QPoint &pos)</signal> + <signal>contextMenuRequested(TQIconViewItem *item, const TQPoint &pos)</signal> <property type="Int">gridX</property> <property type="Int">gridY</property> </customwidget> @@ -177,9 +177,9 @@ <connections> <connection> <sender>m_artists</sender> - <signal>clicked(QListViewItem*)</signal> + <signal>clicked(TQListViewItem*)</signal> <receiver>CoverDialogBase</receiver> - <slot>slotArtistClicked(QListViewItem*)</slot> + <slot>slotArtistClicked(TQListViewItem*)</slot> </connection> <connection> <sender>m_clearSearch</sender> @@ -189,18 +189,18 @@ </connection> <connection> <sender>m_covers</sender> - <signal>contextMenuRequested(QIconViewItem*,const QPoint&)</signal> + <signal>contextMenuRequested(TQIconViewItem*,const TQPoint&)</signal> <receiver>CoverDialogBase</receiver> - <slot>slotContextRequested(QIconViewItem*,const QPoint&)</slot> + <slot>slotContextRequested(TQIconViewItem*,const TQPoint&)</slot> </connection> </connections> -<slots> - <slot>slotArtistClicked(QListViewItem *item)</slot> - <slot>slotContextRequested(QIconViewItem *, const QPoint &pt)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +<Q_SLOTS> + <slot>slotArtistClicked(TQListViewItem *item)</slot> + <slot>slotContextRequested(TQIconViewItem *, const TQPoint &pt)</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <forwards> - <forward>class QIconViewItem;</forward> + <forward>class TQIconViewItem;</forward> </forwards> <includehints> <includehint>klistview.h</includehint> diff --git a/juk/covericonview.cpp b/juk/covericonview.cpp index fc400e78..2dd1260b 100644 --- a/juk/covericonview.cpp +++ b/juk/covericonview.cpp @@ -18,15 +18,15 @@ using CoverUtility::CoverIconViewItem; -CoverIconViewItem::CoverIconViewItem(coverKey id, TQIconView *parent) : - KIconViewItem(parent), m_id(id) +CoverIconViewItem::CoverIconViewItem(coverKey id, TQIconView *tqparent) : + KIconViewItem(tqparent), m_id(id) { CoverDataPtr data = CoverManager::coverInfo(id); - setText(TQString("%1 - %2").arg(data->artist, data->album)); + setText(TQString("%1 - %2").tqarg(data->artist, data->album)); setPixmap(data->thumbnail()); } -CoverIconView::CoverIconView(TQWidget *parent, const char *name) : KIconView(parent, name) +CoverIconView::CoverIconView(TQWidget *tqparent, const char *name) : KIconView(tqparent, name) { setResizeMode(Adjust); } diff --git a/juk/covericonview.h b/juk/covericonview.h index 42e44d66..a12f4354 100644 --- a/juk/covericonview.h +++ b/juk/covericonview.h @@ -29,7 +29,7 @@ namespace CoverUtility class CoverIconViewItem : public KIconViewItem { public: - CoverIconViewItem(coverKey id, TQIconView *parent); + CoverIconViewItem(coverKey id, TQIconView *tqparent); coverKey id() const { return m_id; } @@ -49,7 +49,7 @@ using CoverUtility::CoverIconViewItem; class CoverIconView : public KIconView { public: - CoverIconView(TQWidget *parent, const char *name); + CoverIconView(TQWidget *tqparent, const char *name); CoverIconViewItem *currentItem() const; diff --git a/juk/coverinfo.cpp b/juk/coverinfo.cpp index 67e8514a..49bf0f55 100644 --- a/juk/coverinfo.cpp +++ b/juk/coverinfo.cpp @@ -29,15 +29,15 @@ #include "coverinfo.h" #include "tag.h" -struct CoverPopup : public QWidget +struct CoverPopup : public TQWidget { CoverPopup(const TQPixmap &image, const TQPoint &p) : TQWidget(0, 0, WDestructiveClose | WX11BypassWM) { - TQHBoxLayout *layout = new TQHBoxLayout(this); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); TQLabel *label = new TQLabel(this); - layout->addWidget(label); + tqlayout->addWidget(label); label->setFrameStyle(TQFrame::Box | TQFrame::Raised); label->setLineWidth(1); label->setPixmap(image); @@ -225,9 +225,9 @@ void CoverInfo::popup() const TQString CoverInfo::coverLocation(CoverSize size) const { TQString fileName(TQFile::encodeName(m_file.tag()->artist() + " - " + m_file.tag()->album())); - TQRegExp maskedFileNameChars("[ /?:\"]"); + TQRegExp tqmaskedFileNameChars("[ /?:\"]"); - fileName.replace(maskedFileNameChars, "_"); + fileName.tqreplace(tqmaskedFileNameChars, "_"); fileName.append(".png"); TQString dataDir = KGlobal::dirs()->saveLocation("appdata"); @@ -267,7 +267,7 @@ bool CoverInfo::convertOldStyleCover() const applyCoverToWholeAlbum(); - // If we convert we need to remove the old cover otherwise we'll find + // If we convert we need to remove the old cover otherwise we'll tqfind // it later if the user un-sets the new cover. if(!TQFile::remove(oldLocation)) kdError(65432) << "Unable to remove converted cover at " << oldLocation << endl; diff --git a/juk/covermanager.cpp b/juk/covermanager.cpp index f7530daa..811f904f 100644 --- a/juk/covermanager.cpp +++ b/juk/covermanager.cpp @@ -42,13 +42,13 @@ typedef TQDict<coverKey> TrackLookupMap; static KStaticDeleter<CoverManagerPrivate> sd; const char *CoverDrag::mimetype = "application/x-juk-coverid"; -// Caches the QPixmaps for the covers so that the covers are not all kept in +// Caches the TQPixmaps for the covers so that the covers are not all kept in // memory for no reason. typedef TQCache<TQPixmap> CoverPixmapCache; CoverManagerPrivate *CoverManager::m_data = 0; -// Used to save and load CoverData from a QDataStream +// Used to save and load CoverData from a TQDataStream TQDataStream &operator<<(TQDataStream &out, const CoverData &data); TQDataStream &operator>>(TQDataStream &in, CoverData &data); @@ -156,20 +156,20 @@ void CoverManagerPrivate::saveCovers() const TQDataStream out(&file); // Write out the version and count - out << Q_UINT32(0) << Q_UINT32(covers.count()); + out << TQ_UINT32(0) << TQ_UINT32(covers.count()); // Write out the data for(CoverDataMap::ConstIterator it = covers.begin(); it != covers.end(); ++it) { - out << Q_UINT32(it.key()); + out << TQ_UINT32(it.key()); out << *it.data(); } // Now write out the track mapping. - out << Q_UINT32(tracks.count()); + out << TQ_UINT32(tracks.count()); TQDictIterator<coverKey> trackMapIt(tracks); while(trackMapIt.current()) { - out << trackMapIt.currentKey() << Q_UINT32(*trackMapIt.current()); + out << trackMapIt.currentKey() << TQ_UINT32(*trackMapIt.current()); ++trackMapIt; } } @@ -186,7 +186,7 @@ void CoverManagerPrivate::loadCovers() } TQDataStream in(&file); - Q_UINT32 count, version; + TQ_UINT32 count, version; // First thing we'll read in will be the version. // Only version 0 is defined for now. @@ -200,9 +200,9 @@ void CoverManagerPrivate::loadCovers() // Read in the count next, then the data. in >> count; - for(Q_UINT32 i = 0; i < count; ++i) { - // Read the id, and 3 QStrings for every 1 of the count. - Q_UINT32 id; + for(TQ_UINT32 i = 0; i < count; ++i) { + // Read the id, and 3 TQStrings for every 1 of the count. + TQ_UINT32 id; CoverDataPtr data(new CoverData); in >> id; @@ -213,9 +213,9 @@ void CoverManagerPrivate::loadCovers() } in >> count; - for(Q_UINT32 i = 0; i < count; ++i) { + for(TQ_UINT32 i = 0; i < count; ++i) { TQString path; - Q_UINT32 id; + TQ_UINT32 id; in >> path >> id; @@ -223,7 +223,7 @@ void CoverManagerPrivate::loadCovers() // don't do so again. Possible due to a coding error during 3.5 // development. - if(!tracks.find(path)) { + if(!tracks.tqfind(path)) { ++covers[(coverKey) id]->refCount; // Another track using this. tracks.insert(path, new coverKey(id)); } @@ -242,7 +242,7 @@ coverKey CoverManagerPrivate::nextId() const // Start from 1... coverKey key = 1; - while(covers.contains(key)) + while(covers.tqcontains(key)) ++key; return key; @@ -269,13 +269,13 @@ const char *CoverDrag::format(int i) const return 0; } -TQByteArray CoverDrag::encodedData(const char *mimetype) const +TQByteArray CoverDrag::tqencodedData(const char *mimetype) const { if(qstrcmp(CoverDrag::mimetype, mimetype) == 0) { TQByteArray data; TQDataStream ds(data, IO_WriteOnly); - ds << Q_UINT32(m_id); + ds << TQ_UINT32(m_id); return data; } else if(qstrcmp(mimetype, "image/png") == 0) { @@ -303,9 +303,9 @@ bool CoverDrag::decode(const TQMimeSource *e, coverKey &id) if(!canDecode(e)) return false; - TQByteArray data = e->encodedData(mimetype); + TQByteArray data = e->tqencodedData(mimetype); TQDataStream ds(data, IO_ReadOnly); - Q_UINT32 i; + TQ_UINT32 i; ds >> i; id = (coverKey) i; @@ -371,7 +371,7 @@ TQPixmap CoverManager::coverFromData(const CoverData &coverData, Size size) if(size == Thumbnail) { // Convert to image for smoothScale() TQImage image = pix->convertToImage(); - pix->convertFromImage(image.smoothScale(80, 80, TQImage::ScaleMin)); + pix->convertFromImage(image.smoothScale(80, 80, TQ_ScaleMin)); } TQPixmap returnValue = *pix; // Save it early. @@ -395,7 +395,7 @@ coverKey CoverManager::addCover(const TQPixmap &large, const TQString &artist, c // Save it to file first! - TQString ext = TQString("/coverdb/coverID-%1.png").arg(id); + TQString ext = TQString("/coverdb/coverID-%1.png").tqarg(id); coverData->path = KGlobal::dirs()->saveLocation("appdata") + ext; kdDebug() << "Saving pixmap to " << coverData->path << endl; @@ -413,8 +413,8 @@ coverKey CoverManager::addCover(const TQPixmap &large, const TQString &artist, c data()->covers[id] = coverData; // Make sure the new cover isn't inadvertently cached. - data()->pixmapCache.remove(TQString("f%1").arg(coverData->path)); - data()->pixmapCache.remove(TQString("t%1").arg(coverData->path)); + data()->pixmapCache.remove(TQString("f%1").tqarg(coverData->path)); + data()->pixmapCache.remove(TQString("t%1").tqarg(coverData->path)); return id; } @@ -426,7 +426,7 @@ coverKey CoverManager::addCover(const TQString &path, const TQString &artist, co bool CoverManager::hasCover(coverKey id) { - return data()->covers.contains(id); + return data()->covers.tqcontains(id); } bool CoverManager::removeCover(coverKey id) @@ -436,8 +436,8 @@ bool CoverManager::removeCover(coverKey id) // Remove cover from cache. CoverDataPtr coverData = coverInfo(id); - data()->pixmapCache.remove(TQString("f%1").arg(coverData->path)); - data()->pixmapCache.remove(TQString("t%1").arg(coverData->path)); + data()->pixmapCache.remove(TQString("f%1").tqarg(coverData->path)); + data()->pixmapCache.remove(TQString("t%1").tqarg(coverData->path)); // Remove references to files that had that track ID. TQDictIterator<coverKey> it(data()->tracks); @@ -462,8 +462,8 @@ bool CoverManager::replaceCover(coverKey id, const TQPixmap &large) CoverDataPtr coverData = coverInfo(id); // Empty old pixmaps from cache. - data()->pixmapCache.remove(TQString("%1%2").arg("t", coverData->path)); - data()->pixmapCache.remove(TQString("%1%2").arg("f", coverData->path)); + data()->pixmapCache.remove(TQString("%1%2").tqarg("t", coverData->path)); + data()->pixmapCache.remove(TQString("%1%2").tqarg("f", coverData->path)); large.save(coverData->path, "PNG"); return true; @@ -504,7 +504,7 @@ TQValueList<coverKey> CoverManager::keys() void CoverManager::setIdForTrack(const TQString &path, coverKey id) { - coverKey *oldId = data()->tracks.find(path); + coverKey *oldId = data()->tracks.tqfind(path); if(oldId && (id == *oldId)) return; // We're already done. @@ -526,7 +526,7 @@ void CoverManager::setIdForTrack(const TQString &path, coverKey id) coverKey CoverManager::idForTrack(const TQString &path) { - coverKey *coverPtr = data()->tracks.find(path); + coverKey *coverPtr = data()->tracks.tqfind(path); if(!coverPtr) return NoMatch; @@ -536,7 +536,7 @@ coverKey CoverManager::idForTrack(const TQString &path) CoverDataPtr CoverManager::coverInfo(coverKey id) { - if(data()->covers.contains(id)) + if(data()->covers.tqcontains(id)) return data()->covers[id]; return CoverDataPtr(0); diff --git a/juk/covermanager.h b/juk/covermanager.h index d7eda155..a984f01e 100644 --- a/juk/covermanager.h +++ b/juk/covermanager.h @@ -62,13 +62,13 @@ typedef TQMap<coverKey, CoverDataPtr> CoverDataMap; * * @author Michael Pyne <michael.pyne@kdemail.net> */ -class CoverDrag : public QDragObject +class CoverDrag : public TQDragObject { public: CoverDrag(coverKey id, TQWidget *src); virtual const char *format(int i) const; - virtual TQByteArray encodedData(const char *mimetype) const; + virtual TQByteArray tqencodedData(const char *mimetype) const; void setId(coverKey id) { m_id = id; } @@ -191,7 +191,7 @@ public: * Replaces the cover art for the cover identified by @p id with @p large. * Any other metadata such as artist and album is unchanged. * - * @param id The id of the cover to replace. + * @param id The id of the cover to tqreplace. * @param large The full size cover art for the new cover. */ static bool replaceCover(coverKey id, const TQPixmap &large); diff --git a/juk/deletedialog.cpp b/juk/deletedialog.cpp index e780eec0..688015c1 100644 --- a/juk/deletedialog.cpp +++ b/juk/deletedialog.cpp @@ -33,8 +33,8 @@ // DeleteWidget implementation ////////////////////////////////////////////////////////////////////////////// -DeleteWidget::DeleteWidget(TQWidget *parent, const char *name) - : DeleteDialogBase(parent, name) +DeleteWidget::DeleteWidget(TQWidget *tqparent, const char *name) + : DeleteDialogBase(tqparent, name) { KConfigGroup messageGroup(KGlobal::config(), "FileRemover"); @@ -69,8 +69,8 @@ void DeleteWidget::slotShouldDelete(bool shouldDelete) // DeleteDialog implementation ////////////////////////////////////////////////////////////////////////////// -DeleteDialog::DeleteDialog(TQWidget *parent, const char *name) : - KDialogBase(Swallow, WStyle_DialogBorder, parent, name, +DeleteDialog::DeleteDialog(TQWidget *tqparent, const char *name) : + KDialogBase(Swallow, WStyle_DialogBorder, tqparent, name, true /* modal */, i18n("About to delete selected files"), Ok | Cancel, Cancel /* Default */, true /* separator */), m_trashGuiItem(i18n("&Send to Trash"), "trashcan_full") diff --git a/juk/deletedialog.h b/juk/deletedialog.h index 34a98a6a..bc347f41 100644 --- a/juk/deletedialog.h +++ b/juk/deletedialog.h @@ -29,9 +29,10 @@ class TQWidgetStack; class DeleteWidget : public DeleteDialogBase { Q_OBJECT + TQ_OBJECT public: - DeleteWidget(TQWidget *parent = 0, const char *name = 0); + DeleteWidget(TQWidget *tqparent = 0, const char *name = 0); void setFiles(const TQStringList &files); @@ -42,9 +43,10 @@ protected slots: class DeleteDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DeleteDialog(TQWidget *parent, const char *name = "delete_dialog"); + DeleteDialog(TQWidget *tqparent, const char *name = "delete_dialog"); bool confirmDeleteList(const TQStringList &condemnedFiles); void setFiles(const TQStringList &files); diff --git a/juk/deletedialogbase.ui b/juk/deletedialogbase.ui index f1054d79..992a6af5 100644 --- a/juk/deletedialogbase.ui +++ b/juk/deletedialogbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DeleteDialogBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DeleteDialogBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -12,7 +12,7 @@ <height>374</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>420</width> <height>320</height> @@ -22,15 +22,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>ddWarningIcon</cstring> </property> @@ -46,33 +46,33 @@ <string>Icon Placeholder, not in GUI</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> <property name="text"> <string>Are you sure that you want to remove these items?</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>ddDeleteText</cstring> </property> <property name="text"> <string>Deletion method placeholder, never shown to user.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -94,18 +94,18 @@ <string>This is the list of items that are about to be deleted.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>ddNumFiles</cstring> </property> <property name="text"> <string>Placeholder for number of files, not in GUI</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>ddShouldDelete</cstring> </property> @@ -133,10 +133,10 @@ <slot>slotShouldDelete(bool)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">slotShouldDelete(bool)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> </includehints> diff --git a/juk/directorylist.cpp b/juk/directorylist.cpp index 43df3dda..23532370 100644 --- a/juk/directorylist.cpp +++ b/juk/directorylist.cpp @@ -28,8 +28,8 @@ //////////////////////////////////////////////////////////////////////////////// DirectoryList::DirectoryList(const TQStringList &directories, bool importPlaylists, - TQWidget *parent, const char *name) : - KDialogBase(parent, name, true, i18n("Folder List"), Ok | Cancel, Ok, true), + TQWidget *tqparent, const char *name) : + KDialogBase(tqparent, name, true, i18n("Folder List"), Ok | Cancel, Ok, true), m_dirList(directories), m_importPlaylists(importPlaylists) { @@ -50,9 +50,9 @@ DirectoryList::DirectoryList(const TQStringList &directories, bool importPlaylis m_base->importPlaylistsCheckBox->setChecked(importPlaylists); - TQSize sz = sizeHint(); + TQSize sz = tqsizeHint(); setMinimumSize(kMax(350, sz.width()), kMax(250, sz.height())); - resize(sizeHint()); + resize(tqsizeHint()); } DirectoryList::~DirectoryList() @@ -78,7 +78,7 @@ DirectoryList::Result DirectoryList::exec() void DirectoryList::slotAddDirectory() { TQString dir = KFileDialog::getExistingDirectory(); - if(!dir.isEmpty() && m_dirList.find(dir) == m_dirList.end()) { + if(!dir.isEmpty() && m_dirList.tqfind(dir) == m_dirList.end()) { m_dirList.append(dir); new KListViewItem(m_base->directoryListView, dir); m_result.addedDirs.append(dir); diff --git a/juk/directorylist.h b/juk/directorylist.h index d9b2a080..f25c21ae 100644 --- a/juk/directorylist.h +++ b/juk/directorylist.h @@ -22,6 +22,7 @@ class DirectoryListBase; class DirectoryList : public KDialogBase { Q_OBJECT + TQ_OBJECT public: struct Result @@ -33,7 +34,7 @@ public: }; DirectoryList(const TQStringList &directories, bool importPlaylists, - TQWidget *parent = 0, const char *name = 0); + TQWidget *tqparent = 0, const char *name = 0); virtual ~DirectoryList(); public slots: diff --git a/juk/directorylistbase.ui b/juk/directorylistbase.ui index 643417d3..62df27bd 100644 --- a/juk/directorylistbase.ui +++ b/juk/directorylistbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DirectoryListBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DirectoryListBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -32,7 +32,7 @@ <cstring>directoryListView</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>rightColumnLayout</cstring> </property> @@ -56,14 +56,14 @@ <string>Remove Folder</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>informationLabel</cstring> </property> <property name="text"> <string>These folders will be scanned on startup for new files.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -77,14 +77,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>importPlaylistsCheckBox</cstring> </property> @@ -102,8 +102,8 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="0"/> -<layoutfunctions spacing="KDialog::spacingHint"/> +<tqlayoutdefaults spacing="6" margin="0"/> +<tqlayoutfunctions spacing="KDialog::spacingHint"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/juk/dynamicplaylist.cpp b/juk/dynamicplaylist.cpp index 336d1e3e..a1ef1cd0 100644 --- a/juk/dynamicplaylist.cpp +++ b/juk/dynamicplaylist.cpp @@ -23,9 +23,9 @@ class PlaylistDirtyObserver : public PlaylistObserver { public: - PlaylistDirtyObserver(DynamicPlaylist *parent, Playlist *playlist) : + PlaylistDirtyObserver(DynamicPlaylist *tqparent, Playlist *playlist) : PlaylistObserver(playlist), - m_parent(parent) + m_parent(tqparent) { } diff --git a/juk/dynamicplaylist.h b/juk/dynamicplaylist.h index 20e496d0..f7c4f970 100644 --- a/juk/dynamicplaylist.h +++ b/juk/dynamicplaylist.h @@ -25,13 +25,14 @@ class DynamicPlaylist : public Playlist { Q_OBJECT + TQ_OBJECT public: /** * Creates a dynamic playlist based on lists. */ DynamicPlaylist(const PlaylistList &lists, PlaylistCollection *collection, - const TQString &name = TQString::null, + const TQString &name = TQString(), const TQString &iconName = "midi", bool setupPlaylist = true, bool synchronizePlaying = false); diff --git a/juk/exampleoptions.cpp b/juk/exampleoptions.cpp index e365546a..0f5bd862 100644 --- a/juk/exampleoptions.cpp +++ b/juk/exampleoptions.cpp @@ -21,8 +21,8 @@ #include "exampleoptions.h" -ExampleOptions::ExampleOptions(TQWidget *parent) : - ExampleOptionsBase(parent, "example options widget") +ExampleOptions::ExampleOptions(TQWidget *tqparent) : + ExampleOptionsBase(tqparent, "example options widget") { } @@ -44,8 +44,8 @@ void ExampleOptions::exampleFileChanged() emit fileChanged(); } -ExampleOptionsDialog::ExampleOptionsDialog(TQWidget *parent) : - TQDialog(parent, "example options dialog") +ExampleOptionsDialog::ExampleOptionsDialog(TQWidget *tqparent) : + TQDialog(tqparent, "example options dialog") { setCaption(i18n("JuK")); TQVBoxLayout *l = new TQVBoxLayout(this); diff --git a/juk/exampleoptions.h b/juk/exampleoptions.h index dca7a465..4d849b75 100644 --- a/juk/exampleoptions.h +++ b/juk/exampleoptions.h @@ -22,8 +22,9 @@ class ExampleOptions : public ExampleOptionsBase { Q_OBJECT + TQ_OBJECT public: - ExampleOptions(TQWidget *parent); + ExampleOptions(TQWidget *tqparent); protected slots: virtual void exampleSelectionChanged(); @@ -33,11 +34,12 @@ class ExampleOptions : public ExampleOptionsBase // We're not using KDialog(Base) because this dialog won't have any push // buttons to close it. It's just a little floating dialog. -class ExampleOptionsDialog : public QDialog +class ExampleOptionsDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: - ExampleOptionsDialog(TQWidget *parent); + ExampleOptionsDialog(TQWidget *tqparent); const ExampleOptions *widget() const { return m_options; } diff --git a/juk/exampleoptionsbase.ui b/juk/exampleoptionsbase.ui index a2280ef4..1c17798c 100644 --- a/juk/exampleoptionsbase.ui +++ b/juk/exampleoptionsbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ExampleOptionsBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ExampleOptionsBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup3</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_fileTagsButton</cstring> </property> @@ -60,7 +60,7 @@ <number>24</number> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_manualTagsButton</cstring> </property> @@ -71,7 +71,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_manualGroup</cstring> </property> @@ -85,7 +85,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>m_exampleArtist</cstring> </property> @@ -93,7 +93,7 @@ <string>Artist</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>m_exampleTitle</cstring> </property> @@ -101,7 +101,7 @@ <string>Title</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>m_exampleAlbum</cstring> </property> @@ -109,7 +109,7 @@ <string>Album</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -117,7 +117,7 @@ <string>Title:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -125,7 +125,7 @@ <string>Artist:</string> </property> </widget> - <widget class="QSpinBox" row="5" column="1"> + <widget class="TQSpinBox" row="5" column="1"> <property name="name"> <cstring>m_exampleYear</cstring> </property> @@ -139,7 +139,7 @@ <number>2004</number> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -147,7 +147,7 @@ <string>Album:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -155,7 +155,7 @@ <string>Genre:</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -163,7 +163,7 @@ <string>Track number:</string> </property> </widget> - <widget class="QSpinBox" row="4" column="1"> + <widget class="TQSpinBox" row="4" column="1"> <property name="name"> <cstring>m_exampleTrack</cstring> </property> @@ -171,7 +171,7 @@ <number>1</number> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>m_exampleGenre</cstring> </property> @@ -179,7 +179,7 @@ <string>Genre</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -267,16 +267,16 @@ <tabstop>m_exampleTrack</tabstop> <tabstop>m_exampleYear</tabstop> </tabstops> -<signals> +<Q_SIGNALS> <signal>dataChanged()</signal> <signal>fileChanged()</signal> -</signals> -<slots> +</Q_SIGNALS> +<Q_SLOTS> <slot access="protected">exampleSelectionChanged()</slot> <slot access="protected">exampleDataChanged()</slot> <slot access="protected">exampleFileChanged()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/juk/filehandle.h b/juk/filehandle.h index bbfd6c67..12216bb2 100644 --- a/juk/filehandle.h +++ b/juk/filehandle.h @@ -36,7 +36,7 @@ class FileHandle public: FileHandle(); FileHandle(const FileHandle &f); - explicit FileHandle(const TQFileInfo &info, const TQString &path = TQString::null); + explicit FileHandle(const TQFileInfo &info, const TQString &path = TQString()); explicit FileHandle(const TQString &path); FileHandle(const TQString &path, CacheDataStream &s); ~FileHandle(); diff --git a/juk/filehandleproperties.h b/juk/filehandleproperties.h index 4fc31f92..a930ad87 100644 --- a/juk/filehandleproperties.h +++ b/juk/filehandleproperties.h @@ -61,7 +61,7 @@ namespace FileHandleProperties { virtual TQString value(const FileHandle &) const { - return TQString::null; + return TQString(); } }; @@ -75,7 +75,7 @@ namespace FileHandleProperties static TQString property(const FileHandle &file, const TQCString &key) { - return propertyMap.contains(key) ? propertyMap[key]->value(file) : TQString::null; + return propertyMap.tqcontains(key) ? propertyMap[key]->value(file) : TQString(); } static TQStringList properties() diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp index c1acb2ce..2155d11c 100644 --- a/juk/filerenamer.cpp +++ b/juk/filerenamer.cpp @@ -60,8 +60,8 @@ class ConfirmationDialog : public KDialogBase { public: ConfirmationDialog(const TQMap<TQString, TQString> &files, - TQWidget *parent = 0, const char *name = 0) - : KDialogBase(parent, name, true, i18n("Warning"), Ok | Cancel) + TQWidget *tqparent = 0, const char *name = 0) + : KDialogBase(tqparent, name, true, i18n("Warning"), Ok | Cancel) { TQVBox *vbox = makeVBoxMainWidget(); TQHBox *hbox = new TQHBox(vbox); @@ -89,8 +89,8 @@ public: } lvHeight += lv->horizontalScrollBar()->height() + lv->header()->height(); - lv->setMinimumHeight(QMIN(lvHeight, 400)); - resize(QMIN(width(), 500), QMIN(minimumHeight(), 400)); + lv->setMinimumHeight(TQMIN(lvHeight, 400)); + resize(TQMIN(width(), 500), TQMIN(minimumHeight(), 400)); } }; @@ -140,7 +140,7 @@ ConfigCategoryReader::ConfigCategoryReader() : CategoryReaderInterface(), TQString ConfigCategoryReader::categoryValue(TagType type) const { if(!m_currentItem) - return TQString::null; + return TQString(); Tag *tag = m_currentItem->file().tag(); @@ -164,7 +164,7 @@ TQString ConfigCategoryReader::categoryValue(TagType type) const return tag->genre(); default: - return TQString::null; + return TQString(); } } @@ -224,15 +224,15 @@ bool ConfigCategoryReader::isDisabled(const CategoryID &category) const // Implementation of FileRenamerWidget // -FileRenamerWidget::FileRenamerWidget(TQWidget *parent) : - FileRenamerBase(parent), CategoryReaderInterface(), +FileRenamerWidget::FileRenamerWidget(TQWidget *tqparent) : + FileRenamerBase(tqparent), CategoryReaderInterface(), m_exampleFromFile(false) { TQLabel *temp = new TQLabel(0); m_exampleText->setPaletteBackgroundColor(temp->paletteBackgroundColor()); delete temp; - layout()->setMargin(0); // We'll be wrapped by KDialogBase + tqlayout()->setMargin(0); // We'll be wrapped by KDialogBase // This must be created before createTagRows() is called. @@ -348,23 +348,23 @@ unsigned FileRenamerWidget::addRowCategory(TagType category) row.downButton->setFlat(true); upMapper->connect(row.upButton, TQT_SIGNAL(clicked()), TQT_SLOT(map())); - upMapper->setMapping(row.upButton, id); + upMapper->setMapping(TQT_TQOBJECT(row.upButton), id); downMapper->connect(row.downButton, TQT_SIGNAL(clicked()), TQT_SLOT(map())); - downMapper->setMapping(row.downButton, id); + downMapper->setMapping(TQT_TQOBJECT(row.downButton), id); - TQString labelText = TQString("<b>%1</b>").arg(TagRenamerOptions::tagTypeText(category)); + TQString labelText = TQString("<b>%1</b>").tqarg(TagRenamerOptions::tagTypeText(category)); TQLabel *label = new TQLabel(labelText, frame); frame->setStretchFactor(label, 1); - label->setAlignment(AlignCenter); + label->tqsetAlignment(AlignCenter); TQVBox *options = new TQVBox(frame); row.enableButton = new KPushButton(i18n("Remove"), options); toggleMapper->connect(row.enableButton, TQT_SIGNAL(clicked()), TQT_SLOT(map())); - toggleMapper->setMapping(row.enableButton, id); + toggleMapper->setMapping(TQT_TQOBJECT(row.enableButton), id); row.optionsButton = new KPushButton(i18n("Options"), options); mapper->connect(row.optionsButton, TQT_SIGNAL(clicked()), TQT_SLOT(map())); - mapper->setMapping(row.optionsButton, id); + mapper->setMapping(TQT_TQOBJECT(row.optionsButton), id); row.widget->show(); m_rows.append(row); @@ -378,10 +378,10 @@ unsigned FileRenamerWidget::addRowCategory(TagType category) void FileRenamerWidget::moveSignalMappings(unsigned oldId, unsigned newId) { - mapper->setMapping(m_rows[oldId].optionsButton, newId); - downMapper->setMapping(m_rows[oldId].downButton, newId); - upMapper->setMapping(m_rows[oldId].upButton, newId); - toggleMapper->setMapping(m_rows[oldId].enableButton, newId); + mapper->setMapping(TQT_TQOBJECT(m_rows[oldId].optionsButton), newId); + downMapper->setMapping(TQT_TQOBJECT(m_rows[oldId].downButton), newId); + upMapper->setMapping(TQT_TQOBJECT(m_rows[oldId].upButton), newId); + toggleMapper->setMapping(TQT_TQOBJECT(m_rows[oldId].enableButton), newId); } bool FileRenamerWidget::removeRow(unsigned id) @@ -410,9 +410,9 @@ bool FileRenamerWidget::removeRow(unsigned id) if(m_rows[id].position > 0) checkboxPosition = m_rows[id].position - 1; - // The checkbox is contained within a layout widget, so the layout + // The checkbox is contained within a tqlayout widget, so the tqlayout // widget is the one the needs to die. - delete m_folderSwitches[checkboxPosition]->parent(); + delete m_folderSwitches[checkboxPosition]->tqparent(); m_folderSwitches.erase(&m_folderSwitches[checkboxPosition]); // Go through all the rows and if they have the same category and a @@ -480,10 +480,10 @@ void FileRenamerWidget::createTagRows() m_rows.reserve(categoryOrder.count()); m_folderSwitches.reserve(categoryOrder.count() - 1); - mapper = new TQSignalMapper(this, "signal mapper"); - toggleMapper = new TQSignalMapper(this, "toggle mapper"); - upMapper = new TQSignalMapper(this, "up button mapper"); - downMapper = new TQSignalMapper(this, "down button mapper"); + mapper = new TQSignalMapper(TQT_TQOBJECT(this), "signal mapper"); + toggleMapper = new TQSignalMapper(TQT_TQOBJECT(this), "toggle mapper"); + upMapper = new TQSignalMapper(TQT_TQOBJECT(this), "up button mapper"); + downMapper = new TQSignalMapper(TQT_TQOBJECT(this), "down button mapper"); connect(mapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(showCategoryOption(int))); connect(toggleMapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(slotRemoveRow(int))); @@ -578,7 +578,7 @@ TQString FileRenamerWidget::fileCategoryValue(TagType category) const return tag->genre(); default: - return TQString::null; + return TQString(); } } @@ -609,7 +609,7 @@ TQString FileRenamerWidget::categoryValue(TagType category) const return example->m_exampleGenre->text(); default: - return TQString::null; + return TQString(); } } @@ -675,17 +675,17 @@ void FileRenamerWidget::moveItem(unsigned id, MovementDirection direction) // Move the item two spaces above/below its previous position. It has to // be 2 spaces because of the checkbox. - TQBoxLayout *layout = dynamic_cast<TQBoxLayout *>(m_mainFrame->layout()); + TQBoxLayout *tqlayout = dynamic_cast<TQBoxLayout *>(m_mainFrame->tqlayout()); - layout->remove(l); - layout->insertWidget(2 * newPos, l); + tqlayout->remove(l); + tqlayout->insertWidget(2 * newPos, l); // Move the top item two spaces in the opposite direction, for a similar // reason. - layout->remove(w); - layout->insertWidget(2 * pos, w); - layout->invalidate(); + tqlayout->remove(w); + tqlayout->insertWidget(2 * pos, w); + tqlayout->tqinvalidate(); TQTimer::singleShot(0, this, TQT_SLOT(exampleTextChanged())); } @@ -778,7 +778,7 @@ void FileRenamerWidget::insertCategory() // Set its down button to be disabled. m_rows[id].downButton->setEnabled(false); - m_mainFrame->layout()->invalidate(); + m_mainFrame->tqlayout()->tqinvalidate(); m_mainView->update(); // Now update according to the code in loadConfig(). @@ -864,7 +864,7 @@ void FileRenamer::rename(const PlaylistItemList &items) if(itemMap.isEmpty() || ConfirmationDialog(map).exec() != TQDialog::Accepted) return; - KApplication::setOverrideCursor(Qt::waitCursor); + KApplication::setOverrideCursor(TQt::waitCursor); for(TQMap<TQString, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it) { @@ -875,7 +875,7 @@ void FileRenamer::rename(const PlaylistItemList &items) setFolderIcon(it.data(), itemMap[it.key()]); } else - errorFiles << i18n("%1 to %2").arg(it.key()).arg(it.data()); + errorFiles << i18n("%1 to %2").tqarg(it.key()).tqarg(it.data()); processEvents(); } @@ -906,7 +906,7 @@ bool FileRenamer::moveFile(const TQString &src, const TQString &dest) // Get just the directory. KURL dir = dstURL; - dir.setFileName(TQString::null); + dir.setFileName(TQString()); // Create the directory. if(!KStandardDirs::exists(dir.path())) @@ -939,7 +939,7 @@ void FileRenamer::setFolderIcon(const KURL &dst, const PlaylistItem *item) path.append("/" + (*it)); kdDebug() << "Checking path: " << path << endl; - if((*it).find(item->file().tag()->album()) != -1 && + if((*it).tqfind(item->file().tag()->album()) != -1 && !TQFile::exists(path + "/.directory")) { // Seems to be a match, let's set the folder icon for the current @@ -952,7 +952,7 @@ void FileRenamer::setFolderIcon(const KURL &dst, const PlaylistItem *item) config.setGroup("Desktop Entry"); if(!config.hasKey("Icon")) { - config.writeEntry("Icon", TQString("%1/.juk-thumbnail.png").arg(path)); + config.writeEntry("Icon", TQString("%1/.juk-thumbnail.png").tqarg(path)); config.sync(); } @@ -1011,7 +1011,7 @@ TQString FileRenamer::fileName(const CategoryReaderInterface &interface) // The user can use the folder separator checkbox to add folders, so don't allow // slashes that slip in to accidentally create new folders. Should we filter this // back out when showing it in the GUI? - value.replace('/', "%2f"); + value.tqreplace('/', "%2f"); if(!pastLast && interface.hasFolderSeparator(i)) value.append(dirSeparator); diff --git a/juk/filerenamer.h b/juk/filerenamer.h index 0978a390..fe3a2a7c 100644 --- a/juk/filerenamer.h +++ b/juk/filerenamer.h @@ -61,7 +61,7 @@ struct Row /** * A list of rows, each of which may have its own category options and other * associated data. There is no relation between the order of rows in the vector and their - * GUI layout. Instead, each Row has a position member which indicates what GUI position it + * GUI tqlayout. Instead, each Row has a position member which indicates what GUI position it * takes up. The index into the vector is known as the row identifier (which is unique but * not necessarily constant). */ @@ -140,9 +140,10 @@ private: class FileRenamerWidget : public FileRenamerBase, public CategoryReaderInterface { Q_OBJECT + TQ_OBJECT public: - FileRenamerWidget(TQWidget *parent); + FileRenamerWidget(TQWidget *tqparent); ~FileRenamerWidget(); /// Maximum number of total categories the widget will allow. @@ -185,7 +186,7 @@ private: /** * This function adds a "Insert Folder separator" checkbox to the end of - * the current layout. The setting defaults to being unchecked. + * the current tqlayout. The setting defaults to being unchecked. */ void addFolderSeparatorCheckbox(); @@ -335,7 +336,7 @@ private: /** * This moves the widget \p l in the direction given by \p direction, taking * care to make sure that the checkboxes are not moved, and that they are - * enabled or disabled as appropriate for the new layout, and that the up and + * enabled or disabled as appropriate for the new tqlayout, and that the up and * down buttons are also adjusted as necessary. * * @param id the identifier of the row to move @@ -383,7 +384,7 @@ private: /** * This function returns the identifier of the row in the m_rows index that - * contains \p category and matches \p categoryNum. + * tqcontains \p category and matches \p categoryNum. * * @param category the category to find. * @return the identifier of the category, or MAX_CATEGORIES if it couldn't @@ -426,14 +427,14 @@ private slots: virtual void slotRemoveRow(int id); /** - * This function moves \p category up in the layout. + * This function moves \p category up in the tqlayout. * * @param id the unique id of the widget to move up. */ virtual void moveItemUp(int id); /** - * This function moves \p category down in the layout. + * This function moves \p category down in the tqlayout. * * @param id the unique id of the widget to move down. */ diff --git a/juk/filerenamerbase.ui b/juk/filerenamerbase.ui index 28370971..10a36f17 100644 --- a/juk/filerenamerbase.ui +++ b/juk/filerenamerbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>FileRenamerBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FileRenamerBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -27,9 +27,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> @@ -58,7 +58,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_6</cstring> </property> @@ -66,15 +66,15 @@ <string>Music folder:</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Album Tag</string> @@ -133,7 +133,7 @@ <number>26</number> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -144,7 +144,7 @@ <cstring>m_category</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_7</cstring> </property> @@ -168,7 +168,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QScrollView"> + <widget class="TQScrollView"> <property name="name"> <cstring>m_mainView</cstring> </property> @@ -195,7 +195,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -214,9 +214,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -232,7 +232,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -257,7 +257,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -266,7 +266,7 @@ </spacer> </hbox> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_exampleText</cstring> </property> @@ -295,7 +295,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -307,7 +307,7 @@ <customwidgets> <customwidget> <class>QScrollView</class> - <header location="global">qscrollview.h</header> + <header location="global">tqscrollview.h</header> <sizehint> <width>100</width> <height>30</height> @@ -330,13 +330,13 @@ <connections> <connection> <sender>m_separator</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TTQString&)</signal> <receiver>FileRenamerBase</receiver> <slot>exampleTextChanged()</slot> </connection> <connection> <sender>m_musicFolder</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>FileRenamerBase</receiver> <slot>exampleTextChanged()</slot> </connection> @@ -360,12 +360,12 @@ <tabstop>m_insertCategory</tabstop> <tabstop>m_showExample</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot access="protected">exampleTextChanged()</slot> <slot access="protected">toggleExampleDialog()</slot> <slot access="protected">insertCategory()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> @@ -373,7 +373,7 @@ <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>qscrollview.h</includehint> + <includehint>tqscrollview.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> </UI> diff --git a/juk/filerenamerconfigdlg.cpp b/juk/filerenamerconfigdlg.cpp index 8a741d03..a1f43687 100644 --- a/juk/filerenamerconfigdlg.cpp +++ b/juk/filerenamerconfigdlg.cpp @@ -19,8 +19,8 @@ #include "filerenamer.h" #include "filerenamerconfigdlg.h" -FileRenamerConfigDlg::FileRenamerConfigDlg(TQWidget *parent) : - KDialogBase(parent, "file renamer dialog", true, +FileRenamerConfigDlg::FileRenamerConfigDlg(TQWidget *tqparent) : + KDialogBase(tqparent, "file renamer dialog", true, i18n("File Renamer Options"), Ok | Cancel), m_renamerWidget(new FileRenamerWidget(this)) { diff --git a/juk/filerenamerconfigdlg.h b/juk/filerenamerconfigdlg.h index 0c42ab54..fc953181 100644 --- a/juk/filerenamerconfigdlg.h +++ b/juk/filerenamerconfigdlg.h @@ -23,8 +23,9 @@ class FileRenamerWidget; class FileRenamerConfigDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - FileRenamerConfigDlg(TQWidget *parent); + FileRenamerConfigDlg(TQWidget *tqparent); protected slots: virtual void accept(); diff --git a/juk/filerenameroptions.cpp b/juk/filerenameroptions.cpp index d40fd81c..cc9ab7fa 100644 --- a/juk/filerenameroptions.cpp +++ b/juk/filerenameroptions.cpp @@ -25,32 +25,32 @@ #include "filerenameroptions.h" -FileRenamerTagOptions::FileRenamerTagOptions(TQWidget *parent, +FileRenamerTagOptions::FileRenamerTagOptions(TQWidget *tqparent, const TagRenamerOptions &options) : - FileRenamerTagOptionsBase(parent), m_options(options) + FileRenamerTagOptionsBase(tqparent), m_options(options) { - layout()->setSpacing(KDialog::spacingHint()); - layout()->setMargin(0); + tqlayout()->setSpacing(KDialog::spacingHint()); + tqlayout()->setMargin(0); - m_emptyTagGroup->layout()->setSpacing(KDialog::spacingHint()); - m_trackGroup->layout()->setSpacing(KDialog::spacingHint()); + m_emptyTagGroup->tqlayout()->setSpacing(KDialog::spacingHint()); + m_trackGroup->tqlayout()->setSpacing(KDialog::spacingHint()); m_emptyValueLayout->setSpacing(KDialog::spacingHint()); m_exampleLayout->setSpacing(KDialog::spacingHint()); m_spinLayout->setSpacing(KDialog::spacingHint()); m_widthLayout->setSpacing(KDialog::spacingHint()); m_tagLayout->setSpacing(KDialog::spacingHint()); - m_tagFormatGroup->layout()->setSpacing(KDialog::spacingHint()); + m_tagFormatGroup->tqlayout()->setSpacing(KDialog::spacingHint()); if(m_options.category() != Track) m_trackGroup->hide(); TQString tagText = m_options.tagTypeText(); - setCaption(caption().arg(tagText)); - m_tagFormatGroup->setTitle(m_tagFormatGroup->title().arg(tagText)); - m_emptyTagGroup->setTitle(m_emptyTagGroup->title().arg(tagText)); - m_description->setText(m_description->text().arg(tagText)); - m_tagLabel->setText(m_tagLabel->text().arg(tagText)); + setCaption(caption().tqarg(tagText)); + m_tagFormatGroup->setTitle(m_tagFormatGroup->title().tqarg(tagText)); + m_emptyTagGroup->setTitle(m_emptyTagGroup->title().tqarg(tagText)); + m_description->setText(m_description->text().tqarg(tagText)); + m_tagLabel->setText(m_tagLabel->text().tqarg(tagText)); m_prefixText->setText(options.prefix()); m_suffixText->setText(options.suffix()); @@ -115,10 +115,10 @@ void FileRenamerTagOptions::slotEmptyActionChanged() m_options.setEmptyAction(TagRenamerOptions::ForceEmptyInclude); } -TagOptionsDialog::TagOptionsDialog(TQWidget *parent, +TagOptionsDialog::TagOptionsDialog(TQWidget *tqparent, const TagRenamerOptions &options, unsigned categoryNumber) : - KDialogBase(parent, 0, true, i18n("File Renamer"), Ok | Cancel), + KDialogBase(tqparent, 0, true, i18n("File Renamer"), Ok | Cancel), m_options(options), m_categoryNumber(categoryNumber) { diff --git a/juk/filerenameroptions.h b/juk/filerenameroptions.h index 07408827..88248f65 100644 --- a/juk/filerenameroptions.h +++ b/juk/filerenameroptions.h @@ -28,9 +28,10 @@ class FileRenamerTagOptions : public FileRenamerTagOptionsBase { Q_OBJECT + TQ_OBJECT public: - FileRenamerTagOptions(TQWidget *parent, const TagRenamerOptions &options); + FileRenamerTagOptions(TQWidget *tqparent, const TagRenamerOptions &options); const TagRenamerOptions &options() const { return m_options; } @@ -51,9 +52,10 @@ class FileRenamerTagOptions : public FileRenamerTagOptionsBase class TagOptionsDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - TagOptionsDialog(TQWidget *parent, const TagRenamerOptions &options, unsigned categoryNumber); + TagOptionsDialog(TQWidget *tqparent, const TagRenamerOptions &options, unsigned categoryNumber); const TagRenamerOptions &options() const { return m_options; } diff --git a/juk/filerenameroptionsbase.ui b/juk/filerenameroptionsbase.ui index 1e40ce60..be886990 100644 --- a/juk/filerenameroptionsbase.ui +++ b/juk/filerenameroptionsbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>FileRenamerTagOptionsBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FileRenamerTagOptionsBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_tagFormatGroup</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_description</cstring> </property> @@ -40,11 +40,11 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>m_tagLayout</cstring> </property> @@ -65,22 +65,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_prefixText</cstring> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignRight</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_tagLabel</cstring> </property> @@ -88,11 +88,11 @@ <string>%1</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_suffixText</cstring> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignLeft</set> </property> </widget> @@ -106,7 +106,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -115,7 +115,7 @@ </spacer> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_substitution</cstring> </property> @@ -127,13 +127,13 @@ <property name="text"> <string>Substitution Example</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>m_emptyTagGroup</cstring> </property> @@ -144,7 +144,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_includeEmptyButton</cstring> </property> @@ -152,7 +152,7 @@ <string>Include in the &filename anyways</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_ignoreTagButton</cstring> </property> @@ -163,7 +163,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>m_emptyValueLayout</cstring> </property> @@ -174,7 +174,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_useValueButton</cstring> </property> @@ -182,7 +182,7 @@ <string>Use &this value:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_emptyTagValue</cstring> </property> @@ -197,7 +197,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_trackGroup</cstring> </property> @@ -208,7 +208,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel10</cstring> </property> @@ -218,11 +218,11 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>m_widthLayout</cstring> </property> @@ -233,7 +233,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>m_spinLayout</cstring> </property> @@ -244,7 +244,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -271,7 +271,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>m_exampleLayout</cstring> </property> @@ -282,7 +282,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>m_doubleDigitExample</cstring> </property> @@ -295,7 +295,7 @@ <string>014</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>m_singleDigitExample</cstring> </property> @@ -308,25 +308,25 @@ <string>003</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_singleDigit</cstring> </property> <property name="text"> <string>3 -></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>m_doubleDigit</cstring> </property> <property name="text"> <string>14 -></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -346,7 +346,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -413,12 +413,12 @@ <slot>slotEmptyActionChanged()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">slotBracketsChanged()</slot> <slot access="protected">slotTrackWidthChanged()</slot> <slot access="protected">slotEmptyActionChanged()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/juk/folderplaylist.h b/juk/folderplaylist.h index 4369a6fb..7e4557ff 100644 --- a/juk/folderplaylist.h +++ b/juk/folderplaylist.h @@ -20,10 +20,11 @@ class FolderPlaylist : public Playlist { Q_OBJECT + TQ_OBJECT public: - FolderPlaylist(PlaylistCollection *collection, const TQString &folder = TQString::null, - const TQString &name = TQString::null); + FolderPlaylist(PlaylistCollection *collection, const TQString &folder = TQString(), + const TQString &name = TQString()); virtual ~FolderPlaylist(); TQString folder() const; diff --git a/juk/gstreamerplayer.cpp b/juk/gstreamerplayer.cpp index 39f371a3..2c520128 100644 --- a/juk/gstreamerplayer.cpp +++ b/juk/gstreamerplayer.cpp @@ -107,18 +107,18 @@ bool GStreamerPlayer::paused() const int GStreamerPlayer::totalTime() const { - return time(GST_QUERY_TOTAL) / GST_SECOND; + return time(GST_TQUERY_TOTAL) / GST_SECOND; } int GStreamerPlayer::currentTime() const { - return time(GST_QUERY_POSITION) / GST_SECOND; + return time(GST_TQUERY_POSITION) / GST_SECOND; } int GStreamerPlayer::position() const { - long long total = time(GST_QUERY_TOTAL); - long long current = time(GST_QUERY_POSITION); + long long total = time(GST_TQUERY_TOTAL); + long long current = time(GST_TQUERY_POSITION); return total > 0 ? int((double(current) / double(total)) * double(1000) + 0.5) : 0; } @@ -130,7 +130,7 @@ void GStreamerPlayer::seek(int seekTime) void GStreamerPlayer::seekPosition(int position) { - long long total = time(GST_QUERY_TOTAL); + long long total = time(GST_TQUERY_TOTAL); if(total > 0) seek(int(double(position) / double(1000) * double(totalTime()) + 0.5)); } @@ -142,7 +142,7 @@ void GStreamerPlayer::seekPosition(int position) void GStreamerPlayer::readConfig() { KConfigGroup config(KGlobal::config(), "GStreamerPlayer"); - m_sinkName = config.readEntry("SinkName", TQString::null); + m_sinkName = config.readEntry("SinkName", TQString()); } void GStreamerPlayer::setupPipeline() diff --git a/juk/gstreamerplayer.h b/juk/gstreamerplayer.h index 6cc8ebfd..fe08c837 100644 --- a/juk/gstreamerplayer.h +++ b/juk/gstreamerplayer.h @@ -18,6 +18,10 @@ #include "config.h" +#ifdef Q_MOC_RUN +#define HAVE_GSTREAMER 1 +#endif // Q_MOC_RUN + #if HAVE_GSTREAMER #include <gst/gst.h> @@ -27,6 +31,7 @@ class GStreamerPlayer : public Player { Q_OBJECT + TQ_OBJECT public: GStreamerPlayer(); diff --git a/juk/historyplaylist.cpp b/juk/historyplaylist.cpp index 26758fd6..53aa927e 100644 --- a/juk/historyplaylist.cpp +++ b/juk/historyplaylist.cpp @@ -90,16 +90,16 @@ void HistoryPlaylist::slotCreateNewItem() // HistoryPlaylistItem public members //////////////////////////////////////////////////////////////////////////////// -HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after) : - PlaylistItem(item, parent, after), - m_dateTime(TQDateTime::currentDateTime()) +HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListViewItem *after) : + PlaylistItem(item, tqparent, after), + m_dateTime(TQDateTime::tqcurrentDateTime()) { setText(0, KGlobal::locale()->formatDateTime(m_dateTime)); } -HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent) : - PlaylistItem(item, parent), - m_dateTime(TQDateTime::currentDateTime()) +HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent) : + PlaylistItem(item, tqparent), + m_dateTime(TQDateTime::tqcurrentDateTime()) { setText(0, KGlobal::locale()->formatDateTime(m_dateTime)); } @@ -123,7 +123,7 @@ TQDataStream &operator<<(TQDataStream &s, const HistoryPlaylist &p) { PlaylistItemList l = const_cast<HistoryPlaylist *>(&p)->items(); - s << Q_INT32(l.count()); + s << TQ_INT32(l.count()); for(PlaylistItemList::ConstIterator it = l.begin(); it != l.end(); ++it) { const HistoryPlaylistItem *i = static_cast<HistoryPlaylistItem *>(*it); @@ -136,7 +136,7 @@ TQDataStream &operator<<(TQDataStream &s, const HistoryPlaylist &p) TQDataStream &operator>>(TQDataStream &s, HistoryPlaylist &p) { - Q_INT32 count; + TQ_INT32 count; s >> count; HistoryPlaylistItem *after = 0; diff --git a/juk/historyplaylist.h b/juk/historyplaylist.h index 5f2776d5..13cf5436 100644 --- a/juk/historyplaylist.h +++ b/juk/historyplaylist.h @@ -23,8 +23,8 @@ class HistoryPlaylistItem : public PlaylistItem { public: - HistoryPlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after); - HistoryPlaylistItem(CollectionListItem *item, Playlist *parent); + HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListViewItem *after); + HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent); virtual ~HistoryPlaylistItem(); TQDateTime dateTime() const { return m_dateTime; } @@ -37,6 +37,7 @@ private: class HistoryPlaylist : public Playlist { Q_OBJECT + TQ_OBJECT public: HistoryPlaylist(PlaylistCollection *collection); diff --git a/juk/juk.cpp b/juk/juk.cpp index 35c08dff..47a94692 100644 --- a/juk/juk.cpp +++ b/juk/juk.cpp @@ -43,8 +43,8 @@ using namespace ActionCollection; // public members //////////////////////////////////////////////////////////////////////////////// -JuK::JuK(TQWidget *parent, const char *name) : - KMainWindow(parent, name, WDestructiveClose), +JuK::JuK(TQWidget *tqparent, const char *name) : + KMainWindow(tqparent, name, WDestructiveClose), m_player(PlayerManager::instance()), m_shuttingDown(false) { @@ -72,7 +72,7 @@ JuK::JuK(TQWidget *parent, const char *name) : SplashScreen::finishedLoading(); TQTimer::singleShot(0, CollectionList::instance(), TQT_SLOT(slotCheckCache())); - TQTimer::singleShot(0, this, TQT_SLOT(slotProcessArgs())); + TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotProcessArgs())); m_sliderAction->slotUpdateOrientation(); } @@ -112,52 +112,52 @@ void JuK::setupActions() { ActionCollection::actions()->setWidget(this); - KStdAction::quit(this, TQT_SLOT(slotQuit()), actions()); - KStdAction::undo(this, TQT_SLOT(slotUndo()), actions()); - KStdAction::cut(kapp, TQT_SLOT(cut()), actions()); - KStdAction::copy(kapp, TQT_SLOT(copy()), actions()); - KStdAction::paste(kapp, TQT_SLOT(paste()), actions()); - KStdAction::clear(kapp, TQT_SLOT(clear()), actions()); - KStdAction::selectAll(kapp, TQT_SLOT(selectAll()), actions()); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), ActionCollection::actions()); + KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), ActionCollection::actions()); + KStdAction::cut(TQT_TQOBJECT(kapp), TQT_SLOT(cut()), ActionCollection::actions()); + KStdAction::copy(TQT_TQOBJECT(kapp), TQT_SLOT(copy()), ActionCollection::actions()); + KStdAction::paste(TQT_TQOBJECT(kapp), TQT_SLOT(paste()), ActionCollection::actions()); + KStdAction::clear(TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions()); + KStdAction::selectAll(TQT_TQOBJECT(kapp), TQT_SLOT(selectAll()), ActionCollection::actions()); - new KAction(i18n("Remove From Playlist"), "edit_remove", 0, kapp, TQT_SLOT(clear()), actions(), "removeFromPlaylist"); + new KAction(i18n("Remove From Playlist"), "edit_remove", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist"); - KActionMenu *actionMenu = new KActionMenu(i18n("&Random Play"), "roll", actions(), "actionMenu"); + KActionMenu *actionMenu = new KActionMenu(i18n("&Random Play"), "roll", ActionCollection::actions(), "actionMenu"); actionMenu->setDelayed(false); - KRadioAction *ka = new KRadioAction(i18n("&Disable Random Play"), "player_playlist", 0, actions(), "disableRandomPlay"); + KRadioAction *ka = new KRadioAction(i18n("&Disable Random Play"), "player_playlist", 0, ActionCollection::actions(), "disableRandomPlay"); ka->setExclusiveGroup("randomPlayGroup"); actionMenu->insert(ka); - m_randomPlayAction = new KRadioAction(i18n("Use &Random Play"), "roll", 0, actions(), "randomPlay"); + m_randomPlayAction = new KRadioAction(i18n("Use &Random Play"), "roll", 0, ActionCollection::actions(), "randomPlay"); m_randomPlayAction->setExclusiveGroup("randomPlayGroup"); actionMenu->insert(m_randomPlayAction); - ka = new KRadioAction(i18n("Use &Album Random Play"), "roll", 0, actions(), "albumRandomPlay"); + ka = new KRadioAction(i18n("Use &Album Random Play"), "roll", 0, ActionCollection::actions(), "albumRandomPlay"); ka->setExclusiveGroup("randomPlayGroup"); connect(ka, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckAlbumNextAction(bool))); actionMenu->insert(ka); - new KAction(i18n("&Play"), "player_play", 0, m_player, TQT_SLOT(play()), actions(), "play"); - new KAction(i18n("P&ause"), "player_pause", 0, m_player, TQT_SLOT(pause()), actions(), "pause"); - new KAction(i18n("&Stop"), "player_stop", 0, m_player, TQT_SLOT(stop()), actions(), "stop"); + new KAction(i18n("&Play"), "player_play", 0, TQT_TQOBJECT(m_player), TQT_SLOT(play()), ActionCollection::actions(), "play"); + new KAction(i18n("P&ause"), "player_pause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(pause()), ActionCollection::actions(), "pause"); + new KAction(i18n("&Stop"), "player_stop", 0, TQT_TQOBJECT(m_player), TQT_SLOT(stop()), ActionCollection::actions(), "stop"); - new KToolBarPopupAction(i18n("previous track", "Previous"), "player_start", KShortcut(), m_player, TQT_SLOT(back()), actions(), "back"); - new KAction(i18n("next track", "&Next"), "player_end", KShortcut(), m_player, TQT_SLOT(forward()), actions(), "forward"); - new KToggleAction(i18n("&Loop Playlist"), 0, KShortcut(), actions(), "loopPlaylist"); + new KToolBarPopupAction(i18n("previous track", "Previous"), "player_start", KShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(back()), ActionCollection::actions(), "back"); + new KAction(i18n("next track", "&Next"), "player_end", KShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(forward()), ActionCollection::actions(), "forward"); + new KToggleAction(i18n("&Loop Playlist"), 0, KShortcut(), ActionCollection::actions(), "loopPlaylist"); KToggleAction *resizeColumnAction = new KToggleAction(i18n("&Resize Playlist Columns Manually"), - KShortcut(), actions(), "resizeColumnsManually"); + KShortcut(), ActionCollection::actions(), "resizeColumnsManually"); resizeColumnAction->setCheckedState(i18n("&Resize Column Headers Automatically")); // the following are not visible by default - new KAction(i18n("Mute"), "mute", 0, m_player, TQT_SLOT(mute()), actions(), "mute"); - new KAction(i18n("Volume Up"), "volumeUp", 0, m_player, TQT_SLOT(volumeUp()), actions(), "volumeUp"); - new KAction(i18n("Volume Down"), "volumeDown", 0, m_player, TQT_SLOT(volumeDown()), actions(), "volumeDown"); - new KAction(i18n("Play / Pause"), "playPause", 0, m_player, TQT_SLOT(playPause()), actions(), "playPause"); - new KAction(i18n("Seek Forward"), "seekForward", 0, m_player, TQT_SLOT(seekForward()), actions(), "seekForward"); - new KAction(i18n("Seek Back"), "seekBack", 0, m_player, TQT_SLOT(seekBack()), actions(), "seekBack"); + new KAction(i18n("Mute"), "mute", 0, TQT_TQOBJECT(m_player), TQT_SLOT(mute()), ActionCollection::actions(), "mute"); + new KAction(i18n("Volume Up"), "volumeUp", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeUp()), ActionCollection::actions(), "volumeUp"); + new KAction(i18n("Volume Down"), "volumeDown", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeDown()), ActionCollection::actions(), "volumeDown"); + new KAction(i18n("Play / Pause"), "playPause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(playPause()), ActionCollection::actions(), "playPause"); + new KAction(i18n("Seek Forward"), "seekForward", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekForward()), ActionCollection::actions(), "seekForward"); + new KAction(i18n("Seek Back"), "seekBack", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekBack()), ActionCollection::actions(), "seekBack"); ////////////////////////////////////////////////// // settings menu @@ -165,42 +165,42 @@ void JuK::setupActions() m_toggleSplashAction = new KToggleAction(i18n("Show Splash Screen on Startup"), - KShortcut(), actions(), "showSplashScreen"); + KShortcut(), ActionCollection::actions(), "showSplashScreen"); m_toggleSplashAction->setCheckedState(i18n("Hide Splash Screen on Startup")); m_toggleSystemTrayAction = new KToggleAction(i18n("&Dock in System Tray"), - KShortcut(), actions(), "toggleSystemTray"); + KShortcut(), ActionCollection::actions(), "toggleSystemTray"); m_toggleDockOnCloseAction = new KToggleAction(i18n("&Stay in System Tray on Close"), - KShortcut(), actions(), "dockOnClose"); + KShortcut(), ActionCollection::actions(), "dockOnClose"); m_togglePopupsAction = new KToggleAction(i18n("Popup &Track Announcement"), - KShortcut(), this, 0, actions(), "togglePopups"); + KShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "togglePopups"); new KToggleAction(i18n("Save &Play Queue on Exit"), - KShortcut(), this, 0, actions(), "saveUpcomingTracks"); + KShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "saveUpcomingTracks"); connect(m_toggleSystemTrayAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleSystemTray(bool))); - m_outputSelectAction = PlayerManager::playerSelectAction(actions()); + m_outputSelectAction = PlayerManager::playerSelectAction(ActionCollection::actions()); if(m_outputSelectAction) m_outputSelectAction->setCurrentItem(0); - new KAction(i18n("&Tag Guesser..."), 0, 0, this, TQT_SLOT(slotConfigureTagGuesser()), - actions(), "tagGuesserConfig"); + new KAction(i18n("&Tag Guesser..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureTagGuesser()), + ActionCollection::actions(), "tagGuesserConfig"); - new KAction(i18n("&File Renamer..."), 0, 0, this, TQT_SLOT(slotConfigureFileRenamer()), - actions(), "fileRenamerConfig"); + new KAction(i18n("&File Renamer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureFileRenamer()), + ActionCollection::actions(), "fileRenamerConfig"); - KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), actions()); + KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), ActionCollection::actions()); ////////////////////////////////////////////////// // just in the toolbar ////////////////////////////////////////////////// - m_sliderAction = new SliderAction(i18n("Track Position"), actions(), + m_sliderAction = new SliderAction(i18n("Track Position"), ActionCollection::actions(), "trackPositionAction"); } @@ -213,7 +213,7 @@ void JuK::setupSystemTray() m_toggleDockOnCloseAction->setEnabled(true); m_togglePopupsAction->setEnabled(true); - connect(m_systemTray, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotAboutToQuit())); + connect(m_systemTray, TQT_SIGNAL(quitSelected()), TQT_TQOBJECT(this), TQT_SLOT(slotAboutToQuit())); } else { m_systemTray = 0; @@ -224,7 +224,7 @@ void JuK::setupSystemTray() void JuK::setupGlobalAccels() { - m_accel = new KGlobalAccel(this); + m_accel = new KGlobalAccel(TQT_TQOBJECT(this)); KeyDialog::insert(m_accel, "Play", i18n("Play"), action("play"), TQT_SLOT(activate())); KeyDialog::insert(m_accel, "PlayPause", i18n("Play / Pause"), action("playPause"), TQT_SLOT(activate())); @@ -236,7 +236,7 @@ void JuK::setupGlobalAccels() KeyDialog::insert(m_accel, "VolumeUp", i18n("Volume Up"), action("volumeUp"), TQT_SLOT(activate())); KeyDialog::insert(m_accel, "VolumeDown", i18n("Volume Down"), action("volumeDown"), TQT_SLOT(activate())); KeyDialog::insert(m_accel, "Mute", i18n("Mute"), action("mute"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "ShowHide", i18n("Show / Hide"), this, TQT_SLOT(slotShowHide())); + KeyDialog::insert(m_accel, "ShowHide", i18n("Show / Hide"), TQT_TQOBJECT(this), TQT_SLOT(slotShowHide())); KeyDialog::insert(m_accel, "ForwardAlbum", i18n("Play Next Album"), action("forwardAlbum"), TQT_SLOT(activate())); m_accel->setConfigGroup("Shortcuts"); @@ -267,7 +267,7 @@ void JuK::createDirs() void JuK::keyPressEvent(TQKeyEvent *e) { - if (e->key() >= Qt::Key_Back && e->key() <= Qt::Key_MediaLast) + if (e->key() >= TQt::Key_Back && e->key() <= TQt::Key_MediaLast) e->accept(); KMainWindow::keyPressEvent(e); } @@ -446,7 +446,7 @@ void JuK::slotToggleSystemTray(bool enabled) void JuK::slotEditKeys() { - KeyDialog::configure(m_accel, actions(), this); + KeyDialog::configure(m_accel, ActionCollection::actions(), this); } void JuK::slotConfigureTagGuesser() @@ -37,9 +37,10 @@ class PlaylistSplitter; class JuK : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - JuK(TQWidget* parent = 0, const char *name = 0); + JuK(TQWidget* tqparent = 0, const char *name = 0); virtual ~JuK(); virtual KActionCollection *actionCollection() const; diff --git a/juk/k3bexporter.cpp b/juk/k3bexporter.cpp index d19021e6..a4e4a7c6 100644 --- a/juk/k3bexporter.cpp +++ b/juk/k3bexporter.cpp @@ -86,7 +86,7 @@ class PlaylistAction : public KAction return; // Invoke the slot using some trickery. - // XXX: Use the TQMetaObject to do this in Qt 4. + // XXX: Use the TQMetaObject to do this in TQt 4. connect(this, TQT_SIGNAL(activated()), recipient, m_slot); emit(activated()); disconnect(this, TQT_SIGNAL(activated()), recipient, m_slot); @@ -97,7 +97,7 @@ class PlaylistAction : public KAction PlaylistRecipientMap m_playlistRecipient; }; -K3bExporter::K3bExporter(Playlist *parent) : PlaylistExporter(parent), m_parent(parent) +K3bExporter::K3bExporter(Playlist *tqparent) : PlaylistExporter(tqparent), m_parent(tqparent) { } @@ -263,8 +263,8 @@ K3bExporter::K3bOpenMode K3bExporter::openMode() return Abort; } -K3bPlaylistExporter::K3bPlaylistExporter(PlaylistBox *parent) : K3bExporter(0), - m_playlistBox(parent) +K3bPlaylistExporter::K3bPlaylistExporter(PlaylistBox *tqparent) : K3bExporter(0), + m_playlistBox(tqparent) { } diff --git a/juk/k3bexporter.h b/juk/k3bexporter.h index 0c414107..fa49dc88 100644 --- a/juk/k3bexporter.h +++ b/juk/k3bexporter.h @@ -30,9 +30,10 @@ class PlaylistAction; class K3bExporter : public PlaylistExporter { Q_OBJECT + TQ_OBJECT public: - K3bExporter(Playlist *parent = 0); + K3bExporter(Playlist *tqparent = 0); /** * Returns a KAction that can be used to invoke the export. @@ -77,8 +78,9 @@ private: class K3bPlaylistExporter : public K3bExporter { Q_OBJECT + TQ_OBJECT public: - K3bPlaylistExporter(PlaylistBox *parent = 0); + K3bPlaylistExporter(PlaylistBox *tqparent = 0); virtual KAction *action(); diff --git a/juk/keydialog.cpp b/juk/keydialog.cpp index c8d24a5a..46455c37 100644 --- a/juk/keydialog.cpp +++ b/juk/keydialog.cpp @@ -28,44 +28,44 @@ const KeyDialog::KeyInfo KeyDialog::keyInfo[] = { { "PlayPause", { { KShortcut::null(), KShortcut::null() }, - { Qt::CTRL+Qt::ALT+Qt::Key_P, KKey::QtWIN+Qt::ALT+Qt::Key_P }, - { Qt::Key_MediaPlay, Qt::Key_MediaPlay } } }, + { TQt::CTRL+TQt::ALT+TQt::Key_P, KKey::QtWIN+TQt::ALT+TQt::Key_P }, + { TQt::Key_MediaPlay, TQt::Key_MediaPlay } } }, { "Stop", { { KShortcut::null(), KShortcut::null() }, - { Qt::CTRL+Qt::ALT+Qt::Key_S, KKey::QtWIN+Qt::ALT+Qt::Key_S }, - { Qt::Key_MediaStop, Qt::Key_MediaStop } } }, + { TQt::CTRL+TQt::ALT+TQt::Key_S, KKey::QtWIN+TQt::ALT+TQt::Key_S }, + { TQt::Key_MediaStop, TQt::Key_MediaStop } } }, { "Back", { { KShortcut::null(), KShortcut::null() }, - { Qt::CTRL+Qt::ALT+Qt::Key_Left, KKey::QtWIN+Qt::ALT+Qt::Key_Left }, - { Qt::Key_MediaPrev, Qt::Key_MediaPrev } } }, + { TQt::CTRL+TQt::ALT+TQt::Key_Left, KKey::QtWIN+TQt::ALT+TQt::Key_Left }, + { TQt::Key_MediaPrev, TQt::Key_MediaPrev } } }, { "Forward", { { KShortcut::null(), KShortcut::null() }, - { Qt::CTRL+Qt::ALT+Qt::Key_Right, KKey::QtWIN+Qt::ALT+Qt::Key_Right }, - { Qt::Key_MediaNext, Qt::Key_MediaNext } } }, + { TQt::CTRL+TQt::ALT+TQt::Key_Right, KKey::QtWIN+TQt::ALT+TQt::Key_Right }, + { TQt::Key_MediaNext, TQt::Key_MediaNext } } }, { "ForwardAlbum", { { KShortcut::null(), KShortcut::null() }, - { Qt::CTRL+Qt::ALT+Qt::Key_Up, KKey::QtWIN+Qt::ALT+Qt::Key_Up }, - { Qt::CTRL+Qt::Key_MediaNext, Qt::CTRL+Qt::Key_MediaNext } } }, + { TQt::CTRL+TQt::ALT+TQt::Key_Up, KKey::QtWIN+TQt::ALT+TQt::Key_Up }, + { TQt::CTRL+TQt::Key_MediaNext, TQt::CTRL+TQt::Key_MediaNext } } }, { "SeekBack", { { KShortcut::null(), KShortcut::null() }, - { Qt::CTRL+Qt::SHIFT+Qt::ALT+Qt::Key_Left, KKey::QtWIN+Qt::SHIFT+Qt::ALT+Qt::Key_Left }, - { Qt::SHIFT+Qt::Key_MediaPrev, Qt::SHIFT+Qt::Key_MediaPrev } } }, + { TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_Left, KKey::QtWIN+TQt::SHIFT+TQt::ALT+TQt::Key_Left }, + { TQt::SHIFT+TQt::Key_MediaPrev, TQt::SHIFT+TQt::Key_MediaPrev } } }, { "SeekForward", { { KShortcut::null(), KShortcut::null() }, - { Qt::CTRL+Qt::SHIFT+Qt::ALT+Qt::Key_Right, KKey::QtWIN+Qt::SHIFT+Qt::ALT+Qt::Key_Right }, - { Qt::SHIFT+Qt::Key_MediaNext, Qt::SHIFT+Qt::Key_MediaNext } } }, + { TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_Right, KKey::QtWIN+TQt::SHIFT+TQt::ALT+TQt::Key_Right }, + { TQt::SHIFT+TQt::Key_MediaNext, TQt::SHIFT+TQt::Key_MediaNext } } }, { "VolumeUp", { { KShortcut::null(), KShortcut::null() }, - { Qt::CTRL+Qt::ALT+Qt::SHIFT+Qt::Key_Up, KKey::QtWIN+Qt::ALT+Qt::SHIFT+Qt::Key_Up }, - { Qt::Key_VolumeUp, Qt::Key_VolumeUp } } }, + { TQt::CTRL+TQt::ALT+TQt::SHIFT+TQt::Key_Up, KKey::QtWIN+TQt::ALT+TQt::SHIFT+TQt::Key_Up }, + { TQt::Key_VolumeUp, TQt::Key_VolumeUp } } }, { "VolumeDown", { { KShortcut::null(), KShortcut::null() }, - { Qt::CTRL+Qt::ALT+Qt::SHIFT+Qt::Key_Down, KKey::QtWIN+Qt::ALT+Qt::SHIFT+Qt::Key_Down }, - { Qt::Key_VolumeDown, Qt::Key_VolumeDown } } }, + { TQt::CTRL+TQt::ALT+TQt::SHIFT+TQt::Key_Down, KKey::QtWIN+TQt::ALT+TQt::SHIFT+TQt::Key_Down }, + { TQt::Key_VolumeDown, TQt::Key_VolumeDown } } }, { "Mute", { { KShortcut::null(), KShortcut::null() }, - { Qt::CTRL+Qt::ALT+Qt::Key_M, KKey::QtWIN+Qt::ALT+Qt::Key_M }, - { Qt::Key_VolumeMute, Qt::Key_VolumeMute } } }, + { TQt::CTRL+TQt::ALT+TQt::Key_M, KKey::QtWIN+TQt::ALT+TQt::Key_M }, + { TQt::Key_VolumeMute, TQt::Key_VolumeMute } } }, { "ShowHide", { { KShortcut::null(), KShortcut::null() }, { KShortcut::null(), KShortcut::null() }, @@ -75,8 +75,8 @@ const KeyDialog::KeyInfo KeyDialog::keyInfo[] = { const uint KeyDialog::keyInfoCount = sizeof(KeyDialog::keyInfo) / sizeof(KeyDialog::keyInfo[0]); KeyDialog::KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection, - TQWidget *parent, const char *name) - : KDialogBase(parent, name, true, i18n("Configure Shortcuts"), Default | Ok | Cancel, Ok) + TQWidget *tqparent, const char *name) + : KDialogBase(tqparent, name, true, i18n("Configure Shortcuts"), Default | Ok | Cancel, Ok) { // Read key group from configuration @@ -172,11 +172,11 @@ void KeyDialog::slotDefault() } int KeyDialog::configure(KGlobalAccel *keys, KActionCollection *actionCollection, - TQWidget *parent) + TQWidget *tqparent) { // Create and show dialog - update connections if accepted - int retcode = KeyDialog(keys, actionCollection, parent).configure(); + int retcode = KeyDialog(keys, actionCollection, tqparent).configure(); if(retcode == Accepted) keys->updateConnections(); @@ -198,7 +198,7 @@ void KeyDialog::insert(KGlobalAccel *keys, const TQString &action, const TQStrin break; } } - keys->insert(action, label, TQString::null, def3, def4, objSlot, methodSlot); + keys->insert(action, label, TQString(), def3, def4, objSlot, methodSlot); } #include "keydialog.moc" diff --git a/juk/keydialog.h b/juk/keydialog.h index 13801ee1..83c14d9d 100644 --- a/juk/keydialog.h +++ b/juk/keydialog.h @@ -26,12 +26,13 @@ class KeyDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** - * Constructs a KeyDialog called @p name as a child of @p parent. + * Constructs a KeyDialog called @p name as a child of @p tqparent. */ - KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *parent = 0, const char* name = 0); + KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *tqparent = 0, const char* name = 0); /** * Destructor. Deletes all resources used by a KeyDialog object. @@ -43,7 +44,7 @@ public: * accelerators and actions. It behaves essentially like the functions * in KKeyDialog. */ - static int configure(KGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *parent = 0); + static int configure(KGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *tqparent = 0); /** * This is a member function, provided to create a global accelerator with diff --git a/juk/ktrm.cpp b/juk/ktrm.cpp index cb45c685..72519b96 100644 --- a/juk/ktrm.cpp +++ b/juk/ktrm.cpp @@ -43,7 +43,7 @@ class KTRMLookup; extern "C" { #if HAVE_MUSICBRAINZ >= 4 - static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFileStatus status); + static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFiletqStatus status); #else static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId); #endif @@ -69,7 +69,7 @@ public: { int id; - if(!m_fileMap.contains(lookup->file())) { + if(!m_fileMap.tqcontains(lookup->file())) { #if HAVE_MUSICBRAINZ >= 4 id = tp_AddFile(m_pimp, TQFile::encodeName(lookup->file()), 0); #else @@ -95,9 +95,9 @@ public: bool lookupMapContains(int fileId) const { m_lookupMapMutex.lock(); - bool contains = m_lookupMap.contains(fileId); + bool tqcontains = m_lookupMap.tqcontains(fileId); m_lookupMapMutex.unlock(); - return contains; + return tqcontains; } KTRMLookup *lookup(int fileId) const @@ -202,17 +202,17 @@ private: * A custom event type used for signalling that a TRM lookup is finished. */ -class KTRMEvent : public QCustomEvent +class KTRMEvent : public TQCustomEvent { public: - enum Status { + enum tqStatus { Recognized, Unrecognized, Collision, Error }; - KTRMEvent(int fileId, Status status) : + KTRMEvent(int fileId, tqStatus status) : TQCustomEvent(id), m_fileId(fileId), m_status(status) {} @@ -222,7 +222,7 @@ public: return m_fileId; } - Status status() const + tqStatus status() const { return m_status; } @@ -231,7 +231,7 @@ public: private: int m_fileId; - Status m_status; + tqStatus m_status; }; /** @@ -239,10 +239,10 @@ private: * thread) for the lookup. */ -class KTRMEventHandler : public QObject +class KTRMEventHandler : public TQObject { public: - static void send(int fileId, KTRMEvent::Status status) + static void send(int fileId, KTRMEvent::tqStatus status) { KApplication::postEvent(instance(), new KTRMEvent(fileId, status)); } @@ -303,7 +303,7 @@ protected: * Callback fuction for TunePimp lookup events. */ #if HAVE_MUSICBRAINZ >= 4 -static void TRMNotifyCallback(tunepimp_t /*pimp*/, void* /*data*/, TPCallbackEnum type, int fileId, TPFileStatus status) +static void TRMNotifyCallback(tunepimp_t /*pimp*/, void* /*data*/, TPCallbackEnum type, int fileId, TPFiletqStatus status) #else static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId) #endif @@ -313,7 +313,7 @@ static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, #if HAVE_MUSICBRAINZ < 4 track_t track = tp_GetTrack(pimp, fileId); - TPFileStatus status = tr_GetStatus(track); + TPFiletqStatus status = tr_GettqStatus(track); #endif switch(status) { @@ -496,7 +496,7 @@ void KTRMLookup::unrecognized() tr_Lock(track); tr_GetTRM(track, trm, 255); if ( !trm[0] ) { - tr_SetStatus(track, ePending); + tr_SettqStatus(track, ePending); tp_Wake(KTRMRequestHandler::instance()->tunePimp(), track); } else diff --git a/juk/mediafiles.cpp b/juk/mediafiles.cpp index 3752ec06..7a0eb6a2 100644 --- a/juk/mediafiles.cpp +++ b/juk/mediafiles.cpp @@ -45,9 +45,9 @@ namespace MediaFiles { static const char playlistExtension[] = ".m3u"; } -TQStringList MediaFiles::openDialog(TQWidget *parent) +TQStringList MediaFiles::openDialog(TQWidget *tqparent) { - KFileDialog dialog(TQString::null, TQString::null, parent, "filedialog", true); + KFileDialog dialog(TQString(), TQString(), tqparent, "filedialog", true); dialog.setOperationMode(KFileDialog::Opening); dialog.setCaption(i18n("Open")); @@ -60,11 +60,11 @@ TQStringList MediaFiles::openDialog(TQWidget *parent) return convertURLsToLocal(dialog.selectedFiles()); } -TQString MediaFiles::savePlaylistDialog(const TQString &playlistName, TQWidget *parent) +TQString MediaFiles::savePlaylistDialog(const TQString &playlistName, TQWidget *tqparent) { TQString fileName = KFileDialog::getSaveFileName(playlistName + playlistExtension, TQString("*").append(playlistExtension), - parent, + tqparent, i18n("Playlists")); if(!fileName.isEmpty() && !fileName.endsWith(playlistExtension)) fileName.append(playlistExtension); diff --git a/juk/mediafiles.h b/juk/mediafiles.h index 342739e7..ea6a4345 100644 --- a/juk/mediafiles.h +++ b/juk/mediafiles.h @@ -24,15 +24,15 @@ namespace MediaFiles { /** - * Creates a JuK specific KFileDialog with the specified parent. + * Creates a JuK specific KFileDialog with the specified tqparent. */ - TQStringList openDialog(TQWidget *parent = 0); + TQStringList openDialog(TQWidget *tqparent = 0); /** * Creates a JuK specific KFileDialog for saving a playlist with the name - * playlistName and the specified parent and returns the file name. + * playlistName and the specified tqparent and returns the file name. */ - TQString savePlaylistDialog(const TQString &playlistName, TQWidget *parent = 0); + TQString savePlaylistDialog(const TQString &playlistName, TQWidget *tqparent = 0); /** * Returns true if fileName is a supported media file. diff --git a/juk/musicbrainzquery.cpp b/juk/musicbrainzquery.cpp index 577e240f..6a6eb45e 100644 --- a/juk/musicbrainzquery.cpp +++ b/juk/musicbrainzquery.cpp @@ -68,7 +68,7 @@ void MusicBrainzLookup::error() void MusicBrainzLookup::message(const TQString &s) const { KMainWindow *w = static_cast<KMainWindow *>(kapp->mainWidget()); - w->statusBar()->message(TQString("%1 (%2)").arg(s).arg(m_file.fileInfo().fileName()), 3000); + w->statusBar()->message(TQString("%1 (%2)").tqarg(s).tqarg(m_file.fileInfo().fileName()), 3000); } void MusicBrainzLookup::confirmation() @@ -76,20 +76,20 @@ void MusicBrainzLookup::confirmation() // Here we do a bit of queuing to make sure that we don't pop up multiple // instances of the confirmation dialog at once. - static TQValueList< QPair<FileHandle, KTRMResultList> > queue; + static TQValueList< TQPair<FileHandle, KTRMResultList> > queue; if(results().isEmpty()) return; if(!queue.isEmpty()) { - queue.append(qMakePair(m_file, results())); + queue.append(tqMakePair(m_file, results())); return; } - queue.append(qMakePair(m_file, results())); + queue.append(tqMakePair(m_file, results())); while(!queue.isEmpty()) { - QPair<FileHandle, KTRMResultList> item = queue.first(); + TQPair<FileHandle, KTRMResultList> item = queue.first(); FileHandle file = item.first; KTRMResultList results = item.second; TrackPickerDialog dialog(file.fileInfo().fileName(), results); diff --git a/juk/musicbrainzquery.h b/juk/musicbrainzquery.h index d88b166f..195006e0 100644 --- a/juk/musicbrainzquery.h +++ b/juk/musicbrainzquery.h @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#ifndef MUSICBRAINZQUERY_H -#define MUSICBRAINZQUERY_H +#ifndef MUSICBRAINZTQUERY_H +#define MUSICBRAINZTQUERY_H #include <config.h> diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp index 4256ecff..ebf03b94 100644 --- a/juk/nowplaying.cpp +++ b/juk/nowplaying.cpp @@ -39,17 +39,17 @@ static const int imageSize = 64; -struct Line : public QFrame +struct Line : public TQFrame { - Line(TQWidget *parent) : TQFrame(parent) { setFrameShape(VLine); } + Line(TQWidget *tqparent) : TQFrame(tqparent) { setFrameShape(VLine); } }; //////////////////////////////////////////////////////////////////////////////// // NowPlaying //////////////////////////////////////////////////////////////////////////////// -NowPlaying::NowPlaying(TQWidget *parent, PlaylistCollection *collection, const char *name) : - TQHBox(parent, name), +NowPlaying::NowPlaying(TQWidget *tqparent, PlaylistCollection *collection, const char *name) : + TQHBox(tqparent, name), m_observer(this, collection), m_collection(collection) { @@ -58,9 +58,9 @@ NowPlaying::NowPlaying(TQWidget *parent, PlaylistCollection *collection, const c CollectionList::instance()->addObserver(&m_observer); - layout()->setMargin(5); - layout()->setSpacing(3); - setFixedHeight(imageSize + 2 + layout()->margin() * 2); + tqlayout()->setMargin(5); + tqlayout()->setSpacing(3); + setFixedHeight(imageSize + 2 + tqlayout()->margin() * 2); setStretchFactor(new CoverItem(this), 0); setStretchFactor(new TrackItem(this), 2); @@ -105,11 +105,11 @@ void NowPlaying::slotUpdate() // CoverItem //////////////////////////////////////////////////////////////////////////////// -CoverItem::CoverItem(NowPlaying *parent) : - TQLabel(parent, "CoverItem"), - NowPlayingItem(parent) +CoverItem::CoverItem(NowPlaying *tqparent) : + TQLabel(tqparent, "CoverItem"), + NowPlayingItem(tqparent) { - setFixedHeight(parent->height() - parent->layout()->margin() * 2); + setFixedHeight(tqparent->height() - tqparent->tqlayout()->margin() * 2); setFrameStyle(Box | Plain); setLineWidth(1); setMargin(1); @@ -123,7 +123,7 @@ void CoverItem::update(const FileHandle &file) if(file.coverInfo()->hasCover()) { show(); TQImage image = file.coverInfo()->pixmap(CoverInfo::Thumbnail).convertToImage(); - setPixmap(image.smoothScale(imageSize, imageSize, TQImage::ScaleMin)); + setPixmap(image.smoothScale(imageSize, imageSize, TQ_ScaleMin)); } else hide(); @@ -138,7 +138,7 @@ void CoverItem::mouseReleaseEvent(TQMouseEvent *event) if(event->x() >= 0 && event->y() >= 0 && event->x() < width() && event->y() < height() && - event->button() == LeftButton && + event->button() == Qt::LeftButton && m_file.coverInfo()->hasCover()) { m_file.coverInfo()->popup(); @@ -159,7 +159,7 @@ void CoverItem::mouseMoveEvent(TQMouseEvent *e) return; TQPoint diff = m_dragStart - e->globalPos(); - if(QABS(diff.x()) > 1 || QABS(diff.y()) > 1) { + if(TQABS(diff.x()) > 1 || TQABS(diff.y()) > 1) { // Start a drag. @@ -214,21 +214,21 @@ void CoverItem::dropEvent(TQDropEvent *e) // TrackItem //////////////////////////////////////////////////////////////////////////////// -TrackItem::TrackItem(NowPlaying *parent) : - TQWidget(parent, "TrackItem"), - NowPlayingItem(parent) +TrackItem::TrackItem(NowPlaying *tqparent) : + TQWidget(tqparent, "TrackItem"), + NowPlayingItem(tqparent) { - setFixedHeight(parent->height() - parent->layout()->margin() * 2); - setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + setFixedHeight(tqparent->height() - tqparent->tqlayout()->margin() * 2); + tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); m_label = new LinkLabel(this); m_label->setLinkUnderline(false); - layout->addStretch(); - layout->addWidget(m_label); - layout->addStretch(); + tqlayout->addStretch(); + tqlayout->addWidget(m_label); + tqlayout->addStretch(); connect(m_label, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(slotOpenLink(const TQString &))); @@ -242,7 +242,7 @@ void TrackItem::update(const FileHandle &file) void TrackItem::slotOpenLink(const TQString &link) { - PlaylistCollection *collection = NowPlayingItem::parent()->collection(); + PlaylistCollection *collection = NowPlayingItem::tqparent()->collection(); if(link == "artist") collection->showMore(m_file.tag()->artist()); @@ -259,7 +259,7 @@ void TrackItem::slotUpdate() TQString title = TQStyleSheet::escape(m_file.tag()->title()); TQString artist = TQStyleSheet::escape(m_file.tag()->artist()); TQString album = TQStyleSheet::escape(m_file.tag()->album()); - TQString separator = (artist.isNull() || album.isNull()) ? TQString::null : TQString(" - "); + TQString separator = (artist.isNull() || album.isNull()) ? TQString() : TQString(" - "); // This block-o-nastiness makes the font smaller and smaller until it actually fits. @@ -269,32 +269,32 @@ void TrackItem::slotUpdate() "<br />" "<font size=\"+%3\"><b><a href=\"artist\">%4</a>%5<a href=\"album\">%6</a></b>"; - if(NowPlayingItem::parent()->collection()->showMoreActive()) - format.append(TQString(" (<a href=\"clear\">%1</a>)").arg(i18n("back to playlist"))); + if(NowPlayingItem::tqparent()->collection()->showMoreActive()) + format.append(TQString(" (<a href=\"clear\">%1</a>)").tqarg(i18n("back to playlist"))); format.append("</font>"); do { - m_label->setText(format.arg(size).arg(title).arg(size - 2) - .arg(artist).arg(separator).arg(album)); + m_label->setText(format.tqarg(size).tqarg(title).tqarg(size - 2) + .tqarg(artist).tqarg(separator).tqarg(album)); --size; } while(m_label->heightForWidth(m_label->width()) > imageSize && size >= 0); - m_label->setFixedHeight(QMIN(imageSize, m_label->heightForWidth(m_label->width()))); + m_label->setFixedHeight(TQMIN(imageSize, m_label->heightForWidth(m_label->width()))); } //////////////////////////////////////////////////////////////////////////////// // HistoryItem //////////////////////////////////////////////////////////////////////////////// -HistoryItem::HistoryItem(NowPlaying *parent) : - LinkLabel(parent, "HistoryItem"), - NowPlayingItem(parent) +HistoryItem::HistoryItem(NowPlaying *tqparent) : + LinkLabel(tqparent, "HistoryItem"), + NowPlayingItem(tqparent) { - setFixedHeight(parent->height() - parent->layout()->margin() * 2); - setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + setFixedHeight(tqparent->height() - tqparent->tqlayout()->margin() * 2); + tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); setLinkUnderline(false); - setText(TQString("<b>%1</b>").arg(i18n("History"))); + setText(TQString("<b>%1</b>").tqarg(i18n("History"))); m_timer = new TQTimer(this); connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAddPlaying())); @@ -309,14 +309,14 @@ void HistoryItem::update(const FileHandle &file) m_history.remove(m_history.fromLast()); TQString format = "<br /><a href=\"%1\"><font size=\"-1\">%2</font></a>"; - TQString current = TQString("<b>%1</b>").arg(i18n("History")); + TQString current = TQString("<b>%1</b>").tqarg(i18n("History")); TQString previous; for(TQValueList<Item>::ConstIterator it = m_history.begin(); it != m_history.end(); ++it) { previous = current; - current.append(format.arg((*it).anchor).arg(TQStyleSheet::escape((*it).file.tag()->title()))); + current.append(format.tqarg((*it).anchor).tqarg(TQStyleSheet::escape((*it).file.tag()->title()))); setText(current); if(heightForWidth(width()) > imageSize) { setText(previous); @@ -342,7 +342,7 @@ void HistoryItem::openLink(const TQString &link) (*it).playlist->clearSelection(); (*it).playlist->setSelected(item, true); (*it).playlist->ensureItemVisible(item); - NowPlayingItem::parent()->collection()->raise((*it).playlist); + NowPlayingItem::tqparent()->collection()->raise((*it).playlist); } break; } diff --git a/juk/nowplaying.h b/juk/nowplaying.h index 0a60c278..bacc6582 100644 --- a/juk/nowplaying.h +++ b/juk/nowplaying.h @@ -37,12 +37,13 @@ class Playlist; * when the playing item changes. */ -class NowPlaying : public QHBox +class NowPlaying : public TQHBox { Q_OBJECT + TQ_OBJECT public: - NowPlaying(TQWidget *parent, PlaylistCollection *collection, + NowPlaying(TQWidget *tqparent, PlaylistCollection *collection, const char *name = 0); void addItem(NowPlayingItem *item); PlaylistCollection *collection() const; @@ -53,9 +54,9 @@ private slots: private: struct Observer : public PlaylistObserver { - Observer(NowPlaying *parent, PlaylistInterface *playlist) : + Observer(NowPlaying *tqparent, PlaylistInterface *playlist) : PlaylistObserver(playlist), - m_parent(parent) {} + m_parent(tqparent) {} virtual void updateCurrent() {} virtual void updateData() { m_parent->slotUpdate(); } NowPlaying *m_parent; @@ -75,9 +76,9 @@ class NowPlayingItem { public: virtual void update(const FileHandle &file) = 0; - NowPlaying *parent() const { return m_parent; } + NowPlaying *tqparent() const { return m_parent; } protected: - NowPlayingItem(NowPlaying *parent) : m_parent(parent) { parent->addItem(this); } + NowPlayingItem(NowPlaying *tqparent) : m_parent(tqparent) { tqparent->addItem(this); } private: NowPlaying *m_parent; }; @@ -90,7 +91,7 @@ private: class CoverItem : public TQLabel, public NowPlayingItem { public: - CoverItem(NowPlaying *parent); + CoverItem(NowPlaying *tqparent); virtual void update(const FileHandle &file); virtual void mouseReleaseEvent(TQMouseEvent *event); @@ -114,7 +115,7 @@ private: class LinkLabel : public KActiveLabel { public: - LinkLabel(TQWidget *parent, const char *name = 0) : KActiveLabel(parent, name) {} + LinkLabel(TQWidget *tqparent, const char *name = 0) : KActiveLabel(tqparent, name) {} virtual void openLink(const TQString &) {} }; @@ -126,9 +127,10 @@ public: class TrackItem : public TQWidget, public NowPlayingItem { Q_OBJECT + TQ_OBJECT public: - TrackItem(NowPlaying *parent); + TrackItem(NowPlaying *tqparent); virtual void update(const FileHandle &file); private slots: @@ -147,9 +149,10 @@ private: class HistoryItem : public LinkLabel, public NowPlayingItem { Q_OBJECT + TQ_OBJECT public: - HistoryItem(NowPlaying *parent); + HistoryItem(NowPlaying *tqparent); virtual void update(const FileHandle &file); virtual void openLink(const TQString &link); diff --git a/juk/player.h b/juk/player.h index 600e3db6..69910aaa 100644 --- a/juk/player.h +++ b/juk/player.h @@ -20,7 +20,7 @@ #include "filehandle.h" -class Player : public QObject +class Player : public TQObject { public: virtual ~Player() {} diff --git a/juk/playermanager.cpp b/juk/playermanager.cpp index 19647278..d62c84c4 100644 --- a/juk/playermanager.cpp +++ b/juk/playermanager.cpp @@ -46,7 +46,7 @@ using namespace ActionCollection; -enum PlayerManagerStatus { StatusStopped = -1, StatusPaused = 1, StatusPlaying = 2 }; +enum PlayerManagertqStatus { StatusStopped = -1, StatusPaused = 1, StatusPlaying = 2 }; //////////////////////////////////////////////////////////////////////////////// // helper functions @@ -194,7 +194,7 @@ TQStringList PlayerManager::trackProperties() TQString PlayerManager::trackProperty(const TQString &property) const { if(!playing() && !paused()) - return TQString::null; + return TQString(); return m_file.property(property); } @@ -220,7 +220,7 @@ FileHandle PlayerManager::playingFile() const TQString PlayerManager::playingString() const { if(!playing()) - return TQString::null; + return TQString(); TQString str = m_file.tag()->artist() + " - " + m_file.tag()->title(); if(m_file.tag()->artist().isEmpty()) @@ -239,10 +239,10 @@ void PlayerManager::setStatusLabel(StatusLabel *label) m_statusLabel = label; } -KSelectAction *PlayerManager::playerSelectAction(TQObject *parent) // static +KSelectAction *PlayerManager::playerSelectAction(TQObject *tqparent) // static { KSelectAction *action = 0; - action = new KSelectAction(i18n("&Output To"), 0, parent, "outputSelect"); + action = new KSelectAction(i18n("&Output To"), 0, tqparent, "outputSelect"); TQStringList l; #if HAVE_ARTS diff --git a/juk/playermanager.h b/juk/playermanager.h index c23c0752..3b384762 100644 --- a/juk/playermanager.h +++ b/juk/playermanager.h @@ -33,6 +33,7 @@ class PlaylistInterface; class PlayerManager : public Player, public PlayerIface { Q_OBJECT + TQ_OBJECT protected: PlayerManager(); @@ -61,7 +62,7 @@ public: TQString randomPlayMode() const; - static KSelectAction *playerSelectAction(TQObject *parent); + static KSelectAction *playerSelectAction(TQObject *tqparent); public slots: diff --git a/juk/playlist.cpp b/juk/playlist.cpp index fb218881..51cb5095 100644 --- a/juk/playlist.cpp +++ b/juk/playlist.cpp @@ -80,11 +80,11 @@ static bool manualResize() * A tooltip specialized to show full filenames over the file name column. */ -class PlaylistToolTip : public QToolTip +class PlaylistToolTip : public TQToolTip { public: - PlaylistToolTip(TQWidget *parent, Playlist *playlist) : - TQToolTip(parent), m_playlist(playlist) {} + PlaylistToolTip(TQWidget *tqparent, Playlist *playlist) : + TQToolTip(tqparent), m_playlist(playlist) {} virtual void maybeTip(const TQPoint &p) { @@ -102,7 +102,7 @@ public: (column == m_playlist->columnOffset() + PlaylistItem::CoverColumn && item->file().coverInfo()->hasCover())) { - TQRect r = m_playlist->itemRect(item); + TQRect r = m_playlist->tqitemRect(item); int headerPosition = m_playlist->header()->sectionPos(column); r.setLeft(headerPosition); r.setRight(headerPosition + m_playlist->header()->sectionSize(column)); @@ -312,7 +312,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQString &name, const TQString &iconName) : KListView(collection->playlistStack(), name.latin1()), m_collection(collection), - m_fetcher(new WebImageFetcher(this)), + m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))), m_selectedCount(0), m_allowDuplicates(false), m_polished(false), @@ -336,7 +336,7 @@ Playlist::Playlist(PlaylistCollection *collection, const PlaylistItemList &items const TQString &name, const TQString &iconName) : KListView(collection->playlistStack(), name.latin1()), m_collection(collection), - m_fetcher(new WebImageFetcher(this)), + m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))), m_selectedCount(0), m_allowDuplicates(false), m_polished(false), @@ -361,7 +361,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQFileInfo &playlistFil const TQString &iconName) : KListView(collection->playlistStack()), m_collection(collection), - m_fetcher(new WebImageFetcher(this)), + m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))), m_selectedCount(0), m_allowDuplicates(false), m_polished(false), @@ -385,7 +385,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQFileInfo &playlistFil Playlist::Playlist(PlaylistCollection *collection, bool delaySetup) : KListView(collection->playlistStack()), m_collection(collection), - m_fetcher(new WebImageFetcher(this)), + m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))), m_selectedCount(0), m_allowDuplicates(false), m_polished(false), @@ -543,7 +543,7 @@ void Playlist::save() TQFile file(m_fileName); if(!file.open(IO_WriteOnly)) - return KMessageBox::error(this, i18n("Could not save to file %1.").arg(m_fileName)); + return KMessageBox::error(this, i18n("Could not save to file %1.").tqarg(m_fileName)); TQTextStream stream(&file); @@ -727,12 +727,12 @@ void Playlist::synchronizePlayingItems(const PlaylistList &sources, bool setMast void Playlist::copy() { - kapp->clipboard()->setData(dragObject(0), QClipboard::Clipboard); + kapp->tqclipboard()->setData(dragObject(0), TQClipboard::Clipboard); } void Playlist::paste() { - decode(kapp->clipboard()->data(), static_cast<PlaylistItem *>(currentItem())); + decode(kapp->tqclipboard()->data(), static_cast<PlaylistItem *>(currentItem())); } void Playlist::clear() @@ -750,7 +750,7 @@ void Playlist::slotRefresh() if(l.isEmpty()) l = visibleItems(); - KApplication::setOverrideCursor(Qt::waitCursor); + KApplication::setOverrideCursor(TQt::waitCursor); for(PlaylistItemList::Iterator it = l.begin(); it != l.end(); ++it) { (*it)->refreshFromDisk(); @@ -800,7 +800,7 @@ void Playlist::slotRemoveCover() return; int button = KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to delete these covers?"), - TQString::null, + TQString(), i18n("&Delete Covers")); if(button == KMessageBox::Continue) refreshAlbums(items); @@ -877,7 +877,7 @@ void Playlist::slotCoverChanged(int coverId) void Playlist::slotGuessTagInfo(TagGuesser::Type type) { - KApplication::setOverrideCursor(Qt::waitCursor); + KApplication::setOverrideCursor(TQt::waitCursor); PlaylistItemList items = selectedItems(); setDynamicListsFrozen(true); @@ -922,7 +922,7 @@ void Playlist::slotWeightDirty(int column) return; } - if(m_weightDirty.find(column) == m_weightDirty.end()) + if(m_weightDirty.tqfind(column) == m_weightDirty.end()) m_weightDirty.append(column); } @@ -1015,7 +1015,7 @@ void Playlist::removeFromDisk(const PlaylistItemList &items) } } -TQDragObject *Playlist::dragObject(TQWidget *parent) +TQDragObject *Playlist::dragObject(TQWidget *tqparent) { PlaylistItemList items = selectedItems(); KURL::List urls; @@ -1025,7 +1025,7 @@ TQDragObject *Playlist::dragObject(TQWidget *parent) urls.append(url); } - KURLDrag *drag = new KURLDrag(urls, parent, "Playlist Items"); + KURLDrag *drag = new KURLDrag(urls, tqparent, "Playlist Items"); drag->setPixmap(BarIcon("sound")); return drag; @@ -1110,11 +1110,11 @@ void Playlist::decode(TQMimeSource *s, PlaylistItem *item) bool Playlist::eventFilter(TQObject *watched, TQEvent *e) { - if(watched == header()) { + if(TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(header())) { switch(e->type()) { case TQEvent::MouseMove: { - if((static_cast<TQMouseEvent *>(e)->state() & LeftButton) == LeftButton && + if((TQT_TQMOUSEEVENT(e)->state() & Qt::LeftButton) == Qt::LeftButton && !action<KToggleAction>("resizeColumnsManually")->isChecked()) { m_columnWidthModeChanged = true; @@ -1127,7 +1127,7 @@ bool Playlist::eventFilter(TQObject *watched, TQEvent *e) } case TQEvent::MouseButtonPress: { - if(static_cast<TQMouseEvent *>(e)->button() == RightButton) + if(TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton) m_headerMenu->popup(TQCursor::pos()); break; @@ -1161,7 +1161,7 @@ void Playlist::keyPressEvent(TQKeyEvent *event) TQListViewItemIterator visible(this, TQListViewItemIterator::IteratorFlag( TQListViewItemIterator::Visible)); if(selected.current() == visible.current()) - KApplication::postEvent(parent(), new FocusUpEvent); + KApplication::postEvent(tqparent(), new FocusUpEvent); } } @@ -1247,7 +1247,7 @@ void Playlist::contentsMouseDoubleClickEvent(TQMouseEvent *e) // Filter out non left button double clicks, that way users don't have the // weird experience of switching songs from a double right-click. - if(e->button() == LeftButton) + if(e->button() == Qt::LeftButton) KListView::contentsMouseDoubleClickEvent(e); } @@ -1353,7 +1353,7 @@ void Playlist::addFiles(const TQStringList &files, PlaylistItem *after) if(!after) after = static_cast<PlaylistItem *>(lastItem()); - KApplication::setOverrideCursor(Qt::waitCursor); + KApplication::setOverrideCursor(TQt::waitCursor); m_blockDataChanged = true; @@ -1375,22 +1375,22 @@ void Playlist::addFiles(const TQStringList &files, PlaylistItem *after) void Playlist::refreshAlbums(const PlaylistItemList &items, coverKey id) { - TQValueList< QPair<TQString, TQString> > albums; + TQValueList< TQPair<TQString, TQString> > albums; bool setAlbumCovers = items.count() == 1; for(PlaylistItemList::ConstIterator it = items.begin(); it != items.end(); ++it) { TQString artist = (*it)->file().tag()->artist(); TQString album = (*it)->file().tag()->album(); - if(albums.find(qMakePair(artist, album)) == albums.end()) - albums.append(qMakePair(artist, album)); + if(albums.tqfind(tqMakePair(artist, album)) == albums.end()) + albums.append(tqMakePair(artist, album)); (*it)->file().coverInfo()->setCoverId(id); if(setAlbumCovers) (*it)->file().coverInfo()->applyCoverToWholeAlbum(true); } - for(TQValueList< QPair<TQString, TQString> >::ConstIterator it = albums.begin(); + for(TQValueList< TQPair<TQString, TQString> >::ConstIterator it = albums.begin(); it != albums.end(); ++it) { refreshAlbum((*it).first, (*it).second); @@ -1545,7 +1545,7 @@ void Playlist::polish() // setup header RMB menu ////////////////////////////////////////////////// - m_columnVisibleAction = new KActionMenu(i18n("&Show Columns"), this, "showColumns"); + m_columnVisibleAction = new KActionMenu(i18n("&Show Columns"), TQT_TQOBJECT(this), "showColumns"); m_headerMenu = m_columnVisibleAction->popupMenu(); m_headerMenu->insertTitle(i18n("Show")); @@ -1636,7 +1636,7 @@ void Playlist::slotPopulateBackMenu() const void Playlist::slotPlayFromBackMenu(int number) const { - if(!m_backMenuItems.contains(number)) + if(!m_backMenuItems.tqcontains(number)) return; TrackSequenceManager::instance()->setNextItem(m_backMenuItems[number]); @@ -1947,7 +1947,7 @@ void Playlist::slotUpdateColumnWidths() minimumWidth[column] = header()->fontMetrics().width(header()->label(column)) + 10; minimumWidthTotal += minimumWidth[column]; - minimumFixedWidth[column] = QMAX(minimumWidth[column], m_columnFixedWidths[column]); + minimumFixedWidth[column] = TQMAX(minimumWidth[column], m_columnFixedWidths[column]); minimumFixedWidthTotal += minimumFixedWidth[column]; } @@ -2127,7 +2127,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c if(showEdit) m_rmbMenu->changeItem(m_rmbEditID, - i18n("Edit '%1'").arg(columnText(column + columnOffset()))); + i18n("Edit '%1'").tqarg(columnText(column + columnOffset()))); m_rmbMenu->setItemVisible(m_rmbEditID, showEdit); @@ -2239,7 +2239,7 @@ void Playlist::slotInlineEditDone(TQListViewItem *, const TQString &, int column (l.count() > 1 && KMessageBox::warningContinueCancel( 0, i18n("This will edit multiple files. Are you sure?"), - TQString::null, + TQString(), i18n("Edit"), "DontWarnMultipleTags") == KMessageBox::Cancel)) { diff --git a/juk/playlist.h b/juk/playlist.h index aa1e1d84..d9273834 100644 --- a/juk/playlist.h +++ b/juk/playlist.h @@ -46,13 +46,14 @@ typedef TQValueList<PlaylistItem *> PlaylistItemList; class Playlist : public KListView, public PlaylistInterface { Q_OBJECT + TQ_OBJECT public: - Playlist(PlaylistCollection *collection, const TQString &name = TQString::null, + Playlist(PlaylistCollection *collection, const TQString &name = TQString(), const TQString &iconName = "midi"); Playlist(PlaylistCollection *collection, const PlaylistItemList &items, - const TQString &name = TQString::null, const TQString &iconName = "midi"); + const TQString &name = TQString(), const TQString &iconName = "midi"); Playlist(PlaylistCollection *collection, const TQFileInfo &playlistFile, const TQString &iconName = "midi"); @@ -192,7 +193,7 @@ public: /** * Returns the file name associated with this playlist (an m3u file) or - * TQString::null if no such file exists. + * TQString() if no such file exists. */ TQString fileName() const { return m_fileName; } @@ -419,7 +420,7 @@ protected: virtual bool eventFilter(TQObject *watched, TQEvent *e); virtual void keyPressEvent(TQKeyEvent *e); - virtual TQDragObject *dragObject(TQWidget *parent); + virtual TQDragObject *dragObject(TQWidget *tqparent); virtual TQDragObject *dragObject() { return dragObject(this); } virtual bool canDecode(TQMimeSource *s); virtual void decode(TQMimeSource *s, PlaylistItem *item = 0); @@ -434,7 +435,7 @@ protected: virtual void insertItem(TQListViewItem *item); virtual void takeItem(TQListViewItem *item); - virtual bool hasItem(const TQString &file) const { return m_members.contains(file); } + virtual bool hasItem(const TQString &file) const { return m_members.tqcontains(file); } void addColumn(const TQString &label); @@ -456,7 +457,7 @@ protected: void setupItem(PlaylistItem *item); /** - * Forwards the call to the parent to enable or disable automatic deletion + * Forwards the call to the tqparent to enable or disable automatic deletion * of tree view playlists. Used by CollectionListItem. */ void setDynamicListsFrozen(bool frozen); @@ -711,7 +712,7 @@ private: bool processEvents(); -class FocusUpEvent : public QCustomEvent +class FocusUpEvent : public TQCustomEvent { public: FocusUpEvent() : TQCustomEvent(id) {} diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp index 32e874b9..a0d8b5c8 100644 --- a/juk/playlistbox.cpp +++ b/juk/playlistbox.cpp @@ -46,9 +46,9 @@ using namespace ActionCollection; // PlaylistBox public methods //////////////////////////////////////////////////////////////////////////////// -PlaylistBox::PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack, +PlaylistBox::PlaylistBox(TQWidget *tqparent, TQWidgetStack *playlistStack, const char *name) : - KListView(parent, name), + KListView(tqparent, name), PlaylistCollection(playlistStack), m_viewModeIndex(0), m_hasSelection(false), @@ -91,7 +91,7 @@ PlaylistBox::PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack, // add the view modes stuff KSelectAction *viewModeAction = - new KSelectAction(i18n("View Modes"), "view_choose", KShortcut(), actions(), "viewModeMenu"); + new KSelectAction(i18n("View Modes"), "view_choose", KShortcut(), ActionCollection::actions(), "viewModeMenu"); m_viewModes.append(new ViewMode(this)); m_viewModes.append(new CompactViewMode(this)); @@ -171,7 +171,7 @@ void PlaylistBox::raise(Playlist *playlist) if(!playlist) return; - Item *i = m_playlistDict.find(playlist); + Item *i = m_playlistDict.tqfind(playlist); if(i) { clearSelection(); @@ -208,7 +208,7 @@ void PlaylistBox::duplicate() void PlaylistBox::paste() { Item *i = static_cast<Item *>(currentItem()); - decode(kapp->clipboard()->data(), i); + decode(kapp->tqclipboard()->data(), i); } //////////////////////////////////////////////////////////////////////////////// @@ -230,15 +230,15 @@ void PlaylistBox::setupPlaylist(Playlist *playlist, const TQString &iconName) setupPlaylist(playlist, iconName, 0); } -void PlaylistBox::setupPlaylist(Playlist *playlist, const TQString &iconName, Item *parentItem) +void PlaylistBox::setupPlaylist(Playlist *playlist, const TQString &iconName, Item *tqparentItem) { connect(playlist, TQT_SIGNAL(signalPlaylistItemsDropped(Playlist *)), TQT_SLOT(slotPlaylistItemsDropped(Playlist *))); PlaylistCollection::setupPlaylist(playlist, iconName); - if(parentItem) - new Item(parentItem, iconName, playlist->name(), playlist); + if(tqparentItem) + new Item(tqparentItem, iconName, playlist->name(), playlist); else new Item(this, iconName, playlist->name(), playlist); } @@ -289,7 +289,7 @@ void PlaylistBox::remove() if(!files.isEmpty()) { int remove = KMessageBox::warningYesNoCancelList( - this, i18n("Do you want to delete these files from the disk as well?"), files, TQString::null, KStdGuiItem::del(), i18n("Keep")); + this, i18n("Do you want to delete these files from the disk as well?"), files, TQString(), KStdGuiItem::del(), i18n("Keep")); if(remove == KMessageBox::Yes) { TQStringList couldNotDelete; @@ -445,7 +445,7 @@ void PlaylistBox::contentsDropEvent(TQDropEvent *e) if(m_dropItem) { Item *old = m_dropItem; m_dropItem = 0; - old->repaint(); + old->tqrepaint(); } } @@ -493,14 +493,14 @@ void PlaylistBox::contentsDragMoveEvent(TQDragMoveEvent *e) if(e->isAccepted()) { m_dropItem = target; - target->repaint(); + target->tqrepaint(); m_showTimer->start(1500, true); } else m_dropItem = 0; if(old) - old->repaint(); + old->tqrepaint(); } } else { @@ -517,21 +517,21 @@ void PlaylistBox::contentsDragLeaveEvent(TQDragLeaveEvent *e) if(m_dropItem) { Item *old = m_dropItem; m_dropItem = 0; - old->repaint(); + old->tqrepaint(); } KListView::contentsDragLeaveEvent(e); } void PlaylistBox::contentsMousePressEvent(TQMouseEvent *e) { - if(e->button() == LeftButton) + if(e->button() == Qt::LeftButton) m_doingMultiSelect = true; KListView::contentsMousePressEvent(e); } void PlaylistBox::contentsMouseReleaseEvent(TQMouseEvent *e) { - if(e->button() == LeftButton) { + if(e->button() == Qt::LeftButton) { m_doingMultiSelect = false; slotPlaylistChanged(); } @@ -692,8 +692,8 @@ PlaylistBox::Item::Item(PlaylistBox *listBox, const TQString &icon, const TQStri init(); } -PlaylistBox::Item::Item(Item *parent, const TQString &icon, const TQString &text, Playlist *l) - : TQObject(parent->listView()), KListViewItem(parent, text), +PlaylistBox::Item::Item(Item *tqparent, const TQString &icon, const TQString &text, Playlist *l) + : TQObject(tqparent->listView()), KListViewItem(tqparent, text), m_playlist(l), m_text(text), m_iconName(icon), m_sortedFirst(false) { init(); @@ -722,10 +722,10 @@ int PlaylistBox::Item::compare(TQListViewItem *i, int col, bool) const return text(col).lower().localeAwareCompare(i->text(col).lower()); } -void PlaylistBox::Item::paintCell(TQPainter *painter, const TQColorGroup &colorGroup, int column, int width, int align) +void PlaylistBox::Item::paintCell(TQPainter *painter, const TQColorGroup &tqcolorGroup, int column, int width, int align) { PlaylistBox *playlistBox = static_cast<PlaylistBox *>(listView()); - playlistBox->viewMode()->paintCell(this, painter, colorGroup, column, width, align); + playlistBox->viewMode()->paintCell(this, painter, tqcolorGroup, column, width, align); } void PlaylistBox::Item::setText(int column, const TQString &text) diff --git a/juk/playlistbox.h b/juk/playlistbox.h index 482f4771..cc8159a2 100644 --- a/juk/playlistbox.h +++ b/juk/playlistbox.h @@ -41,6 +41,7 @@ typedef TQValueList<Playlist *> PlaylistList; class PlaylistBox : public KListView, public PlaylistCollection { Q_OBJECT + TQ_OBJECT public: class Item; @@ -48,7 +49,7 @@ public: friend class Item; - PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack, + PlaylistBox(TQWidget *tqparent, TQWidgetStack *playlistStack, const char *name = 0); virtual ~PlaylistBox(); @@ -65,7 +66,7 @@ public: Item *dropItem() const { return m_dropItem; } - void setupPlaylist(Playlist *playlist, const TQString &iconName, Item *parentItem = 0); + void setupPlaylist(Playlist *playlist, const TQString &iconName, Item *tqparentItem = 0); public slots: void paste(); @@ -141,8 +142,9 @@ class PlaylistBox::Item : public TQObject, public KListViewItem friend class TreeViewMode; Q_OBJECT + TQ_OBJECT - // moc won't let me create private TQObject subclasses and Qt won't let me + // tqmoc won't let me create private TQObject subclasses and TQt won't let me // make the destructor protected, so here's the closest hack that will // compile. @@ -151,7 +153,7 @@ public: protected: Item(PlaylistBox *listBox, const TQString &icon, const TQString &text, Playlist *l = 0); - Item(Item *parent, const TQString &icon, const TQString &text, Playlist *l = 0); + Item(Item *tqparent, const TQString &icon, const TQString &text, Playlist *l = 0); Playlist *playlist() const { return m_playlist; } PlaylistBox *listView() const { return static_cast<PlaylistBox *>(KListViewItem::listView()); } @@ -160,7 +162,7 @@ protected: void setSortedFirst(bool first = true) { m_sortedFirst = first; } virtual int compare(TQListViewItem *i, int col, bool) const; - virtual void paintCell(TQPainter *p, const TQColorGroup &colorGroup, int column, int width, int align); + virtual void paintCell(TQPainter *p, const TQColorGroup &tqcolorGroup, int column, int width, int align); virtual void paintFocus(TQPainter *, const TQColorGroup &, const TQRect &) {} virtual void setText(int column, const TQString &text); diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp index 2c30c692..6a248b39 100644 --- a/juk/playlistcollection.cpp +++ b/juk/playlistcollection.cpp @@ -158,7 +158,7 @@ TQStringList PlaylistCollection::playlists() const TQObjectList *childList = m_playlistStack->queryList("Playlist"); TQObject *obj; for(obj = childList->first(); obj; obj = childList->next()) { - Playlist *p = static_cast<Playlist *>(obj); + Playlist *p = static_cast<Playlist *>(TQT_TQWIDGET(obj)); l.append(p->name()); } @@ -223,7 +223,7 @@ void PlaylistCollection::showMore(const TQString &artist, const TQString &album) // so cache the value we want it to have now. Playlist *belowShowMore = visiblePlaylist(); - PlaylistCollection::setupPlaylist(m_showMorePlaylist, TQString::null); + PlaylistCollection::setupPlaylist(m_showMorePlaylist, TQString()); PlaylistCollection::raise(m_showMorePlaylist); m_belowShowMorePlaylist = belowShowMore; @@ -252,12 +252,12 @@ void PlaylistCollection::removeTrack(const TQString &playlist, const TQStringLis TQString PlaylistCollection::playlist() const { - return visiblePlaylist() ? visiblePlaylist()->name() : TQString::null; + return visiblePlaylist() ? visiblePlaylist()->name() : TQString(); } TQString PlaylistCollection::playingPlaylist() const { - return currentPlaylist() && m_playing ? currentPlaylist()->name() : TQString::null; + return currentPlaylist() && m_playing ? currentPlaylist()->name() : TQString(); } void PlaylistCollection::setPlaylist(const TQString &playlist) @@ -281,7 +281,7 @@ TQString PlaylistCollection::trackProperty(const TQString &file, const TQString CollectionList *l = CollectionList::instance(); CollectionListItem *item = l->lookup(file); - return item ? item->file().property(property) : TQString::null; + return item ? item->file().property(property) : TQString(); } TQPixmap PlaylistCollection::trackCover(const TQString &file, const TQString &size) const @@ -320,7 +320,7 @@ void PlaylistCollection::open(const TQStringList &l) KMessageBox::questionYesNo( widget, i18n("Do you want to add these items to the current list or to the collection list?"), - TQString::null, + TQString(), KGuiItem(i18n("Current")), KGuiItem(i18n("Collection"))) == KMessageBox::No) { @@ -509,7 +509,7 @@ void PlaylistCollection::createFolderPlaylist() if(folder.isEmpty()) return; - TQString name = uniquePlaylistName(folder.mid(folder.findRev('/') + 1)); + TQString name = uniquePlaylistName(folder.mid(folder.tqfindRev('/') + 1)); name = playlistNameDialog(i18n("Create Folder Playlist"), name); if(!name.isNull()) @@ -681,7 +681,7 @@ bool PlaylistCollection::importPlaylists() const bool PlaylistCollection::containsPlaylistFile(const TQString &file) const { - return m_playlistFiles.contains(file); + return m_playlistFiles.tqcontains(file); } bool PlaylistCollection::showMoreActive() const @@ -706,7 +706,7 @@ void PlaylistCollection::clearShowMore(bool raisePlaylist) void PlaylistCollection::enableDirWatch(bool enable) { - TQObject *collection = CollectionList::instance(); + TQObject *collection = TQT_TQOBJECT(CollectionList::instance()); m_dirLister.disconnect(object()); if(enable) { @@ -731,7 +731,7 @@ TQString PlaylistCollection::playlistNameDialog(const TQString &caption, forceUnique ? uniquePlaylistName(suggest) : suggest, &ok); - return ok ? uniquePlaylistName(name) : TQString::null; + return ok ? uniquePlaylistName(name) : TQString(); } @@ -740,18 +740,18 @@ TQString PlaylistCollection::uniquePlaylistName(const TQString &suggest) const if(suggest.isEmpty()) return uniquePlaylistName(); - if(!m_playlistNames.contains(suggest)) + if(!m_playlistNames.tqcontains(suggest)) return suggest; TQString base = suggest; base.remove(TQRegExp("\\s\\([0-9]+\\)$")); int count = 1; - TQString s = TQString("%1 (%2)").arg(base).arg(count); + TQString s = TQString("%1 (%2)").tqarg(base).tqarg(count); - while(m_playlistNames.contains(s)) { + while(m_playlistNames.tqcontains(s)) { count++; - s = TQString("%1 (%2)").arg(base).arg(count); + s = TQString("%1 (%2)").tqarg(base).tqarg(count); } return s; @@ -789,7 +789,7 @@ Playlist *PlaylistCollection::playlistByName(const TQString &name) const TQObject *obj; for(obj = l->first(); obj; obj = l->next()) { - Playlist *p = static_cast<Playlist*>(obj); + Playlist *p = static_cast<Playlist*>(TQT_TQWIDGET(obj)); if(p->name() == name) { list = p; break; @@ -845,14 +845,14 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection) menu->insert(createAction(i18n("&Empty Playlist..."), TQT_SLOT(slotCreatePlaylist()), "newPlaylist", "window_new", "CTRL+n")); menu->insert(createAction(i18n("&Search Playlist..."), TQT_SLOT(slotCreateSearchPlaylist()), - "newSearchPlaylist", "find", "CTRL+f")); + "newSearchPlaylist", "tqfind", "CTRL+f")); menu->insert(createAction(i18n("Playlist From &Folder..."), TQT_SLOT(slotCreateFolderPlaylist()), "newDirectoryPlaylist", "fileopen", "CTRL+d")); // Guess tag info menu #if HAVE_MUSICBRAINZ - menu = new KActionMenu(i18n("&Guess Tag Information"), TQString::null, actions(), "guessTag"); + menu = new KActionMenu(i18n("&Guess Tag Information"), TQString(), actions(), "guessTag"); menu->setIconSet(SmallIconSet("wizard")); menu->insert(createAction(i18n("From &File Name"), TQT_SLOT(slotGuessTagFromFile()), @@ -882,7 +882,7 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection) createAction(i18n("Refresh"), TQT_SLOT(slotRefreshItems()), "refresh", "reload"); createAction(i18n("&Rename File"), TQT_SLOT(slotRenameItems()), "renameFile", "filesaveas", "CTRL+r"); - menu = new KActionMenu(i18n("Cover Manager"), TQString::null, actions(), "coverManager"); + menu = new KActionMenu(i18n("Cover Manager"), TQString(), actions(), "coverManager"); menu->setIconSet(SmallIconSet("image")); menu->insert(createAction(i18n("&View Cover"), TQT_SLOT(slotViewCovers()), "viewCover", "viewmag")); diff --git a/juk/playlistcollection.h b/juk/playlistcollection.h index 3c7eecbd..92b5ea0d 100644 --- a/juk/playlistcollection.h +++ b/juk/playlistcollection.h @@ -66,7 +66,7 @@ public: virtual TQStringList playlists() const; virtual void createPlaylist(const TQString &name); virtual void createDynamicPlaylist(const PlaylistList &playlists); - virtual void showMore(const TQString &artist, const TQString &album = TQString::null); + virtual void showMore(const TQString &artist, const TQString &album = TQString()); virtual void removeTrack(const TQString &playlist, const TQStringList &files); virtual TQString playlist() const; @@ -166,7 +166,7 @@ protected: bool containsPlaylistFile(const TQString &file) const; TQString playlistNameDialog(const TQString &caption = i18n("Create New Playlist"), - const TQString &suggest = TQString::null, + const TQString &suggest = TQString(), bool forceUnique = true) const; TQString uniquePlaylistName(const TQString &suggest = i18n("Playlist")) const; @@ -207,9 +207,10 @@ private: * activations without requiring PlaylistCollection to be a TQObject. */ -class PlaylistCollection::ActionHandler : public QObject +class PlaylistCollection::ActionHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: ActionHandler(PlaylistCollection *collection); @@ -217,7 +218,7 @@ private: KAction *createAction(const TQString &text, const char *slot, const char *name, - const TQString &icon = TQString::null, + const TQString &icon = TQString(), const KShortcut &shortcut = KShortcut()); private slots: void slotPlayFirst() { m_collection->playFirst(); } diff --git a/juk/playlistexporter.h b/juk/playlistexporter.h index de9f7fff..ca7d0dc6 100644 --- a/juk/playlistexporter.h +++ b/juk/playlistexporter.h @@ -28,10 +28,10 @@ class KActionCollection; * @author Michael Pyne <michael.pyne@kdemail.net> * @see K3bExporter */ -class PlaylistExporter : public QObject +class PlaylistExporter : public TQObject { public: - PlaylistExporter(TQWidget *parent = 0) : TQObject(parent) { } + PlaylistExporter(TQWidget *tqparent = 0) : TQObject(tqparent) { } virtual ~PlaylistExporter() { } /** diff --git a/juk/playlistitem.cpp b/juk/playlistitem.cpp index bdb41395..951fdb41 100644 --- a/juk/playlistitem.cpp +++ b/juk/playlistitem.cpp @@ -53,7 +53,7 @@ PlaylistItem::~PlaylistItem() m_collectionItem->removeChildItem(this); - if(m_playingItems.find(this) != m_playingItems.end()) { + if(m_playingItems.tqfind(this) != m_playingItems.end()) { m_playingItems.remove(this); if(m_playingItems.isEmpty()) playlist()->setPlaying(0); @@ -94,7 +94,7 @@ const TQPixmap *PlaylistItem::pixmap(int column) const return ℑ if(column == playlist()->leftColumn() && - m_playingItems.contains(const_cast<PlaylistItem *>(this))) + m_playingItems.tqcontains(const_cast<PlaylistItem *>(this))) return &playing; return KListViewItem::pixmap(column); @@ -103,7 +103,7 @@ const TQPixmap *PlaylistItem::pixmap(int column) const TQString PlaylistItem::text(int column) const { if(!d->fileHandle.tag()) - return TQString::null; + return TQString(); int offset = playlist()->columnOffset(); @@ -115,17 +115,17 @@ TQString PlaylistItem::text(int column) const case AlbumColumn: return d->fileHandle.tag()->album(); case CoverColumn: - return TQString::null; + return TQString(); case TrackNumberColumn: return d->fileHandle.tag()->track() > 0 ? TQString::number(d->fileHandle.tag()->track()) - : TQString::null; + : TQString(); case GenreColumn: return d->fileHandle.tag()->genre(); case YearColumn: return d->fileHandle.tag()->year() > 0 ? TQString::number(d->fileHandle.tag()->year()) - : TQString::null; + : TQString(); case LengthColumn: return d->fileHandle.tag()->lengthString(); case BitrateColumn: @@ -145,7 +145,7 @@ void PlaylistItem::setText(int column, const TQString &text) { int offset = playlist()->columnOffset(); if(column - offset >= 0 && column + offset <= lastColumn()) { - KListViewItem::setText(column, TQString::null); + KListViewItem::setText(column, TQString()); return; } @@ -239,16 +239,16 @@ void PlaylistItem::clear() // PlaylistItem protected methods //////////////////////////////////////////////////////////////////////////////// -PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent) : - KListViewItem(parent), +PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *tqparent) : + KListViewItem(tqparent), d(0), m_watched(0) { setup(item); } -PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after) : - KListViewItem(parent, after), +PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListViewItem *after) : + KListViewItem(tqparent, after), d(0), m_watched(0) { @@ -258,8 +258,8 @@ PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent, TQListVie // This constructor should only be used by the CollectionList subclass. -PlaylistItem::PlaylistItem(CollectionList *parent) : - KListViewItem(parent), +PlaylistItem::PlaylistItem(CollectionList *tqparent) : + KListViewItem(tqparent), m_watched(0) { d = new Data; @@ -269,13 +269,13 @@ PlaylistItem::PlaylistItem(CollectionList *parent) : void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align) { - if(!m_playingItems.contains(this)) + if(!m_playingItems.tqcontains(this)) return KListViewItem::paintCell(p, cg, column, width, align); - TQColorGroup colorGroup = cg; + TQColorGroup tqcolorGroup = cg; - TQColor base = colorGroup.base(); - TQColor selection = colorGroup.highlight(); + TQColor base = tqcolorGroup.base(); + TQColor selection = tqcolorGroup.highlight(); int r = (base.red() + selection.red()) / 2; int b = (base.blue() + selection.blue()) / 2; @@ -283,13 +283,13 @@ void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, i TQColor c(r, g, b); - colorGroup.setColor(TQColorGroup::Base, c); - TQListViewItem::paintCell(p, colorGroup, column, width, align); + tqcolorGroup.setColor(TQColorGroup::Base, c); + TQListViewItem::paintCell(p, tqcolorGroup, column, width, align); } int PlaylistItem::compare(TQListViewItem *item, int column, bool ascending) const { - // reimplemented from QListViewItem + // reimplemented from TQListViewItem int offset = playlist()->columnOffset(); diff --git a/juk/playlistitem.h b/juk/playlistitem.h index 9b9cfa80..d8797208 100644 --- a/juk/playlistitem.h +++ b/juk/playlistitem.h @@ -156,13 +156,13 @@ protected: * Items should always be created using Playlist::createItem() or through a * subclss or friend class. */ - PlaylistItem(CollectionListItem *item, Playlist *parent); - PlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after); + PlaylistItem(CollectionListItem *item, Playlist *tqparent); + PlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListViewItem *after); /** * This is the constructor that shold be used by subclasses. */ - PlaylistItem(CollectionList *parent); + PlaylistItem(CollectionList *tqparent); /** * See the class documentation for an explanation of construction and deletion diff --git a/juk/playlistsearch.cpp b/juk/playlistsearch.cpp index 940c13e8..f0eb7a29 100644 --- a/juk/playlistsearch.cpp +++ b/juk/playlistsearch.cpp @@ -197,7 +197,7 @@ bool PlaylistSearch::Component::matches(PlaylistItem *item) const for(ColumnList::Iterator it = m_columns.begin(); it != m_columns.end(); ++it) { if(m_re) { - if(item->text(*it).find(m_queryRe) > -1) + if(item->text(*it).tqfind(m_queryRe) > -1) return true; else break; @@ -205,7 +205,7 @@ bool PlaylistSearch::Component::matches(PlaylistItem *item) const switch(m_mode) { case Contains: - if(item->text(*it).find(m_query, 0, m_caseSensitive) > -1) + if(item->text(*it).tqfind(m_query, 0, m_caseSensitive) > -1) return true; break; case Exact: @@ -221,7 +221,7 @@ bool PlaylistSearch::Component::matches(PlaylistItem *item) const case ContainsWord: { TQString s = item->text(*it); - int i = s.find(m_query, 0, m_caseSensitive); + int i = s.tqfind(m_query, 0, m_caseSensitive); if(i >= 0) { @@ -270,7 +270,7 @@ bool PlaylistSearch::Component::operator==(const Component &v) const TQDataStream &operator<<(TQDataStream &s, const PlaylistSearch &search) { s << search.components() - << Q_INT32(search.searchMode()); + << TQ_INT32(search.searchMode()); return s; } @@ -287,7 +287,7 @@ TQDataStream &operator>>(TQDataStream &s, PlaylistSearch &search) for(; it != components.end(); ++it) search.addComponent(*it); - Q_INT32 mode; + TQ_INT32 mode; s >> mode; search.setSearchMode(PlaylistSearch::SearchMode(mode)); @@ -296,11 +296,11 @@ TQDataStream &operator>>(TQDataStream &s, PlaylistSearch &search) TQDataStream &operator<<(TQDataStream &s, const PlaylistSearch::Component &c) { - s << c.isPatternSearch() - << (c.isPatternSearch() ? c.pattern().pattern() : c.query()) - << c.isCaseSensitive() - << c.columns() - << Q_INT32(c.matchMode()); + s << c.isPatternSearch(); + s << (c.isPatternSearch() ? c.pattern().pattern() : c.query()); + s << c.isCaseSensitive(); + s << c.columns(); + s << TQ_INT32(c.matchMode()); return s; } @@ -311,7 +311,7 @@ TQDataStream &operator>>(TQDataStream &s, PlaylistSearch::Component &c) TQString pattern; bool caseSensitive; ColumnList columns; - Q_INT32 mode; + TQ_INT32 mode; s >> patternSearch >> pattern diff --git a/juk/playlistsearch.h b/juk/playlistsearch.h index 7281ba13..44e0b03c 100644 --- a/juk/playlistsearch.h +++ b/juk/playlistsearch.h @@ -17,6 +17,7 @@ #define PLAYLISTSEARCH_H #include <tqregexp.h> +#include <tqvaluelist.h> class Playlist; typedef TQValueList<Playlist *> PlaylistList; diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp index 3454ee3d..8731c30f 100644 --- a/juk/playlistsplitter.cpp +++ b/juk/playlistsplitter.cpp @@ -34,8 +34,8 @@ using namespace ActionCollection; // public methods //////////////////////////////////////////////////////////////////////////////// -PlaylistSplitter::PlaylistSplitter(TQWidget *parent, const char *name) : - TQSplitter(Qt::Horizontal, parent, name), +PlaylistSplitter::PlaylistSplitter(TQWidget *tqparent, const char *name) : + TQSplitter(Qt::Horizontal, tqparent, name), m_newVisible(0), m_playlistBox(0), m_searchWidget(0), @@ -94,7 +94,7 @@ void PlaylistSplitter::slotFocusCurrentPlaylist() if(!item) return; - // A little bit of a hack to make TQListView repaint things properly. Switch + // A little bit of a hack to make TQListView tqrepaint things properly. Switch // to single selection mode, set the selection and then switch back. playlist->setSelectionMode(TQListView::Single); @@ -118,10 +118,10 @@ Playlist *PlaylistSplitter::visiblePlaylist() const void PlaylistSplitter::setupActions() { KToggleAction *showSearch = - new KToggleAction(i18n("Show &Search Bar"), "filefind", 0, actions(), "showSearch"); + new KToggleAction(i18n("Show &Search Bar"), "filetqfind", 0, ActionCollection::actions(), "showSearch"); showSearch->setCheckedState(i18n("Hide &Search Bar")); - new KAction(i18n("Edit Track Search"), "edit_clear", "F6", this, TQT_SLOT(setFocus()), actions(), "editTrackSearch"); + new KAction(i18n("Edit Track Search"), "edit_clear", "F6", TQT_TQOBJECT(this), TQT_SLOT(setFocus()), ActionCollection::actions(), "editTrackSearch"); } void PlaylistSplitter::setupLayout() diff --git a/juk/playlistsplitter.h b/juk/playlistsplitter.h index cc163640..4865fa22 100644 --- a/juk/playlistsplitter.h +++ b/juk/playlistsplitter.h @@ -30,7 +30,7 @@ class PlaylistInterface; class TagEditor; /** - * This is the main layout class of JuK. It should contain a PlaylistBox and + * This is the main tqlayout class of JuK. It should contain a PlaylistBox and * a TQWidgetStack of the Playlists. * * This class serves as a "mediator" (see "Design Patterns") between the JuK @@ -38,12 +38,13 @@ class TagEditor; * non-Playlist related classes should be through the public API of this class. */ -class PlaylistSplitter : public QSplitter +class PlaylistSplitter : public TQSplitter { Q_OBJECT + TQ_OBJECT public: - PlaylistSplitter(TQWidget *parent, const char *name = 0); + PlaylistSplitter(TQWidget *tqparent, const char *name = 0); virtual ~PlaylistSplitter(); PlaylistInterface *playlist() const { return m_playlistBox; } diff --git a/juk/searchplaylist.cpp b/juk/searchplaylist.cpp index ba1be917..da4f54ce 100644 --- a/juk/searchplaylist.cpp +++ b/juk/searchplaylist.cpp @@ -30,7 +30,7 @@ SearchPlaylist::SearchPlaylist(PlaylistCollection *collection, const TQString &name, bool setupPlaylist, bool synchronizePlaying) : - DynamicPlaylist(search.playlists(), collection, name, "find", + DynamicPlaylist(search.playlists(), collection, name, "tqfind", setupPlaylist, synchronizePlaying), m_search(search) { diff --git a/juk/searchplaylist.h b/juk/searchplaylist.h index 8152670a..5e22baaf 100644 --- a/juk/searchplaylist.h +++ b/juk/searchplaylist.h @@ -21,10 +21,11 @@ class SearchPlaylist : public DynamicPlaylist { Q_OBJECT + TQ_OBJECT public: SearchPlaylist(PlaylistCollection *collection, const PlaylistSearch &search = PlaylistSearch(), - const TQString &name = TQString::null, + const TQString &name = TQString(), bool setupPlaylist = true, bool synchronizePlaying = false); diff --git a/juk/searchwidget.cpp b/juk/searchwidget.cpp index a9b8d868..a0a110fa 100644 --- a/juk/searchwidget.cpp +++ b/juk/searchwidget.cpp @@ -1,6 +1,6 @@ /*************************************************************************** begin : Sun Mar 6 2003 - copyright : (C) 2003 by Richard Lärkäng + copyright : (C) 2003 by Richard L�rk�ng email : nouseforaname@home.se copyright : (C) 2003 - 2004 by Scott Wheeler @@ -39,8 +39,8 @@ using namespace ActionCollection; // SearchLine public methods //////////////////////////////////////////////////////////////////////////////// -SearchLine::SearchLine(TQWidget *parent, bool simple, const char *name) : - TQHBox(parent, name), +SearchLine::SearchLine(TQWidget *tqparent, bool simple, const char *name) : + TQHBox(tqparent, name), m_simple(simple), m_searchFieldsBox(0) { @@ -136,11 +136,11 @@ void SearchLine::setFocus() bool SearchLine::eventFilter(TQObject *watched, TQEvent *e) { - if(watched != m_lineEdit || e->type() != TQEvent::KeyPress) + if(TQT_BASE_OBJECT(watched) != TQT_BASE_OBJECT(m_lineEdit) || e->type() != TQEvent::KeyPress) return TQHBox::eventFilter(watched, e); - TQKeyEvent *key = static_cast<TQKeyEvent *>(e); - if(key->key() == Qt::Key_Down) + TQKeyEvent *key = TQT_TQKEYEVENT(e); + if(key->key() == TQt::Key_Down) emit signalDownPressed(); return TQHBox::eventFilter(watched, e); @@ -163,7 +163,7 @@ void SearchLine::updateColumns() TQStringList columnHeaders; - columnHeaders.append(TQString("<%1>").arg(i18n("All Visible"))); + columnHeaders.append(TQString("<%1>").tqarg(i18n("All Visible"))); Playlist *playlist = CollectionList::instance(); @@ -188,7 +188,7 @@ void SearchLine::updateColumns() // SearchWidget public methods //////////////////////////////////////////////////////////////////////////////// -SearchWidget::SearchWidget(TQWidget *parent, const char *name) : KToolBar(parent, name) +SearchWidget::SearchWidget(TQWidget *tqparent, const char *name) : KToolBar(tqparent, name) { setupLayout(); updateColumns(); diff --git a/juk/searchwidget.h b/juk/searchwidget.h index 604b289b..75f0c513 100644 --- a/juk/searchwidget.h +++ b/juk/searchwidget.h @@ -32,14 +32,15 @@ class KComboBox; class Playlist; -class SearchLine : public QHBox +class SearchLine : public TQHBox { Q_OBJECT + TQ_OBJECT public: enum Mode { Default = 0, CaseSensitive = 1, Pattern = 2 }; - SearchLine(TQWidget *parent, bool simple = false, const char *name = 0); + SearchLine(TQWidget *tqparent, bool simple = false, const char *name = 0); virtual ~SearchLine() {} PlaylistSearch::Component searchComponent() const; @@ -72,9 +73,10 @@ private: class SearchWidget : public KToolBar, public SearchIface { Q_OBJECT + TQ_OBJECT public: - SearchWidget(TQWidget *parent, const char *name = 0); + SearchWidget(TQWidget *tqparent, const char *name = 0); virtual ~SearchWidget(); PlaylistSearch search(const PlaylistList &playlists) const; diff --git a/juk/slideraction.cpp b/juk/slideraction.cpp index 22d8446b..a001fc31 100644 --- a/juk/slideraction.cpp +++ b/juk/slideraction.cpp @@ -36,24 +36,24 @@ * to the left mouse button. */ -class TrackPositionSlider : public QSlider +class TrackPositionSlider : public TQSlider { public: - TrackPositionSlider(TQWidget *parent, const char *name) : TQSlider(parent, name) + TrackPositionSlider(TQWidget *tqparent, const char *name) : TQSlider(tqparent, name) { - setFocusPolicy(NoFocus); + setFocusPolicy(TQ_NoFocus); } protected: virtual void mousePressEvent(TQMouseEvent *e) { - if(e->button() == LeftButton) { - TQMouseEvent reverse(TQEvent::MouseButtonPress, e->pos(), MidButton, e->state()); + if(e->button() == Qt::LeftButton) { + TQMouseEvent reverse(TQEvent::MouseButtonPress, e->pos(), Qt::MidButton, e->state()); TQSlider::mousePressEvent(&reverse); emit sliderPressed(); } - else if(e->button() == MidButton) { - TQMouseEvent reverse(TQEvent::MouseButtonPress, e->pos(), LeftButton, e->state()); + else if(e->button() == Qt::MidButton) { + TQMouseEvent reverse(TQEvent::MouseButtonPress, e->pos(), Qt::LeftButton, e->state()); TQSlider::mousePressEvent(&reverse); } } @@ -63,15 +63,15 @@ protected: // VolumeSlider implementation //////////////////////////////////////////////////////////////////////////////// -VolumeSlider::VolumeSlider(Orientation o, TQWidget *parent, const char *name) : - TQSlider(o, parent, name) +VolumeSlider::VolumeSlider(Qt::Orientation o, TQWidget *tqparent, const char *name) : + TQSlider(o, tqparent, name) { connect(this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int))); } void VolumeSlider::wheelEvent(TQWheelEvent *e) { - if(orientation() == Horizontal) { + if(orientation() ==Qt::Horizontal) { TQWheelEvent transposed(e->pos(), -(e->delta()), e->state(), e->orientation()); TQSlider::wheelEvent(&transposed); } @@ -86,7 +86,7 @@ void VolumeSlider::focusInEvent(TQFocusEvent *) int VolumeSlider::volume() const { - if(orientation() == Horizontal) + if(orientation() ==Qt::Horizontal) return value(); else return maxValue() - value(); @@ -94,13 +94,13 @@ int VolumeSlider::volume() const void VolumeSlider::setVolume(int value) { - if(orientation() == Horizontal) + if(orientation() ==Qt::Horizontal) setValue(value); else setValue(maxValue() - value); } -void VolumeSlider::setOrientation(Orientation o) +void VolumeSlider::setOrientation(Qt::Orientation o) { if(o == orientation()) return; @@ -113,7 +113,7 @@ void VolumeSlider::setOrientation(Orientation o) void VolumeSlider::slotValueChanged(int value) { - if(orientation() == Horizontal) + if(orientation() ==Qt::Horizontal) emit signalVolumeChanged(value); else emit signalVolumeChanged(maxValue() - value); @@ -126,8 +126,8 @@ void VolumeSlider::slotValueChanged(int value) const int SliderAction::minPosition = 0; const int SliderAction::maxPosition = 1000; -SliderAction::SliderAction(const TQString &text, TQObject *parent, const char *name) - : KAction(text, 0, parent, name), +SliderAction::SliderAction(const TQString &text, TQObject *tqparent, const char *name) + : KAction(text, 0, tqparent, name), m_toolBar(0), m_layout(0), m_trackPositionSlider(0), @@ -143,9 +143,9 @@ SliderAction::~SliderAction() } -int SliderAction::plug(TQWidget *parent, int index) +int SliderAction::plug(TQWidget *tqparent, int index) { - TQWidget *w = createWidget(parent); + TQWidget *w = createWidget(tqparent); if(!w) return -1; @@ -153,8 +153,8 @@ int SliderAction::plug(TQWidget *parent, int index) // the check for null makes sure that there is only one toolbar that this is // "plugged" in to - if(parent->inherits("KToolBar") && !m_toolBar) { - m_toolBar = static_cast<KToolBar *>(parent); + if(tqparent->inherits("KToolBar") && !m_toolBar) { + m_toolBar = static_cast<KToolBar *>(tqparent); int id = KAction::getToolButtonID(); @@ -163,7 +163,7 @@ int SliderAction::plug(TQWidget *parent, int index) addContainer(m_toolBar, id); connect(m_toolBar, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotToolbarDestroyed())); - connect(m_toolBar, TQT_SIGNAL(orientationChanged(Orientation)), + connect(m_toolBar, TQT_SIGNAL(orientationChanged(Qt::Orientation)), this, TQT_SLOT(slotUpdateOrientation())); connect(m_toolBar, TQT_SIGNAL(placeChanged(TQDockWindow::Place)), this, TQT_SLOT(slotUpdateOrientation())); @@ -178,10 +178,10 @@ int SliderAction::plug(TQWidget *parent, int index) } -void SliderAction::unplug(TQWidget *parent) +void SliderAction::unplug(TQWidget *tqparent) { - if (parent->inherits("KToolBar")) { - m_toolBar = static_cast<KToolBar *>(parent); + if (tqparent->inherits("KToolBar")) { + m_toolBar = static_cast<KToolBar *>(tqparent); int index = findContainer(m_toolBar); if (index != -1) { @@ -205,13 +205,13 @@ void SliderAction::slotUpdateOrientation() return; if(m_toolBar->barPos() == KToolBar::Right || m_toolBar->barPos() == KToolBar::Left) { - m_trackPositionSlider->setOrientation(Vertical); - m_volumeSlider->setOrientation(Vertical); + m_trackPositionSlider->setOrientation(Qt::Vertical); + m_volumeSlider->setOrientation(Qt::Vertical); m_layout->setDirection(TQBoxLayout::TopToBottom); } else { - m_trackPositionSlider->setOrientation(Horizontal); - m_volumeSlider->setOrientation(Horizontal); + m_trackPositionSlider->setOrientation(Qt::Horizontal); + m_volumeSlider->setOrientation(Qt::Horizontal); m_layout->setDirection(TQBoxLayout::LeftToRight); } slotUpdateSize(); @@ -221,24 +221,24 @@ void SliderAction::slotUpdateOrientation() // private members //////////////////////////////////////////////////////////////////////////////// -TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by base class +TQWidget *SliderAction::createWidget(TQWidget *tqparent) // virtual -- used by base class { - if(parent) { - TQWidget *base = new TQWidget(parent); - base->setBackgroundMode(parent->backgroundMode()); + if(tqparent) { + TQWidget *base = new TQWidget(tqparent); + base->setBackgroundMode(tqparent->backgroundMode()); base->setName("kde toolbar widget"); - KToolBar *toolBar = dynamic_cast<KToolBar *>(parent); + KToolBar *toolBar = dynamic_cast<KToolBar *>(tqparent); if(toolBar) toolBar->setStretchableWidget(base); - Orientation orientation; + Qt::Orientation orientation; if(toolBar && toolBar->barPos() == KToolBar::Right || toolBar->barPos() == KToolBar::Left) - orientation = Vertical; + orientation =Qt::Vertical; else - orientation = Horizontal; + orientation =Qt::Horizontal; m_layout = new TQBoxLayout(base, TQBoxLayout::TopToBottom, 5, 5); @@ -279,7 +279,7 @@ TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by bas m_layout->setStretchFactor(m_trackPositionSlider, 4); m_layout->setStretchFactor(m_volumeSlider, 1); - connect(parent, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotUpdateSize())); + connect(tqparent, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotUpdateSize())); return base; } diff --git a/juk/slideraction.h b/juk/slideraction.h index 2b88c8e3..5577a481 100644 --- a/juk/slideraction.h +++ b/juk/slideraction.h @@ -22,17 +22,18 @@ class TQBoxLayout; class TQDockWindow; -class VolumeSlider : public QSlider +class VolumeSlider : public TQSlider { Q_OBJECT + TQ_OBJECT public: - VolumeSlider(Orientation o, TQWidget *parent, const char *name); + VolumeSlider(Qt::Orientation o, TQWidget *tqparent, const char *name); int volume() const; void setVolume(int value); - void setOrientation(Orientation o); + void setOrientation(Qt::Orientation o); signals: void signalVolumeChanged(int value); @@ -48,9 +49,10 @@ private slots: class SliderAction : public KAction { Q_OBJECT + TQ_OBJECT public: - SliderAction(const TQString &text, TQObject *parent, const char *name); + SliderAction(const TQString &text, TQObject *tqparent, const char *name); virtual ~SliderAction(); VolumeSlider *volumeSlider() const { return m_volumeSlider; } @@ -59,7 +61,7 @@ public: bool dragging() const { return m_dragging; } bool volumeDragging() const { return m_volumeDragging; } - virtual int plug(TQWidget *parent, int index = -1); + virtual int plug(TQWidget *tqparent, int index = -1); virtual void unplug(TQWidget *widget); static const int minPosition; @@ -73,7 +75,7 @@ signals: void signalVolumeChanged(int volume); private: - TQWidget *createWidget(TQWidget *parent); + TQWidget *createWidget(TQWidget *tqparent); private slots: void slotUpdateSize(); diff --git a/juk/sortedstringlist.cpp b/juk/sortedstringlist.cpp index 0886a88d..904c5f01 100644 --- a/juk/sortedstringlist.cpp +++ b/juk/sortedstringlist.cpp @@ -20,11 +20,11 @@ class SortedStringList::Node { public: - Node(const TQString &value) : key(value), parent(0), left(0), right(0) {} + Node(const TQString &value) : key(value), tqparent(0), left(0), right(0) {} ~Node() {} TQString key; - Node *parent; + Node *tqparent; Node *left; Node *right; }; @@ -44,9 +44,9 @@ bool SortedStringList::insert(const TQString &value) return BSTInsert(value); } -bool SortedStringList::contains(const TQString &value) const +bool SortedStringList::tqcontains(const TQString &value) const { - return find(value); + return tqfind(value); } SortedStringList::Node *SortedStringList::treeMinimum(Node *n) const @@ -61,11 +61,11 @@ SortedStringList::Node *SortedStringList::treeSuccessor(Node *n) const if(n->right) return treeMinimum(n->right); - Node *p = n->parent; + Node *p = n->tqparent; while(p && n == p->right) { n = p; - p = p->parent; + p = p->tqparent; } return p; @@ -73,7 +73,7 @@ SortedStringList::Node *SortedStringList::treeSuccessor(Node *n) const bool SortedStringList::remove(const TQString &value) { - Node *n = find(value); + Node *n = tqfind(value); if(!n) return false; @@ -92,15 +92,15 @@ bool SortedStringList::remove(const TQString &value) x = y->right; if(x) - x->parent = y->parent; + x->tqparent = y->tqparent; - if(!y->parent) + if(!y->tqparent) m_root = x; else { - if(y == y->parent->left) - y->parent->left = x; + if(y == y->tqparent->left) + y->tqparent->left = x; else - y->parent->right = x; + y->tqparent->right = x; } if(y != x) @@ -122,7 +122,7 @@ TQStringList SortedStringList::values() const // private methods //////////////////////////////////////////////////////////////////////////////// -SortedStringList::Node *SortedStringList::find(const TQString &value) const +SortedStringList::Node *SortedStringList::tqfind(const TQString &value) const { Node *n = m_root; while(n && value != n->key) { @@ -155,7 +155,7 @@ bool SortedStringList::BSTInsert(const TQString &value) Node *n = new Node(value); - n->parent = previousNode; + n->tqparent = previousNode; if(!m_root) m_root = n; diff --git a/juk/sortedstringlist.h b/juk/sortedstringlist.h index 01386262..1ef94a2b 100644 --- a/juk/sortedstringlist.h +++ b/juk/sortedstringlist.h @@ -29,7 +29,7 @@ public: * or false otherwise. */ bool insert(const TQString &value); - bool contains(const TQString &value) const; + bool tqcontains(const TQString &value) const; bool remove(const TQString &value); /** @@ -42,7 +42,7 @@ public: private: class Node; - Node *find(const TQString &value) const; + Node *tqfind(const TQString &value) const; /** * The insertion implementation. Returns true if the item was already * present in the list. diff --git a/juk/splashscreen.cpp b/juk/splashscreen.cpp index b8b69c87..21f037b0 100644 --- a/juk/splashscreen.cpp +++ b/juk/splashscreen.cpp @@ -70,14 +70,14 @@ void SplashScreen::update() // protected members //////////////////////////////////////////////////////////////////////////////// -SplashScreen::SplashScreen() : TQLabel(0 , "splashScreen", Qt::WStyle_Splash) +SplashScreen::SplashScreen() : TQLabel(0 , "splashScreen", TQt::WStyle_Splash) { TQPixmap background = UserIcon("splash"); resize(background.size()); setPaletteBackgroundPixmap(background); setMargin(7); - setAlignment(AlignLeft | AlignBottom); + tqsetAlignment(AlignLeft | AlignBottom); setPaletteForegroundColor(TQColor(107, 158, 194)); diff --git a/juk/splashscreen.h b/juk/splashscreen.h index eff0eec9..27ef3a73 100644 --- a/juk/splashscreen.h +++ b/juk/splashscreen.h @@ -29,7 +29,7 @@ * methods. */ -class SplashScreen : public QLabel +class SplashScreen : public TQLabel { public: static SplashScreen *instance(); diff --git a/juk/statuslabel.cpp b/juk/statuslabel.cpp index 81f066ea..4867c7ec 100644 --- a/juk/statuslabel.cpp +++ b/juk/statuslabel.cpp @@ -35,14 +35,14 @@ using namespace ActionCollection; // public methods //////////////////////////////////////////////////////////////////////////////// -StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const char *name) : - TQHBox(parent, name), +StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *tqparent, const char *name) : + TQHBox(tqparent, name), PlaylistObserver(playlist), m_showTimeRemaining(false) { TQFrame *trackAndPlaylist = new TQFrame(this); trackAndPlaylist->setFrameStyle(Box | Sunken); - trackAndPlaylist->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + trackAndPlaylist->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); // Make sure that we have enough of a margin to suffice for the borders, // hence the "lineWidth() * 2" @@ -53,23 +53,23 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch m_playlistLabel = new KSqueezedTextLabel(trackAndPlaylist, "playlistLabel"); trackAndPlaylistLayout->addWidget(m_playlistLabel); - m_playlistLabel->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_playlistLabel->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_playlistLabel->setTextFormat(PlainText); - m_playlistLabel->setAlignment(AlignLeft | AlignVCenter); + m_playlistLabel->tqsetAlignment(AlignLeft | AlignVCenter); m_trackLabel = new KSqueezedTextLabel(trackAndPlaylist, "trackLabel"); trackAndPlaylistLayout->addWidget(m_trackLabel); - m_trackLabel->setAlignment(AlignRight | AlignVCenter); - m_trackLabel->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_trackLabel->tqsetAlignment(AlignRight | AlignVCenter); + m_trackLabel->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_trackLabel->setTextFormat(PlainText); trackAndPlaylistLayout->addSpacing(5); m_itemTimeLabel = new TQLabel(this); TQFontMetrics fontMetrics(font()); - m_itemTimeLabel->setAlignment(AlignCenter); + m_itemTimeLabel->tqsetAlignment(AlignCenter); m_itemTimeLabel->setMinimumWidth(fontMetrics.boundingRect("000:00 / 000:00").width()); - m_itemTimeLabel->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); + m_itemTimeLabel->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); m_itemTimeLabel->setFrameStyle(Box | Sunken); m_itemTimeLabel->installEventFilter(this); @@ -78,7 +78,7 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch TQHBox *jumpBox = new TQHBox(this); jumpBox->setFrameStyle(Box | Sunken); - jumpBox->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Minimum); + jumpBox->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Minimum); TQPushButton *jumpButton = new TQPushButton(jumpBox); jumpButton->setPixmap(SmallIcon("up")); @@ -103,7 +103,7 @@ void StatusLabel::updateCurrent() FileHandle file = playlist()->currentFile(); TQString mid = file.tag()->artist().isEmpty() || file.tag()->title().isEmpty() - ? TQString::null : TQString(" - "); + ? TQString() : TQString(" - "); TQString text = file.tag()->artist() + mid + file.tag()->title(); @@ -175,11 +175,11 @@ bool StatusLabel::eventFilter(TQObject *o, TQEvent *e) if(!o || !e) return false; - TQMouseEvent *mouseEvent = static_cast<TQMouseEvent *>(e); + TQMouseEvent *mouseEvent = TQT_TQMOUSEEVENT(e); if(e->type() == TQEvent::MouseButtonRelease && - mouseEvent->button() == LeftButton) + mouseEvent->button() == Qt::LeftButton) { - if(o == m_itemTimeLabel) { + if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_itemTimeLabel)) { m_showTimeRemaining = !m_showTimeRemaining; updateTime(); } diff --git a/juk/statuslabel.h b/juk/statuslabel.h index f0a64393..a2411622 100644 --- a/juk/statuslabel.h +++ b/juk/statuslabel.h @@ -28,9 +28,10 @@ class FileHandle; class StatusLabel : public TQHBox, public PlaylistObserver { Q_OBJECT + TQ_OBJECT public: - StatusLabel(PlaylistInterface *playlist, TQWidget *parent = 0, const char *name = 0); + StatusLabel(PlaylistInterface *playlist, TQWidget *tqparent = 0, const char *name = 0); virtual ~StatusLabel(); virtual void updateCurrent(); diff --git a/juk/stringhash.h b/juk/stringhash.h index 0d3c43bb..11ac3d7b 100644 --- a/juk/stringhash.h +++ b/juk/stringhash.h @@ -42,7 +42,7 @@ public: /** * Returns true if the set contains the item \a value. */ - bool contains(T value) const; + bool tqcontains(T value) const; /** * Removes an item. Returns true if the item was present and false if not. @@ -118,7 +118,7 @@ protected: inline char hashStringAccess(const TQString &in, int index) { - return in.unicode()[index].cell(); + return in.tqunicode()[index].cell(); } inline char hashStringAccess(const TQCString &in, int index) @@ -126,7 +126,7 @@ inline char hashStringAccess(const TQCString &in, int index) return in[index]; } -// Based on QGDict's hash functions, Copyright (C) 1992-2000 Trolltech AS +// Based on TQGDict's hash functions, Copyright (C) 1992-2000 Trolltech AS template <typename StringType> inline int hashString(const StringType &s) @@ -227,7 +227,7 @@ bool Hash<T>::insert(T value) } template <class T> -bool Hash<T>::contains(T value) const +bool Hash<T>::tqcontains(T value) const { int h = hash(value); Node *i = m_table[h]; diff --git a/juk/stringshare.cpp b/juk/stringshare.cpp index 195fd64f..8cb07068 100644 --- a/juk/stringshare.cpp +++ b/juk/stringshare.cpp @@ -21,7 +21,7 @@ StringShare::Data* StringShare::s_data = 0; /** * We store the strings in two simple direct-mapped (i.e. no collision handling, - * just replace) hashes, which contain strings or null objects. This costs only + * just tqreplace) hashes, which contain strings or null objects. This costs only * 4 bytes per slot on 32-bit archs, so with the default constant size we only * really use 40K or so. * diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp index 40cdd082..36c6874e 100644 --- a/juk/systemtray.cpp +++ b/juk/systemtray.cpp @@ -47,14 +47,14 @@ using namespace ActionCollection; static bool copyImage(TQImage &dest, TQImage &src, int x, int y); -class FlickerFreeLabel : public QLabel +class FlickerFreeLabel : public TQLabel { public: - FlickerFreeLabel(const TQString &text, TQWidget *parent, const char *name = 0) : - TQLabel(text, parent, name) + FlickerFreeLabel(const TQString &text, TQWidget *tqparent, const char *name = 0) : + TQLabel(text, tqparent, name) { m_textColor = paletteForegroundColor(); - m_bgColor = parentWidget()->paletteBackgroundColor(); + m_bgColor = tqparentWidget()->paletteBackgroundColor(); setBackgroundMode(NoBackground); } @@ -73,7 +73,7 @@ protected: { // We want to intercept the drawContents call and draw on a pixmap // instead of the window to keep flicker to an absolute minimum. - // Since Qt doesn't refresh the background, we need to do so + // Since TQt doesn't refresh the background, we need to do so // ourselves. TQPixmap pix(size()); @@ -90,8 +90,8 @@ protected: TQColor m_bgColor; }; -PassiveInfo::PassiveInfo(TQWidget *parent, const char *name) : - KPassivePopup(parent, name), m_timer(new TQTimer), m_justDie(false) +PassiveInfo::PassiveInfo(TQWidget *tqparent, const char *name) : + KPassivePopup(tqparent, name), m_timer(new TQTimer), m_justDie(false) { // I'm so sick and tired of KPassivePopup screwing this up // that I'll just handle the timeout myself, thank you very much. @@ -137,7 +137,7 @@ void PassiveInfo::leaveEvent(TQEvent *) // public methods //////////////////////////////////////////////////////////////////////////////// -SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent, name), +SystemTray::SystemTray(TQWidget *tqparent, const char *name) : KSystemTray(tqparent, name), m_popup(0), m_fadeTimer(0), m_fade(true) @@ -162,8 +162,8 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent, // Just create this here so that it show up in the DCOP interface and the key // bindings dialog. - new KAction(i18n("Redisplay Popup"), KShortcut(), this, - TQT_SLOT(slotPlay()), actions(), "showPopup"); + new KAction(i18n("Redisplay Popup"), KShortcut(), TQT_TQOBJECT(this), + TQT_SLOT(slotPlay()), ActionCollection::actions(), "showPopup"); KPopupMenu *cm = contextMenu(); @@ -181,7 +181,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent, // Pity the actionCollection doesn't keep track of what sub-menus it has. - KActionMenu *menu = new KActionMenu(i18n("&Random Play"), this); + KActionMenu *menu = new KActionMenu(i18n("&Random Play"), TQT_TQOBJECT(this)); menu->insert(action("disableRandomPlay")); menu->insert(action("randomPlay")); menu->insert(action("albumRandomPlay")); @@ -299,7 +299,7 @@ void SystemTray::slotMouseInPopup() // private methods //////////////////////////////////////////////////////////////////////////////// -TQVBox *SystemTray::createPopupLayout(TQWidget *parent, const FileHandle &file) +TQVBox *SystemTray::createPopupLayout(TQWidget *tqparent, const FileHandle &file) { TQVBox *infoBox = 0; @@ -307,17 +307,17 @@ TQVBox *SystemTray::createPopupLayout(TQWidget *parent, const FileHandle &file) // They go to the left because JuK is on that side - createButtonBox(parent); - addSeparatorLine(parent); + createButtonBox(tqparent); + addSeparatorLine(tqparent); - infoBox = new TQVBox(parent); + infoBox = new TQVBox(tqparent); // Another line, and the cover, if there's a cover, and if // it's selected to be shown if(file.coverInfo()->hasCover()) { - addSeparatorLine(parent); - addCoverButton(parent, file.coverInfo()->pixmap(CoverInfo::Thumbnail)); + addSeparatorLine(tqparent); + addCoverButton(tqparent, file.coverInfo()->pixmap(CoverInfo::Thumbnail)); } } else { @@ -325,14 +325,14 @@ TQVBox *SystemTray::createPopupLayout(TQWidget *parent, const FileHandle &file) // Like above, but reversed. if(file.coverInfo()->hasCover()) { - addCoverButton(parent, file.coverInfo()->pixmap(CoverInfo::Thumbnail)); - addSeparatorLine(parent); + addCoverButton(tqparent, file.coverInfo()->pixmap(CoverInfo::Thumbnail)); + addSeparatorLine(tqparent); } - infoBox = new TQVBox(parent); + infoBox = new TQVBox(tqparent); - addSeparatorLine(parent); - createButtonBox(parent); + addSeparatorLine(tqparent); + createButtonBox(tqparent); } infoBox->setSpacing(3); @@ -370,7 +370,7 @@ void SystemTray::createPopup() for(unsigned i = 0; i < m_labels.capacity(); ++i) { m_labels[i] = new FlickerFreeLabel(" ", infoBox); - m_labels[i]->setAlignment(AlignRight | AlignVCenter); + m_labels[i]->tqsetAlignment(AlignRight | AlignVCenter); } // We don't want an autodelete popup. There are times when it will need @@ -385,7 +385,7 @@ void SystemTray::createPopup() int labelCount = 0; TQString title = TQStyleSheet::escape(playingInfo->title()); - m_labels[labelCount++]->setText(TQString("<qt><nobr><h2>%1</h2></nobr><qt>").arg(title)); + m_labels[labelCount++]->setText(TQString("<qt><nobr><h2>%1</h2></nobr><qt>").tqarg(title)); if(!playingInfo->artist().isEmpty()) m_labels[labelCount++]->setText(playingInfo->artist()); @@ -393,8 +393,8 @@ void SystemTray::createPopup() if(!playingInfo->album().isEmpty()) { TQString album = TQStyleSheet::escape(playingInfo->album()); TQString s = playingInfo->year() > 0 - ? TQString("<qt><nobr>%1 (%2)</nobr></qt>").arg(album).arg(playingInfo->year()) - : TQString("<qt><nobr>%1</nobr></qt>").arg(album); + ? TQString("<qt><nobr>%1 (%2)</nobr></qt>").tqarg(album).tqarg(playingInfo->year()) + : TQString("<qt><nobr>%1</nobr></qt>").tqarg(album); m_labels[labelCount++]->setText(s); } @@ -440,9 +440,9 @@ TQPixmap SystemTray::createPixmap(const TQString &pixName) return bgPix; } -void SystemTray::createButtonBox(TQWidget *parent) +void SystemTray::createButtonBox(TQWidget *tqparent) { - TQVBox *buttonBox = new TQVBox(parent); + TQVBox *buttonBox = new TQVBox(tqparent); buttonBox->setSpacing(3); @@ -472,9 +472,9 @@ void SystemTray::slotForward() m_fade = false; } -void SystemTray::addSeparatorLine(TQWidget *parent) +void SystemTray::addSeparatorLine(TQWidget *tqparent) { - TQFrame *line = new TQFrame(parent); + TQFrame *line = new TQFrame(tqparent); line->setFrameShape(TQFrame::VLine); // Cover art takes up 80 pixels, make sure we take up at least 80 pixels @@ -483,9 +483,9 @@ void SystemTray::addSeparatorLine(TQWidget *parent) line->setMinimumHeight(80); } -void SystemTray::addCoverButton(TQWidget *parent, const TQPixmap &cover) +void SystemTray::addCoverButton(TQWidget *tqparent, const TQPixmap &cover) { - TQPushButton *coverButton = new TQPushButton(parent); + TQPushButton *coverButton = new TQPushButton(tqparent); coverButton->setPixmap(cover); coverButton->setFixedSize(cover.size()); @@ -531,8 +531,8 @@ void SystemTray::setToolTip(const TQString &tip, const TQPixmap &cover) TQString html = i18n("%1 is Cover Art, %2 is the playing track, %3 is the appname", "<center><table cellspacing=\"2\"><tr><td valign=\"middle\">%1</td>" "<td valign=\"middle\">%2</td></tr></table><em>%3</em></center>"); - html = html.arg("<img valign=\"middle\" src=\"tipCover\""); - html = html.arg(TQString("<nobr>%1</nobr>").arg(tip), i18n("JuK")); + html = html.tqarg("<img valign=\"middle\" src=\"tipCover\""); + html = html.tqarg(TQString("<nobr>%1</nobr>").tqarg(tip), i18n("JuK")); TQToolTip::add(this, html); } @@ -540,7 +540,7 @@ void SystemTray::setToolTip(const TQString &tip, const TQPixmap &cover) void SystemTray::wheelEvent(TQWheelEvent *e) { - if(e->orientation() == Horizontal) + if(e->orientation() ==Qt::Horizontal) return; // I already know the type here, but this file doesn't (and I don't want it @@ -571,13 +571,13 @@ void SystemTray::wheelEvent(TQWheelEvent *e) void SystemTray::mousePressEvent(TQMouseEvent *e) { switch(e->button()) { - case LeftButton: - case RightButton: + case Qt::LeftButton: + case Qt::RightButton: default: KSystemTray::mousePressEvent(e); break; - case MidButton: - if(!rect().contains(e->pos())) + case Qt::MidButton: + if(!TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos())) return; if(action("pause")->isEnabled()) action("pause")->activate(); @@ -589,7 +589,7 @@ void SystemTray::mousePressEvent(TQMouseEvent *e) /* * This function copies the entirety of src into dest, starting in - * dest at x and y. This function exists because I was unable to find + * dest at x and y. This function exists because I was unable to tqfind * a function like it in either TQImage or kdefx */ diff --git a/juk/systemtray.h b/juk/systemtray.h index 05b3c6dc..0dcb9676 100644 --- a/juk/systemtray.h +++ b/juk/systemtray.h @@ -38,8 +38,9 @@ class FileHandle; class PassiveInfo : public KPassivePopup { Q_OBJECT + TQ_OBJECT public: - PassiveInfo(TQWidget *parent = 0, const char *name = 0); + PassiveInfo(TQWidget *tqparent = 0, const char *name = 0); public slots: void setTimeout(int delay); @@ -64,9 +65,10 @@ private: class SystemTray : public KSystemTray { Q_OBJECT + TQ_OBJECT public: - SystemTray(TQWidget *parent = 0, const char *name = 0); + SystemTray(TQWidget *tqparent = 0, const char *name = 0); virtual ~SystemTray(); signals: @@ -78,7 +80,7 @@ private: virtual void wheelEvent(TQWheelEvent *e); void createPopup(); - void setToolTip(const TQString &tip = TQString::null, const TQPixmap &cover = TQPixmap()); + void setToolTip(const TQString &tip = TQString(), const TQPixmap &cover = TQPixmap()); void mousePressEvent(TQMouseEvent *e); TQPixmap createPixmap(const TQString &pixName); @@ -86,15 +88,15 @@ private: // (because the JuK icon is on the left side of the screen. bool buttonsToLeft() const; - void createButtonBox(TQWidget *parent); + void createButtonBox(TQWidget *tqparent); - // Creates the widget layout for the popup, returning the TQVBox that + // Creates the widget tqlayout for the popup, returning the TQVBox that // holds the text labels. Uses buttonsToLeft() to figure out which // order to create them in. @p file is used to grab the cover. - TQVBox *createPopupLayout(TQWidget *parent, const FileHandle &file); + TQVBox *createPopupLayout(TQWidget *tqparent, const FileHandle &file); - void addSeparatorLine(TQWidget *parent); - void addCoverButton(TQWidget *parent, const TQPixmap &cover); + void addSeparatorLine(TQWidget *tqparent); + void addCoverButton(TQWidget *tqparent, const TQPixmap &cover); // Interpolates from start color to end color. If @p step == 0, then // m_startColor is returned, while @p step == @steps returns diff --git a/juk/tag.cpp b/juk/tag.cpp index 802567dd..a9d37297 100644 --- a/juk/tag.cpp +++ b/juk/tag.cpp @@ -146,10 +146,10 @@ CacheDataStream &Tag::read(CacheDataStream &s) { switch(s.cacheVersion()) { case 1: { - Q_INT32 track; - Q_INT32 year; - Q_INT32 bitrate; - Q_INT32 seconds; + TQ_INT32 track; + TQ_INT32 year; + TQ_INT32 bitrate; + TQ_INT32 seconds; s >> m_title >> m_artist @@ -227,11 +227,11 @@ Tag::Tag(const TQString &fileName, bool) : void Tag::setup(TagLib::File *file) { - m_title = TStringToQString(file->tag()->title()).stripWhiteSpace(); - m_artist = TStringToQString(file->tag()->artist()).stripWhiteSpace(); - m_album = TStringToQString(file->tag()->album()).stripWhiteSpace(); - m_genre = TStringToQString(file->tag()->genre()).stripWhiteSpace(); - m_comment = TStringToQString(file->tag()->comment()).stripWhiteSpace(); + m_title = TQString(TStringToQString(file->tag()->title())).stripWhiteSpace(); + m_artist = TQString(TStringToQString(file->tag()->artist())).stripWhiteSpace(); + m_album = TQString(TStringToQString(file->tag()->album())).stripWhiteSpace(); + m_genre = TQString(TStringToQString(file->tag()->genre())).stripWhiteSpace(); + m_comment = TQString(TStringToQString(file->tag()->comment())).stripWhiteSpace(); m_track = file->tag()->track(); m_year = file->tag()->year(); @@ -245,8 +245,8 @@ void Tag::setup(TagLib::File *file) m_lengthString = TQString::number(minutes) + (seconds >= 10 ? ":" : ":0") + TQString::number(seconds); if(m_title.isEmpty()) { - int i = m_fileName.findRev('/'); - int j = m_fileName.findRev('.'); + int i = m_fileName.tqfindRev('/'); + int j = m_fileName.tqfindRev('.'); m_title = i > 0 ? m_fileName.mid(i + 1, j - i - 1) : m_fileName; } @@ -263,12 +263,12 @@ TQDataStream &operator<<(TQDataStream &s, const Tag &t) << t.artist() << t.album() << t.genre() - << Q_INT32(t.track()) - << Q_INT32(t.year()) + << TQ_INT32(t.track()) + << TQ_INT32(t.year()) << t.comment() - << Q_INT32(t.bitrate()) + << TQ_INT32(t.bitrate()) << t.lengthString() - << Q_INT32(t.seconds()); + << TQ_INT32(t.seconds()); return s; } @@ -24,7 +24,7 @@ class CacheDataStream; /*! * This should really be called "metadata" and may at some point be titled as - * such. Right now it's mostly a Qt wrapper around TagLib. + * such. Right now it's mostly a TQt wrapper around TagLib. */ class Tag diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp index eb2dfa88..4e5299ae 100644 --- a/juk/tageditor.cpp +++ b/juk/tageditor.cpp @@ -46,11 +46,11 @@ using namespace ActionCollection; -class FileNameValidator : public QValidator +class FileNameValidator : public TQValidator { public: - FileNameValidator(TQObject *parent, const char *name = 0) : - TQValidator(parent, name) {} + FileNameValidator(TQObject *tqparent, const char *name = 0) : + TQValidator(tqparent, name) {} virtual void fixup(TQString &s) const { @@ -59,13 +59,13 @@ public: virtual State validate(TQString &s, int &) const { - if(s.find('/') != -1) + if(s.tqfind('/') != -1) return Invalid; return Acceptable; } }; -class FileBoxToolTip : public QToolTip +class FileBoxToolTip : public TQToolTip { public: FileBoxToolTip(TagEditor *editor, TQWidget *widget) : @@ -73,28 +73,28 @@ public: protected: virtual void maybeTip(const TQPoint &) { - tip(parentWidget()->rect(), m_editor->items().first()->file().absFilePath()); + tip(tqparentWidget()->rect(), m_editor->items().first()->file().absFilePath()); } private: TagEditor *m_editor; }; -class FixedHLayout : public QHBoxLayout +class FixedHLayout : public TQHBoxLayout { public: - FixedHLayout(TQWidget *parent, int margin = 0, int spacing = -1, const char *name = 0) : - TQHBoxLayout(parent, margin, spacing, name), + FixedHLayout(TQWidget *tqparent, int margin = 0, int spacing = -1, const char *name = 0) : + TQHBoxLayout(tqparent, margin, spacing, name), m_width(-1) {} - FixedHLayout(TQLayout *parentLayout, int spacing = -1, const char *name = 0) : - TQHBoxLayout(parentLayout, spacing, name), + FixedHLayout(TQLayout *tqparentLayout, int spacing = -1, const char *name = 0) : + TQHBoxLayout(tqparentLayout, spacing, name), m_width(-1) {} void setWidth(int w = -1) { - m_width = w == -1 ? TQHBoxLayout::minimumSize().width() : w; + m_width = w == -1 ? TQHBoxLayout::tqminimumSize().width() : w; } - virtual TQSize minimumSize() const + virtual TQSize tqminimumSize() const { - TQSize s = TQHBoxLayout::minimumSize(); + TQSize s = TQHBoxLayout::tqminimumSize(); s.setWidth(m_width); return s; } @@ -105,9 +105,9 @@ private: class CollectionObserver : public PlaylistObserver { public: - CollectionObserver(TagEditor *parent) : + CollectionObserver(TagEditor *tqparent) : PlaylistObserver(CollectionList::instance()), - m_parent(parent) + m_parent(tqparent) { } @@ -127,8 +127,8 @@ private: // public members //////////////////////////////////////////////////////////////////////////////// -TagEditor::TagEditor(TQWidget *parent, const char *name) : - TQWidget(parent, name), +TagEditor::TagEditor(TQWidget *tqparent, const char *name) : + TQWidget(tqparent, name), m_currentPlaylist(0), m_observer(0), m_performingSave(false) @@ -234,8 +234,8 @@ void TagEditor::slotRefresh() m_bitrateBox->setText(TQString::number(tag->bitrate())); m_lengthBox->setText(tag->lengthString()); - if(m_genreList.findIndex(tag->genre()) >= 0) - m_genreBox->setCurrentItem(m_genreList.findIndex(tag->genre()) + 1); + if(m_genreList.tqfindIndex(tag->genre()) >= 0) + m_genreBox->setCurrentItem(m_genreList.tqfindIndex(tag->genre()) + 1); else { m_genreBox->setCurrentItem(0); m_genreBox->setEditText(tag->genre()); @@ -287,43 +287,43 @@ void TagEditor::slotRefresh() if(tag) { if(m_artistNameBox->currentText() != tag->artist() && - m_enableBoxes.contains(m_artistNameBox)) + m_enableBoxes.tqcontains(m_artistNameBox)) { m_artistNameBox->lineEdit()->clear(); m_enableBoxes[m_artistNameBox]->setChecked(false); } if(m_trackNameBox->text() != tag->title() && - m_enableBoxes.contains(m_trackNameBox)) + m_enableBoxes.tqcontains(m_trackNameBox)) { m_trackNameBox->clear(); m_enableBoxes[m_trackNameBox]->setChecked(false); } if(m_albumNameBox->currentText() != tag->album() && - m_enableBoxes.contains(m_albumNameBox)) + m_enableBoxes.tqcontains(m_albumNameBox)) { m_albumNameBox->lineEdit()->clear(); m_enableBoxes[m_albumNameBox]->setChecked(false); } if(m_genreBox->currentText() != tag->genre() && - m_enableBoxes.contains(m_genreBox)) + m_enableBoxes.tqcontains(m_genreBox)) { m_genreBox->lineEdit()->clear(); m_enableBoxes[m_genreBox]->setChecked(false); } if(m_trackSpin->value() != tag->track() && - m_enableBoxes.contains(m_trackSpin)) + m_enableBoxes.tqcontains(m_trackSpin)) { m_trackSpin->setValue(0); m_enableBoxes[m_trackSpin]->setChecked(false); } if(m_yearSpin->value() != tag->year() && - m_enableBoxes.contains(m_yearSpin)) + m_enableBoxes.tqcontains(m_yearSpin)) { m_yearSpin->setValue(0); m_enableBoxes[m_yearSpin]->setChecked(false); } if(m_commentBox->text() != tag->comment() && - m_enableBoxes.contains(m_commentBox)) + m_enableBoxes.tqcontains(m_commentBox)) { m_commentBox->clear(); m_enableBoxes[m_commentBox]->setChecked(false); @@ -409,7 +409,7 @@ void TagEditor::updateCollection() m_genreList.sort(); m_genreBox->listBox()->clear(); - m_genreBox->listBox()->insertItem(TQString::null); + m_genreBox->listBox()->insertItem(TQString()); m_genreBox->listBox()->insertStringList(m_genreList); m_genreBox->completionObject()->setItems(m_genreList); } @@ -440,7 +440,7 @@ void TagEditor::readConfig() m_genreList.sort(); m_genreBox->clear(); - m_genreBox->insertItem(TQString::null); + m_genreBox->insertItem(TQString()); m_genreBox->insertStringList(m_genreList); m_genreBox->completionObject()->setItems(m_genreList); } @@ -469,11 +469,11 @@ void TagEditor::saveConfig() void TagEditor::setupActions() { - KToggleAction *show = new KToggleAction(i18n("Show &Tag Editor"), "edit", 0, actions(), "showEditor"); + KToggleAction *show = new KToggleAction(i18n("Show &Tag Editor"), "edit", 0, ActionCollection::actions(), "showEditor"); show->setCheckedState(i18n("Hide &Tag Editor")); connect(show, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShown(bool))); - new KAction(i18n("&Save"), "filesave", "CTRL+t", this, TQT_SLOT(slotSave()), actions(), "saveItem"); + new KAction(i18n("&Save"), "filesave", "CTRL+t", TQT_TQOBJECT(this), TQT_SLOT(slotSave()), ActionCollection::actions(), "saveItem"); } void TagEditor::setupLayout() @@ -481,16 +481,16 @@ void TagEditor::setupLayout() static const int horizontalSpacing = 12; static const int verticalSpacing = 2; - TQHBoxLayout *layout = new TQHBoxLayout(this, 6, horizontalSpacing); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 6, horizontalSpacing); ////////////////////////////////////////////////////////////////////////////// - // define two columns of the bottem layout + // define two columns of the bottem tqlayout ////////////////////////////////////////////////////////////////////////////// - TQVBoxLayout *leftColumnLayout = new TQVBoxLayout(layout, verticalSpacing); - TQVBoxLayout *rightColumnLayout = new TQVBoxLayout(layout, verticalSpacing); + TQVBoxLayout *leftColumnLayout = new TQVBoxLayout(tqlayout, verticalSpacing); + TQVBoxLayout *rightColumnLayout = new TQVBoxLayout(tqlayout, verticalSpacing); - layout->setStretchFactor(leftColumnLayout, 2); - layout->setStretchFactor(rightColumnLayout, 3); + tqlayout->setStretchFactor(leftColumnLayout, 2); + tqlayout->setStretchFactor(rightColumnLayout, 3); ////////////////////////////////////////////////////////////////////////////// // put stuff in the left column -- all of the field names are class wide @@ -524,7 +524,7 @@ void TagEditor::setupLayout() horizontalSpacing); m_fileNameBox = new KLineEdit(this, "fileNameBox"); - m_fileNameBox->setValidator(new FileNameValidator(m_fileNameBox)); + m_fileNameBox->setValidator(new FileNameValidator(TQT_TQOBJECT(m_fileNameBox))); TQLabel *fileNameIcon = new TQLabel(this); fileNameIcon->setPixmap(SmallIcon("sound")); @@ -560,7 +560,7 @@ void TagEditor::setupLayout() // addItem(i18n("Length:"), m_lengthBox, trackRowLayout); m_lengthBox->setMinimumWidth(fontMetrics().width("00:00") + trackRowLayout->spacing()); m_lengthBox->setMaximumWidth(50); - m_lengthBox->setAlignment(Qt::AlignRight); + m_lengthBox->tqsetAlignment(TQt::AlignRight); m_lengthBox->setReadOnly(true); trackRowLayout->addWidget(addHidden(m_lengthBox)); @@ -572,7 +572,7 @@ void TagEditor::setupLayout() // addItem(i18n("Bitrate:"), m_bitrateBox, trackRowLayout); m_bitrateBox->setMinimumWidth(fontMetrics().width("000") + trackRowLayout->spacing()); m_bitrateBox->setMaximumWidth(50); - m_bitrateBox->setAlignment(Qt::AlignRight); + m_bitrateBox->tqsetAlignment(TQt::AlignRight); m_bitrateBox->setReadOnly(true); trackRowLayout->addWidget(addHidden(m_bitrateBox)); @@ -580,7 +580,7 @@ void TagEditor::setupLayout() } m_commentBox = new KEdit(this, "commentBox"); - m_commentBox->setTextFormat(Qt::PlainText); + m_commentBox->setTextFormat(TQt::PlainText); addItem(i18n("&Comment:"), m_commentBox, rightColumnLayout, "edit"); fileNameLabel->setMinimumHeight(m_trackSpin->height()); @@ -618,7 +618,7 @@ void TagEditor::save(const PlaylistItemList &list) { if(!list.isEmpty() && m_dataChanged) { - KApplication::setOverrideCursor(Qt::waitCursor); + KApplication::setOverrideCursor(TQt::waitCursor); m_dataChanged = false; m_performingSave = true; @@ -711,9 +711,9 @@ void TagEditor::saveChangesPrompt() } } -void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *layout, const TQString &iconName) +void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *tqlayout, const TQString &iconName) { - if(!item || !layout) + if(!item || !tqlayout) return; TQLabel *label = new TQLabel(item, text, this); @@ -727,14 +727,14 @@ void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *layou label->setMinimumHeight(enableBox->height()); - if(layout->direction() == TQBoxLayout::LeftToRight) { - layout->addWidget(iconLabel); - layout->addWidget(label); - layout->addWidget(item); - layout->addWidget(enableBox); + if(tqlayout->direction() == TQBoxLayout::LeftToRight) { + tqlayout->addWidget(iconLabel); + tqlayout->addWidget(label); + tqlayout->addWidget(item); + tqlayout->addWidget(enableBox); } else { - TQHBoxLayout *l = new TQHBoxLayout(layout); + TQHBoxLayout *l = new TQHBoxLayout(tqlayout); l->addWidget(iconLabel); l->addWidget(label); @@ -745,7 +745,7 @@ void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *layou l->addWidget(enableBox); l->setStretchFactor(enableBox, 0); - layout->addWidget(item); + tqlayout->addWidget(item); } enableBox->hide(); @@ -766,7 +766,7 @@ void TagEditor::showEvent(TQShowEvent *e) bool TagEditor::eventFilter(TQObject *watched, TQEvent *e) { - TQKeyEvent *ke = static_cast<TQKeyEvent*>(e); + TQKeyEvent *ke = TQT_TQKEYEVENT(e); if(watched->inherits(TQSPINBOX_OBJECT_NAME_STRING) && e->type() == TQEvent::KeyRelease && ke->state() == 0) slotDataChanged(); diff --git a/juk/tageditor.h b/juk/tageditor.h index c62df207..8a616f15 100644 --- a/juk/tageditor.h +++ b/juk/tageditor.h @@ -34,12 +34,13 @@ typedef TQValueList<PlaylistItem *> PlaylistItemList; class CollectionObserver; -class TagEditor : public QWidget +class TagEditor : public TQWidget { Q_OBJECT + TQ_OBJECT public: - TagEditor(TQWidget *parent = 0, const char *name = 0); + TagEditor(TQWidget *tqparent = 0, const char *name = 0); virtual ~TagEditor(); PlaylistItemList items() const { return m_items; } void setupObservers(); @@ -66,10 +67,10 @@ private: void save(const PlaylistItemList &list); void saveChangesPrompt(); /** - * Adds an item to JuK's tagging layout. This handles the creation and + * Adds an item to JuK's tagging tqlayout. This handles the creation and * placement of the "enable" box as well. */ - void addItem(const TQString &text, TQWidget *item, TQBoxLayout *layout, const TQString &iconName = TQString::null); + void addItem(const TQString &text, TQWidget *item, TQBoxLayout *tqlayout, const TQString &iconName = TQString()); /** * Adds a widget to m_hideList and returns that widget. diff --git a/juk/tagguesser.cpp b/juk/tagguesser.cpp index b540aaf1..a93b5996 100644 --- a/juk/tagguesser.cpp +++ b/juk/tagguesser.cpp @@ -23,7 +23,7 @@ FileNameScheme::FileNameScheme(const TQString &s) m_commentField(-1) { int fieldNumber = 1; - int i = s.find('%'); + int i = s.tqfind('%'); while (i > -1) { switch (s[ i + 1 ]) { case 't': m_titleField = fieldNumber++; @@ -39,7 +39,7 @@ FileNameScheme::FileNameScheme(const TQString &s) default: break; } - i = s.find('%', i + 1); + i = s.tqfind('%', i + 1); } m_regExp.setPattern(composeRegExp(s)); } @@ -50,42 +50,42 @@ bool FileNameScheme::matches(const TQString &fileName) const * does not work as a separator. */ TQString stripped = fileName; - stripped.truncate(stripped.findRev('.')); + stripped.truncate(stripped.tqfindRev('.')); return m_regExp.exactMatch(stripped); } TQString FileNameScheme::title() const { if(m_titleField == -1) - return TQString::null; + return TQString(); return m_regExp.capturedTexts()[ m_titleField ]; } TQString FileNameScheme::artist() const { if(m_artistField == -1) - return TQString::null; + return TQString(); return m_regExp.capturedTexts()[ m_artistField ]; } TQString FileNameScheme::album() const { if(m_albumField == -1) - return TQString::null; + return TQString(); return m_regExp.capturedTexts()[ m_albumField ]; } TQString FileNameScheme::track() const { if(m_trackField == -1) - return TQString::null; + return TQString(); return m_regExp.capturedTexts()[ m_trackField ]; } TQString FileNameScheme::comment() const { if(m_commentField == -1) - return TQString::null; + return TQString(); return m_regExp.capturedTexts()[ m_commentField ]; } @@ -103,7 +103,7 @@ TQString FileNameScheme::composeRegExp(const TQString &s) const TQString regExp = TQRegExp::escape(s.simplifyWhiteSpace()); regExp = ".*" + regExp; - regExp.replace(' ', "\\s+"); + regExp.tqreplace(' ', "\\s+"); regExp = KMacroExpander::expandMacros(regExp, substitutions); regExp += "[^/]*$"; return regExp; @@ -180,18 +180,18 @@ void TagGuesser::loadSchemes() void TagGuesser::guess(const TQString &absFileName) { - m_title = m_artist = m_album = m_track = m_comment = TQString::null; + m_title = m_artist = m_album = m_track = m_comment = TQString(); FileNameScheme::List::ConstIterator it = m_schemes.begin(); FileNameScheme::List::ConstIterator end = m_schemes.end(); for (; it != end; ++it) { const FileNameScheme schema(*it); if(schema.matches(absFileName)) { - m_title = capitalizeWords(schema.title().replace('_', " ")).stripWhiteSpace(); - m_artist = capitalizeWords(schema.artist().replace('_', " ")).stripWhiteSpace(); - m_album = capitalizeWords(schema.album().replace('_', " ")).stripWhiteSpace(); + m_title = capitalizeWords(schema.title().tqreplace('_', " ")).stripWhiteSpace(); + m_artist = capitalizeWords(schema.artist().tqreplace('_', " ")).stripWhiteSpace(); + m_album = capitalizeWords(schema.album().tqreplace('_', " ")).stripWhiteSpace(); m_track = schema.track().stripWhiteSpace(); - m_comment = schema.comment().replace('_', " ").stripWhiteSpace(); + m_comment = schema.comment().tqreplace('_', " ").stripWhiteSpace(); break; } } @@ -206,10 +206,10 @@ TQString TagGuesser::capitalizeWords(const TQString &s) result[ 0 ] = result[ 0 ].upper(); const TQRegExp wordRegExp("\\s\\w"); - int i = result.find( wordRegExp ); + int i = result.tqfind( wordRegExp ); while ( i > -1 ) { result[ i + 1 ] = result[ i + 1 ].upper(); - i = result.find( wordRegExp, ++i ); + i = result.tqfind( wordRegExp, ++i ); } return result; diff --git a/juk/tagguesserconfigdlg.cpp b/juk/tagguesserconfigdlg.cpp index 7caea019..f6f1c469 100644 --- a/juk/tagguesserconfigdlg.cpp +++ b/juk/tagguesserconfigdlg.cpp @@ -20,8 +20,8 @@ #include <tqtoolbutton.h> #include <tqevent.h> -TagGuesserConfigDlg::TagGuesserConfigDlg(TQWidget *parent, const char *name) - : KDialogBase(parent, name, true, i18n("Tag Guesser Configuration"), +TagGuesserConfigDlg::TagGuesserConfigDlg(TQWidget *tqparent, const char *name) + : KDialogBase(tqparent, name, true, i18n("Tag Guesser Configuration"), Ok | Cancel, Ok, true) { m_child = new TagGuesserConfigDlgWidget(this, "child"); diff --git a/juk/tagguesserconfigdlg.h b/juk/tagguesserconfigdlg.h index e0585f07..480e00f3 100644 --- a/juk/tagguesserconfigdlg.h +++ b/juk/tagguesserconfigdlg.h @@ -17,8 +17,9 @@ class TagGuesserConfigDlgWidget; class TagGuesserConfigDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - TagGuesserConfigDlg(TQWidget *parent, const char *name = 0); + TagGuesserConfigDlg(TQWidget *tqparent, const char *name = 0); protected slots: virtual void accept(); diff --git a/juk/tagguesserconfigdlgwidget.ui b/juk/tagguesserconfigdlgwidget.ui index 25d86c0b..23e1a37b 100644 --- a/juk/tagguesserconfigdlgwidget.ui +++ b/juk/tagguesserconfigdlgwidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>TagGuesserConfigDlgWidget</class> <author>Frerich Raabe <raabe@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -70,7 +70,7 @@ Note that the order in which the schemes appear in the list is relevant, since t <string>Press this button to add a new file name scheme to the end of the list.</string> </property> </widget> - <widget class="QToolButton" row="0" column="1"> + <widget class="TQToolButton" row="0" column="1"> <property name="name"> <cstring>bMoveUp</cstring> </property> @@ -84,7 +84,7 @@ Note that the order in which the schemes appear in the list is relevant, since t <string>Press this button to move the currently selected scheme one step upwards.</string> </property> </widget> - <widget class="QToolButton" row="0" column="3"> + <widget class="TQToolButton" row="0" column="3"> <property name="name"> <cstring>bMoveDown</cstring> </property> @@ -136,7 +136,7 @@ Note that the order in which the schemes appear in the list is relevant, since t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>130</height> @@ -148,8 +148,8 @@ Note that the order in which the schemes appear in the list is relevant, since t <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="0"/> -<layoutfunctions spacing="KDialog::spacingHint"/> +<tqlayoutdefaults spacing="6" margin="0"/> +<tqlayoutfunctions spacing="KDialog::spacingHint"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/juk/tagguessertest.cpp b/juk/tagguessertest.cpp index b94f9639..adba59db 100644 --- a/juk/tagguessertest.cpp +++ b/juk/tagguessertest.cpp @@ -35,7 +35,7 @@ using std::endl; void check( const TQString &filename, const TQString &title, const TQString &artist, const TQString &track, - const TQString &comment, const TQString &album = TQString::null ) + const TQString &comment, const TQString &album = TQString() ) { cout << "Checking " << filename.latin1() << "..."; TagGuesser guesser( filename ); @@ -72,57 +72,57 @@ int main( int argc, char **argv ) check( "/home/frerich/Chemical Brothers - (01) - Block rockin' beats (Live).mp3", "Block Rockin' Beats", "Chemical Brothers", "01", "Live" ); check( "/home/frerich/Chemical Brothers - (01) - Block rockin' beats.mp3", - "Block Rockin' Beats", "Chemical Brothers", "01", TQString::null ); + "Block Rockin' Beats", "Chemical Brothers", "01", TQString() ); check( "/home/frerich/Chemical Brothers - [01] - Block rockin' beats [Live].mp3", "Block Rockin' Beats", "Chemical Brothers", "01", "Live" ); check( "/home/frerich/Chemical Brothers - [01] - Block rockin' beats (Live).mp3", "Block Rockin' Beats", "Chemical Brothers", "01", "Live" ); check( "/home/frerich/Chemical Brothers - [01] - Block rockin' beats.mp3", - "Block Rockin' Beats", "Chemical Brothers", "01", TQString::null ); + "Block Rockin' Beats", "Chemical Brothers", "01", TQString() ); check( "/home/frerich/Chemical Brothers - 01 - Block rockin' beats [Live].mp3", "Block Rockin' Beats", "Chemical Brothers", "01", "Live" ); check( "/home/frerich/Chemical Brothers - 01 - Block rockin' beats (Live).mp3", "Block Rockin' Beats", "Chemical Brothers", "01", "Live" ); check( "/home/frerich/Chemical Brothers - 01 - Block rockin' beats.mp3", - "Block Rockin' Beats", "Chemical Brothers", "01", TQString::null ); + "Block Rockin' Beats", "Chemical Brothers", "01", TQString() ); check( "/home/frerich/(01) Chemical Brothers - Block rockin' beats [Live].mp3", "Block Rockin' Beats", "Chemical Brothers", "01", "Live" ); check( "/home/frerich/(01) Chemical Brothers - Block rockin' beats (Live).mp3", "Block Rockin' Beats", "Chemical Brothers", "01", "Live" ); check( "/home/frerich/(01) Chemical Brothers - Block rockin' beats.mp3", - "Block Rockin' Beats", "Chemical Brothers", "01", TQString::null ); + "Block Rockin' Beats", "Chemical Brothers", "01", TQString() ); check( "/home/frerich/[01] Chemical Brothers - Block rockin' beats [Live].mp3", "Block Rockin' Beats", "Chemical Brothers", "01", "Live" ); check( "/home/frerich/[01] Chemical Brothers - Block rockin' beats (Live).mp3", "Block Rockin' Beats", "Chemical Brothers", "01", "Live" ); check( "/home/frerich/[01] Chemical Brothers - Block rockin' beats.mp3", - "Block Rockin' Beats", "Chemical Brothers", "01", TQString::null ); + "Block Rockin' Beats", "Chemical Brothers", "01", TQString() ); check( "/home/frerich/01 Chemical Brothers - Block rockin' beats [Live].mp3", "Block Rockin' Beats", "Chemical Brothers", "01", "Live" ); check( "/home/frerich/01 Chemical Brothers - Block rockin' beats (Live).mp3", "Block Rockin' Beats", "Chemical Brothers", "01", "Live" ); check( "/home/frerich/01 Chemical Brothers - Block rockin' beats.mp3", - "Block Rockin' Beats", "Chemical Brothers", "01", TQString::null ); + "Block Rockin' Beats", "Chemical Brothers", "01", TQString() ); check( "/home/frerich/(Chemical Brothers) Block rockin' beats [Live].mp3", - "Block Rockin' Beats", "Chemical Brothers", TQString::null, "Live" ); + "Block Rockin' Beats", "Chemical Brothers", TQString(), "Live" ); check( "/home/frerich/(Chemical Brothers) Block rockin' beats (Live).mp3", - "Block Rockin' Beats", "Chemical Brothers", TQString::null, "Live" ); + "Block Rockin' Beats", "Chemical Brothers", TQString(), "Live" ); check( "/home/frerich/(Chemical Brothers) Block rockin' beats.mp3", - "Block Rockin' Beats", "Chemical Brothers", TQString::null, TQString::null ); + "Block Rockin' Beats", "Chemical Brothers", TQString(), TQString() ); check( "/home/frerich/Chemical Brothers - Block rockin' beats [Live].mp3", - "Block Rockin' Beats", "Chemical Brothers", TQString::null, "Live" ); + "Block Rockin' Beats", "Chemical Brothers", TQString(), "Live" ); check( "/home/frerich/Chemical Brothers - Block rockin' beats (Live).mp3", - "Block Rockin' Beats", "Chemical Brothers", TQString::null, "Live" ); + "Block Rockin' Beats", "Chemical Brothers", TQString(), "Live" ); check( "/home/frerich/Chemical Brothers - Block rockin' beats.mp3", - "Block Rockin' Beats", "Chemical Brothers", TQString::null, TQString::null ); + "Block Rockin' Beats", "Chemical Brothers", TQString(), TQString() ); check( "/home/frerich/mp3/Chemical Brothers/Dig your own hole/[01] Block rockin' beats.mp3", - "Block Rockin' Beats", "Chemical Brothers", "01", TQString::null, "Dig Your Own Hole"); + "Block Rockin' Beats", "Chemical Brothers", "01", TQString(), "Dig Your Own Hole"); check( TQDir::homeDirPath() + "/[01] Randy - Religion, religion.mp3", - "Religion, Religion", "Randy", "01", TQString::null, TQString::null ); + "Religion, Religion", "Randy", "01", TQString(), TQString() ); check( TQDir::homeDirPath() + "/(3) Mr. Doe - Punk.mp3", - "Punk", "Mr. Doe", "3", TQString::null, TQString::null ); + "Punk", "Mr. Doe", "3", TQString(), TQString() ); check( "c:\\music\\mp3s\\(3) Mr. Doe - Punk.mp3", - "Punk", "Mr. Doe", "3", TQString::null, TQString::null ); + "Punk", "Mr. Doe", "3", TQString(), TQString() ); cout << "All OK" << endl; return 0; } diff --git a/juk/tagrenameroptions.cpp b/juk/tagrenameroptions.cpp index 50f7036d..fc97ac8e 100644 --- a/juk/tagrenameroptions.cpp +++ b/juk/tagrenameroptions.cpp @@ -69,12 +69,12 @@ TagRenamerOptions::TagRenamerOptions(const CategoryID &category) if(categoryNum > 0) typeKey.append(TQString::number(categoryNum)); - setSuffix(config.readEntry(TQString("%1Suffix").arg(typeKey))); - setPrefix(config.readEntry(TQString("%1Prefix").arg(typeKey))); + setSuffix(config.readEntry(TQString("%1Suffix").tqarg(typeKey))); + setPrefix(config.readEntry(TQString("%1Prefix").tqarg(typeKey))); // Default the emptyAction to ignoring the empty tag. - const TQString emptyAction = config.readEntry(TQString("%1EmptyAction").arg(typeKey)).lower(); + const TQString emptyAction = config.readEntry(TQString("%1EmptyAction").tqarg(typeKey)).lower(); setEmptyAction(IgnoreEmptyTag); if(emptyAction == "forceemptyinclude") @@ -82,9 +82,9 @@ TagRenamerOptions::TagRenamerOptions(const CategoryID &category) else if(emptyAction == "usereplacementvalue") setEmptyAction(UseReplacementValue); - setEmptyText(config.readEntry(TQString("%1EmptyText").arg(typeKey))); - setTrackWidth(config.readUnsignedNumEntry(TQString("%1TrackWidth").arg(typeKey))); - setDisabled(config.readBoolEntry(TQString("%1Disabled").arg(typeKey), disabled)); + setEmptyText(config.readEntry(TQString("%1EmptyText").tqarg(typeKey))); + setTrackWidth(config.readUnsignedNumEntry(TQString("%1TrackWidth").tqarg(typeKey))); + setDisabled(config.readBoolEntry(TQString("%1Disabled").tqarg(typeKey), disabled)); } TQString TagRenamerOptions::tagTypeText(TagType type, bool translate) @@ -104,7 +104,7 @@ TQString TagRenamerOptions::tagTypeText(TagType type, bool translate) return translate ? i18n("Unknown") : "Unknown"; } - return translate ? i18n(tags[type]) : tags[type]; + return translate ? TQString(i18n(tags[type])) : TQString(tags[type]); } void TagRenamerOptions::saveConfig(unsigned categoryNum) const @@ -117,8 +117,8 @@ void TagRenamerOptions::saveConfig(unsigned categoryNum) const KConfigGroup config(KGlobal::config(), "FileRenamer"); - config.writeEntry(TQString("%1Suffix").arg(typeKey), suffix()); - config.writeEntry(TQString("%1Prefix").arg(typeKey), prefix()); + config.writeEntry(TQString("%1Suffix").tqarg(typeKey), suffix()); + config.writeEntry(TQString("%1Prefix").tqarg(typeKey), prefix()); TQString emptyStr; @@ -136,12 +136,12 @@ void TagRenamerOptions::saveConfig(unsigned categoryNum) const break; } - config.writeEntry(TQString("%1EmptyAction").arg(typeKey), emptyStr); - config.writeEntry(TQString("%1EmptyText").arg(typeKey), emptyText()); - config.writeEntry(TQString("%1Disabled").arg(typeKey), disabled()); + config.writeEntry(TQString("%1EmptyAction").tqarg(typeKey), emptyStr); + config.writeEntry(TQString("%1EmptyText").tqarg(typeKey), emptyText()); + config.writeEntry(TQString("%1Disabled").tqarg(typeKey), disabled()); if(category() == Track) - config.writeEntry(TQString("%1TrackWidth").arg(typeKey), trackWidth()); + config.writeEntry(TQString("%1TrackWidth").tqarg(typeKey), trackWidth()); config.sync(); } diff --git a/juk/tagtransactionmanager.cpp b/juk/tagtransactionmanager.cpp index cc8b1c80..256b7041 100644 --- a/juk/tagtransactionmanager.cpp +++ b/juk/tagtransactionmanager.cpp @@ -123,7 +123,7 @@ bool TagTransactionManager::undo() return result; } -TagTransactionManager::TagTransactionManager(TQWidget *parent) : TQObject(parent, "tagmanager") +TagTransactionManager::TagTransactionManager(TQWidget *tqparent) : TQObject(tqparent, "tagmanager") { m_manager = this; } @@ -135,7 +135,7 @@ bool TagTransactionManager::renameFile(const TQFileInfo &from, const TQFileInfo if(!to.exists() || KMessageBox::warningContinueCancel( - static_cast<TQWidget *>(parent()), + TQT_TQWIDGET(tqparent()), i18n("This file already exists.\nDo you want to replace it?"), i18n("File Exists"),i18n("Replace")) == KMessageBox::Continue) { @@ -176,7 +176,7 @@ bool TagTransactionManager::processChangeList(bool undo) item->file().setFile(tag->fileName()); item->refreshFromDisk(); - item->repaint(); + item->tqrepaint(); item->playlist()->dataChanged(); item->playlist()->update(); } @@ -200,7 +200,7 @@ bool TagTransactionManager::processChangeList(bool undo) action("edit_undo")->setEnabled(false); if(!errorItems.isEmpty()) - KMessageBox::errorList(static_cast<TQWidget *>(parent()), + KMessageBox::errorList(TQT_TQWIDGET(tqparent()), i18n("The following files were unable to be changed."), errorItems, i18n("Error")); diff --git a/juk/tagtransactionmanager.h b/juk/tagtransactionmanager.h index 7f8ef8d0..7ea38f96 100644 --- a/juk/tagtransactionmanager.h +++ b/juk/tagtransactionmanager.h @@ -40,7 +40,7 @@ class TagTransactionAtom /** * Copy constructor. This takes ownership of the m_tag pointer, so the * object being copied no longer has access to the tag. This function also - * exists mainly for QValueList's benefit. + * exists mainly for TQValueList's benefit. * * @param other The TagTransactionAtom to copy. */ @@ -103,17 +103,18 @@ typedef TQValueList<TagTransactionAtom> TagAlterationList; * * @author Michael Pyne <michael.pyne@kdemail.net> */ -class TagTransactionManager : public QObject +class TagTransactionManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** - * Constructs a TagTransactionManager, owned by @p parent. + * Constructs a TagTransactionManager, owned by @p tqparent. * - * @param parent The parent TQWidget. + * @param tqparent The tqparent TQWidget. */ - TagTransactionManager(TQWidget *parent = 0); + TagTransactionManager(TQWidget *tqparent = 0); /** * Returns the global TagTransactionManager instance. @@ -137,13 +138,13 @@ class TagTransactionManager : public QObject * object doesn't have a decent copy constructor. * * @param tag The Tag to duplicate. - * @param fileName The filename to assign to the tag. If TQString::null + * @param fileName The filename to assign to the tag. If TQString() * (the default) is passed, the filename of the existing tag is * used. * @bug Tag should have a correct copy ctor and assignment operator. * @return The duplicate Tag. */ - static Tag *duplicateTag(const Tag *tag, const TQString &fileName = TQString::null); + static Tag *duplicateTag(const Tag *tag, const TQString &fileName = TQString()); /** * Commits the changes to the PlaylistItems. It is important that the diff --git a/juk/trackpickerdialog.cpp b/juk/trackpickerdialog.cpp index 407ffea2..ee70ebda 100644 --- a/juk/trackpickerdialog.cpp +++ b/juk/trackpickerdialog.cpp @@ -25,13 +25,13 @@ #include "trackpickerdialog.h" #include "trackpickerdialogbase.h" -#define NUMBER(x) (x == 0 ? TQString::null : TQString::number(x)) +#define NUMBER(x) (x == 0 ? TQString() : TQString::number(x)) class TrackPickerItem : public KListViewItem { public: - TrackPickerItem(KListView *parent, const KTRMResult &result) : - KListViewItem(parent, parent->lastChild(), + TrackPickerItem(KListView *tqparent, const KTRMResult &result) : + KListViewItem(tqparent, tqparent->lastChild(), result.title(), result.artist(), result.album(), NUMBER(result.track()), NUMBER(result.year())), m_result(result) {} @@ -47,8 +47,8 @@ private: TrackPickerDialog::TrackPickerDialog(const TQString &name, const KTRMResultList &results, - TQWidget *parent) : - KDialogBase(parent, name.latin1(), true, i18n("Internet Tag Guesser"), Ok | Cancel, Ok, true) + TQWidget *tqparent) : + KDialogBase(tqparent, name.latin1(), true, i18n("Internet Tag Guesser"), Ok | Cancel, Ok, true) { m_base = new TrackPickerDialogBase(this); setMainWidget(m_base); diff --git a/juk/trackpickerdialog.h b/juk/trackpickerdialog.h index 06450efa..9cc5f347 100644 --- a/juk/trackpickerdialog.h +++ b/juk/trackpickerdialog.h @@ -29,11 +29,12 @@ class TrackPickerDialogBase; class TrackPickerDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: TrackPickerDialog(const TQString &name, const KTRMResultList &results, - TQWidget *parent = 0); + TQWidget *tqparent = 0); virtual ~TrackPickerDialog(); diff --git a/juk/trackpickerdialogbase.ui b/juk/trackpickerdialogbase.ui index b938fb19..69119f46 100644 --- a/juk/trackpickerdialogbase.ui +++ b/juk/trackpickerdialogbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>TrackPickerDialogBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>trackPickerDialogBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>fileLayout</cstring> </property> @@ -24,21 +24,21 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>fileInfoGroup</cstring> </property> <property name="title"> <string>File Name</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>fileLabel</cstring> </property> @@ -50,7 +50,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="indent"> @@ -61,7 +61,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>trackLayout</cstring> </property> @@ -69,14 +69,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>trackInfoGroup</cstring> </property> <property name="title"> <string>Select Best Possible Match</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <vbox> @@ -172,7 +172,7 @@ <tabstops> <tabstop>trackList</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/juk/tracksequencemanager.h b/juk/tracksequencemanager.h index a83cd508..8d90f7d9 100644 --- a/juk/tracksequencemanager.h +++ b/juk/tracksequencemanager.h @@ -33,9 +33,10 @@ class Playlist; * @see TrackSequenceIterator * @author Michael Pyne <michael.pyne@kdemail.net> */ -class TrackSequenceManager : public QObject +class TrackSequenceManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** diff --git a/juk/treeviewitemplaylist.cpp b/juk/treeviewitemplaylist.cpp index 22872760..38f85f10 100644 --- a/juk/treeviewitemplaylist.cpp +++ b/juk/treeviewitemplaylist.cpp @@ -52,7 +52,7 @@ void TreeViewItemPlaylist::retag(const TQStringList &files, Playlist *) if(KMessageBox::warningContinueCancelList( this, - i18n("You are about to change the %1 on these files.").arg(changedTag), + i18n("You are about to change the %1 on these files.").tqarg(changedTag), files, i18n("Changing Track Tags"), KStdGuiItem::cont(), diff --git a/juk/treeviewitemplaylist.h b/juk/treeviewitemplaylist.h index be7337c9..de2c13d9 100644 --- a/juk/treeviewitemplaylist.h +++ b/juk/treeviewitemplaylist.h @@ -24,11 +24,12 @@ class TQStringList; class TreeViewItemPlaylist : public SearchPlaylist { Q_OBJECT + TQ_OBJECT public: TreeViewItemPlaylist(PlaylistCollection *collection, const PlaylistSearch &search = PlaylistSearch(), - const TQString &name = TQString::null); + const TQString &name = TQString()); virtual bool searchIsEditable() const { return false; } void retag(const TQStringList &files, Playlist *donorPlaylist); diff --git a/juk/upcomingplaylist.cpp b/juk/upcomingplaylist.cpp index f31e3144..52da900e 100644 --- a/juk/upcomingplaylist.cpp +++ b/juk/upcomingplaylist.cpp @@ -208,7 +208,7 @@ void UpcomingPlaylist::UpcomingSequenceIterator::setCurrent(PlaylistItem *curren } // If the upcoming playlist is playing something, clear it out since - // apparently the user didn't want to hear it. + // aptqparently the user didn't want to hear it. PlaylistItem *playingItem = m_playlist->playingItem(); if(playingItem && playingItem->playlist() == m_playlist && currentItem != playingItem) @@ -250,7 +250,7 @@ TQDataStream &operator<<(TQDataStream &s, const UpcomingPlaylist &p) { PlaylistItemList l = const_cast<UpcomingPlaylist *>(&p)->items(); - s << Q_INT32(l.count()); + s << TQ_INT32(l.count()); for(PlaylistItemList::ConstIterator it = l.begin(); it != l.end(); ++it) s << (*it)->file().absFilePath(); @@ -262,11 +262,11 @@ TQDataStream &operator>>(TQDataStream &s, UpcomingPlaylist &p) { TQString fileName; PlaylistItem *newItem = 0; - Q_INT32 count; + TQ_INT32 count; s >> count; - for(Q_INT32 i = 0; i < count; ++i) { + for(TQ_INT32 i = 0; i < count; ++i) { s >> fileName; newItem = p.createItem(FileHandle(fileName), newItem, false); } diff --git a/juk/upcomingplaylist.h b/juk/upcomingplaylist.h index 4bd7b712..a0a95083 100644 --- a/juk/upcomingplaylist.h +++ b/juk/upcomingplaylist.h @@ -180,7 +180,7 @@ public: /** * This function sets the currently playing item to @a currentItem. If the - * item doesn't belong to the parent UpcomingPlaylist, it will be added to + * item doesn't belong to the tqparent UpcomingPlaylist, it will be added to * the UpcomingPlaylist, replacing any track that may be playing. * Otherwise, it is moved up and set to play, replacing any track that may * be playing. @@ -196,7 +196,7 @@ public: /** * This function readies the UpcomingSequenceIterator for playback, by - * making sure the parent UpcomingPlaylist has items to play if it is + * making sure the tqparent UpcomingPlaylist has items to play if it is * empty. */ virtual void prepareToPlay(Playlist *); diff --git a/juk/viewmode.cpp b/juk/viewmode.cpp index 6c46278b..785f765b 100644 --- a/juk/viewmode.cpp +++ b/juk/viewmode.cpp @@ -49,7 +49,7 @@ ViewMode::~ViewMode() void ViewMode::paintCell(PlaylistBox::Item *item, TQPainter *painter, - const TQColorGroup &colorGroup, + const TQColorGroup &tqcolorGroup, int column, int width, int) { if(width < item->pixmap(column)->width()) @@ -71,7 +71,7 @@ void ViewMode::paintCell(PlaylistBox::Item *item, TQPen newPen = oldPen; newPen.setWidth(5); - newPen.setJoinStyle(RoundJoin); + newPen.setJoinStyle(Qt::RoundJoin); newPen.setColor(TQColorGroup::Highlight); painter->setPen(newPen); @@ -79,21 +79,21 @@ void ViewMode::paintCell(PlaylistBox::Item *item, painter->setPen(oldPen); painter->fillRect(border, border, width - border * 2, item->height() - border * 2 + 1, - colorGroup.brush(TQColorGroup::Highlight)); - painter->setPen(colorGroup.highlightedText()); + tqcolorGroup.brush(TQColorGroup::Highlight)); + painter->setPen(tqcolorGroup.highlightedText()); } else painter->eraseRect(0, 0, width, item->height()); if (!pm->isNull()) { int x = (width - pm->width()) / 2; - x = QMAX(x, item->listView()->itemMargin()); + x = TQMAX(x, item->listView()->itemMargin()); painter->drawPixmap(x, y, *pm); } y += pm->height() + fm.height() - fm.descent(); for(TQStringList::Iterator it = m_lines[item].begin(); it != m_lines[item].end(); ++it) { int x = (width - fm.width(*it)) / 2; - x = QMAX(x, item->listView()->itemMargin()); + x = TQMAX(x, item->listView()->itemMargin()); painter->drawText(x, y, *it); y += fm.height() - fm.descent(); } @@ -104,8 +104,8 @@ void ViewMode::paintCell(PlaylistBox::Item *item, bool ViewMode::eventFilter(TQObject *watched, TQEvent *e) { - if(m_visible && watched == m_playlistBox->viewport() && e->type() == TQEvent::Resize) { - TQResizeEvent *re = static_cast<TQResizeEvent *>(e); + if(m_visible && TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_playlistBox->viewport()) && e->type() == TQEvent::Resize) { + TQResizeEvent *re = TQT_TQRESIZEEVENT(e); if(re->size().width() != re->oldSize().width()) m_needsRefresh = true; } @@ -168,7 +168,7 @@ void ViewMode::paintDropIndicator(TQPainter *painter, int width, int height) // TQPen newPen = oldPen; newPen.setWidth(lineWidth); - newPen.setStyle(DotLine); + newPen.setStyle(Qt::DotLine); painter->setPen(newPen); painter->drawRect(border, border, width - border * 2, height - border * 2); @@ -195,7 +195,7 @@ TQStringList ViewMode::lines(const PlaylistBox::Item *item, fm.width(line.mid(0, textLength).stripWhiteSpace()) + item->listView()->itemMargin() * 2 > width) { - int i = line.findRev(TQRegExp( "\\W"), textLength - 1); + int i = line.tqfindRev(TQRegExp( "\\W"), textLength - 1); if(i > 0) textLength = i; else @@ -224,10 +224,10 @@ CompactViewMode::~CompactViewMode() void CompactViewMode::paintCell(PlaylistBox::Item *item, TQPainter *painter, - const TQColorGroup &colorGroup, + const TQColorGroup &tqcolorGroup, int column, int width, int align) { - item->KListViewItem::paintCell(painter, colorGroup, column, width, align); + item->KListViewItem::paintCell(painter, tqcolorGroup, column, width, align); if(item == item->listView()->dropItem()) paintDropIndicator(painter, width, item->height()); } @@ -313,7 +313,7 @@ void TreeViewMode::removeItem(const TQString &item, unsigned column) return; } - if(!m_treeViewItems.find(itemKey)) + if(!m_treeViewItems.tqfind(itemKey)) return; TreeViewItemPlaylist *itemPlaylist = m_treeViewItems[itemKey]; @@ -363,7 +363,7 @@ void TreeViewMode::addItems(const TQStringList &items, unsigned column) item = *it; itemKey = searchCategory + item; - if(m_treeViewItems.find(itemKey)) + if(m_treeViewItems.tqfind(itemKey)) continue; components.clear(); diff --git a/juk/viewmode.h b/juk/viewmode.h index 2f164177..2ef4f007 100644 --- a/juk/viewmode.h +++ b/juk/viewmode.h @@ -26,9 +26,10 @@ class TQColorGroup; class SearchPlaylist; -class ViewMode : public QObject +class ViewMode : public TQObject { Q_OBJECT + TQ_OBJECT public: ViewMode(PlaylistBox *b); @@ -39,7 +40,7 @@ public: virtual void paintCell(PlaylistBox::Item *item, TQPainter *painter, - const TQColorGroup &colorGroup, + const TQColorGroup &tqcolorGroup, int column, int width, int align); virtual bool eventFilter(TQObject *watched, TQEvent *e); @@ -105,7 +106,7 @@ public: virtual void paintCell(PlaylistBox::Item *item, TQPainter *painter, - const TQColorGroup &colorGroup, + const TQColorGroup &tqcolorGroup, int column, int width, int align); virtual void setupItem(PlaylistBox::Item *item) const { item->KListViewItem::setup(); } @@ -120,6 +121,7 @@ class TreeViewItemPlaylist; class TreeViewMode : public CompactViewMode { Q_OBJECT + TQ_OBJECT public: TreeViewMode(PlaylistBox *l); @@ -149,6 +151,7 @@ private: class CoverManagerMode : public ViewMode { Q_OBJECT + TQ_OBJECT public: CoverManagerMode(PlaylistBox *b); diff --git a/juk/webimagefetcher.cpp b/juk/webimagefetcher.cpp index 1e5bec83..f8445bc3 100644 --- a/juk/webimagefetcher.cpp +++ b/juk/webimagefetcher.cpp @@ -37,13 +37,13 @@ WebImage::WebImage(const TQString &imageURL, const TQString &thumbURL, int width, int height) : m_imageURL(imageURL), m_thumbURL(thumbURL), - m_size(TQString("\n%1 x %2").arg(width).arg(height)) + m_size(TQString("\n%1 x %2").tqarg(width).tqarg(height)) { } -WebImageFetcher::WebImageFetcher(TQObject *parent) - : TQObject(parent), +WebImageFetcher::WebImageFetcher(TQObject *tqparent) + : TQObject(tqparent), m_connection(new TQHttp(this)), m_connectionId(-1), m_dialog(0) diff --git a/juk/webimagefetcher.h b/juk/webimagefetcher.h index 803fd434..4c2aafef 100644 --- a/juk/webimagefetcher.h +++ b/juk/webimagefetcher.h @@ -52,12 +52,13 @@ private: typedef TQValueList<WebImage> WebImageList; -class WebImageFetcher : public QObject +class WebImageFetcher : public TQObject { Q_OBJECT + TQ_OBJECT public: - WebImageFetcher(TQObject *parent); + WebImageFetcher(TQObject *tqparent); ~WebImageFetcher(); void setFile(const FileHandle &file); diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp index 5e9e0d0c..32cbbe9b 100644 --- a/juk/webimagefetcherdialog.cpp +++ b/juk/webimagefetcherdialog.cpp @@ -36,8 +36,8 @@ WebImageFetcherDialog::WebImageFetcherDialog(const WebImageList &imageList, const FileHandle &file, - TQWidget *parent) : - KDialogBase(parent, "internet_image_fetcher", true, TQString::null, + TQWidget *tqparent) : + KDialogBase(tqparent, "internet_image_fetcher", true, TQString(), Ok | Cancel | User1 , NoDefault, true), m_pixmap(TQPixmap()), m_imageList(imageList), @@ -86,15 +86,15 @@ void WebImageFetcherDialog::showCreditURL(const TQString &url) { // Don't use static member since I'm sure that someday knowing my luck // Yahoo will change their mimetype they serve. - (void) new KRun(KURL(url), topLevelWidget()); + (void) new KRun(KURL(url), tqtopLevelWidget()); } void WebImageFetcherDialog::setLayout() { setCaption(TQString("%1 - %2 (%3)") - .arg(m_file.tag()->artist()) - .arg(m_file.tag()->album()) - .arg(m_imageList.size())); + .tqarg(m_file.tag()->artist()) + .tqarg(m_file.tag()->album()) + .tqarg(m_imageList.size())); m_iconWidget->clear(); for(uint i = 0; i < m_imageList.size(); i++) @@ -184,8 +184,8 @@ TQPixmap WebImageFetcherDialog::pixmapFromURL(const KURL &url) const // CoverIconViewItem //////////////////////////////////////////////////////////////////////////////// -CoverIconViewItem::CoverIconViewItem(TQIconView *parent, const WebImage &image) : - TQObject(parent), KIconViewItem(parent, parent->lastItem(), image.size()), m_job(0) +CoverIconViewItem::CoverIconViewItem(TQIconView *tqparent, const WebImage &image) : + TQObject(tqparent), KIconViewItem(tqparent, tqparent->lastItem(), image.size()), m_job(0) { // Set up the iconViewItem @@ -218,7 +218,7 @@ CoverIconViewItem::~CoverIconViewItem() void CoverIconViewItem::imageData(KIO::Job *, const TQByteArray &data) { int currentSize = m_buffer.size(); - m_buffer.resize(currentSize + data.size(), TQGArray::SpeedOptim); + m_buffer.tqresize(currentSize + data.size(), TQGArray::SpeedOptim); memcpy(&(m_buffer.data()[currentSize]), data.data(), data.size()); } @@ -228,7 +228,7 @@ void CoverIconViewItem::imageResult(KIO::Job *job) return; TQPixmap iconImage(m_buffer); - iconImage = TQImage(iconImage.convertToImage()).smoothScale(80, 80, TQImage::ScaleMin); + iconImage = TQImage(iconImage.convertToImage()).smoothScale(80, 80, TQ_ScaleMin); setPixmap(iconImage, true, true); } diff --git a/juk/webimagefetcherdialog.h b/juk/webimagefetcherdialog.h index d418a947..bd9eb43e 100644 --- a/juk/webimagefetcherdialog.h +++ b/juk/webimagefetcherdialog.h @@ -27,11 +27,12 @@ class KURL; class WebImageFetcherDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: WebImageFetcherDialog(const WebImageList &urlList, const FileHandle &file, - TQWidget *parent = 0); + TQWidget *tqparent = 0); virtual ~WebImageFetcherDialog(); @@ -73,9 +74,10 @@ namespace KIO class CoverIconViewItem : public TQObject, public KIconViewItem { Q_OBJECT + TQ_OBJECT public: - CoverIconViewItem(TQIconView *parent, const WebImage &image); + CoverIconViewItem(TQIconView *tqparent, const WebImage &image); ~CoverIconViewItem(); private slots: diff --git a/kaboodle/conf.cpp b/kaboodle/conf.cpp index 4570bf2e..370946e4 100644 --- a/kaboodle/conf.cpp +++ b/kaboodle/conf.cpp @@ -32,7 +32,7 @@ #include "view.h" Kaboodle::Conf::Conf(TQWidget *_parent, const char *_name) - : KDialogBase(_parent, _name, true, TQString::null, Ok | Cancel) + : KDialogBase(_parent, _name, true, TQString(), Ok | Cancel) { TQVBox *box = makeVBoxMainWidget(); diff --git a/kaboodle/conf.h b/kaboodle/conf.h index 884593ba..a3d46dd8 100644 --- a/kaboodle/conf.h +++ b/kaboodle/conf.h @@ -36,6 +36,7 @@ namespace Kaboodle class Conf : public KDialogBase { Q_OBJECT + TQ_OBJECT public: Conf(TQWidget *_parent = 0, const char *_name = 0); diff --git a/kaboodle/controls.cpp b/kaboodle/controls.cpp index 305ae661..b718b659 100644 --- a/kaboodle/controls.cpp +++ b/kaboodle/controls.cpp @@ -23,15 +23,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "controls.h" -Kaboodle::L33tSlider::L33tSlider(TQWidget * parent, const char * name) : - TQSlider(parent,name), pressed(false) +Kaboodle::L33tSlider::L33tSlider(TQWidget * tqparent, const char * name) : + TQSlider(tqparent,name), pressed(false) {} -Kaboodle::L33tSlider::L33tSlider(Orientation o, TQWidget * parent, const char * name) : - TQSlider(o,parent,name), pressed(false) +Kaboodle::L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * tqparent, const char * name) : + TQSlider(o,tqparent,name), pressed(false) {} Kaboodle::L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value, - Orientation o, TQWidget * parent, const char * name) : - TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) + Qt::Orientation o, TQWidget * tqparent, const char * name) : + TQSlider(minValue, maxValue, pageStep, value, o, tqparent,name), pressed(false) {} bool Kaboodle::L33tSlider::currentlyPressed() const @@ -47,7 +47,7 @@ void Kaboodle::L33tSlider::setValue(int i) void Kaboodle::L33tSlider::mousePressEvent(TQMouseEvent*e) { - if (e->button()!=RightButton) + if (e->button()!=Qt::RightButton) { pressed=true; TQSlider::mousePressEvent(e); @@ -76,8 +76,8 @@ void Kaboodle::L33tSlider::wheelEvent(TQWheelEvent *e) } Kaboodle::SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver, - const char *member, TQObject* parent, const char* name ) - : KAction( text, accel, parent, name ) + const char *member, TQObject* tqparent, const char* name ) + : KAction( text, accel, tqparent, name ) { m_receiver = receiver; m_member = member; @@ -91,7 +91,7 @@ int Kaboodle::SliderAction::plug( TQWidget *w, int index ) int id = KAction::getToolButtonID(); //Create it. - m_slider=new L33tSlider(0, 1000, 100, 0, Horizontal, toolBar); + m_slider=new L33tSlider(0, 1000, 100, 0,Qt::Horizontal, toolBar); m_slider->setMinimumWidth(10); toolBar->insertWidget(id, 10, m_slider, index ); @@ -115,12 +115,12 @@ return; /* if (pos == KToolBar::Left || pos == KToolBar::Right) { - m_slider->setOrientation(Vertical); + m_slider->setOrientationVertical); m_slider->setFixedWidth(m_slider->height()); } else { - m_slider->setOrientation(Horizontal); + m_slider->setOrientationHorizontal); m_slider->resize(m_slider->height(), m_slider->height()); } */ diff --git a/kaboodle/controls.h b/kaboodle/controls.h index c89ee8d5..19b11fde 100644 --- a/kaboodle/controls.h +++ b/kaboodle/controls.h @@ -40,14 +40,15 @@ namespace Kaboodle * A slider that can be moved around while being * changed internally **/ -class L33tSlider : public QSlider +class L33tSlider : public TQSlider { Q_OBJECT + TQ_OBJECT public: - L33tSlider(TQWidget * parent, const char * name=0); - L33tSlider(Orientation, TQWidget * parent, const char * name=0); + L33tSlider(TQWidget * tqparent, const char * name=0); + L33tSlider(Qt::Orientation, TQWidget * tqparent, const char * name=0); L33tSlider(int minValue, int maxValue, int pageStep, int value, - Orientation, TQWidget * parent, const char * name=0); + Qt::Orientation, TQWidget * tqparent, const char * name=0); bool currentlyPressed() const; signals: @@ -73,9 +74,10 @@ private: class SliderAction : public KAction { Q_OBJECT + TQ_OBJECT public: SliderAction(const TQString& text, int accel, const TQObject *receiver, - const char *member, TQObject* parent, const char* name ); + const char *member, TQObject* tqparent, const char* name ); virtual int plug( TQWidget *w, int index = -1 ); virtual void unplug( TQWidget *w ); TQSlider* slider() const { return m_slider; } diff --git a/kaboodle/engine.cpp b/kaboodle/engine.cpp index 5909dbcd..f103ca19 100644 --- a/kaboodle/engine.cpp +++ b/kaboodle/engine.cpp @@ -71,8 +71,8 @@ public: KURL file; }; -Kaboodle::Engine::Engine(TQObject *parent) - : TQObject(parent) +Kaboodle::Engine::Engine(TQObject *tqparent) + : TQObject(tqparent) , d(new EnginePrivate) { } diff --git a/kaboodle/engine.h b/kaboodle/engine.h index c8001e56..5a1b51b3 100644 --- a/kaboodle/engine.h +++ b/kaboodle/engine.h @@ -42,12 +42,13 @@ namespace Kaboodle * Does almost everything related to multimedia. * Most interfacing should be done with Player **/ -class Engine : public QObject +class Engine : public TQObject { Q_OBJECT + TQ_OBJECT public: - Engine(TQObject *parent=0); + Engine(TQObject *tqparent=0); ~Engine(); Arts::PlayObject playObject() const; diff --git a/kaboodle/kaboodle_factory.cpp b/kaboodle/kaboodle_factory.cpp index 99302702..0b842d53 100644 --- a/kaboodle/kaboodle_factory.cpp +++ b/kaboodle/kaboodle_factory.cpp @@ -42,15 +42,15 @@ Kaboodle::KaboodleFactory::~KaboodleFactory() s_instance = 0; } -KParts::Part *Kaboodle::KaboodleFactory::createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &) +KParts::Part *Kaboodle::KaboodleFactory::createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *tqparent, const char *name, const char *className, const TQStringList &) { if(className == TQString("KMediaPlayer/Engine")) { - return new Player(parent, name); + return new Player(tqparent, name); } else { - return new Player(widgetParent, widgetName, parent, name); + return new Player(widgetParent, widgetName, tqparent, name); } } diff --git a/kaboodle/kaboodle_factory.h b/kaboodle/kaboodle_factory.h index 415876d5..46e02af6 100644 --- a/kaboodle/kaboodle_factory.h +++ b/kaboodle/kaboodle_factory.h @@ -35,12 +35,13 @@ class Player; class KaboodleFactory : public KParts::Factory { Q_OBJECT + TQ_OBJECT public: KaboodleFactory(); virtual ~KaboodleFactory(); - virtual KParts::Part *createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList()); + virtual KParts::Part *createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *tqparent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); static const KAboutData *aboutData(); static KInstance *instance(); diff --git a/kaboodle/kaboodleapp.h b/kaboodle/kaboodleapp.h index 92073c96..8f61b234 100644 --- a/kaboodle/kaboodleapp.h +++ b/kaboodle/kaboodleapp.h @@ -33,6 +33,7 @@ class UserInterface; class KaboodleApp : public KApplication { Q_OBJECT + TQ_OBJECT public: KaboodleApp(); diff --git a/kaboodle/main.cpp b/kaboodle/main.cpp index 943e90df..b3f4f84e 100644 --- a/kaboodle/main.cpp +++ b/kaboodle/main.cpp @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "kaboodle_factory.h" #include "kaboodleapp.h" -void noMessageOutput(QtMsgType, const char *) +void noMessageOutput(TQtMsgType, const char *) { } @@ -37,7 +37,7 @@ static KCmdLineOptions options[] = { { "+[URL]", I18N_NOOP("URL to open"), 0 }, #ifndef NDEBUG - { "qdebug", I18N_NOOP("Turn on Qt Debug output"), 0 }, + { "qdebug", I18N_NOOP("Turn on TQt Debug output"), 0 }, #endif KCmdLineLastOption }; @@ -49,7 +49,7 @@ int main(int argc, char **argv) #ifndef NDEBUG if(!KCmdLineArgs::parsedArgs()->isSet("qdebug")) - qInstallMsgHandler(noMessageOutput); + tqInstallMsgHandler(noMessageOutput); #endif Kaboodle::KaboodleApp::addCmdLineOptions(); diff --git a/kaboodle/player.cpp b/kaboodle/player.cpp index 70517c2d..32cc37d2 100644 --- a/kaboodle/player.cpp +++ b/kaboodle/player.cpp @@ -32,8 +32,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "player.h" #include "view.h" -Kaboodle::Player::Player(TQObject *parent, const char *name) - : KMediaPlayer::Player(parent, name) +Kaboodle::Player::Player(TQObject *tqparent, const char *name) + : KMediaPlayer::Player(tqparent, name) , engine(new Engine(this)) , widget(0) , uncompleted(true) @@ -47,8 +47,8 @@ Kaboodle::Player::Player(TQObject *parent, const char *name) } Kaboodle::Player::Player(TQWidget *widgetParent, const char *widgetName, - TQObject *parent, const char *name) - : KMediaPlayer::Player(widgetParent, widgetName, parent, name) + TQObject *tqparent, const char *name) + : KMediaPlayer::Player(widgetParent, widgetName, tqparent, name) , engine(new Engine(this)) , widget(new View(widgetParent, widgetName, this)) , uncompleted(true) @@ -244,8 +244,8 @@ void Kaboodle::Player::tickerTimeout(void) if(extension) emit setStatusBarText(i18n("Playing %1 - %2") - .arg(current.prettyURL()) - .arg(positionString() + "/" + lengthString())); + .tqarg(current.prettyURL()) + .tqarg(positionString() + "/" + lengthString())); } updateTitle(); @@ -260,8 +260,8 @@ void Kaboodle::Player::updateTitle() } } -Kaboodle::BrowserExtension::BrowserExtension(Player *parent) - : KParts::BrowserExtension(parent, "Kaboodle Browser Extension") +Kaboodle::BrowserExtension::BrowserExtension(Player *tqparent) + : KParts::BrowserExtension(tqparent, "Kaboodle Browser Extension") { } diff --git a/kaboodle/player.h b/kaboodle/player.h index 4d67abb6..ee7f1b0a 100644 --- a/kaboodle/player.h +++ b/kaboodle/player.h @@ -43,19 +43,21 @@ class View; class BrowserExtension : public KParts::BrowserExtension { Q_OBJECT + TQ_OBJECT public: - BrowserExtension(Player *parent); + BrowserExtension(Player *tqparent); }; class Player : public KMediaPlayer::Player { Q_OBJECT + TQ_OBJECT public: Player(TQWidget *widgetParent, const char *widgetName, - TQObject *parent, const char *name); - Player(TQObject *parent, const char *name); + TQObject *tqparent, const char *name); + Player(TQObject *tqparent, const char *name); virtual ~Player(); virtual bool openURL(const KURL &); diff --git a/kaboodle/userinterface.cpp b/kaboodle/userinterface.cpp index 72449fcf..5dd8bd70 100644 --- a/kaboodle/userinterface.cpp +++ b/kaboodle/userinterface.cpp @@ -48,22 +48,22 @@ #include "view.h" #include "userinterface.h" -Kaboodle::UserInterface::UserInterface(TQWidget *parent, const KURL &initialFile) - : KParts::MainWindow(parent) +Kaboodle::UserInterface::UserInterface(TQWidget *tqparent, const KURL &initialFile) + : KParts::MainWindow(tqparent) { setAcceptDrops(true); setStandardToolBarMenuEnabled(true); - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(playerPreferences()), actionCollection()); - KStdAction::keyBindings( this, TQT_SLOT( slotConfigureKeys() ), actionCollection() ); + KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(playerPreferences()), actionCollection()); + KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys() ), actionCollection() ); - menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), actionCollection()); - propertiesAction = new KAction(i18n("Properties"), 0, this, TQT_SLOT(properties()), actionCollection(), "properties"); + menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()), actionCollection()); + propertiesAction = new KAction(i18n("Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(properties()), actionCollection(), "properties"); propertiesAction->setEnabled(false); - part = new Player(this, "KaboodlePlayer", this, "KaboodleView"); + part = new Player(this, "KaboodlePlayer", TQT_TQOBJECT(this), "KaboodleView"); part->view()->setButtons(KMediaPlayer::View::Seeker); setCentralWidget(part->view()); @@ -109,7 +109,7 @@ Kaboodle::UserInterface::~UserInterface(void) void Kaboodle::UserInterface::fileOpen(void) { - KURL file(KFileDialog::getOpenURL(TQString::null, KDE::PlayObjectFactory::mimeTypes().join(" "), this, i18n("Select File to Play"))); + KURL file(KFileDialog::getOpenURL(TQString(), KDE::PlayObjectFactory::mimeTypes().join(" "), this, i18n("Select File to Play"))); if(file.isValid()) { part->openURL(file); diff --git a/kaboodle/userinterface.h b/kaboodle/userinterface.h index a58dfa5d..076a4eec 100644 --- a/kaboodle/userinterface.h +++ b/kaboodle/userinterface.h @@ -42,8 +42,9 @@ namespace Kaboodle class UserInterface : public KParts::MainWindow { Q_OBJECT + TQ_OBJECT public: - UserInterface(TQWidget *parent, const KURL &initialFile = KURL()); + UserInterface(TQWidget *tqparent, const KURL &initialFile = KURL()); virtual ~UserInterface(void); void load(const TQString& url); diff --git a/kaboodle/view.cpp b/kaboodle/view.cpp index eba6ff20..75171584 100644 --- a/kaboodle/view.cpp +++ b/kaboodle/view.cpp @@ -55,8 +55,8 @@ TQButton *createButton(const TQIconSet &_iconset, const TQString &_tip, TQObject } } -Kaboodle::View::View(TQWidget *parent, const char *name, Player *p) - : KMediaPlayer::View(parent, name) +Kaboodle::View::View(TQWidget *tqparent, const char *name, Player *p) + : KMediaPlayer::View(tqparent, name) , state((KMediaPlayer::Player::State)p->state()) , autoPlay(false) , quitAfterPlaying(false) @@ -77,19 +77,19 @@ Kaboodle::View::View(TQWidget *parent, const char *name, Player *p) connect(video, TQT_SIGNAL(mouseButtonDoubleClick(const TQPoint&, int)), this, TQT_SLOT(slotDblClick(const TQPoint &, int) ) ) ; TQWidget *sliderBox = new TQWidget(box); - sliderBox->setFocusPolicy(TQWidget::ClickFocus); + sliderBox->setFocusPolicy(TQ_ClickFocus); sliderBox->setAcceptDrops(true); - TQHBoxLayout *layout = new TQHBoxLayout(sliderBox); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(0); - layout->setAutoAdd(true); + TQHBoxLayout *tqlayout = new TQHBoxLayout(sliderBox); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(0); + tqlayout->setAutoAdd(true); playButton = createButton(BarIconSet("1rightarrow"), i18n("Play"), player, TQT_SLOT(play()), sliderBox); pauseButton = createButton(BarIconSet("player_pause"), i18n("Pause"), player, TQT_SLOT(pause()), sliderBox); stopButton = createButton(BarIconSet("player_stop"), i18n("Stop"), player, TQT_SLOT(stop()), sliderBox); - slider = new L33tSlider(0, 1000, 10, 0, L33tSlider::Horizontal, sliderBox); + slider = new L33tSlider(0, 1000, 10, 0, Qt::Horizontal, sliderBox); slider->setTickmarks(TQSlider::NoMarks); slider->show(); @@ -99,7 +99,7 @@ Kaboodle::View::View(TQWidget *parent, const char *name, Player *p) labelFont.setBold(true); TQFontMetrics labelFontMetrics(labelFont); elapsedLabel->setFont(labelFont); - elapsedLabel->setAlignment(AlignCenter | AlignVCenter | ExpandTabs); + elapsedLabel->tqsetAlignment(AlignCenter | AlignVCenter | ExpandTabs); elapsedLabel->setFixedHeight(labelFontMetrics.height()); elapsedLabel->setMinimumWidth(labelFontMetrics.width("00:00")); diff --git a/kaboodle/view.h b/kaboodle/view.h index 4e2f3edf..5aa2a6b7 100644 --- a/kaboodle/view.h +++ b/kaboodle/view.h @@ -45,9 +45,10 @@ namespace Kaboodle class View : public KMediaPlayer::View { Q_OBJECT + TQ_OBJECT public: - View(TQWidget *parent, const char *name, Player *player); + View(TQWidget *tqparent, const char *name, Player *player); virtual ~View(void); /** diff --git a/kaudiocreator/cdconfig.ui b/kaudiocreator/cdconfig.ui index 3c688699..d437181f 100644 --- a/kaudiocreator/cdconfig.ui +++ b/kaudiocreator/cdconfig.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>CdConfig</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CdConfig</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_performCDDBauto</cstring> </property> @@ -27,7 +27,7 @@ <string>&Perform CDDB lookup automatically</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_autoRip</cstring> </property> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -54,8 +54,8 @@ </spacer> </vbox> </widget> -<slots> +<Q_SLOTS> <slot access="protected" specifier="non virtual">configureAudioCD()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/encodefile.ui b/kaudiocreator/encodefile.ui index 21163f87..b6395f6d 100644 --- a/kaudiocreator/encodefile.ui +++ b/kaudiocreator/encodefile.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>EncodeFile</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -48,7 +48,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -59,7 +59,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox" row="3" column="1"> + <widget class="TQSpinBox" row="3" column="1"> <property name="name"> <cstring>track</cstring> </property> @@ -67,70 +67,70 @@ <number>1</number> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> <property name="text"> <string>Track:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> <property name="text"> <string>Comment:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>track_comment</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> <property name="text"> <string>Title:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel2</cstring> </property> <property name="text"> <string>Artist:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="2" colspan="1"> + <widget class="TQLineEdit" row="1" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>track_title</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>track_artist</cstring> </property> </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -141,43 +141,43 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>artist</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> <property name="text"> <string>Artist:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel7</cstring> </property> <property name="text"> <string>Album:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>album</cstring> </property> </widget> - <widget class="QSpinBox" row="3" column="1"> + <widget class="TQSpinBox" row="3" column="1"> <property name="name"> <cstring>year</cstring> </property> @@ -185,49 +185,49 @@ <number>99999</number> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel8</cstring> </property> <property name="text"> <string>Year:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel9</cstring> </property> <property name="text"> <string>Genre:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QComboBox" row="4" column="1"> + <widget class="TQComboBox" row="4" column="1"> <property name="name"> <cstring>genre</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel10</cstring> </property> <property name="text"> <string>Comment:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLineEdit" row="5" column="1"> + <widget class="TQLineEdit" row="5" column="1"> <property name="name"> <cstring>comment</cstring> </property> @@ -244,7 +244,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -265,9 +265,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -283,14 +283,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>121</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>encodeButton</cstring> </property> @@ -301,7 +301,7 @@ <string>&Encode File</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>closeButton</cstring> </property> @@ -335,7 +335,7 @@ <tabstop>encodeButton</tabstop> <tabstop>closeButton</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdialog.h</includehint> <includehint>kurlrequester.h</includehint> diff --git a/kaudiocreator/encodefileimp.cpp b/kaudiocreator/encodefileimp.cpp index 59f32405..d4aae9a3 100644 --- a/kaudiocreator/encodefileimp.cpp +++ b/kaudiocreator/encodefileimp.cpp @@ -27,8 +27,8 @@ #include <tqcombobox.h> #include <kmessagebox.h> -EncodeFileImp::EncodeFileImp(TQWidget* parent, - const char* name) : EncodeFile(parent, name), m_genres(KCDDB::Genres()) { +EncodeFileImp::EncodeFileImp(TQWidget* tqparent, + const char* name) : EncodeFile(tqparent, name), m_genres(KCDDB::Genres()) { genre->insertStringList(m_genres.i18nList()); // Specify to only accept wav files file->setFilter("*.wav|Wav Files"); @@ -70,7 +70,7 @@ void EncodeFileImp::encode(){ int counter(1); KMessageBox::information(this, i18n("%1 Job(s) have been started. You can watch their progress in the " \ - "jobs section.").arg(counter), + "jobs section.").tqarg(counter), i18n("Jobs have started"), i18n("Jobs have started")); } diff --git a/kaudiocreator/encodefileimp.h b/kaudiocreator/encodefileimp.h index e0e6eaa7..de556417 100644 --- a/kaudiocreator/encodefileimp.h +++ b/kaudiocreator/encodefileimp.h @@ -33,13 +33,14 @@ class Job; class EncodeFileImp : public EncodeFile { Q_OBJECT + TQ_OBJECT signals: // Start encoding this wav file void startJob(Job *newJob); public: - EncodeFileImp(TQWidget* parent = 0, const char* name = 0); + EncodeFileImp(TQWidget* tqparent = 0, const char* name = 0); protected slots: // Encode button diff --git a/kaudiocreator/encoder.cpp b/kaudiocreator/encoder.cpp index ced2fcac..a0567fbf 100644 --- a/kaudiocreator/encoder.cpp +++ b/kaudiocreator/encoder.cpp @@ -37,7 +37,7 @@ /** * Constructor, load settings. */ -Encoder::Encoder( TQObject* parent, const char* name):TQObject(parent,name),reportCount(0) { +Encoder::Encoder( TQObject* tqparent, const char* name):TQObject(tqparent,name),reportCount(0) { loadSettings(); } @@ -53,11 +53,11 @@ void Encoder::loadSettings() { EncoderPrefs* Encoder::loadEncoder( int encoder ){ EncoderPrefs* prefs; - TQString currentEncoderGroup = TQString("Encoder_%1").arg(encoder); + TQString currentEncoderGroup = TQString("Encoder_%1").tqarg(encoder); prefs = EncoderPrefs::prefs(currentEncoderGroup); if ( !EncoderPrefs::hasPrefs(currentEncoderGroup) ) { KMessageBox::sorry(0, i18n("No encoder has been selected.\nPlease select an encoder in the configuration."), i18n("No Encoder Selected")); - prefs->setCommandLine(TQString::null); + prefs->setCommandLine(TQString()); } return prefs; @@ -132,8 +132,8 @@ void Encoder::removeJob(int id ) { * @param job the job to encode. */ void Encoder::encodeWav(Job *job ) { - emit(addJob(job, i18n("Encoding (%1): %2 - %3").arg(loadEncoder(job->encoder)->extension()) - .arg(job->track_artist).arg(job->track_title))); + emit(addJob(job, i18n("Encoding (%1): %2 - %3").tqarg(loadEncoder(job->encoder)->extension()) + .tqarg(job->track_artist).tqarg(job->track_title))); pendingJobs.append(job); tendToNewJobs(); } @@ -160,7 +160,7 @@ void Encoder::tendToNewJobs() { EncoderPrefs* prefs = loadEncoder(job->encoder); TQString desiredFile = Prefs::fileFormat(); - desiredFile.replace( TQRegExp("~"), TQDir::homeDirPath() ); + desiredFile.tqreplace( TQRegExp("~"), TQDir::homeDirPath() ); { TQMap <TQString,TQString> map; map.insert("extension", prefs->extension()); @@ -185,7 +185,7 @@ void Encoder::tendToNewJobs() { } } - int lastSlash = desiredFile.findRev('/',-1); + int lastSlash = desiredFile.tqfindRev('/',-1); if ( lastSlash == -1 || !(KStandardDirs::makeDir( desiredFile.mid(0,lastSlash), 0775)) ) { KMessageBox::sorry(0, i18n("Cannot place file, unable to make directories."), i18n("Encoding Failed")); @@ -211,7 +211,7 @@ void Encoder::tendToNewJobs() { KShellProcess *proc = new KShellProcess(); proc->setPriority(Prefs::niceLevel()); - *proc << TQFile::encodeName(command); + *proc << TQFile::encodeName(command).data(); connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )), this, TQT_SLOT(receivedThreadOutput(KProcess *, char *, int ))); connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int )), @@ -225,7 +225,7 @@ void Encoder::tendToNewJobs() { } /** - * We have received some output from a thread. See if it contains %. + * We have received some output from a thread. See if it tqcontains %. * @param proc the process that has new output. * @param buffer the output from the process * @param buflen the length of the buffer. @@ -235,7 +235,7 @@ void Encoder::receivedThreadOutput(KProcess *process, char *buffer, int length ) kdDebug(60002) << buffer << endl; // Make sure we have a job to send an update too. - if(jobs.find((KShellProcess*)process) == jobs.end()){ + if(jobs.tqfind((KShellProcess*)process) == jobs.end()){ kdDebug(60002) << "Encoder::receivedThreadOutput Job doesn't exists. Line: " << __LINE__ << endl; return; } @@ -247,17 +247,17 @@ void Encoder::receivedThreadOutput(KProcess *process, char *buffer, int length ) // Make sure the output string has a % symble in it. TQString output = TQString(buffer).mid(0,length); - if ( output.find('%') == -1 && reportCount < 5 ) { + if ( output.tqfind('%') == -1 && reportCount < 5 ) { kdDebug(60002) << "No \'%%\' in output. Report as bug w/encoder options if progressbar doesn't fill." << endl; reportCount++; return; } - //qDebug(TQString("Pre cropped: %1").arg(output).latin1()); - output = output.mid(output.find('%')-loadEncoder(job->encoder)->percentLength(),2); - //qDebug(TQString("Post cropped: %1").arg(output).latin1()); + //qDebug(TQString("Pre cropped: %1").tqarg(output).latin1()); + output = output.mid(output.tqfind('%')-loadEncoder(job->encoder)->percentLength(),2); + //qDebug(TQString("Post cropped: %1").tqarg(output).latin1()); bool conversionSuccessfull = false; int percent = output.toInt(&conversionSuccessfull); - //qDebug(TQString("number: %1").arg(percent).latin1()); + //qDebug(TQString("number: %1").tqarg(percent).latin1()); if ( percent >= 0 && percent < 100 && conversionSuccessfull ) { emit(updateProgress(job->id, percent)); } @@ -284,7 +284,7 @@ void Encoder::jobDone(KProcess *process ) { bool showDebugBox = false; if ( process->exitStatus() == 127 ) { - KMessageBox::sorry(0, i18n("The selected encoder was not found.\nThe wav file has been removed. Command was: %1").arg(job->errorString), i18n("Encoding Failed")); + KMessageBox::sorry(0, i18n("The selected encoder was not found.\nThe wav file has been removed. Command was: %1").tqarg(job->errorString), i18n("Encoding Failed")); emit(updateProgress(job->id, -1)); } else if ( TQFile::exists(job->newLocation) ) { diff --git a/kaudiocreator/encoder.h b/kaudiocreator/encoder.h index 24ebcafc..1209c71d 100644 --- a/kaudiocreator/encoder.h +++ b/kaudiocreator/encoder.h @@ -33,6 +33,7 @@ class EncoderPrefs; class Encoder : public TQObject { Q_OBJECT + TQ_OBJECT signals: void addJob(Job *job, const TQString &name); @@ -40,7 +41,7 @@ signals: void jobsChanged(); public: - Encoder( TQObject* parent = 0, const char* name = 0); + Encoder( TQObject* tqparent = 0, const char* name = 0); ~Encoder(); int activeJobCount(); int pendingJobCount(); diff --git a/kaudiocreator/encoderconfig.ui b/kaudiocreator/encoderconfig.ui index edab93fb..1c7d70f6 100644 --- a/kaudiocreator/encoderconfig.ui +++ b/kaudiocreator/encoderconfig.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>EncoderConfig</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EncoderConfig</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,12 +19,12 @@ <property name="margin"> <number>0</number> </property> - <widget class="QListBox" row="0" column="0" rowspan="3" colspan="1"> + <widget class="TQListBox" row="0" column="0" rowspan="3" colspan="1"> <property name="name"> <cstring>kcfg_currentEncoder</cstring> </property> </widget> - <widget class="QPushButton" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>addEncoder</cstring> </property> @@ -32,7 +32,7 @@ <string>&Add...</string> </property> </widget> - <widget class="QPushButton" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>removeEncoder</cstring> </property> @@ -40,7 +40,7 @@ <string>&Remove</string> </property> </widget> - <widget class="QPushButton" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>configureEncoder</cstring> </property> @@ -62,7 +62,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QGroupBox" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>GroupBox3</cstring> </property> @@ -79,7 +79,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -87,12 +87,12 @@ <string>Location:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>kcfg_fileFormat</cstring> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>encoderWizardButton</cstring> </property> @@ -102,7 +102,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -113,7 +113,7 @@ <cstring>kcfg_numberOfCpus</cstring> </property> </widget> - <widget class="QSpinBox" row="6" column="1"> + <widget class="TQSpinBox" row="6" column="1"> <property name="name"> <cstring>kcfg_numberOfCpus</cstring> </property> @@ -131,22 +131,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>currentEncoderText</cstring> </property> @@ -154,7 +154,7 @@ <string>Current encoder:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>currentEncoderName</cstring> </property> @@ -188,14 +188,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> </size> </property> </spacer> - <widget class="QGroupBox" row="9" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="9" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -206,7 +206,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQSlider" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_NiceLevel</cstring> </property> @@ -226,7 +226,7 @@ <enum>NoMarks</enum> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -234,25 +234,25 @@ <string>Highest</string> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel3</cstring> </property> <property name="text"> <string>Lowest</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel4</cstring> </property> <property name="text"> <string>Normal</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -286,8 +286,8 @@ <includes> <include location="local" impldecl="in implementation">encoderconfig.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot>encoderWizard()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/encoderconfig.ui.h b/kaudiocreator/encoderconfig.ui.h index e24f9535..7650b239 100644 --- a/kaudiocreator/encoderconfig.ui.h +++ b/kaudiocreator/encoderconfig.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/kaudiocreator/encoderconfigimp.cpp b/kaudiocreator/encoderconfigimp.cpp index e49dd6a9..4455781c 100644 --- a/kaudiocreator/encoderconfigimp.cpp +++ b/kaudiocreator/encoderconfigimp.cpp @@ -32,8 +32,8 @@ /** * Constructor. */ -EncoderConfigImp::EncoderConfigImp( TQWidget* parent, const char* name) : - EncoderConfig (parent, name) { +EncoderConfigImp::EncoderConfigImp( TQWidget* tqparent, const char* name) : + EncoderConfig (tqparent, name) { connect(addEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(addEncoderSlot())); connect(removeEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeEncoderSlot())); connect(configureEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureEncoderSlot())); @@ -93,7 +93,7 @@ void EncoderConfigImp::loadEncoderList(){ int lastKnownEncoder = Prefs::lastKnownEncoder(); lastKnownEncoder++; for( int i=0; i<=lastKnownEncoder; i++ ){ - TQString currentGroup = TQString("Encoder_%1").arg(i); + TQString currentGroup = TQString("Encoder_%1").tqarg(i); if(EncoderPrefs::hasPrefs(currentGroup)){ lastEncoder = i; EncoderPrefs *encPrefs = EncoderPrefs::prefs(currentGroup); @@ -123,7 +123,7 @@ void EncoderConfigImp::addEncoderSlot(){ uint number = 0; TQString groupName; while(!foundEmptyGroup){ - groupName = TQString("Encoder_%1").arg(number); + groupName = TQString("Encoder_%1").tqarg(number); if(!EncoderPrefs::hasPrefs(groupName)) foundEmptyGroup = true; else @@ -242,7 +242,7 @@ void EncoderConfigImp::updateEncoder(const char *dialogName){ if(newName == encoderName) return; - TQListBoxItem *item = kcfg_currentEncoder->findItem(encoderName); + TQListBoxItem *item = kcfg_currentEncoder->tqfindItem(encoderName); if(!item) return; kcfg_currentEncoder->changeItem(newName, kcfg_currentEncoder->index(item)); @@ -260,7 +260,7 @@ EncoderPrefs *EncoderPrefs::prefs(const TQString &groupName) m_prefs = new TQDict<EncoderPrefs>(); m_prefs->setAutoDelete(true); } - EncoderPrefs *encPrefs = m_prefs->find(groupName); + EncoderPrefs *encPrefs = m_prefs->tqfind(groupName); if (encPrefs) return encPrefs; diff --git a/kaudiocreator/encoderconfigimp.h b/kaudiocreator/encoderconfigimp.h index a72e138f..86fbf5a4 100644 --- a/kaudiocreator/encoderconfigimp.h +++ b/kaudiocreator/encoderconfigimp.h @@ -32,12 +32,13 @@ class EncoderConfigImp : public EncoderConfig { Q_OBJECT + TQ_OBJECT signals: void encoderUpdated(); public: - EncoderConfigImp( TQWidget* parent = 0, const char* name = 0); + EncoderConfigImp( TQWidget* tqparent = 0, const char* name = 0); private slots: void addEncoderSlot(); diff --git a/kaudiocreator/encoderedit.ui b/kaudiocreator/encoderedit.ui index 6a0fa7f0..e45c977a 100644 --- a/kaudiocreator/encoderedit.ui +++ b/kaudiocreator/encoderedit.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EncoderEdit</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EncoderEdit</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>kcfg_commandLine</cstring> </property> @@ -24,11 +24,11 @@ <string>app.exe %f %o</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>kcfg_encoderName</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>320</width> <height>0</height> @@ -38,7 +38,7 @@ <string>Unknown Encoder</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>kcfg_extension</cstring> </property> @@ -46,7 +46,7 @@ <string>wav</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -54,7 +54,7 @@ <string>Extension:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -62,7 +62,7 @@ <string>Command line:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -94,5 +94,5 @@ <tabstop>kcfg_commandLine</tabstop> <tabstop>kcfg_extension</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/encoderoutput.ui b/kaudiocreator/encoderoutput.ui index 1cc26be4..85da4902 100644 --- a/kaudiocreator/encoderoutput.ui +++ b/kaudiocreator/encoderoutput.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EncoderOutput</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>EncoderOutput</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>output</cstring> </property> @@ -39,7 +39,7 @@ <enum>WidgetWidth</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -63,14 +63,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -99,5 +99,5 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/general.ui b/kaudiocreator/general.ui index f20fea5b..2fa79a2a 100644 --- a/kaudiocreator/general.ui +++ b/kaudiocreator/general.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>General</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>General</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_removeCompletedJobs</cstring> </property> @@ -30,7 +30,7 @@ <string>&Automatically remove jobs when finished</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_promptIfIncompleteInfo</cstring> </property> @@ -38,7 +38,7 @@ <string>Prompt if information is not complete</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -49,7 +49,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -57,7 +57,7 @@ <string>Selection:</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -65,11 +65,11 @@ <string>Regular expression used on all file names. For example using selection " " and replace with "_" would replace all the spaces with underlines. </string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>inputlabel</cstring> </property> @@ -77,7 +77,7 @@ <string>Input:</string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>outputLabel</cstring> </property> @@ -85,7 +85,7 @@ <string>Output:</string> </property> </widget> - <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>exampleLabel</cstring> </property> @@ -93,7 +93,7 @@ <string>Example</string> </property> </widget> - <widget class="QLabel" row="6" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="6" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>exampleOutput</cstring> </property> @@ -101,7 +101,7 @@ <string>Cool artist - example audio file.wav</string> </property> </widget> - <widget class="QLineEdit" row="5" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="5" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>example</cstring> </property> @@ -109,17 +109,17 @@ <string>Cool artist - example audio file.wav</string> </property> </widget> - <widget class="QLineEdit" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_replaceInput</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="2"> + <widget class="TQLineEdit" row="2" column="2"> <property name="name"> <cstring>kcfg_replaceOutput</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -143,7 +143,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>kcfg_seperateMultiArtist</cstring> </property> @@ -160,7 +160,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -171,7 +171,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>kcfg_format_titleArtist</cstring> </property> @@ -179,7 +179,7 @@ <string>Title - Artist</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>kcfg_format_artistTitle</cstring> </property> @@ -192,15 +192,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>delimiterLabel</cstring> </property> @@ -208,7 +208,7 @@ <string>Delimiter:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>genArtistLabel</cstring> </property> @@ -216,12 +216,12 @@ <string>Generic artist:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>kcfg_delimiter</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>kcfg_genericArtist</cstring> </property> @@ -240,7 +240,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -278,8 +278,8 @@ <includes> <include location="local" impldecl="in implementation">general.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected" specifier="non virtual">updateExample()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/general.ui.h b/kaudiocreator/general.ui.h index 244219ab..98c00de3 100644 --- a/kaudiocreator/general.ui.h +++ b/kaudiocreator/general.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -14,6 +14,6 @@ void General::updateExample() { TQString text = example->text(); - text.replace( TQRegExp(kcfg_replaceInput->text()), kcfg_replaceOutput->text() ); + text.tqreplace( TQRegExp(kcfg_replaceInput->text()), kcfg_replaceOutput->text() ); exampleOutput->setText(text); } diff --git a/kaudiocreator/infodialog.ui b/kaudiocreator/infodialog.ui index a488e3dc..39109dfd 100644 --- a/kaudiocreator/infodialog.ui +++ b/kaudiocreator/infodialog.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>AlbumEditor</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>AlbumEditor</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -28,7 +28,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -39,59 +39,59 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="2" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel2</cstring> </property> <property name="text"> <string>Comment:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>track_comment</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>trackLabel</cstring> </property> <property name="text"> <string>Title:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="2" colspan="1"> + <widget class="TQLineEdit" row="1" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>track_title</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> <property name="text"> <string>Artist:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>track_artist</cstring> </property> </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -102,43 +102,43 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>artist</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> <property name="text"> <string>Artist:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel6</cstring> </property> <property name="text"> <string>Album:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>album</cstring> </property> </widget> - <widget class="QSpinBox" row="3" column="1"> + <widget class="TQSpinBox" row="3" column="1"> <property name="name"> <cstring>year</cstring> </property> @@ -146,49 +146,49 @@ <number>99999</number> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel7</cstring> </property> <property name="text"> <string>Year:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> <property name="text"> <string>Genre:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QComboBox" row="4" column="1"> + <widget class="TQComboBox" row="4" column="1"> <property name="name"> <cstring>genre</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> <property name="text"> <string>Comment:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLineEdit" row="5" column="1"> + <widget class="TQLineEdit" row="5" column="1"> <property name="name"> <cstring>comment</cstring> </property> @@ -205,22 +205,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>100</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonPrevious</cstring> </property> @@ -228,7 +228,7 @@ <string>&Previous Track</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonNext</cstring> </property> @@ -236,7 +236,7 @@ <string>&Next Track</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -250,7 +250,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -293,5 +293,5 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/job.cpp b/kaudiocreator/job.cpp index 740aeb5e..c4950377 100644 --- a/kaudiocreator/job.cpp +++ b/kaudiocreator/job.cpp @@ -21,7 +21,7 @@ #include <tqregexp.h> /** - * A helper function to replace %X with the stuff in the album. + * A helper function to tqreplace %X with the stuff in the album. * if quote is true then put "" around the %X */ TQString Job::replaceSpecialChars(const TQString &string, bool quote, TQMap<TQString, TQString> _map){ @@ -45,14 +45,14 @@ TQString Job::replaceSpecialChars(const TQString &string, bool quote, TQMap<TQSt } void Job::fix(const TQString &in, const TQString &out){ - track_title.replace( TQRegExp(in), out ); - track_artist.replace( TQRegExp(in), out ); - track_comment.replace( TQRegExp(in), out ); + track_title.tqreplace( TQRegExp(in), out ); + track_artist.tqreplace( TQRegExp(in), out ); + track_comment.tqreplace( TQRegExp(in), out ); // year // track - genre.replace( TQRegExp(in), out ); - album.replace( TQRegExp(in), out ); - comment.replace( TQRegExp(in), out ); - group.replace( TQRegExp(in), out ); + genre.tqreplace( TQRegExp(in), out ); + album.tqreplace( TQRegExp(in), out ); + comment.tqreplace( TQRegExp(in), out ); + group.tqreplace( TQRegExp(in), out ); } diff --git a/kaudiocreator/jobque.ui b/kaudiocreator/jobque.ui index 137ed6df..935ef959 100644 --- a/kaudiocreator/jobque.ui +++ b/kaudiocreator/jobque.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>JobQue</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>JobQue</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QPushButton" row="2" column="2"> + <widget class="TQPushButton" row="2" column="2"> <property name="name"> <cstring>removeAll</cstring> </property> @@ -27,7 +27,7 @@ <string>Remove All Jobs</string> </property> </widget> - <widget class="QPushButton" row="2" column="3"> + <widget class="TQPushButton" row="2" column="3"> <property name="name"> <cstring>removeSelected</cstring> </property> @@ -45,14 +45,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QListView" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TQListView" row="1" column="0" rowspan="1" colspan="4"> <column> <property name="text"> <string>Job</string> @@ -99,20 +99,20 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>queLabel</cstring> </property> <property name="text"> <string>No jobs are in the queue</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>removeDoneJobs</cstring> </property> @@ -128,5 +128,5 @@ <tabstop>removeAll</tabstop> <tabstop>removeSelected</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/jobqueimp.cpp b/kaudiocreator/jobqueimp.cpp index 81c0431d..fc580a29 100644 --- a/kaudiocreator/jobqueimp.cpp +++ b/kaudiocreator/jobqueimp.cpp @@ -46,11 +46,11 @@ /** * Constructor, set up signals. - * @param parent - parent widget + * @param tqparent - tqparent widget * @param name - widget name */ -JobQueImp::JobQueImp( TQWidget* parent, const char* name) : - JobQue(parent,name),highestNumber(DEFAULT_HIGHEST_NUMBER), currentId(0){ +JobQueImp::JobQueImp( TQWidget* tqparent, const char* name) : + JobQue(tqparent,name),highestNumber(DEFAULT_HIGHEST_NUMBER), currentId(0){ connect(removeSelected,TQT_SIGNAL(clicked()), this, TQT_SLOT( removeSelectedJob())); connect(removeAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeAllJobs())); connect(removeDoneJobs, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearDoneJobs())); @@ -64,7 +64,7 @@ JobQueImp::JobQueImp( TQWidget* parent, const char* name) : */ TQString JobQueImp::getStringFromNumber(int number){ if(number > highestNumber){ - int diff = TQString("%1").arg(number).length() - TQString("%1").arg(highestNumber).length(); + int diff = TQString("%1").tqarg(number).length() - TQString("%1").tqarg(highestNumber).length(); highestNumber = number; if(diff > 0){ // We have to update all of the cells. @@ -77,7 +77,7 @@ TQString JobQueImp::getStringFromNumber(int number){ } TQString buffer = ""; - uint newLength = TQString("%1").arg(highestNumber).length() - TQString("%1").arg(number).length(); + uint newLength = TQString("%1").tqarg(highestNumber).length() - TQString("%1").tqarg(number).length(); for(uint i=0; i < newLength; i++) buffer += "0"; return buffer; @@ -92,9 +92,9 @@ void JobQueImp::addJob(Job*job, const TQString &name ){ if(!job) return; job->id = ++currentId; - QueListViewItem *currentItem = new QueListViewItem(todoQue, TQString("%1%2").arg(getStringFromNumber(currentId)).arg(currentId), "0", name); + QueListViewItem *currentItem = new QueListViewItem(todoQue, TQString("%1%2").tqarg(getStringFromNumber(currentId)).tqarg(currentId), "0", name); currentItem->setPixmap(ICON_LOC, SmallIcon("player_pause", currentItem->height()-2)); - queLabel->setText(i18n("Number of jobs in the queue: %1").arg(todoQue->childCount())); + queLabel->setText(i18n("Number of jobs in the queue: %1").tqarg(todoQue->childCount())); } /** @@ -106,7 +106,7 @@ void JobQueImp::updateProgress(int id, int progress){ int currentJobCount = numberOfJobsNotFinished(); QueListViewItem * currentItem = (QueListViewItem*)todoQue->firstChild(); TQString buffer = getStringFromNumber(id); - buffer += TQString("%1").arg(id); + buffer += TQString("%1").tqarg(id); // Find the current item while( currentItem != NULL ){ @@ -124,7 +124,7 @@ void JobQueImp::updateProgress(int id, int progress){ return; currentItem->percentDone = progress; - currentItem->repaint(); + currentItem->tqrepaint(); // Update the icon if needed if(progress > 0 && progress < 100 && !currentItem->progressing ){ @@ -158,7 +158,7 @@ bool JobQueImp::removeJob(QueListViewItem *item, bool kill, bool prompt){ if(!item) return false; - if(item->percentDone < 100 && item->percentDone > -1 && (prompt && KMessageBox::questionYesNo(this, i18n("KAudioCreator has not finished %1. Remove anyway?").arg(item->text(HEADER_DESCRIPTION)), i18n("Unfinished Job in Queue"), KStdGuiItem::del(), i18n("Keep")) + if(item->percentDone < 100 && item->percentDone > -1 && (prompt && KMessageBox::questionYesNo(this, i18n("KAudioCreator has not finished %1. Remove anyway?").tqarg(item->text(HEADER_DESCRIPTION)), i18n("Unfinished Job in Queue"), KStdGuiItem::del(), i18n("Keep")) == KMessageBox::No )) return false; @@ -180,7 +180,7 @@ bool JobQueImp::removeJob(QueListViewItem *item, bool kill, bool prompt){ currentId = 0; } else - queLabel->setText(i18n("Number of jobs in the queue: %1").arg(todoQue->childCount())); + queLabel->setText(i18n("Number of jobs in the queue: %1").tqarg(todoQue->childCount())); return true; } @@ -248,7 +248,7 @@ void JobQueImp::clearDoneJobs(){ currentId = 0; } else - queLabel->setText(i18n("Number of jobs in the queue: %1").arg(todoQue->childCount())); + queLabel->setText(i18n("Number of jobs in the queue: %1").tqarg(todoQue->childCount())); } /** @@ -270,7 +270,7 @@ int JobQueImp::numberOfJobsNotFinished(){ } /** - * The repaint function overloaded so that we can have a built in progressbar. + * The tqrepaint function overloaded so that we can have a built in progressbar. */ void QueListViewItem::paintCell (TQPainter * p,const TQColorGroup &cg,int column, int width,int align){ @@ -303,7 +303,7 @@ void QueListViewItem::paintCell (TQPainter * p,const TQColorGroup &cg,int column /** * Header for built in treelist item so we can have a progress bar in them. */ -QueListViewItem::QueListViewItem(TQListView *parent, const TQString id, const TQString p , const TQString name, const TQString d, const TQString e) : TQListViewItem(parent, id, p, name,d,e), percentDone(0), progressing(false) { +QueListViewItem::QueListViewItem(TQListView *tqparent, const TQString id, const TQString p , const TQString name, const TQString d, const TQString e) : TQListViewItem(tqparent, id, p, name,d,e), percentDone(0), progressing(false) { } #include "jobqueimp.moc" diff --git a/kaudiocreator/jobqueimp.h b/kaudiocreator/jobqueimp.h index 133a020a..32735a3a 100644 --- a/kaudiocreator/jobqueimp.h +++ b/kaudiocreator/jobqueimp.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef JOBQUEIMP_H -#define JOBQUEIMP_H +#ifndef JOBTQUEIMP_H +#define JOBTQUEIMP_H #include "jobque.h" #include <tqstring.h> @@ -49,12 +49,13 @@ public: class JobQueImp : public JobQue { Q_OBJECT + TQ_OBJECT signals: void removeJob( int idNumber ); public: - JobQueImp( TQWidget* parent = 0, const char* name = 0 ); + JobQueImp( TQWidget* tqparent = 0, const char* name = 0 ); int numberOfJobsNotFinished(); public slots: diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp index 6ac77beb..946b57dc 100644 --- a/kaudiocreator/kaudiocreator.cpp +++ b/kaudiocreator/kaudiocreator.cpp @@ -49,32 +49,32 @@ /** * Constructor. Connect all of the object and the job control. */ -KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) : - KMainWindow(parent, name) +KAudioCreator::KAudioCreator( TQWidget* tqparent, const char* name) : + KMainWindow(tqparent, name) { janusWidget = new KJanusWidget(this, name, KJanusWidget::Tabbed); setCentralWidget(janusWidget); - TQVBox *frame = janusWidget->addVBoxPage(i18n("&CD Tracks"), TQString::null, SmallIcon("cdaudio_unmount", 32)); + TQVBox *frame = janusWidget->addVBoxPage(i18n("&CD Tracks"), TQString(), SmallIcon("cdaudio_unmount", 32)); tracks = new TracksImp(frame, "Tracks"); - ripper = new Ripper ( frame, "Rip" ); - encoder = new Encoder( frame, "Encoder" ); + ripper = new Ripper ( TQT_TQOBJECT(frame), "Rip" ); + encoder = new Encoder( TQT_TQOBJECT(frame), "Encoder" ); - frame = janusWidget->addVBoxPage( i18n("&Jobs"), TQString::null, SmallIcon( "run", 32 ) ); + frame = janusWidget->addVBoxPage( i18n("&Jobs"), TQString(), SmallIcon( "run", 32 ) ); jobQue = new JobQueImp( frame, "Que" ); resize(500, 440); - /*KAction *eject = */new KAction( i18n("&Eject CD"), 0, tracks, + /*KAction *eject = */new KAction( i18n("&Eject CD"), 0, TQT_TQOBJECT(tracks), TQT_SLOT( eject() ), actionCollection(), "eject" ); - (void)new KAction( i18n("&Configure KAudioCreator..."), 0, this, + (void)new KAction( i18n("&Configure KAudioCreator..."), 0, TQT_TQOBJECT(this), TQT_SLOT( showSettings() ), actionCollection(), "configure_kaudiocreator" ); - KAction *selectAll = new KAction( i18n( "Select &All Tracks"), 0, tracks, + KAction *selectAll = new KAction( i18n( "Select &All Tracks"), 0, TQT_TQOBJECT(tracks), TQT_SLOT( selectAllTracks() ), actionCollection(), "select_all" ) ; - KAction *deselectAll = new KAction( i18n( "Deselect &All Tracks"), 0, tracks, + KAction *deselectAll = new KAction( i18n( "Deselect &All Tracks"), 0, TQT_TQOBJECT(tracks), TQT_SLOT( deselectAllTracks() ), actionCollection(), "deselect_all" ); selectAll->setEnabled( false ); deselectAll->setEnabled( false ); @@ -82,56 +82,56 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) : KActionMenu *actActionMenu = new KActionMenu( i18n("Rip &Selection"), "rip", actionCollection(), "rip" ); actActionMenu->setDelayed(true); //needed for checking "all accounts" actActionMenu->setEnabled( false ); - connect( actActionMenu, TQT_SIGNAL( activated() ), tracks, TQT_SLOT( startSession() ) ); + connect( actActionMenu, TQT_SIGNAL( activated() ), TQT_TQOBJECT(tracks), TQT_SLOT( startSession() ) ); ripMenu = actActionMenu->popupMenu(); - connect( ripMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotRipSelection(int)) ); - connect( ripMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( getRipMenu()) ); + connect( ripMenu, TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), TQT_SLOT( slotRipSelection(int)) ); + connect( ripMenu, TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( getRipMenu()) ); - KAction *rip = new KAction( i18n( "Rip &Selection" ), 0, tracks, + KAction *rip = new KAction( i18n( "Rip &Selection" ), 0, TQT_TQOBJECT(tracks), TQT_SLOT( startSession() ), actionCollection(), "rip_selected" ); rip->setEnabled( false ); - connect( jobQue, TQT_SIGNAL( removeJob(int) ), this, TQT_SLOT( updateStatus() ) ); - connect( jobQue, TQT_SIGNAL( removeJob(int) ), ripper, TQT_SLOT( removeJob(int) ) ); - connect( jobQue, TQT_SIGNAL( removeJob(int) ), encoder, TQT_SLOT( removeJob(int)) ); + connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(this), TQT_SLOT( updatetqStatus() ) ); + connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(ripper), TQT_SLOT( removeJob(int) ) ); + connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(encoder), TQT_SLOT( removeJob(int)) ); - connect( ripper, TQT_SIGNAL( updateProgress(int, int) ) , jobQue, TQT_SLOT( updateProgress(int,int) ) ); - connect( ripper, TQT_SIGNAL( addJob(Job*, const TQString &) ), jobQue, TQT_SLOT( addJob(Job*, const TQString &)) ); - connect( ripper, TQT_SIGNAL( eject(const TQString &) ) , tracks, TQT_SLOT( ejectDevice(const TQString &)) ); - connect( ripper, TQT_SIGNAL( encodeWav(Job *) ) , encoder, TQT_SLOT( encodeWav(Job *)) ); - connect( ripper, TQT_SIGNAL( jobsChanged() ) , this, TQT_SLOT( updateStatus() ) ); + connect( ripper, TQT_SIGNAL( updateProgress(int, int) ), TQT_TQOBJECT(jobQue), TQT_SLOT( updateProgress(int,int) ) ); + connect( ripper, TQT_SIGNAL( addJob(Job*, const TQString &) ), TQT_TQOBJECT(jobQue), TQT_SLOT( addJob(Job*, const TQString &)) ); + connect( ripper, TQT_SIGNAL( eject(const TQString &) ) , TQT_TQOBJECT(tracks), TQT_SLOT( ejectDevice(const TQString &)) ); + connect( ripper, TQT_SIGNAL( encodeWav(Job *) ) , TQT_TQOBJECT(encoder), TQT_SLOT( encodeWav(Job *)) ); + connect( ripper, TQT_SIGNAL( jobsChanged() ) , TQT_TQOBJECT(this), TQT_SLOT( updatetqStatus() ) ); - connect( encoder, TQT_SIGNAL( updateProgress(int, int) ) , jobQue, TQT_SLOT( updateProgress(int,int)) ); - connect( encoder, TQT_SIGNAL( addJob(Job*, const TQString&)), jobQue, TQT_SLOT( addJob(Job*, const TQString &)) ); - connect( encoder, TQT_SIGNAL( jobsChanged() ) , this, TQT_SLOT( updateStatus() ) ); + connect( encoder, TQT_SIGNAL( updateProgress(int, int) ) , TQT_TQOBJECT(jobQue), TQT_SLOT( updateProgress(int,int)) ); + connect( encoder, TQT_SIGNAL( addJob(Job*, const TQString&)), TQT_TQOBJECT(jobQue), TQT_SLOT( addJob(Job*, const TQString &)) ); + connect( encoder, TQT_SIGNAL( jobsChanged() ) , TQT_TQOBJECT(this), TQT_SLOT( updatetqStatus() ) ); - connect( tracks, TQT_SIGNAL( hasCD(bool) ) , this, TQT_SLOT( hasCD(bool) ) ); - connect( tracks, TQT_SIGNAL( ripTrack(Job *) ), ripper, TQT_SLOT( ripTrack(Job *)) ); + connect( tracks, TQT_SIGNAL( hasCD(bool) ) , TQT_TQOBJECT(this), TQT_SLOT( hasCD(bool) ) ); + connect( tracks, TQT_SIGNAL( ripTrack(Job *) ), TQT_TQOBJECT(ripper), TQT_SLOT( ripTrack(Job *)) ); connect( tracks, TQT_SIGNAL( hasTracks(bool) ), rip, TQT_SLOT( setEnabled(bool)) ); connect( tracks, TQT_SIGNAL( hasTracks(bool) ), actActionMenu, TQT_SLOT( setEnabled(bool)) ); connect( tracks, TQT_SIGNAL( hasTracks(bool) ), deselectAll, TQT_SLOT( setEnabled(bool)) ); connect( tracks, TQT_SIGNAL( hasTracks(bool) ), selectAll, TQT_SLOT( setEnabled(bool)) ); - (void)new KAction(i18n("Remove &Completed Jobs"), 0, jobQue, + (void)new KAction(i18n("Remove &Completed Jobs"), 0, TQT_TQOBJECT(jobQue), TQT_SLOT(clearDoneJobs()), actionCollection(), "clear_done_jobs" ); - KAction *edit = new KAction(i18n("&Edit Album..."), 0, tracks, + KAction *edit = new KAction(i18n("&Edit Album..."), 0, TQT_TQOBJECT(tracks), TQT_SLOT(editInformation()), actionCollection(), "edit_cd"); connect(tracks, TQT_SIGNAL(hasCD(bool)), edit, TQT_SLOT(setEnabled(bool))); edit->setEnabled( false ); - (void)new KAction(i18n("Encode &File..."), 0, this, + (void)new KAction(i18n("Encode &File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(encodeFile()), actionCollection(), "encode_file"); - KAction *cddb = new KAction(i18n("&CDDB Lookup"), 0, tracks, + KAction *cddb = new KAction(i18n("&CDDB Lookup"), 0, TQT_TQOBJECT(tracks), TQT_SLOT(performCDDB()), actionCollection(), "cddb_now"); connect(tracks, TQT_SIGNAL(hasCD(bool)), cddb, TQT_SLOT(setEnabled(bool))); cddb->setEnabled( false ); - KStdAction::configureNotifications(this, TQT_SLOT(configureNotifications()), + KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(configureNotifications()), actionCollection()); - KStdAction::quit( this, TQT_SLOT(close()), actionCollection(), "quit" ); + KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "quit" ); // Init statusbar statusBar()->insertItem(i18n("No Audio CD detected"), 0 ); @@ -153,10 +153,10 @@ void KAudioCreator::getRipMenu(){ ripMenu->clear(); int i=0; - TQString currentGroup = TQString("Encoder_%1").arg(i); + TQString currentGroup = TQString("Encoder_%1").tqarg(i); while(EncoderPrefs::hasPrefs(currentGroup)){ ripMenu->insertItem(EncoderPrefs::prefs(currentGroup)->encoderName(), i); - currentGroup = TQString("Encoder_%1").arg(++i); + currentGroup = TQString("Encoder_%1").tqarg(++i); } } @@ -170,28 +170,28 @@ void KAudioCreator::hasCD(bool cd){ statusBar()->changeItem(i18n("No Audio CD detected"), 0 ); } -void KAudioCreator::updateStatus() { +void KAudioCreator::updatetqStatus() { TQString status = i18n("Idle."); - TQString rippingStatus; - TQString encodingStatus; + TQString rippingtqStatus; + TQString encodingtqStatus; int activeRippingJobs = ripper->activeJobCount(); int pendingRippingJobs = ripper->pendingJobCount(); int activeEncodingJobs = encoder->activeJobCount(); int pendingEncodingJobs = encoder->pendingJobCount(); if ( activeRippingJobs ) { - rippingStatus = i18n("Ripping (%1 active, %2 queued)").arg( activeRippingJobs ).arg( pendingRippingJobs ); - status = rippingStatus; + rippingtqStatus = i18n("Ripping (%1 active, %2 queued)").tqarg( activeRippingJobs ).tqarg( pendingRippingJobs ); + status = rippingtqStatus; } if ( activeEncodingJobs ) { - encodingStatus = i18n("Encoding (%1 active, %2 queued)").arg( activeEncodingJobs ).arg( pendingEncodingJobs ); + encodingtqStatus = i18n("Encoding (%1 active, %2 queued)").tqarg( activeEncodingJobs ).tqarg( pendingEncodingJobs ); if ( activeRippingJobs ) { status.append(" : "); - status.append( encodingStatus ); + status.append( encodingtqStatus ); } else { - status = encodingStatus; + status = encodingtqStatus; } } @@ -229,14 +229,14 @@ void KAudioCreator::showSettings(){ SettingsDialog *dialog = new SettingsDialog(this, "settings", Prefs::self()); connect(dialog, TQT_SIGNAL(settingsChanged()), ripper, TQT_SLOT(loadSettings())); - connect(dialog, TQT_SIGNAL(settingsChanged()), encoder, TQT_SLOT(loadSettings())); - connect(dialog, TQT_SIGNAL(settingsChanged()), tracks, TQT_SLOT(loadSettings())); - connect(dialog->encoderConfigImp, TQT_SIGNAL(encoderUpdated()), encoder, TQT_SLOT(loadSettings())); + connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(encoder), TQT_SLOT(loadSettings())); + connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(tracks), TQT_SLOT(loadSettings())); + connect(dialog->encoderConfigImp, TQT_SIGNAL(encoderUpdated()), TQT_TQOBJECT(encoder), TQT_SLOT(loadSettings())); dialog->show(); } -SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config) - : KConfigDialog(parent, name, config), +SettingsDialog::SettingsDialog(TQWidget *tqparent, const char *name,KConfigSkeleton *config) + : KConfigDialog(tqparent, name, config), cddb(0), cddbChanged(false) { addPage(new General(0, "General"), i18n("General"), "package_settings", @@ -253,7 +253,7 @@ SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleto { cddb->load(); addPage(cddb, i18n("CDDB"), "cdaudio_mount", i18n("CDDB Configuration"), false); - connect(cddb, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(slotCddbChanged(bool))); + connect(cddb, TQT_SIGNAL(changed(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotCddbChanged(bool))); } } RipConfig *rip = new RipConfig(0, "Ripper"); diff --git a/kaudiocreator/kaudiocreator.h b/kaudiocreator/kaudiocreator.h index d2e0c57d..29951b74 100644 --- a/kaudiocreator/kaudiocreator.h +++ b/kaudiocreator/kaudiocreator.h @@ -36,9 +36,10 @@ class KPopupMenu; class KAudioCreator : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - KAudioCreator( TQWidget* parent = 0, const char* name = 0); + KAudioCreator( TQWidget* tqparent = 0, const char* name = 0); void setDevice( const TQString &device ); protected: @@ -46,7 +47,7 @@ protected: private slots: void showSettings(); - void updateStatus(); + void updatetqStatus(); void hasCD(bool); void configureNotifications(); @@ -67,9 +68,10 @@ private: class SettingsDialog: public KConfigDialog { Q_OBJECT + TQ_OBJECT public: - SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config); + SettingsDialog(TQWidget *tqparent, const char *name,KConfigSkeleton *config); protected slots: void updateSettings(); diff --git a/kaudiocreator/kaudiocreator.kcfg b/kaudiocreator/kaudiocreator.kcfg index 9e8addd0..03e5fa12 100644 --- a/kaudiocreator/kaudiocreator.kcfg +++ b/kaudiocreator/kaudiocreator.kcfg @@ -31,7 +31,7 @@ <entry name="replaceInput" type="String" key="selection"> <label>Regexp to match file names with</label> </entry> - <entry name="replaceOutput" type="String" key="replace"> + <entry name="replaceOutput" type="String" key="tqreplace"> <label>String used to replace the parts that match the selection regexp</label> </entry> <entry name="seperateMultiArtist" type="Bool"> diff --git a/kaudiocreator/ripconfig.ui b/kaudiocreator/ripconfig.ui index 4ce85f1b..eb88ab8e 100644 --- a/kaudiocreator/ripconfig.ui +++ b/kaudiocreator/ripconfig.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>RipConfig</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>RipConfig</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_beepAfterRip</cstring> </property> @@ -27,7 +27,7 @@ <string>&Beep after each rip is done</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -41,7 +41,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel14</cstring> </property> @@ -52,7 +52,7 @@ <cstring>kcfg_maxWavFiles</cstring> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>kcfg_maxWavFiles</cstring> </property> @@ -65,7 +65,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_autoEjectAfterRip</cstring> </property> @@ -73,7 +73,7 @@ <string>&Auto-eject CD after last track is ripped</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -87,7 +87,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel15</cstring> </property> @@ -101,7 +101,7 @@ <cstring>kcfg_autoEjectDelay</cstring> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>kcfg_autoEjectDelay</cstring> </property> @@ -117,7 +117,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>kcfg_enableTempDir</cstring> </property> @@ -151,7 +151,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>280</height> @@ -182,7 +182,7 @@ <tabstop>kcfg_autoEjectAfterRip</tabstop> <tabstop>kcfg_autoEjectDelay</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kaudiocreator/ripper.cpp b/kaudiocreator/ripper.cpp index cb9c012b..7a308a9f 100644 --- a/kaudiocreator/ripper.cpp +++ b/kaudiocreator/ripper.cpp @@ -32,7 +32,7 @@ /** * Constructor, load settings. */ -Ripper::Ripper( TQObject* parent, const char* name) : TQObject(parent,name) { +Ripper::Ripper( TQObject* tqparent, const char* name) : TQObject(tqparent,name) { loadSettings(); } @@ -120,7 +120,7 @@ void Ripper::removeJob(int id){ pendingJobs.remove(job); delete job; } - //qDebug(TQString("Done removing Job:%1").arg(id).latin1()); + //qDebug(TQString("Done removing Job:%1").tqarg(id).latin1()); tendToNewJobs(); } @@ -132,7 +132,7 @@ void Ripper::removeJob(int id){ void Ripper::ripTrack(Job *job){ if(!job) return; - emit(addJob(job, i18n("Ripping: %1 - %2").arg(job->track_artist).arg(job->track_title))); + emit(addJob(job, i18n("Ripping: %1 - %2").tqarg(job->track_artist).tqarg(job->track_title))); pendingJobs.append(job); tendToNewJobs(); } @@ -172,12 +172,12 @@ void Ripper::tendToNewJobs(){ TQString wavFile; TQString args = job->device; if(!args.isEmpty()) - args = TQString("?device=%1").arg(args); + args = TQString("?device=%1").tqarg(args); args = args+"&fileNameTemplate=Track %{number}"; if(job->track < 10) - wavFile = TQString("audiocd:/Wav/Track 0%1.wav%2").arg(job->track).arg(args); + wavFile = TQString("audiocd:/Wav/Track 0%1.wav%2").tqarg(job->track).tqarg(args); else - wavFile = TQString("audiocd:/Wav/Track %1.wav%2").arg(job->track).arg(args); + wavFile = TQString("audiocd:/Wav/Track %1.wav%2").tqarg(job->track).tqarg(args); KURL source(wavFile); KURL dest(tmp.name()); @@ -201,7 +201,7 @@ void Ripper::copyJobResult(KIO::Job *copyjob){ KIO::FileCopyJob *copyJob = dynamic_cast<KIO::FileCopyJob*> (copyjob); KNotifyClient::event("track ripped"); - if(jobs.find(copyjob) == jobs.end()) + if(jobs.tqfind(copyjob) == jobs.end()) return; Job *newJob = jobs[copyjob]; jobs.remove(copyjob); diff --git a/kaudiocreator/ripper.h b/kaudiocreator/ripper.h index 1b92493e..9dfed908 100644 --- a/kaudiocreator/ripper.h +++ b/kaudiocreator/ripper.h @@ -31,6 +31,7 @@ class Job; class Ripper : public TQObject { Q_OBJECT + TQ_OBJECT signals: void addJob( Job *job, const TQString &name ); @@ -40,7 +41,7 @@ signals: void jobsChanged(); public: - Ripper( TQObject* parent = 0, const char* name = 0 ); + Ripper( TQObject* tqparent = 0, const char* name = 0 ); ~Ripper(); int activeJobCount(); int pendingJobCount(); diff --git a/kaudiocreator/tracks.ui b/kaudiocreator/tracks.ui index a225f041..05a3b3ab 100644 --- a/kaudiocreator/tracks.ui +++ b/kaudiocreator/tracks.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>Tracks</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Tracks</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>albumName</cstring> </property> @@ -35,7 +35,7 @@ <property name="text"> <string>Unknown Artist - Unknown Album</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -96,7 +96,7 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -120,14 +120,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>selectAllTracksButton</cstring> </property> @@ -135,7 +135,7 @@ <string>Select &All Tracks</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>deselectAllTracksButton</cstring> </property> @@ -145,15 +145,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>246</width> <height>20</height> @@ -217,7 +217,7 @@ <tabstop>selectAllTracksButton</tabstop> <tabstop>deselectAllTracksButton</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kaudiocreator/tracksimp.cpp b/kaudiocreator/tracksimp.cpp index 9a864e9d..02668821 100644 --- a/kaudiocreator/tracksimp.cpp +++ b/kaudiocreator/tracksimp.cpp @@ -49,8 +49,8 @@ /** * Constructor, connect up slots and signals. */ -TracksImp::TracksImp( TQWidget* parent, const char* name) : - Tracks(parent,name), +TracksImp::TracksImp( TQWidget* tqparent, const char* name) : + Tracks(tqparent,name), cddbInfo() { cd = new KCompactDisc; @@ -84,7 +84,7 @@ TracksImp::~TracksImp() { list.append(deviceCombo->currentText()); for ( int i=0; i<deviceCombo->count();i++ ) { TQString text = deviceCombo->text(i); - if( list.find(text) == list.end()) + if( list.tqfind(text) == list.end()) list.append(text); if( list.count() == 5) break; @@ -104,13 +104,13 @@ void TracksImp::loadSettings() { TQStringList prefsList = Prefs::device(); TQStringList::Iterator it; for ( it = prefsList.begin(); it != prefsList.end(); ++it ) { - if( list.find( *it ) == list.end()) + if( list.tqfind( *it ) == list.end()) list.append(*it); } // Get current list, no dups for ( int i=0; i<deviceCombo->count();i++ ) { TQString text = deviceCombo->text(i); - if( list.find(text) == list.end()) + if( list.tqfind(text) == list.end()) list.append(text); } @@ -198,7 +198,7 @@ void TracksImp::changeDevice(const TQString &file ) { TQString errstring = i18n("CDROM read or access error (or no audio disk in drive).\n"\ "Please make sure you have access permissions to:\n%1") - .arg(file); + .tqarg(file); KMessageBox::error(this, errstring, i18n("Error")); } } @@ -247,8 +247,8 @@ void TracksImp::lookupCDDBDone(CDDB::Result result ) { CDInfoList::iterator it; TQStringList list; for ( it = cddb_info.begin(); it != cddb_info.end(); ++it ) { - list.append( TQString("%1, %2, %3").arg((*it).artist).arg((*it).title) - .arg((*it).genre)); + list.append( TQString("%1, %2, %3").tqarg((*it).artist).tqarg((*it).title) + .tqarg((*it).genre)); } bool ok(false); @@ -277,7 +277,7 @@ void TracksImp::lookupCDDBDone(CDDB::Result result ) { } // Some sanity provisions to ensure that the number of records matches what - // the CD actually contains. + // the CD actually tqcontains. while (info.trackInfoList.count() < cddbInfo.trackInfoList.count()) { info.trackInfoList.append(KCDDB::TrackInfo()); @@ -378,7 +378,7 @@ void TracksImp::startSession( int encoder ) if( Prefs::promptIfIncompleteInfo() && list.count() > 0 ) { int r = KMessageBox::questionYesNo( this, - i18n( "Part of the album is not set: %1.\n (To change album information click the \"Edit Information\" button.)\n Would you like to rip the selected tracks anyway?").arg(list.join(", ")), i18n("Album Information Incomplete"), i18n("Rip"), KStdGuiItem::cancel() ); + i18n( "Part of the album is not set: %1.\n (To change album information click the \"Edit Information\" button.)\n Would you like to rip the selected tracks anyway?").tqarg(list.join(", ")), i18n("Album Information Incomplete"), i18n("Rip"), KStdGuiItem::cancel() ); if( r == KMessageBox::No ) return; @@ -417,7 +417,7 @@ void TracksImp::startSession( int encoder ) KMessageBox::information(this, i18n("%1 Job(s) have been started. You can watch their progress in the " - "jobs section.").arg( selected.count() ), + "jobs section.").tqarg( selected.count() ), i18n("Jobs have started"), i18n("Jobs have started")); } @@ -496,7 +496,7 @@ void TracksImp::newAlbum() bool isSampler = true; for( unsigned i = 0; i < t.count(); i++ ) { - if (t[i].title.find(" / ") == -1) + if (t[i].title.tqfind(" / ") == -1) { isSampler = false; break; @@ -512,7 +512,7 @@ void TracksImp::newAlbum() if( isSampler ) { // Support for multiple artists stripping. - int delimiter = t[i].title.find(" / "); + int delimiter = t[i].title.tqfind(" / "); Q_ASSERT( delimiter != -1 ); trackArtist = t[i].title.left(delimiter); title = t[i].title.mid(delimiter + 3); @@ -547,7 +547,7 @@ void TracksImp::keyPressEvent(TQKeyEvent *event) TQListViewItem *item = trackListing->selectedItem(); if( !item ) return; - if( event->key() == Qt::Key_F2 ) + if( event->key() == TQt::Key_F2 ) { item->setRenameEnabled( HEADER_TRACK_NAME, true ); item->startRename( HEADER_TRACK_NAME ); diff --git a/kaudiocreator/tracksimp.h b/kaudiocreator/tracksimp.h index 89ea2e36..bc109f55 100644 --- a/kaudiocreator/tracksimp.h +++ b/kaudiocreator/tracksimp.h @@ -44,8 +44,8 @@ class KCompactDisc; class TracksItem : public KListViewItem { public: - TracksItem( KListView *parent, KListViewItem *after, TQString t, TQString a, int tr, TQString l, TQString c ) - : KListViewItem( parent, after, TQString::null/*rip*/, TQString::number(tr), l, t ) + TracksItem( KListView *tqparent, KListViewItem *after, TQString t, TQString a, int tr, TQString l, TQString c ) + : KListViewItem( tqparent, after, TQString()/*rip*/, TQString::number(tr), l, t ) { m_title = t; m_artist = a; @@ -86,6 +86,7 @@ private: class TracksImp : public Tracks { Q_OBJECT + TQ_OBJECT signals: void ripTrack(Job *job); @@ -93,7 +94,7 @@ signals: void hasTracks(bool); public: - TracksImp( TQWidget* parent = 0, const char* name = 0); + TracksImp( TQWidget* tqparent = 0, const char* name = 0); ~TracksImp(); bool hasCD(); diff --git a/kaudiocreator/wizard.ui b/kaudiocreator/wizard.ui index 7658557b..14090be4 100644 --- a/kaudiocreator/wizard.ui +++ b/kaudiocreator/wizard.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>fileWizard</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>fileWizard</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -33,7 +33,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel8</cstring> </property> @@ -51,7 +51,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> </widget> @@ -65,14 +65,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout8</cstring> </property> @@ -86,7 +86,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel9</cstring> </property> @@ -97,7 +97,7 @@ <cstring>playlistFormat</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>fileFormat</cstring> </property> @@ -107,7 +107,7 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>exampleLabel</cstring> </property> @@ -115,15 +115,15 @@ <string>Example: ~/mp3/Staind/Lost Love/Staind - Lost Love.m3u</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>artistButton</cstring> </property> @@ -131,7 +131,7 @@ <string>&Artist</string> </property> </widget> - <widget class="QPushButton" row="2" column="2"> + <widget class="TQPushButton" row="2" column="2"> <property name="name"> <cstring>homeDirButton</cstring> </property> @@ -139,7 +139,7 @@ <string>&Home Folder</string> </property> </widget> - <widget class="QPushButton" row="1" column="3"> + <widget class="TQPushButton" row="1" column="3"> <property name="name"> <cstring>trackNumberButton</cstring> </property> @@ -147,7 +147,7 @@ <string>&Track Number</string> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>extensionButton</cstring> </property> @@ -155,7 +155,7 @@ <string>&Extension</string> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>trackTitleButton</cstring> </property> @@ -163,7 +163,7 @@ <string>Track T&itle</string> </property> </widget> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>trackCommentButton</cstring> </property> @@ -171,7 +171,7 @@ <string>T&rack Comment</string> </property> </widget> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>genreButton</cstring> </property> @@ -179,7 +179,7 @@ <string>&Genre</string> </property> </widget> - <widget class="QPushButton" row="0" column="3"> + <widget class="TQPushButton" row="0" column="3"> <property name="name"> <cstring>yearButton</cstring> </property> @@ -187,7 +187,7 @@ <string>&Year</string> </property> </widget> - <widget class="QPushButton" row="0" column="0"> + <widget class="TQPushButton" row="0" column="0"> <property name="name"> <cstring>albumButton</cstring> </property> @@ -195,7 +195,7 @@ <string>Al&bum</string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>trackArtistButton</cstring> </property> @@ -203,7 +203,7 @@ <string>Trac&k Artist</string> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>commentButton</cstring> </property> @@ -227,7 +227,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -251,14 +251,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -272,7 +272,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -350,9 +350,9 @@ </connection> <connection> <sender>fileFormat</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TTQString&)</signal> <receiver>fileWizard</receiver> - <slot>fileFormatTextChanged(const QString&)</slot> + <slot>fileFormatTextChanged(const TQString&)</slot> </connection> <connection> <sender>trackArtistButton</sender> @@ -392,7 +392,7 @@ <includes> <include location="local" impldecl="in implementation">wizard.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="private">homePressed()</slot> <slot>extensionPressed()</slot> <slot access="private">trackTitlePressed()</slot> @@ -404,7 +404,7 @@ <slot>albumPressed()</slot> <slot>artistPressed()</slot> <slot>commentPressed()</slot> - <slot>fileFormatTextChanged( const QString & text )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> + <slot>fileFormatTextChanged( const TQString & text )</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/wizard.ui.h b/kaudiocreator/wizard.ui.h index 57a21a42..294d36dc 100644 --- a/kaudiocreator/wizard.ui.h +++ b/kaudiocreator/wizard.ui.h @@ -21,7 +21,7 @@ /**************************************************************************** ** ui.h extension file, included from the uic-generated form implementation. ** -** If you wish to add, delete or rename slots use Qt Designer which will +** If you wish to add, delete or rename slots use TQt Designer which will ** update this file, preserving your code. Create an init() slot in place of ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ @@ -90,7 +90,7 @@ void fileWizard::commentPressed() void fileWizard::fileFormatTextChanged(const TQString& text) { TQString string = text; - string.replace(TQRegExp("~"), "/home/foo"); + string.tqreplace(TQRegExp("~"), "/home/foo"); Job job; job.genre = "Rock"; job.group = "J Rocker"; @@ -105,6 +105,6 @@ void fileWizard::fileFormatTextChanged(const TQString& text) TQMap<TQString,TQString> map; map.insert("extension", "mp3"); string = job.replaceSpecialChars(string, false, map); - exampleLabel->setText(i18n("Example: %1").arg(string)); + exampleLabel->setText(i18n("Example: %1").tqarg(string)); } diff --git a/kfile-plugins/au/kfile_au.cpp b/kfile-plugins/au/kfile_au.cpp index ae1b4614..1c6e3cfd 100644 --- a/kfile-plugins/au/kfile_au.cpp +++ b/kfile-plugins/au/kfile_au.cpp @@ -43,10 +43,10 @@ typedef KGenericFactory<KAuPlugin> AuFactory; K_EXPORT_COMPONENT_FACTORY(kfile_au, AuFactory( "kfile_au" )) -KAuPlugin::KAuPlugin(TQObject *parent, const char *name, +KAuPlugin::KAuPlugin(TQObject *tqparent, const char *name, const TQStringList &args) - : KFilePlugin(parent, name, args) + : KFilePlugin(tqparent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "audio/basic" ); @@ -90,7 +90,7 @@ bool KAuPlugin::readInfo( KFileMetaInfo& info, uint what) if (!file.open(IO_ReadOnly)) { - kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl; + kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()).data() << endl; return false; } diff --git a/kfile-plugins/au/kfile_au.h b/kfile-plugins/au/kfile_au.h index 7968d87c..d09ce2a7 100644 --- a/kfile-plugins/au/kfile_au.h +++ b/kfile-plugins/au/kfile_au.h @@ -27,9 +27,10 @@ class TQStringList; class KAuPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KAuPlugin( TQObject *parent, const char *name, const TQStringList& args ); + KAuPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/kfile-plugins/avi/kfile_avi.cpp b/kfile-plugins/avi/kfile_avi.cpp index a7c2bc31..d8dd2f7b 100644 --- a/kfile-plugins/avi/kfile_avi.cpp +++ b/kfile-plugins/avi/kfile_avi.cpp @@ -45,10 +45,10 @@ typedef KGenericFactory<KAviPlugin> AviFactory; K_EXPORT_COMPONENT_FACTORY(kfile_avi, AviFactory( "kfile_avi" )) -KAviPlugin::KAviPlugin(TQObject *parent, const char *name, +KAviPlugin::KAviPlugin(TQObject *tqparent, const char *name, const TQStringList &args) - : KFilePlugin(parent, name, args) + : KFilePlugin(tqparent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "video/x-msvideo" ); @@ -486,7 +486,7 @@ bool KAviPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) // open file, set up stream and set endianness if (!f.open(IO_ReadOnly)) { - kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl; + kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()).data() << endl; return false; } //TQDataStream dstream(&file); diff --git a/kfile-plugins/avi/kfile_avi.h b/kfile-plugins/avi/kfile_avi.h index 43bc72e0..da16a16b 100644 --- a/kfile-plugins/avi/kfile_avi.h +++ b/kfile-plugins/avi/kfile_avi.h @@ -37,9 +37,10 @@ class TQStringList; class KAviPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KAviPlugin( TQObject *parent, const char *name, const TQStringList& args ); + KAviPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); diff --git a/kfile-plugins/flac/kfile_flac.cpp b/kfile-plugins/flac/kfile_flac.cpp index 6462c917..be804ee1 100644 --- a/kfile-plugins/flac/kfile_flac.cpp +++ b/kfile-plugins/flac/kfile_flac.cpp @@ -56,9 +56,9 @@ K_EXPORT_COMPONENT_FACTORY(kfile_flac, KGenericFactory<KFlacPlugin>("kfile_flac")) -KFlacPlugin::KFlacPlugin( TQObject *parent, const char *name, +KFlacPlugin::KFlacPlugin( TQObject *tqparent, const char *name, const TQStringList &args ) - : KFilePlugin( parent, name, args ) + : KFilePlugin( tqparent, name, args ) { kdDebug(7034) << "flac plugin\n"; @@ -178,16 +178,16 @@ bool KFlacPlugin::readInfo( KFileMetaInfo& info, uint what ) { KFileMetaInfoGroup commentgroup = appendGroup(info, "Comment"); - TQString date = file->tag()->year() > 0 ? TQString::number(file->tag()->year()) : TQString::null; - TQString track = file->tag()->track() > 0 ? TQString::number(file->tag()->track()) : TQString::null; + TQString date = file->tag()->year() > 0 ? TQString::number(file->tag()->year()) : TQString(); + TQString track = file->tag()->track() > 0 ? TQString::number(file->tag()->track()) : TQString(); - appendItem(commentgroup, "Title", TStringToQString(file->tag()->title()).stripWhiteSpace()); - appendItem(commentgroup, "Artist", TStringToQString(file->tag()->artist()).stripWhiteSpace()); - appendItem(commentgroup, "Album", TStringToQString(file->tag()->album()).stripWhiteSpace()); + appendItem(commentgroup, "Title", TQString(TStringToQString(file->tag()->title())).stripWhiteSpace()); + appendItem(commentgroup, "Artist", TQString(TStringToQString(file->tag()->artist())).stripWhiteSpace()); + appendItem(commentgroup, "Album", TQString(TStringToQString(file->tag()->album())).stripWhiteSpace()); appendItem(commentgroup, "Date", date); - appendItem(commentgroup, "Comment", TStringToQString(file->tag()->comment()).stripWhiteSpace()); + appendItem(commentgroup, "Comment", TQString(TStringToQString(file->tag()->comment())).stripWhiteSpace()); appendItem(commentgroup, "Tracknumber", track); - appendItem(commentgroup, "Genre", TStringToQString(file->tag()->genre()).stripWhiteSpace()); + appendItem(commentgroup, "Genre", TQString(TStringToQString(file->tag()->genre())).stripWhiteSpace()); } if (readTech && file->audioProperties()) @@ -269,14 +269,14 @@ bool KFlacPlugin::writeInfo(const KFileMetaInfo& info) const TQValidator* KFlacPlugin::createValidator( const TQString&, const TQString &group, const TQString &key, - TQObject* parent, const char* name) const + TQObject* tqparent, const char* name) const { if(key == "Tracknumber" || key == "Date") { - return new TQIntValidator(0, 9999, parent, name); + return new TQIntValidator(0, 9999, tqparent, name); } else - return new TQRegExpValidator(TQRegExp(".*"), parent, name); + return new TQRegExpValidator(TQRegExp(".*"), tqparent, name); } #include "kfile_flac.moc" diff --git a/kfile-plugins/flac/kfile_flac.h b/kfile-plugins/flac/kfile_flac.h index b08e2136..8d60169c 100644 --- a/kfile-plugins/flac/kfile_flac.h +++ b/kfile-plugins/flac/kfile_flac.h @@ -32,16 +32,17 @@ class TQStringList; class KFlacPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KFlacPlugin( TQObject *parent, const char *name, const TQStringList& args ); + KFlacPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); virtual bool writeInfo( const KFileMetaInfo& info ) const; virtual TQValidator* createValidator( const TQString& mimetype, const TQString &group, const TQString &key, - TQObject* parent, const char* name) const; + TQObject* tqparent, const char* name) const; protected: virtual void makeMimeTypeInfo(const TQString& mimeType); }; diff --git a/kfile-plugins/m3u/kfile_m3u.cpp b/kfile-plugins/m3u/kfile_m3u.cpp index 5fff1a08..d366685f 100644 --- a/kfile-plugins/m3u/kfile_m3u.cpp +++ b/kfile-plugins/m3u/kfile_m3u.cpp @@ -37,9 +37,9 @@ typedef KGenericFactory<KM3uPlugin> M3uFactory; K_EXPORT_COMPONENT_FACTORY( kfile_m3u, M3uFactory( "kfile_m3u" ) ) -KM3uPlugin::KM3uPlugin( TQObject *parent, const char *name, +KM3uPlugin::KM3uPlugin( TQObject *tqparent, const char *name, const TQStringList &preferredItems ) - : KFilePlugin( parent, name, preferredItems ) + : KFilePlugin( tqparent, name, preferredItems ) { kdDebug(7034) << "m3u plugin\n"; @@ -75,7 +75,7 @@ bool KM3uPlugin::readInfo( KFileMetaInfo& info, uint ) if (s.endsWith("\n")) s.truncate(s.length()-1); if (!s.stripWhiteSpace().isEmpty()) { - appendItem(group, i18n("Track %1").arg(num, 3), s); + appendItem(group, i18n("Track %1").tqarg(num, 3), s); num++; } } diff --git a/kfile-plugins/m3u/kfile_m3u.h b/kfile-plugins/m3u/kfile_m3u.h index 2787c81b..a91d392d 100644 --- a/kfile-plugins/m3u/kfile_m3u.h +++ b/kfile-plugins/m3u/kfile_m3u.h @@ -29,9 +29,10 @@ class TQStringList; class KM3uPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KM3uPlugin( TQObject *parent, const char *name, const TQStringList& args ); + KM3uPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what ); }; diff --git a/kfile-plugins/mp3/kfile_mp3.cpp b/kfile-plugins/mp3/kfile_mp3.cpp index c6317946..8036cef8 100644 --- a/kfile-plugins/mp3/kfile_mp3.cpp +++ b/kfile-plugins/mp3/kfile_mp3.cpp @@ -44,8 +44,8 @@ typedef KGenericFactory<KMp3Plugin> Mp3Factory; K_EXPORT_COMPONENT_FACTORY(kfile_mp3, Mp3Factory( "kfile_mp3" )) -KMp3Plugin::KMp3Plugin(TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin(parent, name, args) +KMp3Plugin::KMp3Plugin(TQObject *tqparent, const char *name, const TQStringList &args) + : KFilePlugin(tqparent, name, args) { kdDebug(7034) << "mp3 plugin\n"; @@ -151,24 +151,24 @@ bool KMp3Plugin::readInfo(KFileMetaInfo &info, uint what) { KFileMetaInfoGroup id3group = appendGroup(info, "id3"); - TQString date = file.tag()->year() > 0 ? TQString::number(file.tag()->year()) : TQString::null; - TQString track = file.tag()->track() > 0 ? TQString::number(file.tag()->track()) : TQString::null; + TQString date = file.tag()->year() > 0 ? TQString::number(file.tag()->year()) : TQString(); + TQString track = file.tag()->track() > 0 ? TQString::number(file.tag()->track()) : TQString(); - TQString title = TStringToQString(file.tag()->title()).stripWhiteSpace(); + TQString title = TQString(TStringToQString(file.tag()->title())).stripWhiteSpace(); if (!title.isEmpty()) appendItem(id3group, "Title", title); - TQString artist = TStringToQString(file.tag()->artist()).stripWhiteSpace(); + TQString artist = TQString(TStringToQString(file.tag()->artist())).stripWhiteSpace(); if (!artist.isEmpty()) appendItem(id3group, "Artist", artist); - TQString album = TStringToQString(file.tag()->album()).stripWhiteSpace(); + TQString album = TQString(TStringToQString(file.tag()->album())).stripWhiteSpace(); if (!album.isEmpty()) appendItem(id3group, "Album", album); appendItem(id3group, "Date", date); - TQString comment = TStringToQString(file.tag()->comment()).stripWhiteSpace(); + TQString comment = TQString(TStringToQString(file.tag()->comment())).stripWhiteSpace(); if (!comment.isEmpty()) appendItem(id3group, "Comment", comment); appendItem(id3group, "Tracknumber", track); - TQString genre = TStringToQString(file.tag()->genre()).stripWhiteSpace(); + TQString genre = TQString(TStringToQString(file.tag()->genre())).stripWhiteSpace(); if (!genre.isEmpty()) appendItem(id3group, "Genre", genre); } @@ -191,7 +191,7 @@ bool KMp3Plugin::readInfo(KFileMetaInfo &info, uint what) break; } - static const int dummy = 0; // QVariant's bool constructor requires a dummy int value. + static const int dummy = 0; // TQVariant's bool constructor requires a dummy int value. // CRC and Emphasis aren't yet implemented in TagLib (not that I think anyone cares) @@ -267,8 +267,8 @@ class ComboValidator : public KStringListValidator { public: ComboValidator(const TQStringList &list, bool rejecting, - bool fixupEnabled, TQObject *parent, const char *name) : - KStringListValidator(list, rejecting, fixupEnabled, parent, name) + bool fixupEnabled, TQObject *tqparent, const char *name) : + KStringListValidator(list, rejecting, fixupEnabled, tqparent, name) { } @@ -281,13 +281,13 @@ public: TQValidator *KMp3Plugin::createValidator(const TQString & /* mimetype */, const TQString &group, const TQString &key, - TQObject *parent, const char *name) const + TQObject *tqparent, const char *name) const { kdDebug(7034) << "making a validator for " << group << "/" << key << endl; if(key == "Tracknumber" || key == "Date") { - return new TQIntValidator(0, 9999, parent, name); + return new TQIntValidator(0, 9999, tqparent, name); } if(key == "Genre") @@ -298,7 +298,7 @@ TQValidator *KMp3Plugin::createValidator(const TQString & /* mimetype */, { l.append(TStringToQString((*it))); } - return new ComboValidator(l, false, true, parent, name); + return new ComboValidator(l, false, true, tqparent, name); } return 0; diff --git a/kfile-plugins/mp3/kfile_mp3.h b/kfile-plugins/mp3/kfile_mp3.h index 6f3fc44c..903a5804 100644 --- a/kfile-plugins/mp3/kfile_mp3.h +++ b/kfile-plugins/mp3/kfile_mp3.h @@ -26,16 +26,17 @@ class TQStringList; class KMp3Plugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KMp3Plugin(TQObject *parent, const char *name, const TQStringList &args); + KMp3Plugin(TQObject *tqparent, const char *name, const TQStringList &args); virtual bool readInfo( KFileMetaInfo& info, uint what ); virtual bool writeInfo( const KFileMetaInfo& info) const; virtual TQValidator *createValidator(const TQString &mimetype, const TQString &group, const TQString &key, - TQObject *parent, const char *name) const; + TQObject *tqparent, const char *name) const; }; #endif diff --git a/kfile-plugins/mpc/kfile_mpc.cpp b/kfile-plugins/mpc/kfile_mpc.cpp index 4b6800df..a1bf5648 100644 --- a/kfile-plugins/mpc/kfile_mpc.cpp +++ b/kfile-plugins/mpc/kfile_mpc.cpp @@ -48,9 +48,9 @@ K_EXPORT_COMPONENT_FACTORY(kfile_mpc, KGenericFactory<KMpcPlugin>("kfile_mpc")) -KMpcPlugin::KMpcPlugin( TQObject *parent, const char *name, +KMpcPlugin::KMpcPlugin( TQObject *tqparent, const char *name, const TQStringList &args ) - : KFilePlugin( parent, name, args ) + : KFilePlugin( tqparent, name, args ) { kdDebug(7034) << "mpc plugin\n"; @@ -154,16 +154,16 @@ bool KMpcPlugin::readInfo( KFileMetaInfo& info, uint what ) { KFileMetaInfoGroup commentgroup = appendGroup(info, "Comment"); - TQString date = file->tag()->year() > 0 ? TQString::number(file->tag()->year()) : TQString::null; - TQString track = file->tag()->track() > 0 ? TQString::number(file->tag()->track()) : TQString::null; + TQString date = file->tag()->year() > 0 ? TQString::number(file->tag()->year()) : TQString(); + TQString track = file->tag()->track() > 0 ? TQString::number(file->tag()->track()) : TQString(); - appendItem(commentgroup, "Title", TStringToQString(file->tag()->title()).stripWhiteSpace()); - appendItem(commentgroup, "Artist", TStringToQString(file->tag()->artist()).stripWhiteSpace()); - appendItem(commentgroup, "Album", TStringToQString(file->tag()->album()).stripWhiteSpace()); + appendItem(commentgroup, "Title", TQString(TStringToQString(file->tag()->title())).stripWhiteSpace()); + appendItem(commentgroup, "Artist", TQString(TStringToQString(file->tag()->artist())).stripWhiteSpace()); + appendItem(commentgroup, "Album", TQString(TStringToQString(file->tag()->album())).stripWhiteSpace()); appendItem(commentgroup, "Date", date); - appendItem(commentgroup, "Comment", TStringToQString(file->tag()->comment()).stripWhiteSpace()); + appendItem(commentgroup, "Comment", TQString(TStringToQString(file->tag()->comment())).stripWhiteSpace()); appendItem(commentgroup, "Tracknumber", track); - appendItem(commentgroup, "Genre", TStringToQString(file->tag()->genre()).stripWhiteSpace()); + appendItem(commentgroup, "Genre", TQString(TStringToQString(file->tag()->genre())).stripWhiteSpace()); } if (readTech) @@ -240,14 +240,14 @@ bool KMpcPlugin::writeInfo(const KFileMetaInfo& info) const TQValidator* KMpcPlugin::createValidator( const TQString&, const TQString &group, const TQString &key, - TQObject* parent, const char* name) const + TQObject* tqparent, const char* name) const { if(key == "Tracknumber" || key == "Date") { - return new TQIntValidator(0, 9999, parent, name); + return new TQIntValidator(0, 9999, tqparent, name); } else - return new TQRegExpValidator(TQRegExp(".*"), parent, name); + return new TQRegExpValidator(TQRegExp(".*"), tqparent, name); } #include "kfile_mpc.moc" diff --git a/kfile-plugins/mpc/kfile_mpc.h b/kfile-plugins/mpc/kfile_mpc.h index 9deb7d71..380da446 100644 --- a/kfile-plugins/mpc/kfile_mpc.h +++ b/kfile-plugins/mpc/kfile_mpc.h @@ -32,16 +32,17 @@ class TQStringList; class KMpcPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KMpcPlugin( TQObject *parent, const char *name, const TQStringList& args ); + KMpcPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); virtual bool writeInfo( const KFileMetaInfo& info ) const; virtual TQValidator* createValidator( const TQString& mimetype, const TQString &group, const TQString &key, - TQObject* parent, const char* name) const; + TQObject* tqparent, const char* name) const; }; diff --git a/kfile-plugins/mpeg/kfile_mpeg.cpp b/kfile-plugins/mpeg/kfile_mpeg.cpp index f532318e..a94ce15a 100644 --- a/kfile-plugins/mpeg/kfile_mpeg.cpp +++ b/kfile-plugins/mpeg/kfile_mpeg.cpp @@ -46,10 +46,10 @@ typedef KGenericFactory<KMpegPlugin> MpegFactory; K_EXPORT_COMPONENT_FACTORY(kfile_mpeg, MpegFactory( "kfile_mpeg" )) -KMpegPlugin::KMpegPlugin(TQObject *parent, const char *name, +KMpegPlugin::KMpegPlugin(TQObject *tqparent, const char *name, const TQStringList &args) - : KFilePlugin(parent, name, args) + : KFilePlugin(tqparent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "video/mpeg" ); @@ -329,7 +329,7 @@ bool KMpegPlugin::read_mpeg() skimmed++; searched++; if (video_len > 0) video_len--; - // Use a fast state machine to find 00 00 01 sync code + // Use a fast state machine to tqfind 00 00 01 sync code switch (state) { case 0: if (byte == 0) @@ -502,7 +502,7 @@ bool KMpegPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) // open file, set up stream and set endianness if (!file.open(IO_ReadOnly)) { - kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl; + kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()).data() << endl; return false; } diff --git a/kfile-plugins/mpeg/kfile_mpeg.h b/kfile-plugins/mpeg/kfile_mpeg.h index 2aa313d2..e35b639e 100644 --- a/kfile-plugins/mpeg/kfile_mpeg.h +++ b/kfile-plugins/mpeg/kfile_mpeg.h @@ -28,9 +28,10 @@ class TQStringList; class KMpegPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KMpegPlugin( TQObject *parent, const char *name, const TQStringList& args ); + KMpegPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); diff --git a/kfile-plugins/ogg/kfile_ogg.cpp b/kfile-plugins/ogg/kfile_ogg.cpp index dc4a8f3e..3964b814 100644 --- a/kfile-plugins/ogg/kfile_ogg.cpp +++ b/kfile-plugins/ogg/kfile_ogg.cpp @@ -61,9 +61,9 @@ static const char* const knownTranslations[] = { K_EXPORT_COMPONENT_FACTORY(kfile_ogg, KGenericFactory<KOggPlugin>("kfile_ogg")) -KOggPlugin::KOggPlugin( TQObject *parent, const char *name, +KOggPlugin::KOggPlugin( TQObject *tqparent, const char *name, const TQStringList &args ) - : KFilePlugin( parent, name, args ) + : KFilePlugin( tqparent, name, args ) { kdDebug(7034) << "ogg plugin\n"; @@ -176,7 +176,7 @@ bool KOggPlugin::readInfo( KFileMetaInfo& info, uint what ) fp = fopen(TQFile::encodeName(info.path()),"rb"); if (!fp) { - kdDebug(7034) << "Unable to open " << TQFile::encodeName(info.path()) << endl; + kdDebug(7034) << "Unable to open " << TQFile::encodeName(info.path()).data() << endl; return false; } @@ -184,7 +184,7 @@ bool KOggPlugin::readInfo( KFileMetaInfo& info, uint what ) if (rc < 0) { - kdDebug(7034) << "Unable to understand " << TQFile::encodeName(info.path()) + kdDebug(7034) << "Unable to understand " << TQFile::encodeName(info.path()).data() << ", errorcode=" << rc << endl; return false; } @@ -319,7 +319,7 @@ bool KOggPlugin::writeInfo(const KFileMetaInfo& info) const else filename = info.path(); - // nothing in Qt or KDE to get the mode as an int? + // nothing in TQt or KDE to get the mode as an int? struct stat s; stat(TQFile::encodeName(filename), &s); @@ -350,8 +350,8 @@ bool KOggPlugin::writeInfo(const KFileMetaInfo& info) const TQValidator* KOggPlugin::createValidator( const TQString&, const TQString &, const TQString &, - TQObject* parent, const char* name) const { - return new TQRegExpValidator(TQRegExp(".*"), parent, name); + TQObject* tqparent, const char* name) const { + return new TQRegExpValidator(TQRegExp(".*"), tqparent, name); } #include "kfile_ogg.moc" diff --git a/kfile-plugins/ogg/kfile_ogg.h b/kfile-plugins/ogg/kfile_ogg.h index 79130527..47472c6d 100644 --- a/kfile-plugins/ogg/kfile_ogg.h +++ b/kfile-plugins/ogg/kfile_ogg.h @@ -29,16 +29,17 @@ class TQStringList; class KOggPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KOggPlugin( TQObject *parent, const char *name, const TQStringList& args ); + KOggPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); virtual bool writeInfo( const KFileMetaInfo& info ) const; virtual TQValidator* createValidator( const TQString& mimetype, const TQString &group, const TQString &key, - TQObject* parent, const char* name) const; + TQObject* tqparent, const char* name) const; }; diff --git a/kfile-plugins/sid/kfile_sid.cpp b/kfile-plugins/sid/kfile_sid.cpp index 444e2ea8..3bdaf681 100644 --- a/kfile-plugins/sid/kfile_sid.cpp +++ b/kfile-plugins/sid/kfile_sid.cpp @@ -36,10 +36,10 @@ typedef KGenericFactory<KSidPlugin> SidFactory; K_EXPORT_COMPONENT_FACTORY(kfile_sid, SidFactory("kfile_sid")) -KSidPlugin::KSidPlugin(TQObject *parent, const char *name, +KSidPlugin::KSidPlugin(TQObject *tqparent, const char *name, const TQStringList &args) - : KFilePlugin(parent, name, args) + : KFilePlugin(tqparent, name, args) { kdDebug(7034) << "sid plugin\n"; @@ -211,13 +211,13 @@ failure: TQValidator* KSidPlugin::createValidator(const TQString& /*mimetype*/, const TQString& group, - const TQString& /*key*/, TQObject* parent, + const TQString& /*key*/, TQObject* tqparent, const char* name) const { kdDebug(7034) << k_funcinfo << endl; // all items in "General" group are strings of max lenght 31 if (group == "General") - return new TQRegExpValidator(TQRegExp(".{,31}"), parent, name); + return new TQRegExpValidator(TQRegExp(".{,31}"), tqparent, name); // all others are read-only return 0; } diff --git a/kfile-plugins/sid/kfile_sid.h b/kfile-plugins/sid/kfile_sid.h index eb809c56..d042e57d 100644 --- a/kfile-plugins/sid/kfile_sid.h +++ b/kfile-plugins/sid/kfile_sid.h @@ -28,14 +28,15 @@ class TQStringList; class KSidPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KSidPlugin(TQObject *parent, const char *name, const TQStringList& args); + KSidPlugin(TQObject *tqparent, const char *name, const TQStringList& args); virtual bool readInfo(KFileMetaInfo& info, uint what); virtual bool writeInfo(const KFileMetaInfo& info) const; TQValidator* createValidator(const TQString& mimetype, const TQString& group, - const TQString& key, TQObject* parent, + const TQString& key, TQObject* tqparent, const char* name) const; }; diff --git a/kfile-plugins/theora/kfile_theora.cpp b/kfile-plugins/theora/kfile_theora.cpp index d426cc7f..0dbefbe7 100644 --- a/kfile-plugins/theora/kfile_theora.cpp +++ b/kfile-plugins/theora/kfile_theora.cpp @@ -56,9 +56,9 @@ typedef KGenericFactory<theoraPlugin> theoraFactory; K_EXPORT_COMPONENT_FACTORY(kfile_theora, theoraFactory( "kfile_theora" )) -theoraPlugin::theoraPlugin(TQObject *parent, const char *name, +theoraPlugin::theoraPlugin(TQObject *tqparent, const char *name, const TQStringList &args) - : KFilePlugin(parent, name, args) + : KFilePlugin(tqparent, name, args) { // kdDebug(7034) << "theora plugin\n"; @@ -136,7 +136,7 @@ bool theoraPlugin::readInfo( KFileMetaInfo& info, uint what) fp = fopen(TQFile::encodeName(info.path()),"rb"); if (!fp) { - kdDebug(7034) << "Unable to open " << TQFile::encodeName(info.path()) << endl; + kdDebug(7034) << "Unable to open " << TQFile::encodeName(info.path()).data() << endl; return false; } diff --git a/kfile-plugins/theora/kfile_theora.h b/kfile-plugins/theora/kfile_theora.h index 740dea2b..13c943c4 100644 --- a/kfile-plugins/theora/kfile_theora.h +++ b/kfile-plugins/theora/kfile_theora.h @@ -31,9 +31,10 @@ class TQStringList; class theoraPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - theoraPlugin( TQObject *parent, const char *name, const TQStringList& args ); + theoraPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/kfile-plugins/wav/kfile_wav.cpp b/kfile-plugins/wav/kfile_wav.cpp index 09e2c2cc..917d8fca 100644 --- a/kfile-plugins/wav/kfile_wav.cpp +++ b/kfile-plugins/wav/kfile_wav.cpp @@ -43,10 +43,10 @@ typedef KGenericFactory<KWavPlugin> WavFactory; K_EXPORT_COMPONENT_FACTORY(kfile_wav, WavFactory( "kfile_wav" )) -KWavPlugin::KWavPlugin(TQObject *parent, const char *name, +KWavPlugin::KWavPlugin(TQObject *tqparent, const char *name, const TQStringList &args) - : KFilePlugin(parent, name, args) + : KFilePlugin(tqparent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "audio/x-wav" ); @@ -99,7 +99,7 @@ bool KWavPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) if (!file.open(IO_ReadOnly)) { - kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl; + kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()).data() << endl; return false; } diff --git a/kfile-plugins/wav/kfile_wav.h b/kfile-plugins/wav/kfile_wav.h index a2f8ae40..9eb4d796 100644 --- a/kfile-plugins/wav/kfile_wav.h +++ b/kfile-plugins/wav/kfile_wav.h @@ -27,9 +27,10 @@ class TQStringList; class KWavPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KWavPlugin( TQObject *parent, const char *name, const TQStringList& args ); + KWavPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/kioslave/audiocd/audiocd.cpp b/kioslave/audiocd/audiocd.cpp index d092ffda..43f61d21 100644 --- a/kioslave/audiocd/audiocd.cpp +++ b/kioslave/audiocd/audiocd.cpp @@ -59,7 +59,7 @@ extern "C" using namespace KIO; using namespace KCDDB; -#define QFL1(x) TQString::fromLatin1(x) +#define TQFL1(x) TQString::tqfromLatin1(x) #define DEFAULT_CD_DEVICE "/dev/cdrom" #define CDDB_INFORMATION "CDDB Information" @@ -149,7 +149,7 @@ public: TQString fileNameTemplate; // URL settable TQString albumTemplate; // URL settable TQString rsearch; - TQString rreplace; + TQString rtqreplace; // Current strings for this CD and or cddb selection TQStringList templateTitles; @@ -189,7 +189,7 @@ AudioCDEncoder *AudioCDProtocol::encoderFromExtension(const TQString& extension) AudioCDEncoder *AudioCDProtocol::determineEncoder(const TQString & filename) { int len = filename.length(); - int pos = filename.findRev('.'); + int pos = filename.tqfindRev('.'); return encoderFromExtension(filename.right(len - pos)); } @@ -251,9 +251,9 @@ struct cdrom_drive * AudioCDProtocol::initRequest(const KURL & url) // circumstances, so build a representation from // the unit number and SCSI device name. // - TQString devname = TQString::fromLatin1( "/dev/%1%2" ) - .arg( drive->dev->given_dev_name ) - .arg( drive->dev->given_unit_number ) ; + TQString devname = TQString::tqfromLatin1( "/dev/%1%2" ) + .tqarg( drive->dev->given_dev_name ) + .tqarg( drive->dev->given_unit_number ) ; kdDebug(7117) << " Using derived name " << devname << endl; d->cd.setDevice( devname ); } @@ -326,7 +326,7 @@ struct cdrom_drive * AudioCDProtocol::initRequest(const KURL & url) TQString name(d->fname); // Remove extension - int dot = name.findRev('.'); + int dot = name.tqfindRev('.'); if (dot >= 0) name.truncate(dot); @@ -365,7 +365,7 @@ struct cdrom_drive * AudioCDProtocol::initRequest(const KURL & url) d->req_track = -1; // Are we in the directory that lists "full CD" files? - d->req_allTracks = (dname.contains(d->s_fullCD)); + d->req_allTracks = (dname.tqcontains(d->s_fullCD)); kdDebug(7117) << "dir=" << dname << " file=" << d->fname << " req_track=" << d->req_track << " which_dir=" << d->which_dir << " full CD?=" << d->req_allTracks << endl; @@ -397,9 +397,9 @@ void AudioCDProtocol::get(const KURL & url) if (!drive) return; - if( d->fname.contains(i18n(CDDB_INFORMATION))){ + if( d->fname.tqcontains(i18n(CDDB_INFORMATION))){ uint choice = 1; - if(d->fname != TQString("%1.txt").arg(i18n(CDDB_INFORMATION))){ + if(d->fname != TQString("%1.txt").tqarg(i18n(CDDB_INFORMATION))){ choice= d->fname.section('_',1,1).section('.',0,0).toInt(); } uint count = 1; @@ -417,7 +417,7 @@ void AudioCDProtocol::get(const KURL & url) } count++; } - if(!found && d->fname.contains(i18n(CDDB_INFORMATION)+":")){ + if(!found && d->fname.tqcontains(i18n(CDDB_INFORMATION)+":")){ mimeType("text/html"); //data(TQCString( d->fname.latin1() )); // send an empty TQByteArray to signal end of data. @@ -465,7 +465,7 @@ void AudioCDProtocol::get(const KURL & url) unsigned long size = encoder->size(time_secs); totalSize(size); - emit mimeType(QFL1(encoder->mimeType())); + emit mimeType(TQFL1(encoder->mimeType())); // Read data (track/disk) from the cd paranoiaRead(drive, firstSector, lastSector, encoder, url.fileName(), size); @@ -504,7 +504,7 @@ void AudioCDProtocol::stat(const KURL & url) UDSAtom atom; atom.m_uds = KIO::UDS_NAME; - atom.m_str = url.fileName().replace('/', QFL1("%2F")); + atom.m_str = url.fileName().tqreplace('/', TQFL1("%2F")); kdDebug(7117) << k_funcinfo << atom.m_str << endl; entry.append(atom); @@ -610,15 +610,15 @@ void AudioCDProtocol::listDir(const KURL & url) for ( it = d->cddbList.begin(); it != d->cddbList.end(); ++it ){ (*it).toString(); if(count == 1) - app_file(entry, TQString("%1.txt").arg(i18n(CDDB_INFORMATION)), ((*it).toString().length())+1); + app_file(entry, TQString("%1.txt").tqarg(i18n(CDDB_INFORMATION)), ((*it).toString().length())+1); else - app_file(entry, TQString("%1_%2.txt").arg(i18n(CDDB_INFORMATION)).arg(count), ((*it).toString().length())+1); + app_file(entry, TQString("%1_%2.txt").tqarg(i18n(CDDB_INFORMATION)).tqarg(count), ((*it).toString().length())+1); count++; listEntry(entry, false); } // Error if( count == 1 ) { - app_file(entry, TQString("%1: %2.txt").arg(i18n(CDDB_INFORMATION)).arg(CDDB::resultToString(d->cddbResult)), ((*it).toString().length())+1); + app_file(entry, TQString("%1: %2.txt").tqarg(i18n(CDDB_INFORMATION)).tqarg(CDDB::resultToString(d->cddbResult)), ((*it).toString().length())+1); count++; listEntry(entry, false); } @@ -838,7 +838,7 @@ void AudioCDProtocol::paranoiaRead( if (0 == buf) { kdDebug(7117) << "Unrecoverable error in paranoia_read" << endl; ok = false; - error( ERR_SLAVE_DEFINED, i18n( "Error reading audio data for %1 from the CD" ).arg( fileName ) ); + error( ERR_SLAVE_DEFINED, i18n( "Error reading audio data for %1 from the CD" ).tqarg( fileName ) ); break; } @@ -848,7 +848,7 @@ void AudioCDProtocol::paranoiaRead( if(encoderProcessed == -1){ kdDebug(7117) << "Encoder processing error, stopping." << endl; ok = false; - TQString errMsg = i18n( "Couldn't read %1: encoding failed" ).arg( fileName ); + TQString errMsg = i18n( "Couldn't read %1: encoding failed" ).tqarg( fileName ); TQString details = encoder->lastErrorMessage(); if ( !details.isEmpty() ) errMsg += "\n" + details; @@ -926,7 +926,7 @@ void AudioCDProtocol::paranoiaRead( processedSize(processed); } else if ( ok ) // i.e. no error message already emitted - error( ERR_SLAVE_DEFINED, i18n( "Couldn't read %1: encoding failed" ).arg( fileName ) ); + error( ERR_SLAVE_DEFINED, i18n( "Couldn't read %1: encoding failed" ).tqarg( fileName ) ); paranoia_free(paranoia); paranoia = 0; @@ -953,24 +953,24 @@ void AudioCDProtocol::parseURLArgs(const KURL & url) { TQString token(*it); - int equalsPos(token.find('=')); + int equalsPos(token.tqfind('=')); if (-1 == equalsPos) continue; TQString attribute(token.left(equalsPos)); TQString value(token.mid(equalsPos + 1)); - if (attribute == QFL1("device")) + if (attribute == TQFL1("device")) d->device = value; - else if (attribute == QFL1("paranoia_level")) + else if (attribute == TQFL1("paranoia_level")) d->paranoiaLevel = value.toInt(); - else if (attribute == QFL1("fileNameTemplate")) + else if (attribute == TQFL1("fileNameTemplate")) d->fileNameTemplate = value; - else if (attribute == QFL1("albumNameTemplate")) + else if (attribute == TQFL1("albumNameTemplate")) d->albumTemplate = value; - else if (attribute == QFL1("cddbChoice")) + else if (attribute == TQFL1("cddbChoice")) d->cddbUserChoice = value.toInt(); - else if (attribute == QFL1("niceLevel")){ + else if (attribute == TQFL1("niceLevel")){ int niceLevel = value.toInt(); if(setpriority(PRIO_PROCESS, getpid(), niceLevel) != 0) kdDebug(7117) << "Setting nice level to (" << niceLevel << ") failed." << endl; @@ -984,12 +984,12 @@ void AudioCDProtocol::parseURLArgs(const KURL & url) */ void AudioCDProtocol::loadSettings() { - KConfig *config = new KConfig(QFL1("kcmaudiocdrc"), true /*readonly*/, false /*no kdeglobals*/); + KConfig *config = new KConfig(TQFL1("kcmaudiocdrc"), true /*readonly*/, false /*no kdeglobals*/); - config->setGroup(QFL1("CDDA")); + config->setGroup(TQFL1("CDDA")); - if (!config->readBoolEntry(QFL1("autosearch"),true)) { - d->device = config->readEntry(QFL1("device"),QFL1(DEFAULT_CD_DEVICE)); + if (!config->readBoolEntry(TQFL1("autosearch"),true)) { + d->device = config->readEntry(TQFL1("device"),TQFL1(DEFAULT_CD_DEVICE)); } d->paranoiaLevel = 1; // enable paranoia error correction, but allow skipping @@ -1016,7 +1016,7 @@ void AudioCDProtocol::loadSettings() d->fileNameTemplate = config->readEntry("file_name_template", "%{albumartist} - %{number} - %{title}"); d->albumTemplate = config->readEntry("album_template", "%{albumartist} - %{albumtitle}"); d->rsearch = config->readEntry("regexp_search"); - d->rreplace = config->readEntry("regexp_replace"); + d->rtqreplace = config->readEntry("regexp_tqreplace"); // if the regular expressions are enclosed in qoutes. remove them // otherwise it is not possible to search for a space " ", since an empty (only spaces) value is not // supported by KConfig, so the space has to be qouted, but then here the regexp searches really for " " @@ -1026,9 +1026,9 @@ void AudioCDProtocol::loadSettings() { d->rsearch=d->rsearch.mid(1, d->rsearch.length()-2); } - if (qoutedString.exactMatch(d->rreplace)) + if (qoutedString.exactMatch(d->rtqreplace)) { - d->rreplace=d->rreplace.mid(1, d->rreplace.length()-2); + d->rtqreplace=d->rtqreplace.mid(1, d->rtqreplace.length()-2); } // Tell the encoders to load their settings @@ -1058,7 +1058,7 @@ void AudioCDProtocol::generateTemplateTitles() { for (unsigned int i = 0; i < d->tracks; i++){ TQString n; - d->templateTitles.append( i18n("Track %1").arg(n.sprintf("%02d", i + 1))); + d->templateTitles.append( i18n("Track %1").tqarg(n.sprintf("%02d", i + 1))); } return; } @@ -1076,12 +1076,12 @@ void AudioCDProtocol::generateTemplateTitles() macros["title"] = (info.trackInfoList[i].title); TQString n; macros["number"] = n.sprintf("%02d", i + 1); - //macros["number"] = TQString("%1").arg(i+1, 2, 10); + //macros["number"] = TQString("%1").tqarg(i+1, 2, 10); macros["genre"] = info.genre; macros["year"] = TQString::number(info.year); - TQString title = KMacroExpander::expandMacros(d->fileNameTemplate, macros, '%').replace('/', QFL1("%2F")); - title.replace( TQRegExp(d->rsearch), d->rreplace ); + TQString title = KMacroExpander::expandMacros(d->fileNameTemplate, macros, '%').tqreplace('/', TQFL1("%2F")); + title.tqreplace( TQRegExp(d->rsearch), d->rtqreplace ); d->templateTitles.append(title); } @@ -1090,8 +1090,8 @@ void AudioCDProtocol::generateTemplateTitles() macros["albumtitle"] = info.title; macros["genre"] = info.genre; macros["year"] = TQString::number(info.year); - d->templateAlbumName = KMacroExpander::expandMacros(d->albumTemplate, macros, '%').replace('/', QFL1("%2F")); - d->templateAlbumName.replace( TQRegExp(d->rsearch), d->rreplace ); + d->templateAlbumName = KMacroExpander::expandMacros(d->albumTemplate, macros, '%').tqreplace('/', TQFL1("%2F")); + d->templateAlbumName.tqreplace( TQRegExp(d->rsearch), d->rtqreplace ); } /** diff --git a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui index a742a4cc..271c6261 100644 --- a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui +++ b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AudiocdConfig</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -12,9 +12,9 @@ <height>563</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"> @@ -26,7 +26,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget</cstring> </property> @@ -38,11 +38,11 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -63,14 +63,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>210</height> </size> </property> </spacer> - <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>encoderPriority</cstring> </property> @@ -81,7 +81,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQSlider" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>niceLevel</cstring> </property> @@ -101,7 +101,7 @@ <enum>NoMarks</enum> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -109,31 +109,31 @@ <string>Highest</string> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel3</cstring> </property> <property name="text"> <string>Lowest</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel4</cstring> </property> <property name="text"> <string>Normal</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> </grid> </widget> - <widget class="QLineEdit" row="0" column="2"> + <widget class="TQLineEdit" row="0" column="2"> <property name="name"> <cstring>cd_device_string</cstring> </property> @@ -147,7 +147,7 @@ <string>Specify a location for the drive you want to use. Normally, this is a file inside the /dev folder representing your CD or DVD drive.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>cd_specify_device</cstring> </property> @@ -158,7 +158,7 @@ <string>Check this to specify a CD device different from the one which is detected automatically</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>ec_enable_check</cstring> </property> @@ -172,7 +172,7 @@ <string>If you uncheck this option, the slave will not try to use error correction which can be useful for reading damaged CDs. However, this feature can be problematic in some cases, so you can switch it off here.</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>ec_skip_check</cstring> </property> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -202,7 +202,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -213,7 +213,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>fileNameGroupBox</cstring> </property> @@ -224,7 +224,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -232,15 +232,15 @@ <string>The following macros will be expanded:</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="5" column="1"> + <widget class="TQLabel" row="5" column="1"> <property name="name"> <cstring>textLabel13</cstring> </property> @@ -248,7 +248,7 @@ <string>Genre</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -256,7 +256,7 @@ <string>Track Number</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -264,7 +264,7 @@ <string>%{title}</string> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>textLabel11</cstring> </property> @@ -272,7 +272,7 @@ <string>Year</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel3_3</cstring> </property> @@ -280,7 +280,7 @@ <string>Track Title</string> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -288,7 +288,7 @@ <string>Album Artist</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel10</cstring> </property> @@ -296,7 +296,7 @@ <string>%{year}</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -304,7 +304,7 @@ <string>%{albumtitle}</string> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -312,7 +312,7 @@ <string>Album Title</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel12</cstring> </property> @@ -320,7 +320,7 @@ <string>%{genre}</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -328,7 +328,7 @@ <string>%{albumartist}</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel4_2</cstring> </property> @@ -345,7 +345,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -356,7 +356,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -364,7 +364,7 @@ <string>Selection:</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -372,11 +372,11 @@ <string>Regular expression used on all file names. For example using selection " " and replace with "_" would replace all the spaces with underlines. </string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>inputlabel</cstring> </property> @@ -384,7 +384,7 @@ <string>Input:</string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>outputLabel</cstring> </property> @@ -392,7 +392,7 @@ <string>Output:</string> </property> </widget> - <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>exampleLabel</cstring> </property> @@ -400,7 +400,7 @@ <string>Example</string> </property> </widget> - <widget class="QLabel" row="6" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="6" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>exampleOutput</cstring> </property> @@ -408,7 +408,7 @@ <string>Cool artist - example audio file.wav</string> </property> </widget> - <widget class="QLineEdit" row="5" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="5" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>example</cstring> </property> @@ -416,17 +416,17 @@ <string>Cool artist - example audio file.wav</string> </property> </widget> - <widget class="QLineEdit" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_replaceInput</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="2"> + <widget class="TQLineEdit" row="2" column="2"> <property name="name"> <cstring>kcfg_replaceOutput</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -460,14 +460,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>16</height> </size> </property> </spacer> - <widget class="QGroupBox" row="0" column="1"> + <widget class="TQGroupBox" row="0" column="1"> <property name="name"> <cstring>fileNameGroupBox_2</cstring> </property> @@ -478,7 +478,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>fileNameLabel_2</cstring> </property> @@ -486,15 +486,15 @@ <string>The following macros will be expanded:</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="1" rowspan="2" colspan="1"> + <widget class="TQLabel" row="2" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel20</cstring> </property> @@ -502,7 +502,7 @@ <string>Year</string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="1" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel15</cstring> </property> @@ -510,7 +510,7 @@ <string>%{albumartist}</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel16</cstring> </property> @@ -518,7 +518,7 @@ <string>%{year}</string> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>textLabel21</cstring> </property> @@ -526,7 +526,7 @@ <string>Genre</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel19</cstring> </property> @@ -534,7 +534,7 @@ <string>Album Artist</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel18</cstring> </property> @@ -542,7 +542,7 @@ <string>Album Title</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel17</cstring> </property> @@ -550,7 +550,7 @@ <string>%{genre}</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel14</cstring> </property> @@ -570,7 +570,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -618,10 +618,10 @@ <includes> <include location="global" impldecl="in declaration">kcmodule.h</include> </includes> -<slots> +<Q_SLOTS> <slot>toggleLowpass()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp index 87614806..166aa126 100644 --- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp +++ b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp @@ -34,8 +34,8 @@ #include "kcmaudiocd.moc" #include <kconfigdialogmanager.h> -KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name) - : AudiocdConfig(parent, name), configChanged(false) +KAudiocdModule::KAudiocdModule(TQWidget *tqparent, const char *name) + : AudiocdConfig(tqparent, name), configChanged(false) { TQString foo = i18n("Report errors found on the cd."); @@ -51,7 +51,7 @@ KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name) KConfigSkeleton *config = NULL; TQWidget *widget = encoder->getConfigureWidget(&config); if(widget && config){ - tabWidget->addTab(widget, i18n("%1 Encoder").arg(encoder->type())); + tabWidget->addTab(widget, i18n("%1 Encoder").tqarg(encoder->type())); KConfigDialogManager *configManager = new KConfigDialogManager(widget, config, TQString(encoder->type()+" EncoderConfigManager").latin1()); encoderSettings.append(configManager); } @@ -123,7 +123,7 @@ void KAudiocdModule::updateExample() TQString deqoutedReplaceInput=removeQoutes(kcfg_replaceInput->text()); TQString deqoutedReplaceOutput=removeQoutes(kcfg_replaceOutput->text()); - text.replace( TQRegExp(deqoutedReplaceInput), deqoutedReplaceOutput ); + text.tqreplace( TQRegExp(deqoutedReplaceInput), deqoutedReplaceOutput ); exampleOutput->setText(text); } @@ -165,7 +165,7 @@ void KAudiocdModule::save() { replaceOutput=TQString("\"")+replaceOutput+TQString("\""); } config->writeEntry("regexp_search", replaceInput); - config->writeEntry("regexp_replace", replaceOutput); + config->writeEntry("regexp_tqreplace", replaceOutput); } KConfigDialogManager *widget; @@ -204,7 +204,7 @@ void KAudiocdModule::load(bool useDefaults) { fileNameLineEdit->setText(config->readEntry("file_name_template", "%{albumartist} - %{number} - %{title}")); albumNameLineEdit->setText(config->readEntry("album_name_template", "%{albumartist} - %{albumtitle}")); kcfg_replaceInput->setText(config->readEntry("regexp_search")); - kcfg_replaceOutput->setText(config->readEntry("regexp_replace")); + kcfg_replaceOutput->setText(config->readEntry("regexp_tqreplace")); example->setText(config->readEntry("example", i18n("Cool artist - example audio file.wav"))); } @@ -259,9 +259,9 @@ TQString KAudiocdModule::quickHelp() const extern "C" { - KCModule *create_audiocd(TQWidget *parent, const char */*name*/) + KCModule *create_audiocd(TQWidget *tqparent, const char */*name*/) { - return new KAudiocdModule(parent, "kcmaudiocd"); + return new KAudiocdModule(tqparent, "kcmaudiocd"); } } diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h index 4d51134d..b69a6784 100644 --- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h +++ b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h @@ -16,8 +16,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. */ @@ -32,10 +32,11 @@ class KConfigDialogManager; class KAudiocdModule : public AudiocdConfig { Q_OBJECT + TQ_OBJECT public: - KAudiocdModule(TQWidget *parent=0, const char *name=0); + KAudiocdModule(TQWidget *tqparent=0, const char *name=0); ~KAudiocdModule(); TQString quickHelp() const; diff --git a/kioslave/audiocd/plugins/audiocdencoder.cpp b/kioslave/audiocd/plugins/audiocdencoder.cpp index 6dfbec18..200534a4 100644 --- a/kioslave/audiocd/plugins/audiocdencoder.cpp +++ b/kioslave/audiocd/plugins/audiocdencoder.cpp @@ -78,12 +78,12 @@ void AudioCDEncoder::findAllPlugins(KIO::SlaveBase *slave, TQPtrList<AudioCDEnco { TQString fileName = *it2; kdDebug() << fileName << endl; - if (foundEncoders.contains(fileName)) { + if (foundEncoders.tqcontains(fileName)) { kdDebug(7117) << "Warning, encoder has been found twice!" << endl; continue; } foundEncoders.append(fileName); - fileName = fileName.mid(0, fileName.find('.')); + fileName = fileName.mid(0, fileName.tqfind('.')); void *function = loadPlugin(fileName); if(function){ void (*functionPointer)(KIO::SlaveBase *, TQPtrList<AudioCDEncoder> &) = (void (*)(KIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)) function; diff --git a/kioslave/audiocd/plugins/audiocdencoder.h b/kioslave/audiocd/plugins/audiocdencoder.h index cac9b2aa..9f58536f 100644 --- a/kioslave/audiocd/plugins/audiocdencoder.h +++ b/kioslave/audiocd/plugins/audiocdencoder.h @@ -31,7 +31,7 @@ class AudioCDEncoder { public: /** * Constructor. - * @param slave parent that this classes can use to call data() with + * @param slave tqparent that this classes can use to call data() with * when finished encoding bits. */ explicit AudioCDEncoder(KIO::SlaveBase *slave) : ioslave(slave) {}; @@ -120,7 +120,7 @@ public: /** * Returns the last error message; called when e.g. read() returns -1. */ - virtual TQString lastErrorMessage() const { return TQString::null; } + virtual TQString lastErrorMessage() const { return TQString(); } /** * Helper function to load all of the AudioCD Encoders from libraries. diff --git a/kioslave/audiocd/plugins/flac/encoderflac.cpp b/kioslave/audiocd/plugins/flac/encoderflac.cpp index 4be1aeb3..fd98f8b4 100644 --- a/kioslave/audiocd/plugins/flac/encoderflac.cpp +++ b/kioslave/audiocd/plugins/flac/encoderflac.cpp @@ -53,9 +53,9 @@ public: }; #ifdef LEGACY_FLAC -static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) +static FLAC__StreamEncoderWritetqStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) #else -static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) +static FLAC__StreamEncoderWritetqStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) #endif { EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data; @@ -80,7 +80,7 @@ static void MetadataCallback (const FLAC__StreamEncoder *encoder, const FLAC__St } /* -static FLAC__SeekableStreamEncoderSeekStatus SeekCallback(const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) +static FLAC__SeekableStreamEncoderSeektqStatus SeekCallback(const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) {} ; */ @@ -177,14 +177,14 @@ void EncoderFLAC::fillSongInfo( KCDDB::CDInfo info, int track, const TQString &c // d->metadata[1] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_PADDING); // d->metadata[2] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_SEEKTABLE) - typedef QPair<TQString, TQVariant> Comment; + typedef TQPair<TQString, TQVariant> Comment; Comment comments[7] = { Comment("Title", info.trackInfoList[track].get("title")), Comment("Artist", info.get("artist")), Comment("Album", info.get("title")), Comment("Genre", info.get("genre")), Comment("Tracknumber", TQString::number(track+1)), Comment("Comment", comment), - Comment("Date", TQString::null )}; + Comment("Date", TQString() )}; if (info.get("Year").toInt() > 0) { TQDateTime dt(TQDate(info.get("Year").toInt(), 1, 1)); comments[6] = Comment("Date", dt.toString(Qt::ISODate)); diff --git a/kioslave/audiocd/plugins/lame/collectingprocess.cpp b/kioslave/audiocd/plugins/lame/collectingprocess.cpp index 42bdf206..58485fa3 100644 --- a/kioslave/audiocd/plugins/lame/collectingprocess.cpp +++ b/kioslave/audiocd/plugins/lame/collectingprocess.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,8 +47,8 @@ struct CollectingProcess::Private { }; -CollectingProcess::CollectingProcess( TQObject * parent, const char * name ) - : KProcess( parent, name ) +CollectingProcess::CollectingProcess( TQObject * tqparent, const char * name ) + : KProcess( tqparent, name ) { d = new Private(); } diff --git a/kioslave/audiocd/plugins/lame/collectingprocess.h b/kioslave/audiocd/plugins/lame/collectingprocess.h index e9f0def4..bd5abca9 100644 --- a/kioslave/audiocd/plugins/lame/collectingprocess.h +++ b/kioslave/audiocd/plugins/lame/collectingprocess.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -45,8 +45,9 @@ */ class CollectingProcess : public KProcess { Q_OBJECT + TQ_OBJECT public: - CollectingProcess( TQObject * parent = 0, const char * name = 0 ); + CollectingProcess( TQObject * tqparent = 0, const char * name = 0 ); ~CollectingProcess(); /** Starts the process in NotifyOnExit mode and writes in to stdin of diff --git a/kioslave/audiocd/plugins/lame/encoderlame.cpp b/kioslave/audiocd/plugins/lame/encoderlame.cpp index 5e59c6a4..6154145b 100644 --- a/kioslave/audiocd/plugins/lame/encoderlame.cpp +++ b/kioslave/audiocd/plugins/lame/encoderlame.cpp @@ -126,31 +126,31 @@ void EncoderLame::loadSettings(){ if (method == 0) { // Constant Bitrate Encoding args.append("-b"); - args.append(TQString("%1").arg(bitrates[settings->cbr_bitrate()])); + args.append(TQString("%1").tqarg(bitrates[settings->cbr_bitrate()])); d->bitrate = bitrates[settings->cbr_bitrate()]; args.append("-q"); - args.append(TQString("%1").arg(quality)); + args.append(TQString("%1").tqarg(quality)); } else { // Variable Bitrate Encoding if (settings->vbr_average_br()) { args.append("--abr"); - args.append(TQString("%1").arg(bitrates[settings->vbr_mean_brate()])); + args.append(TQString("%1").tqarg(bitrates[settings->vbr_mean_brate()])); d->bitrate = bitrates[settings->vbr_mean_brate()]; if (settings->vbr_min_br()){ args.append("-b"); - args.append(TQString("%1").arg(bitrates[settings->vbr_min_brate()])); + args.append(TQString("%1").tqarg(bitrates[settings->vbr_min_brate()])); } if (settings->vbr_min_hard()) args.append("-F"); if (settings->vbr_max_br()){ args.append("-B"); - args.append(TQString("%1").arg(bitrates[settings->vbr_max_brate()])); + args.append(TQString("%1").tqarg(bitrates[settings->vbr_max_brate()])); } } else { d->bitrate = 128; args.append("-V"); - args.append(TQString("%1").arg(quality)); + args.append(TQString("%1").tqarg(quality)); } if ( !settings->vbr_xing_tag() ) args.append("-t"); @@ -186,21 +186,21 @@ void EncoderLame::loadSettings(){ if ( settings->enable_lowpass() ) { args.append("--lowpass"); - args.append(TQString("%1").arg(settings->lowfilterfreq())); + args.append(TQString("%1").tqarg(settings->lowfilterfreq())); if (settings->set_lpf_width()){ args.append("--lowpass-width"); - args.append(TQString("%1").arg(settings->lowfilterwidth())); + args.append(TQString("%1").tqarg(settings->lowfilterwidth())); } } if ( settings->enable_highpass()) { args.append("--hipass"); - args.append(TQString("%1").arg(settings->highfilterfreq())); + args.append(TQString("%1").tqarg(settings->highfilterfreq())); if (settings->set_hpf_width()){ args.append("--hipass-width"); - args.append(TQString("%1").arg(settings->highfilterwidth())); + args.append(TQString("%1").tqarg(settings->highfilterwidth())); } } } @@ -215,7 +215,7 @@ long EncoderLame::readInit(long /*size*/){ TQString prefix = locateLocal("tmp", ""); d->tempFile = new KTempFile(prefix, ".mp3"); d->tempFile->setAutoDelete(true); - d->lastErrorMessage = TQString::null; + d->lastErrorMessage = TQString(); d->processHasExited = false; // -x bitswap @@ -341,16 +341,16 @@ void EncoderLame::fillSongInfo( KCDDB::CDInfo info, int track, const TQString &c trackInfo.append(info.get("title").toString()); trackInfo.append("--ty"); - trackInfo.append(TQString("%1").arg(info.get("year").toString())); + trackInfo.append(TQString("%1").tqarg(info.get("year").toString())); trackInfo.append("--tc"); trackInfo.append(comment); trackInfo.append("--tn"); - trackInfo.append(TQString("%1").arg(track+1)); + trackInfo.append(TQString("%1").tqarg(track+1)); const TQString genre = info.get( "genre" ).toString(); - if ( d->genreList.find( genre ) != d->genreList.end() ) + if ( d->genreList.tqfind( genre ) != d->genreList.end() ) { trackInfo.append("--tg"); trackInfo.append(genre); diff --git a/kioslave/audiocd/plugins/lame/encoderlame.h b/kioslave/audiocd/plugins/lame/encoderlame.h index ba02cf4f..1f5044b0 100644 --- a/kioslave/audiocd/plugins/lame/encoderlame.h +++ b/kioslave/audiocd/plugins/lame/encoderlame.h @@ -30,6 +30,7 @@ class KProcess; class EncoderLame : public TQObject, public AudioCDEncoder { Q_OBJECT + TQ_OBJECT public: EncoderLame(KIO::SlaveBase *slave); diff --git a/kioslave/audiocd/plugins/lame/encoderlameconfig.ui b/kioslave/audiocd/plugins/lame/encoderlameconfig.ui index 74060353..7b7dcf17 100644 --- a/kioslave/audiocd/plugins/lame/encoderlameconfig.ui +++ b/kioslave/audiocd/plugins/lame/encoderlameconfig.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EncoderLameConfig</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>LameConfig</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1"> + <widget class="TQGroupBox" row="0" column="1"> <property name="name"> <cstring>GroupBox1_2</cstring> </property> @@ -33,7 +33,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_copyright</cstring> </property> @@ -47,7 +47,7 @@ <string>Mark MP3 file as copyrighted.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_original</cstring> </property> @@ -64,7 +64,7 @@ <string>Mark MP3 file as an original.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_iso</cstring> </property> @@ -78,7 +78,7 @@ <string>This selects the maximal bitrate used for encoding.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_crc</cstring> </property> @@ -86,7 +86,7 @@ <string>&Error protection</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_id3_tag</cstring> </property> @@ -105,7 +105,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -116,7 +116,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout21</cstring> </property> @@ -130,7 +130,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3_2</cstring> </property> @@ -138,7 +138,7 @@ <string>Low</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>kcfg_quality</cstring> </property> @@ -161,7 +161,7 @@ <enum>NoMarks</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -171,21 +171,21 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> <property name="text"> <string>&Quality:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignLeft</set> </property> <property name="buddy" stdset="0"> <cstring>kcfg_quality</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQComboBox" row="1" column="0" rowspan="1" colspan="2"> <item> <property name="text"> <string>Stereo</string> @@ -213,7 +213,7 @@ <string>This option controls whether MP3 files are recorded with one or two channels. Note that choosing <i>"Mono"</i> reduces file size, but also kills the stereo signal.</string> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>kcfg_bitrate_constant</cstring> </property> @@ -221,7 +221,7 @@ <string>Constant bitrate</string> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>kcfg_bitrate_variable</cstring> </property> @@ -244,14 +244,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>vbr_settings</cstring> </property> @@ -271,7 +271,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>kcfg_vbr_average_br</cstring> </property> @@ -282,7 +282,7 @@ <string>This selects the maximal bitrate used for encoding.</string> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>32 kbs</string> @@ -363,7 +363,7 @@ <number>13</number> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>kcfg_vbr_max_br</cstring> </property> @@ -377,7 +377,7 @@ <string>This selects the maximal bitrate used for encoding.</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_vbr_xing_tag</cstring> </property> @@ -391,7 +391,7 @@ <string>This writes additional information related to VBR as introduced by Xing.</string> </property> </widget> - <widget class="QComboBox" row="3" column="1"> + <widget class="TQComboBox" row="3" column="1"> <item> <property name="text"> <string>32 kbs</string> @@ -472,7 +472,7 @@ <number>9</number> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_vbr_min_hard</cstring> </property> @@ -483,7 +483,7 @@ <string>Minimal &value is a hard limit</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_vbr_min_br</cstring> </property> @@ -497,7 +497,7 @@ <string>This selects the minimal bitrate used for encoding.</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>32 kbs</string> @@ -580,7 +580,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>cbr_settings</cstring> </property> @@ -597,7 +597,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4_2</cstring> </property> @@ -608,7 +608,7 @@ <cstring>kcfg_cbr_bitrate</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>32 kbs</string> @@ -691,14 +691,14 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>GroupBox83_2</cstring> </property> <property name="title"> <string>Filter Settings</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -715,7 +715,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_enable_lowpass</cstring> </property> @@ -723,7 +723,7 @@ <string>&Lowpass filter cutoff above</string> </property> </widget> - <widget class="QSpinBox" row="1" column="0"> + <widget class="TQSpinBox" row="1" column="0"> <property name="name"> <cstring>kcfg_lowfilterfreq</cstring> </property> @@ -737,7 +737,7 @@ <number>20000</number> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>kcfg_enable_highpass</cstring> </property> @@ -745,7 +745,7 @@ <string>&Highpass filter cutoff below</string> </property> </widget> - <widget class="QSpinBox" row="3" column="0"> + <widget class="TQSpinBox" row="3" column="0"> <property name="name"> <cstring>kcfg_highfilterfreq</cstring> </property> @@ -759,7 +759,7 @@ <number>200</number> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>kcfg_set_lpf_width</cstring> </property> @@ -770,7 +770,7 @@ <string>Low&pass filter width</string> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>kcfg_lowfilterwidth</cstring> </property> @@ -784,7 +784,7 @@ <number>5000</number> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>kcfg_set_hpf_width</cstring> </property> @@ -795,7 +795,7 @@ <string>Highpa&ss filter width</string> </property> </widget> - <widget class="QSpinBox" row="3" column="1"> + <widget class="TQSpinBox" row="3" column="1"> <property name="name"> <cstring>kcfg_highfilterwidth</cstring> </property> @@ -926,5 +926,5 @@ <tabstop>kcfg_set_hpf_width</tabstop> <tabstop>kcfg_highfilterwidth</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp b/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp index 739e1c8f..2caab8e5 100644 --- a/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp +++ b/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp @@ -301,7 +301,7 @@ void EncoderVorbis::fillSongInfo( KCDDB::CDInfo info, int track, const TQString if( !d->write_vorbis_comments ) return; - typedef QPair<TQCString, TQVariant> CommentField; + typedef TQPair<TQCString, TQVariant> CommentField; TQValueList<CommentField> commentFields; commentFields.append(CommentField("title", info.trackInfoList[track].get("title"))); diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui b/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui index 17000745..5e057de0 100644 --- a/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui +++ b/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EncoderVorbisConfig</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>VorbisConfig</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>kcfg_vorbis_enc_method</cstring> </property> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>vorbis_enc_quality</cstring> </property> @@ -38,7 +38,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>vorbis_enc_bitrate</cstring> </property> @@ -48,7 +48,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>vorbis_bitrate_settings</cstring> </property> @@ -68,7 +68,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>32 kbs</string> @@ -149,7 +149,7 @@ <number>1</number> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>32 kbs</string> @@ -230,7 +230,7 @@ <number>13</number> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_set_vorbis_min_br</cstring> </property> @@ -241,7 +241,7 @@ <string>M&inimal bitrate:</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>kcfg_set_vorbis_max_br</cstring> </property> @@ -252,7 +252,7 @@ <string>Ma&ximal bitrate:</string> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>128 kbs</string> @@ -285,7 +285,7 @@ <number>1</number> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>kcfg_set_vorbis_nominal_br</cstring> </property> @@ -298,7 +298,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>vorbis_quality_settings</cstring> </property> @@ -340,7 +340,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox193</cstring> </property> @@ -357,7 +357,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_vorbis_comments</cstring> </property> @@ -383,7 +383,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>51</height> @@ -417,7 +417,7 @@ <tabstop>kcfg_vorbis_quality</tabstop> <tabstop>kcfg_vorbis_comments</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kioslave/audiocd/plugins/wav/encoderwav.cpp b/kioslave/audiocd/plugins/wav/encoderwav.cpp index 8052ce41..57e455c1 100644 --- a/kioslave/audiocd/plugins/wav/encoderwav.cpp +++ b/kioslave/audiocd/plugins/wav/encoderwav.cpp @@ -63,7 +63,7 @@ long EncoderWav::readInit(long byteCount){ 0x00, 0x00, 0x00, 0x00 // 40 byteCount }; - Q_INT32 wavSize(byteCount + 44 - 8); + TQ_INT32 wavSize(byteCount + 44 - 8); riffHeader[4] = (wavSize >> 0 ) & 0xff; diff --git a/kmid/README b/kmid/README index 52c5f759..3b819871 100644 --- a/kmid/README +++ b/kmid/README @@ -60,7 +60,7 @@ Index 3. Compiling consoleKMid ----------------- - Do a configure from the parent directory, then go to the player directory, + Do a configure from the tqparent directory, then go to the player directory, and do a 'make' . Simple , isn't it ? By default it will use the external midi device, if you want to use another diff --git a/kmid/channel.cpp b/kmid/channel.cpp index 7d077dd7..a4547767 100644 --- a/kmid/channel.cpp +++ b/kmid/channel.cpp @@ -39,7 +39,7 @@ #include "instrname.h" #include <kiconloader.h> -KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent) +KMidChannel::KMidChannel(int chn,TQWidget *tqparent) : TQWidget (tqparent) { channel=chn; replay=TRUE; @@ -48,7 +48,7 @@ KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent) keyboard = TQPixmap(locate("appdata","icons/keyboard.xpm")); penB = new TQPen (black); penW = new TQPen (white); - penT = new TQPen (colorGroup().background()); + penT = new TQPen (tqcolorGroup().background()); KConfig *kcfg=KGlobal::instance()->config(); kcfg->setGroup("KMid"); @@ -87,7 +87,7 @@ void KMidChannel::paintEvent( TQPaintEvent * ) TQPainter *qpaint=new TQPainter(this); - TQString tmp = i18n("Channel %1").arg(channel); + TQString tmp = i18n("Channel %1").tqarg(channel); qpaint->setFont(*qcvfont); qpaint->setPen(*penB); qpaint->drawText(2,20,tmp); @@ -185,7 +185,7 @@ void KMidChannel::reset(int level) replay=TRUE; }; - repaint(FALSE); + tqrepaint(FALSE); } void KMidChannel::saveState(bool *p,int *pgm) @@ -198,7 +198,7 @@ void KMidChannel::loadState(bool *p,int *pgm) { for (int i=0;i<128;i++) pressed[i]=p[i]; instrumentCombo->setCurrentItem(*pgm); - repaint(FALSE); + tqrepaint(FALSE); } void KMidChannel::pgmChanged(int i) diff --git a/kmid/channel.h b/kmid/channel.h index 7051247b..7eb4166c 100644 --- a/kmid/channel.h +++ b/kmid/channel.h @@ -36,9 +36,10 @@ class TQFont; class TQComboBox; class KMidButton; -class KMidChannel : public QWidget +class KMidChannel : public TQWidget { Q_OBJECT + TQ_OBJECT private: bool pressed[128]; // The 128 keys diff --git a/kmid/channel3d.cpp b/kmid/channel3d.cpp index d3bef7fd..8a24410b 100644 --- a/kmid/channel3d.cpp +++ b/kmid/channel3d.cpp @@ -25,7 +25,7 @@ #include "channel3d.h" #include <tqpainter.h> -KMidChannel3D::KMidChannel3D (int chn,TQWidget *parent) : KMidChannel(chn,parent) +KMidChannel3D::KMidChannel3D (int chn,TQWidget *tqparent) : KMidChannel(chn,tqparent) { } diff --git a/kmid/channel3d.h b/kmid/channel3d.h index a8c81da0..2ce8de10 100644 --- a/kmid/channel3d.h +++ b/kmid/channel3d.h @@ -30,7 +30,7 @@ class KMidChannel3D : public KMidChannel { public: - KMidChannel3D(int chn,TQWidget *parent); + KMidChannel3D(int chn,TQWidget *tqparent); virtual void drawDo (TQPainter *qpaint,int x,int p); diff --git a/kmid/channel4d.cpp b/kmid/channel4d.cpp index 4f47c3ae..a12165eb 100644 --- a/kmid/channel4d.cpp +++ b/kmid/channel4d.cpp @@ -25,7 +25,7 @@ #include "channel4d.h" #include <tqpainter.h> -KMidChannel4D::KMidChannel4D (int chn,TQWidget *parent) : KMidChannel(chn,parent) +KMidChannel4D::KMidChannel4D (int chn,TQWidget *tqparent) : KMidChannel(chn,tqparent) { brushR = new TQBrush (red); brushW = new TQBrush (white); diff --git a/kmid/channel4d.h b/kmid/channel4d.h index e6326f4a..e5cba3c7 100644 --- a/kmid/channel4d.h +++ b/kmid/channel4d.h @@ -36,7 +36,7 @@ private: TQPen *penR; public: - KMidChannel4D(int chn,TQWidget *parent); + KMidChannel4D(int chn,TQWidget *tqparent); virtual void drawDo (TQPainter *qpaint,int x,int p); diff --git a/kmid/channelcfgdlg.cpp b/kmid/channelcfgdlg.cpp index db320a28..4384dd7c 100644 --- a/kmid/channelcfgdlg.cpp +++ b/kmid/channelcfgdlg.cpp @@ -12,7 +12,7 @@ #include <tqlayout.h> #include <tqvbuttongroup.h> -ChannelViewConfigDialog::ChannelViewConfigDialog(TQWidget *parent,const char *name) : KDialogBase(parent,name,TRUE,i18n("Configure Channel View"),Ok|Cancel, Ok) +ChannelViewConfigDialog::ChannelViewConfigDialog(TQWidget *tqparent,const char *name) : KDialogBase(tqparent,name,TRUE,i18n("Configure Channel View"),Ok|Cancel, Ok) { TQWidget *page = new TQWidget( this ); setMainWidget(page); diff --git a/kmid/channelcfgdlg.h b/kmid/channelcfgdlg.h index c845be3e..040b741b 100644 --- a/kmid/channelcfgdlg.h +++ b/kmid/channelcfgdlg.h @@ -31,10 +31,11 @@ class TQRadioButton; class ChannelViewConfigDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ChannelViewConfigDialog(TQWidget *parent,const char *name); + ChannelViewConfigDialog(TQWidget *tqparent,const char *name); private: TQVButtonGroup *qbg; diff --git a/kmid/channelview.cpp b/kmid/channelview.cpp index a349691a..9a1f1e88 100644 --- a/kmid/channelview.cpp +++ b/kmid/channelview.cpp @@ -44,7 +44,7 @@ ChannelView::ChannelView(void) : KMainWindow(0, "ChannelView") Channel[i]->setGeometry(5,5+i*CHANNELHEIGHT,width()-20,CHANNELHEIGHT); Channel[i]->show(); } - scrollbar=new TQScrollBar(1,16,1,1,1,TQScrollBar::Vertical,this,"Channelscrollbar"); + scrollbar=new TQScrollBar(1,16,1,1,1,Qt::Vertical,this,"Channelscrollbar"); connect(scrollbar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(ScrollChn(int))); setScrollBarRange(); } diff --git a/kmid/channelview.h b/kmid/channelview.h index 3eb51302..eaf92979 100644 --- a/kmid/channelview.h +++ b/kmid/channelview.h @@ -33,6 +33,7 @@ class ChannelView : public KMainWindow { Q_OBJECT + TQ_OBJECT private: KMidChannel *Channel[16]; int nvisiblechannels; diff --git a/kmid/collectdlg.cpp b/kmid/collectdlg.cpp index ab476bb6..a98a8a05 100644 --- a/kmid/collectdlg.cpp +++ b/kmid/collectdlg.cpp @@ -38,7 +38,7 @@ #include "songlist.h" #include "slman.h" -CollectionDialog::CollectionDialog(SLManager *slm,int selC,TQWidget *parent,const char *name) : TQDialog(parent,name,TRUE) +CollectionDialog::CollectionDialog(SLManager *slm,int selC,TQWidget *tqparent,const char *name) : TQDialog(tqparent,name,TRUE) { setCaption(i18n("Collections Manager")); ok=new KPushButton(KStdGuiItem::ok(),this); @@ -156,7 +156,7 @@ void CollectionDialog::newCollection() { bool ok; TQString name = KInputDialog::getText( i18n( "New Collection" ), - i18n( "Enter the name of the new collection:" ), TQString::null, + i18n( "Enter the name of the new collection:" ), TQString(), &ok, this ); if (ok) @@ -164,7 +164,7 @@ void CollectionDialog::newCollection() int i=slman->createCollection(name.ascii()); if (i==-1) { - TQString s = i18n("The name '%1' is already used").arg(name); + TQString s = i18n("The name '%1' is already used").tqarg(name); KMessageBox::sorry(this, s); } else @@ -182,7 +182,7 @@ SongList *src=currentsl; int i; bool ok; TQString name = KInputDialog::getText( i18n( "Copy Collection" ), - i18n( "Enter the name of the copy collection:" ), TQString::null, + i18n( "Enter the name of the copy collection:" ), TQString(), &ok, this ); if (ok) @@ -190,7 +190,7 @@ int i; i=slman->createCollection(name.ascii()); if (i==-1) { - TQString s = i18n("The name '%1' is already used").arg(name); + TQString s = i18n("The name '%1' is already used").tqarg(name); KMessageBox::sorry(this, s); } else @@ -225,14 +225,14 @@ if (idx==0) return; bool ok; TQString name = KInputDialog::getText( i18n( "Change Collection Name" ), - i18n( "Enter the name of the selected collection:" ), TQString::null, + i18n( "Enter the name of the selected collection:" ), TQString(), &ok, this ); if (ok) { if (slman->getCollection(name.ascii())!=NULL) { - TQString s = i18n("The name '%1' is already used").arg(name); + TQString s = i18n("The name '%1' is already used").tqarg(name); KMessageBox::sorry(this, s); } else diff --git a/kmid/collectdlg.h b/kmid/collectdlg.h index ae9a0b3a..a53dff70 100644 --- a/kmid/collectdlg.h +++ b/kmid/collectdlg.h @@ -33,9 +33,10 @@ class KPushButton; class TQPushButton; class TQListBox; class KURL; -class CollectionDialog : public QDialog +class CollectionDialog : public TQDialog { Q_OBJECT + TQ_OBJECT private: SLManager *slman; SongList *currentsl; @@ -48,7 +49,7 @@ protected: void addSong(const KURL &); public: - CollectionDialog(SLManager *slm,int selc,TQWidget *parent,const char *name); + CollectionDialog(SLManager *slm,int selc,TQWidget *tqparent,const char *name); public slots: void collectionselected(int idx); diff --git a/kmid/kdisptext.cpp b/kmid/kdisptext.cpp index cc1eb4d3..2842608c 100644 --- a/kmid/kdisptext.cpp +++ b/kmid/kdisptext.cpp @@ -40,7 +40,7 @@ //#define DRAW_BOUNDING_RECTS -KDisplayText::KDisplayText(TQWidget *parent,const char *name) : TQScrollView(parent,name) +KDisplayText::KDisplayText(TQWidget *tqparent,const char *name) : TQScrollView(tqparent,name) { first_line_[0]=first_line_[1]=NULL; linked_list_[0]=linked_list_[1]=NULL; @@ -122,10 +122,10 @@ void KDisplayText::ClearEv(bool totally) RemoveLinkedList(); if (totally) { - killTimers(); + TQT_TQOBJECT(this)->killTimers(); autoscrollv=0; resizeContents(0,0); - viewport()->repaint(TRUE); + viewport()->tqrepaint(TRUE); } } @@ -367,7 +367,7 @@ void KDisplayText::CursorToHome(void) setContentsPos(0,0); - viewport()->repaint(true); + viewport()->tqrepaint(true); } void KDisplayText::PaintIn(int type) @@ -425,14 +425,14 @@ void KDisplayText::PaintIn(int type) autoscrollv+=qfmetr->lineSpacing(); if (b) startTimer(100); else { - killTimers(); + TQT_TQOBJECT(this)->killTimers(); startTimer(100/(autoscrollv/qfmetr->lineSpacing()+1)); } } // scrollBy(0,qfmetr->lineSpacing()); } } - if (paint) repaintContents(tmp->r); + if (paint) tqrepaintContents(tmp->r); } void KDisplayText::gotomsec(ulong i) @@ -484,10 +484,10 @@ void KDisplayText::gotomsec(ulong i) } - killTimers(); + TQT_TQOBJECT(this)->killTimers(); autoscrollv=0; setContentsPos(0,first_line->ypos); - viewport()->repaint(); + viewport()->tqrepaint(); } } @@ -508,7 +508,7 @@ void KDisplayText::fontChanged(void) qfmetr=new TQFontMetrics(*qtextfont); calculatePositions(); nvisiblelines=height()/qfmetr->lineSpacing(); - viewport()->repaint(TRUE); + viewport()->tqrepaint(TRUE); } void KDisplayText::ChangeTypeOfTextEvents(int type) @@ -534,7 +534,7 @@ void KDisplayText::ChangeTypeOfTextEvents(int type) setContentsPos(0,first_line->ypos); } - viewport()->repaint(TRUE); + viewport()->tqrepaint(TRUE); } int KDisplayText::ChooseTypeOfTextEvents(void) diff --git a/kmid/kdisptext.h b/kmid/kdisptext.h index d23787c0..2b9c3fed 100644 --- a/kmid/kdisptext.h +++ b/kmid/kdisptext.h @@ -51,6 +51,7 @@ class TQScrollBar; class KDisplayText : public TQScrollView { Q_OBJECT + TQ_OBJECT private: TQTextCodec *lyrics_codec; @@ -91,7 +92,7 @@ protected: virtual void timerEvent(TQTimerEvent *e); public: - KDisplayText(TQWidget *parent,const char *name); + KDisplayText(TQWidget *tqparent,const char *name); virtual ~KDisplayText(); void ClearEv(bool totally=true); @@ -112,7 +113,7 @@ public: void setLyricsEncoding(const TQString &enc); -// TQSize sizeHint(); +// TQSize tqsizeHint(); public slots: void ScrollDown(); diff --git a/kmid/klcdnumber.cpp b/kmid/klcdnumber.cpp index 014188cc..21bdbbd5 100644 --- a/kmid/klcdnumber.cpp +++ b/kmid/klcdnumber.cpp @@ -28,8 +28,8 @@ #define BUTTONWIDTH 9 -KLCDNumber::KLCDNumber(int _numDigits,TQWidget *parent,const char *name) - : TQWidget(parent,name) +KLCDNumber::KLCDNumber(int _numDigits,TQWidget *tqparent,const char *name) + : TQWidget(tqparent,name) { initDigits(); setUserChangeValue=false; @@ -47,8 +47,8 @@ KLCDNumber::KLCDNumber(int _numDigits,TQWidget *parent,const char *name) setLCDColor(100,255,100); } -KLCDNumber::KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *parent,const char *name) - : TQWidget(parent,name) +KLCDNumber::KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *tqparent,const char *name) + : TQWidget(tqparent,name) { initDigits(); setUserChangeValue=_setUserChangeValue; @@ -197,7 +197,7 @@ void KLCDNumber::setValue(double v) void KLCDNumber::display (double v) { setValue(v); - repaint(FALSE); + tqrepaint(FALSE); } void KLCDNumber::display (int v) @@ -299,7 +299,7 @@ void KLCDNumber::mousePressEvent (TQMouseEvent *e) void KLCDNumber::timerEvent(TQTimerEvent *) { - killTimers(); + TQT_TQOBJECT(this)->killTimers(); doubleclicked=false; } @@ -317,13 +317,13 @@ void KLCDNumber::defaultValueClicked() void KLCDNumber::setLCDBackgroundColor(int r,int g,int b) { backgcolor=TQColor(r,g,b); - repaint(FALSE); + tqrepaint(FALSE); } void KLCDNumber::setLCDColor(int r,int g,int b) { LCDcolor=TQColor(r,g,b); - repaint(FALSE); + tqrepaint(FALSE); } void KLCDNumber::setRange(double min, double max) @@ -332,7 +332,7 @@ void KLCDNumber::setRange(double min, double max) maxValue=max; } -TQSize KLCDNumber::sizeHint() +TQSize KLCDNumber::tqsizeHint() { return TQSize(83,28); } diff --git a/kmid/klcdnumber.h b/kmid/klcdnumber.h index aaf58dbc..d7be294f 100644 --- a/kmid/klcdnumber.h +++ b/kmid/klcdnumber.h @@ -30,9 +30,10 @@ class TQPainter; class KTriangleButton; class TQColor; -class KLCDNumber : public QWidget +class KLCDNumber : public TQWidget { Q_OBJECT + TQ_OBJECT protected: class digit { public: @@ -100,8 +101,8 @@ public: void initDigits(void); public: - KLCDNumber(int _numDigits,TQWidget *parent,const char *name); - KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *parent,const char *name); + KLCDNumber(int _numDigits,TQWidget *tqparent,const char *name); + KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *tqparent,const char *name); void setUserSetDefaultValue(bool _userSetDefaultValue); void setDefaultValue(double v); @@ -120,7 +121,7 @@ public: void display (int v); void display (double v); - TQSize sizeHint (); + TQSize tqsizeHint (); // TQSizePolicy sizePolicy(); protected: diff --git a/kmid/kmid_part.cpp b/kmid/kmid_part.cpp index 39b10603..16618f7d 100644 --- a/kmid/kmid_part.cpp +++ b/kmid/kmid_part.cpp @@ -37,11 +37,11 @@ KMidFactory::~KMidFactory() s_instance = 0; } -KParts::Part *KMidFactory::createPartObject(TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, const char*, +KParts::Part *KMidFactory::createPartObject(TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const char*, const TQStringList& ) { - KParts::Part *obj = new KMidPart(parentWidget, widgetName, parent, name); + KParts::Part *obj = new KMidPart(tqparentWidget, widgetName, tqparent, name); return obj; } @@ -65,15 +65,15 @@ KInstance *KMidFactory::instance() return s_instance; } - KMidPart::KMidPart(TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name) -: KParts::ReadOnlyPart(parent, name) + KMidPart::KMidPart(TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name) +: KParts::ReadOnlyPart(tqparent, name) { setInstance(KMidFactory::instance()); - widget = new kmidClient(parentWidget, actionCollection()); + widget = new kmidClient(tqparentWidget, actionCollection()); widget->show(); - widget->setFocusPolicy(TQWidget::ClickFocus); + widget->setFocusPolicy(TQ_ClickFocus); setWidget(widget); // create and connect our actions @@ -133,8 +133,8 @@ void KMidPart::slotStop() { widget->stop(); } -KMidBrowserExtension::KMidBrowserExtension(KMidPart *parent) - : KParts::BrowserExtension(parent, "KMidBrowserExtension") +KMidBrowserExtension::KMidBrowserExtension(KMidPart *tqparent) + : KParts::BrowserExtension(tqparent, "KMidBrowserExtension") { } diff --git a/kmid/kmid_part.h b/kmid/kmid_part.h index 5b0cbc0e..c22d8d43 100644 --- a/kmid/kmid_part.h +++ b/kmid/kmid_part.h @@ -12,13 +12,14 @@ class kmidClient; class KDE_EXPORT KMidFactory : public KParts::Factory { Q_OBJECT + TQ_OBJECT public: KMidFactory(); virtual ~KMidFactory(); - virtual KParts::Part* createPartObject(TQWidget *parentWidget, const char *widgetName, - TQObject* parent = 0, const char* name = 0, - const char* classname = "TQObject", + virtual KParts::Part* createPartObject(TQWidget *tqparentWidget, const char *widgetName, + TQObject* tqparent = 0, const char* name = 0, + const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); static KInstance *instance(); @@ -31,9 +32,10 @@ class KDE_EXPORT KMidFactory : public KParts::Factory class KMidPart: public KParts::ReadOnlyPart { Q_OBJECT + TQ_OBJECT public: - KMidPart(TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name); + KMidPart(TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name); virtual ~KMidPart(); @@ -54,9 +56,10 @@ class KMidPart: public KParts::ReadOnlyPart class KMidBrowserExtension : public KParts::BrowserExtension { Q_OBJECT + TQ_OBJECT friend class KMidPart; public: - KMidBrowserExtension(KMidPart *parent); + KMidBrowserExtension(KMidPart *tqparent); virtual ~KMidBrowserExtension(); }; diff --git a/kmid/kmidbutton.h b/kmid/kmidbutton.h index 442b0fbd..ceba94a5 100644 --- a/kmid/kmidbutton.h +++ b/kmid/kmidbutton.h @@ -1,7 +1,7 @@ #include <tqpushbutton.h> #include <tqpainter.h> -class KMidButton : public QPushButton +class KMidButton : public TQPushButton { protected: @@ -15,7 +15,7 @@ protected: public: - KMidButton (TQWidget *parent,const char *name) : TQPushButton (parent,name) + KMidButton (TQWidget *tqparent,const char *name) : TQPushButton (tqparent,name) { }; diff --git a/kmid/kmidclient.cpp b/kmid/kmidclient.cpp index 94467098..74234bac 100644 --- a/kmid/kmidclient.cpp +++ b/kmid/kmidclient.cpp @@ -65,8 +65,8 @@ //#define TEMPHACK -kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name) - : DCOPObject("KMidIface"), TQWidget(parent,name) +kmidClient::kmidClient(TQWidget *tqparent, KActionCollection *ac, const char *name) + : DCOPObject("KMidIface"), TQWidget(tqparent,name) { actionCollection=ac; KConfig *cfg=kapp->config(); @@ -90,13 +90,13 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name // currentsl=slman->getCollection(activecollection); itsme=0; m_kMid.pid=0; - timebar = new TQSlider(0,240000,30000,60000,TQSlider::Horizontal, this); + timebar = new TQSlider(0,240000,30000,60000,Qt::Horizontal, this); timebar->setSteps(30000,60000); timebar->setValue(0); connect (timebar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotSeek(int))); timetags = new QSliderTime(timebar,this); - timetags->setMinimumSize(timetags->sizeHint()); + timetags->setMinimumSize(timetags->tqsizeHint()); qlabelTempo= new TQLabel(i18n("Tempo:"), this,"tempolabel", TQLabel::NoFrame); @@ -108,7 +108,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name tempoLCD->setRange(3,999); tempoLCD->setDefaultValue(120); tempoLCD->setUserSetDefaultValue(true); - tempoLCD->setMinimumSize(tempoLCD->sizeHint()); + tempoLCD->setMinimumSize(tempoLCD->tqsizeHint()); connect(tempoLCD,TQT_SIGNAL(valueChanged(double)),this,TQT_SLOT(slotSetTempo(double))); comboSongs = new TQComboBox(FALSE, this,"Songs"); @@ -125,7 +125,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name rhythmview->setMaximumHeight(7); rhythmview->setMinimumHeight(7); - volumebar = new TQSlider(0,200,10,100,TQSlider::Vertical, this ); + volumebar = new TQSlider(0,200,10,100,Qt::Vertical, this ); volumebar->setSteps(10,20); volumebar->setValue(100); volumebar->setTickmarks(TQSlider::NoMarks); @@ -147,7 +147,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name TQString samplefile = KGlobal::dirs()->findAllResources("appdata", "fm/*.o3").last(); - samplefile.truncate(samplefile.findRev('/')); + samplefile.truncate(samplefile.tqfindRev('/')); FMOut::setFMPatchesDirectory(TQFile::encodeName(samplefile)); m_kMid.pctlsmID=shmget(IPC_PRIVATE,sizeof(PlayerController),0666 | IPC_CREAT ); @@ -290,10 +290,10 @@ int kmidClient::openFile(const char *filename) switch (r) { case (-1) : errormsg = - i18n("The file %1 does not exist or cannot be opened.").arg(filename); + i18n("The file %1 does not exist or cannot be opened.").tqarg(filename); break; case (-2) : errormsg = - i18n("The file %1 is not a MIDI file.").arg(filename);break; + i18n("The file %1 is not a MIDI file.").tqarg(filename);break; case (-3) : errormsg = i18n("Ticks per quarter note is negative. Please send this file to larrosa@kde.org");break; case (-4) : errormsg = @@ -301,7 +301,7 @@ int kmidClient::openFile(const char *filename) case (-5) : errormsg = i18n("This file is corrupted or not well built.");break; case (-6) : errormsg = - i18n("%1 is not a regular file.").arg(filename);break; + i18n("%1 is not a regular file.").tqarg(filename);break; default : errormsg = i18n("Unknown error message");break; } KMessageBox::error(this, errormsg); @@ -310,10 +310,10 @@ int kmidClient::openFile(const char *filename) midifile_opened=0L; timebar->setRange(0,240000); timebar->setValue(0); - timetags->repaint(TRUE); + timetags->tqrepaint(TRUE); kdispt->ClearEv(); - kdispt->repaint(TRUE); - topLevelWidget()->setCaption("KMid"); + kdispt->tqrepaint(TRUE); + tqtopLevelWidget()->setCaption("KMid"); return -1; } @@ -327,7 +327,7 @@ int kmidClient::openFile(const char *filename) // noteArray=player->parseNotes(); noteArray=player->noteArray(); timebar->setRange(0,(int)(player->information()->millisecsTotal)); - timetags->repaint(TRUE); + timetags->tqrepaint(TRUE); kdispt->ClearEv(); spev=player->specialEvents(); while (spev) @@ -343,7 +343,7 @@ int kmidClient::openFile(const char *filename) kdispt->CursorToHome(); // kdispt->updateScrollBars(); emit mustRechooseTextEvent(); - kdispt->repaint(TRUE); + kdispt->tqrepaint(TRUE); tempoLCD->display(tempoToMetronomeTempo(m_kMid.pctl->tempo)); currentTempo=tempoLCD->getValue(); tempoLCD->setDefaultValue(tempoToMetronomeTempo(m_kMid.pctl->tempo)*m_kMid.pctl->ratioTempo); @@ -353,7 +353,7 @@ int kmidClient::openFile(const char *filename) char *capt=new char[strlen(fn)+20]; sprintf(capt,"KMid - %s",fn); delete fn; - topLevelWidget()->setCaption(capt); + tqtopLevelWidget()->setCaption(capt); delete capt; timebar->setValue(0); @@ -1125,11 +1125,11 @@ void kmidClient::processSpecialEvent() } -void kmidClient::repaintText(int type) +void kmidClient::tqrepaintText(int type) { kdispt->ChangeTypeOfTextEvents(type); typeoftextevents=type; - kdispt->repaint(TRUE); + kdispt->tqrepaint(TRUE); } int kmidClient::ChooseTypeOfTextEvents(void) @@ -1265,12 +1265,12 @@ void kmidClient::slotSelectSong(int i) player->removeSong(); timebar->setRange(0,240000); timebar->setValue(0); - timetags->repaint(TRUE); + timetags->tqrepaint(TRUE); kdispt->ClearEv(); - kdispt->repaint(TRUE); + kdispt->tqrepaint(TRUE); comboSongs->clear(); - comboSongs->repaint(TRUE); - topLevelWidget()->setCaption("KMid"); + comboSongs->tqrepaint(TRUE); + tqtopLevelWidget()->setCaption("KMid"); return; } @@ -1374,7 +1374,7 @@ void kmidClient::visibleChannelView(int i) } channelView->show(); connect(channelView,TQT_SIGNAL(signalToKMidClient(int *)),this,TQT_SLOT(communicationFromChannelView(int *))); - connect(kapp,TQT_SIGNAL(shutDown()),parentWidget(),TQT_SLOT(shuttingDown())); + connect(kapp,TQT_SIGNAL(shutDown()),tqparentWidget(),TQT_SLOT(shuttingDown())); } else if ((channelView!=NULL)&&(i==0)) @@ -1487,7 +1487,7 @@ void kmidClient::slotSetTempo(double value) timebar->setRange(0,(int)(player->information()->millisecsTotal)); timebar->setValue(pausedatmillisec); - timetags->repaint(TRUE); + timetags->tqrepaint(TRUE); kdispt->ClearEv(false); @@ -1522,9 +1522,9 @@ void kmidClient::downloadFinished(KIO::Job *) kapp->exit_loop(); } -TQSize kmidClient::sizeHint() const +TQSize kmidClient::tqsizeHint() const { - TQSize sh = TQWidget::sizeHint(); + TQSize sh = TQWidget::tqsizeHint(); return sh.expandedTo(TQSize(560,420)); } @@ -1599,7 +1599,7 @@ void kmidClient::setPlayListMode(int i) void kmidClient::slotSelectEncoding(int i) { if (i == 0) - kdispt->setLyricsEncoding(TQString::null); // Default + kdispt->setLyricsEncoding(TQString()); // Default else kdispt->setLyricsEncoding(KGlobal::charsets()->encodingForName(comboEncodings->text(i))); } diff --git a/kmid/kmidclient.h b/kmid/kmidclient.h index 204aefac..dc18208d 100644 --- a/kmid/kmidclient.h +++ b/kmid/kmidclient.h @@ -55,6 +55,7 @@ class TQString; class kmidClient : public TQWidget, virtual public KMidIface { Q_OBJECT + TQ_OBJECT private: #ifdef KMidDEBUG long passcount; @@ -105,7 +106,7 @@ private: int openFile(const char *filename); void allNotesOff(void); public: - kmidClient(TQWidget *parent, KActionCollection *ac, const char *name=0); + kmidClient(TQWidget *tqparent, KActionCollection *ac, const char *name=0); ~kmidClient(); char *midiFileName(void) {return midifile_opened;}; @@ -116,7 +117,7 @@ public: int openURL(const TQString s); - void repaintText(int typeoftextevents); + void tqrepaintText(int typeoftextevents); static void kmidOutput(void); int ChooseTypeOfTextEvents(void); @@ -216,7 +217,7 @@ public: void setCurrentSong(int i); void setPlayListMode(int i); - TQSize sizeHint() const; + TQSize tqsizeHint() const; private: TQSlider *timebar; QSliderTime *timetags; diff --git a/kmid/kmidframe.cpp b/kmid/kmidframe.cpp index 54f9d3c5..e986a221 100644 --- a/kmid/kmidframe.cpp +++ b/kmid/kmidframe.cpp @@ -68,7 +68,7 @@ kmidFrame::kmidFrame(const char *name) /* kKeysAccel=new KAccel(this); kKeysAccel->insertItem(i18n("Play/Pause"),"Play/Pause", Key_Space); - kKeysAccel->connectItem("Play/Pause", this, TQT_SLOT(spacePressed())); + kKeysAccel->connectItem("Play/Pause", TQT_TQOBJECT(this), TQT_SLOT(spacePressed())); kKeysAccel->insertItem(i18n("Stop"),"Stop", Key_Backspace); kKeysAccel->connectItem("Stop",kmidclient,TQT_SLOT(song_Stop())); kKeysAccel->insertItem(i18n("Previous Song"),"Previous Song", Key_Left); @@ -86,34 +86,34 @@ kmidFrame::kmidFrame(const char *name) kKeysAccel->readSettings(); */ - KStdAction::open(this, TQT_SLOT(file_Open()), actionCollection()); - (void)new KAction(i18n("&Save Lyrics..."), 0, this, + KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_Open()), actionCollection()); + (void)new KAction(i18n("&Save Lyrics..."), 0, TQT_TQOBJECT(this), TQT_SLOT(file_SaveLyrics()), actionCollection(), "file_save_lyrics"); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); - (void)new KAction(i18n("&Play"), "player_play", Qt::Key_Space, - kmidclient, TQT_SLOT(slotPlay()), actionCollection(), "song_play"); - (void)new KAction(i18n("P&ause"), "player_pause", Qt::Key_P, kmidclient, + (void)new KAction(i18n("&Play"), "player_play", TQt::Key_Space, + TQT_TQOBJECT(kmidclient), TQT_SLOT(slotPlay()), actionCollection(), "song_play"); + (void)new KAction(i18n("P&ause"), "player_pause", TQt::Key_P, TQT_TQOBJECT(kmidclient), TQT_SLOT(slotPause()), actionCollection(), "song_pause"); - (void)new KAction(i18n("&Stop"), "player_stop", Qt::Key_Backspace, - kmidclient, TQT_SLOT(slotStop()), actionCollection(), "song_stop"); + (void)new KAction(i18n("&Stop"), "player_stop", TQt::Key_Backspace, + TQT_TQOBJECT(kmidclient), TQT_SLOT(slotStop()), actionCollection(), "song_stop"); (void)new KAction(i18n("P&revious Song"), "player_start", Key_Left, - kmidclient, TQT_SLOT(slotPrevSong()), actionCollection(), + TQT_TQOBJECT(kmidclient), TQT_SLOT(slotPrevSong()), actionCollection(), "song_previous"); (void)new KAction(i18n("&Next Song"), "player_end", Key_Right, - kmidclient, TQT_SLOT(slotNextSong()), actionCollection(), + TQT_TQOBJECT(kmidclient), TQT_SLOT(slotNextSong()), actionCollection(), "song_next"); - (void)new KToggleAction(i18n("&Loop"), 0, this, TQT_SLOT(song_Loop()), + (void)new KToggleAction(i18n("&Loop"), 0, TQT_TQOBJECT(this), TQT_SLOT(song_Loop()), actionCollection(), "song_loop"); - (void)new KAction(i18n("Rewind"), "2leftarrow", 0, kmidclient, + (void)new KAction(i18n("Rewind"), "2leftarrow", 0, TQT_TQOBJECT(kmidclient), TQT_SLOT(slotRewind()), actionCollection(), "song_rewind"); - (void)new KAction(i18n("Forward"), "2rightarrow", 0, kmidclient, + (void)new KAction(i18n("Forward"), "2rightarrow", 0, TQT_TQOBJECT(kmidclient), TQT_SLOT(slotForward()), actionCollection(), "song_forward"); - (void)new KAction(i18n("&Organize..."), 0, this, TQT_SLOT(collect_organize()), + (void)new KAction(i18n("&Organize..."), 0, TQT_TQOBJECT(this), TQT_SLOT(collect_organize()), actionCollection(), "collect_organize"); TQStringList playmodes; @@ -125,7 +125,7 @@ kmidFrame::kmidFrame(const char *name) connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(collect_PlayOrder(int))); act->setItems(playmodes); - (void)new KToggleAction(i18n("Auto-Add to Collection"), 0, this, + (void)new KToggleAction(i18n("Auto-Add to Collection"), 0, TQT_TQOBJECT(this), TQT_SLOT(collect_AutoAdd()), actionCollection(), "collect_autoadd"); playmodes.clear(); @@ -147,29 +147,29 @@ kmidFrame::kmidFrame(const char *name) connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(options_DisplayEvents(int))); act->setItems(playmodes); - (void)new KToggleAction(i18n("Automatic Text Chooser"), 0, this, + (void)new KToggleAction(i18n("Automatic Text Chooser"), 0, TQT_TQOBJECT(this), TQT_SLOT(options_AutomaticText()), actionCollection(), "option_automatictext"); KToggleAction* togact = new KToggleAction(i18n("Show &Volume Bar"), "volume", - 0, this, TQT_SLOT(options_ShowVolumeBar()), actionCollection(), + 0, TQT_TQOBJECT(this), TQT_SLOT(options_ShowVolumeBar()), actionCollection(), "toggle_volumebar"); togact->setCheckedState(i18n("Hide &Volume Bar")); togact = new KToggleAction(i18n("Show &Channel View"), "piano", - 0, this, TQT_SLOT(options_ShowChannelView()), actionCollection(), + 0, TQT_TQOBJECT(this), TQT_SLOT(options_ShowChannelView()), actionCollection(), "toggle_channelview"); togact->setCheckedState(i18n("Hide &Channel View")); - (void)new KAction(i18n("Channel View &Options..."), 0, this, + (void)new KAction(i18n("Channel View &Options..."), 0, TQT_TQOBJECT(this), TQT_SLOT(options_ChannelViewOptions()), actionCollection(), "channelview_options"); - (void)new KAction(i18n("&Font Change..."), 0, this, + (void)new KAction(i18n("&Font Change..."), 0, TQT_TQOBJECT(this), TQT_SLOT(options_FontChange()), actionCollection(), "change_font"); - (void)new KAction(i18n("MIDI &Setup..."), 0, this, + (void)new KAction(i18n("MIDI &Setup..."), 0, TQT_TQOBJECT(this), TQT_SLOT(options_MidiSetup()), actionCollection(), "midi_setup"); @@ -276,7 +276,7 @@ kmidFrame::~kmidFrame() void kmidFrame::file_Open() { - KURL url = KFileDialog::getOpenURL(TQString::null, "*.kar *.mid *.kar.gz *.mid.gz\n*.kar *.kar.gz\n*.mid *.mid.gz\n*",this); + KURL url = KFileDialog::getOpenURL(TQString(), "*.kar *.mid *.kar.gz *.mid.gz\n*.kar *.kar.gz\n*.mid *.mid.gz\n*",this); if( url.isEmpty() ) return; @@ -316,7 +316,7 @@ void kmidFrame::options_DisplayEvents(int i) cfg->setGroup("KMid"); cfg->writeEntry("TypeOfTextEvents",(i==0)?1:5); cfg->sync(); - kmidclient->repaintText((i==0)?1:5); + kmidclient->tqrepaintText((i==0)?1:5); } void kmidFrame::options_AutomaticText() @@ -480,7 +480,7 @@ void kmidFrame::options_MidiSetup() kmidclient->setMidiDevice(MidiConfigDialog::selecteddevice); cfg->setGroup("Midimapper"); cfg->writePathEntry("LoadFile", - (MidiConfigDialog::selectedmap==NULL)? TQString::null:MidiConfigDialog::selectedmap); + (MidiConfigDialog::selectedmap==NULL)? TQString():MidiConfigDialog::selectedmap); kmidclient->setMidiMapFilename(MidiConfigDialog::selectedmap); } delete dlg; @@ -514,7 +514,7 @@ void kmidFrame::rechooseTextEvent() if ((cfg->readNumEntry("AutomaticTextEventChooser",1))==1) { int t=kmidclient->ChooseTypeOfTextEvents(); - kmidclient->repaintText(t); + kmidclient->tqrepaintText(t); if (t==1) ((KSelectAction*)actionCollection()->action("display_events"))->setCurrentItem(0); else @@ -551,7 +551,7 @@ void kmidFrame::collect_AutoAdd() void kmidFrame::file_SaveLyrics() { - KURL url = KFileDialog::getSaveURL(TQString::null,"*",this); + KURL url = KFileDialog::getSaveURL(TQString(),"*",this); if( url.isEmpty() ) return; @@ -567,8 +567,8 @@ void kmidFrame::file_SaveLyrics() if (stat(TQFile::encodeName(filename), &statbuf)!=-1) { - TQString s = i18n("File %1 already exists\nDo you want to overwrite it?").arg(filename); - if (KMessageBox::warningYesNo(this,s,TQString::null,i18n("Overwrite"),KStdGuiItem::cancel())==1) + TQString s = i18n("File %1 already exists\nDo you want to overwrite it?").tqarg(filename); + if (KMessageBox::warningYesNo(this,s,TQString(),i18n("Overwrite"),KStdGuiItem::cancel())==1) return; } diff --git a/kmid/kmidframe.h b/kmid/kmidframe.h index 8891720d..c60d6267 100644 --- a/kmid/kmidframe.h +++ b/kmid/kmidframe.h @@ -36,12 +36,13 @@ class KApplication; class KConfig; class kmidClient; class KToolBar; -class QDragEvent; +class TQDragEvent; class KAccel; class KDE_EXPORT kmidFrame : public KMainWindow { Q_OBJECT + TQ_OBJECT private: #ifdef KMidDEBUG long passcount; @@ -63,7 +64,7 @@ private: */ KAccel *kKeysAccel; protected: - int autoAddSongToCollection(const TQString& filename=TQString::null,int setactive=1); + int autoAddSongToCollection(const TQString& filename=TQString(),int setactive=1); virtual void saveProperties(KConfig *kcfg); diff --git a/kmid/ktrianglebutton.cpp b/kmid/ktrianglebutton.cpp index 1b31dade..f2c47ca5 100644 --- a/kmid/ktrianglebutton.cpp +++ b/kmid/ktrianglebutton.cpp @@ -35,7 +35,7 @@ KTriangleButton::KTriangleButton( Direction d,TQWidget *_parent, const char *nam { dir=d; raised = FALSE; - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); } KTriangleButton::~KTriangleButton() @@ -47,7 +47,7 @@ void KTriangleButton::enterEvent( TQEvent* ) if ( isEnabled() ) { raised = TRUE; - repaint(FALSE); + tqrepaint(FALSE); } } @@ -56,7 +56,7 @@ void KTriangleButton::leaveEvent( TQEvent * ) if( raised != FALSE ) { raised = FALSE; - repaint(); + tqrepaint(); } } @@ -75,21 +75,21 @@ void KTriangleButton::paint( TQPainter *painter ) { if ( isDown() || isOn() ) { - if ( style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) qDrawWinButton( painter, 0, 0, width(), - height(), colorGroup(), TRUE ); + height(), tqcolorGroup(), TRUE ); else qDrawShadePanel( painter, 0, 0, width(), - height(), colorGroup(), TRUE, 2, 0L ); + height(), tqcolorGroup(), TRUE, 2, 0L ); } else if ( raised ) { - if ( style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) qDrawWinButton( painter, 0, 0, width(), height(), - colorGroup(), FALSE ); + tqcolorGroup(), FALSE ); else qDrawShadePanel( painter, 0, 0, width(), height(), - colorGroup(), FALSE, 2, 0L ); + tqcolorGroup(), FALSE, 2, 0L ); } if (dir==Right) @@ -144,17 +144,17 @@ void KTriangleButton::mouseReleaseEvent(TQMouseEvent *e) void KTriangleButton::timerEvent(TQTimerEvent *) { - if (!usingTimer) {killTimers();return;}; + if (!usingTimer) {TQT_TQOBJECT(this)->killTimers();return;}; if (timeCount==0) { timeCount++; - killTimers(); + TQT_TQOBJECT(this)->killTimers(); startTimer(120); } else if (timeCount==30) { timeCount=-1; - killTimers(); + TQT_TQOBJECT(this)->killTimers(); startTimer(80); } else if (timeCount>0) timeCount++; diff --git a/kmid/ktrianglebutton.h b/kmid/ktrianglebutton.h index 3c951dec..c67a0dad 100644 --- a/kmid/ktrianglebutton.h +++ b/kmid/ktrianglebutton.h @@ -30,9 +30,10 @@ #include <tqbutton.h> -class KTriangleButton : public QButton +class KTriangleButton : public TQButton { Q_OBJECT + TQ_OBJECT public: enum Direction {Left , Right, Up, Down}; diff --git a/kmid/main.cpp b/kmid/main.cpp index 45cd1fab..3bafb1f9 100644 --- a/kmid/main.cpp +++ b/kmid/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char **argv) /* struct sigaction act; act.sa_handler = SIG_DFL; - sigemptyset(&(act.sa_mask)); + sigemptyset(&(act.sa_tqmask)); act.sa_flags=0; sigaction(SIGINT, &act, NULL); diff --git a/kmid/midicfgdlg.cpp b/kmid/midicfgdlg.cpp index 855de04a..0be88c72 100644 --- a/kmid/midicfgdlg.cpp +++ b/kmid/midicfgdlg.cpp @@ -38,7 +38,7 @@ #include <kstandarddirs.h> MidiConfigDialog::MidiConfigDialog(DeviceManager *dm, - TQWidget *parent,const char *name) : KDialogBase(parent,name,TRUE, + TQWidget *tqparent,const char *name) : KDialogBase(tqparent,name,TRUE, i18n("Configure MIDI Devices"), KDialogBase::Ok|KDialogBase::Cancel) { setMinimumSize(360,240); @@ -56,7 +56,7 @@ MidiConfigDialog::MidiConfigDialog(DeviceManager *dm, for (int i=0;i<devman->midiPorts()+devman->synthDevices();i++) { if (strcmp(devman->type(i),"")!=0) - temp = TQString("%1 - %2").arg(devman->name(i)).arg(devman->type(i)); + temp = TQString("%1 - %2").tqarg(devman->name(i)).tqarg(devman->type(i)); else temp = devman->name(i); @@ -105,7 +105,7 @@ void MidiConfigDialog::deviceselected(int idx) void MidiConfigDialog::browseMap() { TQString path = KGlobal::dirs()->findAllResources("appdata", "maps/*.map").last(); - path.truncate(path.findRev('/')); + path.truncate(path.tqfindRev('/')); KURL url = KFileDialog::getOpenURL(path,"*.map",this); diff --git a/kmid/midicfgdlg.h b/kmid/midicfgdlg.h index 14cff5a4..bab949b8 100644 --- a/kmid/midicfgdlg.h +++ b/kmid/midicfgdlg.h @@ -34,10 +34,11 @@ class TQListBox; class MidiConfigDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - MidiConfigDialog(DeviceManager *dm,TQWidget *parent,const char *name); + MidiConfigDialog(DeviceManager *dm,TQWidget *tqparent,const char *name); public slots: void deviceselected(int idx); diff --git a/kmid/qslidertime.cpp b/kmid/qslidertime.cpp index 09975e25..e7313d22 100644 --- a/kmid/qslidertime.cpp +++ b/kmid/qslidertime.cpp @@ -28,8 +28,8 @@ #define ARROW_LENGTH 13 -QSliderTime::QSliderTime( TQSlider *ksl, TQWidget *parent, const char *name) - : TQWidget (parent,name) +QSliderTime::QSliderTime( TQSlider *ksl, TQWidget *tqparent, const char *name) + : TQWidget (tqparent,name) { kslider=ksl; @@ -90,25 +90,25 @@ if (kslider==NULL) return; int pos=0; int deltapos=0; formatMillisecs(0,tmp); - painter->drawText( 0, posy,tmp); + painter->drawText( 0, posy,TQString(tmp)); for ( i = timestep; i <= maxV - timestep; i += timestep ) { pos = (width()-10) * i / maxV + 5; formatMillisecs(i,tmp); deltapos=qfmt.width(tmp)/2; - painter->drawText( pos-deltapos, posy,tmp); + painter->drawText( pos-deltapos, posy,TQString(tmp)); } pos = width()- 5; formatMillisecs(maxV,tmp); deltapos=qfmt.width(tmp); - painter->drawText( pos-deltapos, posy,tmp); + painter->drawText( pos-deltapos, posy,TQString(tmp)); } -TQSize QSliderTime::sizeHint() +TQSize QSliderTime::tqsizeHint() { return TQSize(10,fontheight+2); } diff --git a/kmid/qslidertime.h b/kmid/qslidertime.h index fcefdc13..c42632b0 100644 --- a/kmid/qslidertime.h +++ b/kmid/qslidertime.h @@ -28,9 +28,10 @@ class TQWidget; -class QSliderTime : public QWidget +class QSliderTime : public TQWidget { Q_OBJECT + TQ_OBJECT private: TQSlider *kslider; @@ -38,11 +39,11 @@ private: int fontheight; public: - QSliderTime( TQSlider *ksl, TQWidget *parent = NULL, const char *name = NULL ); + QSliderTime( TQSlider *ksl, TQWidget *tqparent = NULL, const char *name = NULL ); int getFontHeight(void) {return fontheight;}; - TQSize sizeHint(); + TQSize tqsizeHint(); TQSizePolicy sizePolicy(); private: diff --git a/kmid/rhythmview.cpp b/kmid/rhythmview.cpp index 0358620d..a10bb79c 100644 --- a/kmid/rhythmview.cpp +++ b/kmid/rhythmview.cpp @@ -23,7 +23,7 @@ ***************************************************************************/ #include "rhythmview.h" -RhythmView::RhythmView (TQWidget *parent, const char *name) : TQWidget (parent,name) +RhythmView::RhythmView (TQWidget *tqparent, const char *name) : TQWidget (tqparent,name) { lamps=NULL; setRhythm(4,4); @@ -57,7 +57,7 @@ void RhythmView::setRhythm(int numerator,int denominator) for (i=0;i<num;i++) { - lamps[i]=new KLed(Qt::yellow, KLed::Off, KLed::Sunken, KLed::Rectangular, this); + lamps[i]=new KLed(TQt::yellow, KLed::Off, KLed::Sunken, KLed::Rectangular, this); // lamps[i]->setState(KLed::Off); lamps[i]->setGeometry(x+2,0,w-4,height()); lamps[i]->show(); @@ -95,7 +95,7 @@ void RhythmView::resizeEvent(TQResizeEvent *) } } -TQSize RhythmView::sizeHint() +TQSize RhythmView::tqsizeHint() { return TQSize(10,10); } diff --git a/kmid/rhythmview.h b/kmid/rhythmview.h index c157e9d8..3754c074 100644 --- a/kmid/rhythmview.h +++ b/kmid/rhythmview.h @@ -27,14 +27,14 @@ #include <tqwidget.h> #include <kled.h> -class RhythmView : public QWidget +class RhythmView : public TQWidget { int num,den; KLed **lamps; public: - RhythmView (TQWidget *parent, const char *name); + RhythmView (TQWidget *tqparent, const char *name); ~RhythmView(); void setRhythm(int numerator,int denominator); @@ -43,7 +43,7 @@ public: void Beat(void); // Just increase the beat - TQSize sizeHint(); + TQSize tqsizeHint(); TQSizePolicy sizePolicy(); private: diff --git a/kmix/KMixApp.h b/kmix/KMixApp.h index 79e4fc4e..4b5b1122 100644 --- a/kmix/KMixApp.h +++ b/kmix/KMixApp.h @@ -8,6 +8,7 @@ class KMixWindow; class KMixApp : public KUniqueApplication { Q_OBJECT + TQ_OBJECT public: KMixApp(); ~KMixApp(); diff --git a/kmix/colorwidget.ui b/kmix/colorwidget.ui index 56f1d60e..35d2a0f8 100644 --- a/kmix/colorwidget.ui +++ b/kmix/colorwidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>ColorWidget</class> <author>Stefan Schimanski <1Stein@gmx.de></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ColorWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,7 +20,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>customColors</cstring> </property> @@ -28,7 +28,7 @@ <string>&Use custom colors</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>activeColors</cstring> </property> @@ -53,7 +53,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -97,7 +97,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>labelLoad</cstring> </property> @@ -111,7 +111,7 @@ <cstring>activeHigh</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -127,7 +127,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>mutedColors</cstring> </property> @@ -141,7 +141,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -155,7 +155,7 @@ <cstring>mutedHigh</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel8</cstring> </property> @@ -169,7 +169,7 @@ <cstring>mutedBack</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel7</cstring> </property> @@ -236,7 +236,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -272,5 +272,5 @@ <include location="global" impldecl="in declaration">klocale.h</include> <include location="global" impldecl="in declaration">kseparator.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmix/dialogselectmaster.cpp b/kmix/dialogselectmaster.cpp index a201f33a..d206429e 100644 --- a/kmix/dialogselectmaster.cpp +++ b/kmix/dialogselectmaster.cpp @@ -67,15 +67,15 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer) TQHBoxLayout* mixerNameLayout = new TQHBoxLayout( _layout ); //widgetsLayout->setStretchFactor( mixerNameLayout, 0 ); //TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum); - //mixerNameLayout->setSizePolicy(qsp); + //mixerNameLayout->tqsetSizePolicy(qsp); mixerNameLayout->setSpacing(KDialog::spacingHint()); TQLabel *qlbl = new TQLabel( i18n("Current Mixer"), m_mainFrame ); mixerNameLayout->addWidget(qlbl); - qlbl->setFixedHeight(qlbl->sizeHint().height()); + qlbl->setFixedHeight(qlbl->tqsizeHint().height()); m_cMixer = new KComboBox( FALSE, m_mainFrame, "mixerCombo" ); - m_cMixer->setFixedHeight(m_cMixer->sizeHint().height()); + m_cMixer->setFixedHeight(m_cMixer->tqsizeHint().height()); connect( m_cMixer, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( createPageByID( int ) ) ); //int id=1; @@ -97,10 +97,10 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer) _layout->addWidget(qlbl); m_scrollableChannelSelector = new TQScrollView(m_mainFrame, "scrollableChannelSelector"); - m_scrollableChannelSelector->viewport()->setBackgroundMode(Qt::PaletteBackground); + m_scrollableChannelSelector->viewport()->setBackgroundMode(TQt::PaletteBackground); _layout->add(m_scrollableChannelSelector); - m_buttonGroupForScrollView = new TQButtonGroup(this); // invisible QButtonGroup + m_buttonGroupForScrollView = new TQButtonGroup(this); // invisible TQButtonGroup m_buttonGroupForScrollView->hide(); createPage(ptr_mixer); @@ -133,7 +133,7 @@ void DialogSelectMaster::createPage(Mixer* mixer) * In case the user selected a new Mixer via m_cMixer, we need * to remove the stuff created on the last call. */ - // delete the VBox. This should automatically remove all contained QRadioButton's. + // delete the VBox. This should automatically remove all contained TQRadioButton's. delete m_vboxForScrollView; m_mixerPKs.clear(); /** Reset page end -------------------------------------------------- */ @@ -153,7 +153,7 @@ void DialogSelectMaster::createPage(Mixer* mixer) if ( ! md->isEnum() && ! md->isSwitch() ) { //kdDebug(67100) << "DialogSelectMaster::createPage() mset append qrb" << endl; TQString mdName = md->name(); - mdName.replace('&', "&&"); // Quoting the '&' needed, to prevent TQRadioButton creating an accelerator + mdName.tqreplace('&', "&&"); // Quoting the '&' needed, to prevent TQRadioButton creating an accelerator TQRadioButton* qrb = new TQRadioButton( mdName, m_vboxForScrollView); m_buttonGroupForScrollView->insert(qrb); //(qrb, md->num()); //_qEnabledCB.append(qrb); diff --git a/kmix/dialogselectmaster.h b/kmix/dialogselectmaster.h index c454a3fe..5a3a57b2 100644 --- a/kmix/dialogselectmaster.h +++ b/kmix/dialogselectmaster.h @@ -16,6 +16,7 @@ class Mixer; class DialogSelectMaster : public KDialogBase { Q_OBJECT + TQ_OBJECT public: DialogSelectMaster(Mixer *); ~DialogSelectMaster(); diff --git a/kmix/dialogviewconfiguration.cpp b/kmix/dialogviewconfiguration.cpp index 09e88d23..948df8fe 100644 --- a/kmix/dialogviewconfiguration.cpp +++ b/kmix/dialogviewconfiguration.cpp @@ -50,7 +50,7 @@ DialogViewConfiguration::DialogViewConfiguration( TQWidget*, ViewBase& view) if ( qw->inherits("MixDeviceWidget") ) { MixDeviceWidget *mdw = static_cast<MixDeviceWidget*>(qw); TQString mdName = mdw->mixDevice()->name(); - mdName.replace('&', "&&"); // Quoting the '&' needed, to prevent TQCheckBox creating an accelerator + mdName.tqreplace('&', "&&"); // Quoting the '&' needed, to prevent TQCheckBox creating an accelerator TQCheckBox* cb = new TQCheckBox( mdName, plainPage() ); _qEnabledCB.append(cb); cb->setChecked( !mdw->isDisabled() ); //mdw->isVisible() ); @@ -58,7 +58,7 @@ DialogViewConfiguration::DialogViewConfiguration( TQWidget*, ViewBase& view) } } _layout->activate(); - resize(_layout->sizeHint() ); + resize(_layout->tqsizeHint() ); connect( this, TQT_SIGNAL(okClicked()) , this, TQT_SLOT(apply()) ); } @@ -93,9 +93,9 @@ void DialogViewConfiguration::apply() _view.configurationUpdate(); } -TQSize DialogViewConfiguration::sizeHint() const { - // kdDebug(67100) << "DialogViewConfiguration::sizeHint() is (100,500)\n"; - return _layout->sizeHint(); +TQSize DialogViewConfiguration::tqsizeHint() const { + // kdDebug(67100) << "DialogViewConfiguration::tqsizeHint() is (100,500)\n"; + return _layout->tqsizeHint(); } #include "dialogviewconfiguration.moc" diff --git a/kmix/dialogviewconfiguration.h b/kmix/dialogviewconfiguration.h index 6ee8c83f..4b90a168 100644 --- a/kmix/dialogviewconfiguration.h +++ b/kmix/dialogviewconfiguration.h @@ -13,11 +13,12 @@ class TQVBoxLayout; class DialogViewConfiguration : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DialogViewConfiguration(TQWidget* parent, ViewBase& view); + DialogViewConfiguration(TQWidget* tqparent, ViewBase& view); ~DialogViewConfiguration(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; public slots: void apply(); diff --git a/kmix/kledbutton.cpp b/kmix/kledbutton.cpp index e0a7bff1..0145d4c4 100644 --- a/kmix/kledbutton.cpp +++ b/kmix/kledbutton.cpp @@ -24,17 +24,17 @@ #include "kledbutton.h" -KLedButton::KLedButton(const TQColor &col, TQWidget *parent, const char *name) - : KLed( col, parent, name ) +KLedButton::KLedButton(const TQColor &col, TQWidget *tqparent, const char *name) + : KLed( col, tqparent, name ) { - // KLed and thus KLedButtung does not do proper positioning in QLayout's. + // KLed and thus KLedButtung does not do proper positioning in TQLayout's. // Thus I will do a dirty trick here - installEventFilter(parent); + installEventFilter(tqparent); } KLedButton::KLedButton(const TQColor& col, KLed::State st, KLed::Look look, - KLed::Shape shape, TQWidget *parent, const char *name) - : KLed( col, st, look, shape, parent, name ) + KLed::Shape tqshape, TQWidget *tqparent, const char *name) + : KLed( col, st, look, tqshape, tqparent, name ) { } @@ -44,7 +44,7 @@ KLedButton::~KLedButton() void KLedButton::mousePressEvent( TQMouseEvent *e ) { - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) { toggle(); emit stateChanged( state() ); @@ -52,8 +52,8 @@ void KLedButton::mousePressEvent( TQMouseEvent *e ) } bool KLedButton::eventFilter( TQObject* /*obj*/ , TQEvent* /*ev*/ ) { - // KLed and thus KLedButtung does not do proper positioning in QLayout's. - // Thus I listen to my parents resize events and do it here ... OUCH, that's ugly + // KLed and thus KLedButtung does not do proper positioning in TQLayout's. + // Thus I listen to my tqparents resize events and do it here ... OUCH, that's ugly /* No, this cannot work ! if ( ev->type() == TQEvent::Resize ) { TQResizeEvent* qre = (TQResizeEvent*)ev; @@ -66,7 +66,7 @@ bool KLedButton::eventFilter( TQObject* /*obj*/ , TQEvent* /*ev*/ ) { } -TQSize KLedButton::sizeHint() const +TQSize KLedButton::tqsizeHint() const { return size(); } diff --git a/kmix/kledbutton.h b/kmix/kledbutton.h index e8d562af..ed7f529b 100644 --- a/kmix/kledbutton.h +++ b/kmix/kledbutton.h @@ -32,13 +32,14 @@ class KLedButton : public KLed { Q_OBJECT + TQ_OBJECT public: - KLedButton(const TQColor &col=Qt::green, TQWidget *parent=0, const char *name=0); - KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape shape, - TQWidget *parent=0, const char *name=0); + KLedButton(const TQColor &col=TQt::green, TQWidget *tqparent=0, const char *name=0); + KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape tqshape, + TQWidget *tqparent=0, const char *name=0); ~KLedButton(); - TQSize sizeHint () const; + TQSize tqsizeHint () const; TQSizePolicy sizePolicy () const; signals: void stateChanged( bool newState ); diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp index ce4ab910..f0a2e4db 100644 --- a/kmix/kmix.cpp +++ b/kmix/kmix.cpp @@ -107,25 +107,25 @@ void KMixWindow::initActions() { // file menu - KStdAction::quit( this, TQT_SLOT(quit()), actionCollection()); + KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection()); // settings menu - KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBar()), actionCollection()); - KStdAction::preferences( this, TQT_SLOT(showSettings()), actionCollection()); - new KAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, this, + KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBar()), actionCollection()); + KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection()); + new KAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, TQT_TQOBJECT(this), TQT_SLOT( configureGlobalShortcuts() ), actionCollection(), "settings_global" ); KStdAction::keyBindings( guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); - (void) new KAction( i18n( "Hardware &Information" ), 0, this, TQT_SLOT( slotHWInfo() ), actionCollection(), "hwinfo" ); - (void) new KAction( i18n( "Hide Mixer Window" ), Key_Escape, this, TQT_SLOT(hide()), actionCollection(), "hide_kmixwindow" ); + (void) new KAction( i18n( "Hardware &Information" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotHWInfo() ), actionCollection(), "hwinfo" ); + (void) new KAction( i18n( "Hide Mixer Window" ), Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(hide()), actionCollection(), "hide_kmixwindow" ); - m_globalAccel = new KGlobalAccel( this ); - m_globalAccel->insert( "Increase volume", i18n( "Increase Volume of Master Channel"), TQString::null, - KShortcut(), KShortcut(), this, TQT_SLOT( increaseVolume() ) ); - m_globalAccel->insert( "Decrease volume", i18n( "Decrease Volume of Master Channel"), TQString::null, - KShortcut(), KShortcut(), this, TQT_SLOT( decreaseVolume() ) ); - m_globalAccel->insert( "Toggle mute", i18n( "Toggle Mute of Master Channel"), TQString::null, - KShortcut(), KShortcut(), this, TQT_SLOT( toggleMuted() ) ); + m_globalAccel = new KGlobalAccel( TQT_TQOBJECT(this) ); + m_globalAccel->insert( "Increase volume", i18n( "Increase Volume of Master Channel"), TQString(), + KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) ); + m_globalAccel->insert( "Decrease volume", i18n( "Decrease Volume of Master Channel"), TQString(), + KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( decreaseVolume() ) ); + m_globalAccel->insert( "Toggle mute", i18n( "Toggle Mute of Master Channel"), TQString(), + KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleMuted() ) ); m_globalAccel->readSettings(); m_globalAccel->updateConnections(); @@ -145,10 +145,10 @@ KMixWindow::initPrefDlg() void KMixWindow::initWidgets() { - // Main widget and layout + // Main widget and tqlayout setCentralWidget( new TQWidget( this, "qt_central_widget" ) ); - // Widgets layout + // Widgets tqlayout widgetsLayout = new TQVBoxLayout( centralWidget(), 0, 0, "widgetsLayout" ); widgetsLayout->setResizeMode(TQLayout::Minimum); // works fine @@ -157,16 +157,16 @@ KMixWindow::initWidgets() mixerNameLayout = new TQHBox( centralWidget(), "mixerNameLayout" ); widgetsLayout->setStretchFactor( mixerNameLayout, 0 ); TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum); - mixerNameLayout->setSizePolicy(qsp); + mixerNameLayout->tqsetSizePolicy(qsp); mixerNameLayout->setSpacing(KDialog::spacingHint()); TQLabel *qlbl = new TQLabel( i18n("Current mixer:"), mixerNameLayout ); - qlbl->setFixedHeight(qlbl->sizeHint().height()); + qlbl->setFixedHeight(qlbl->tqsizeHint().height()); m_cMixer = new KComboBox( FALSE, mixerNameLayout, "mixerCombo" ); - m_cMixer->setFixedHeight(m_cMixer->sizeHint().height()); - connect( m_cMixer, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( showSelectedMixer( int ) ) ); + m_cMixer->setFixedHeight(m_cMixer->tqsizeHint().height()); + connect( m_cMixer, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( showSelectedMixer( int ) ) ); TQToolTip::add( m_cMixer, i18n("Current mixer" ) ); - // Add first layout to widgets + // Add first tqlayout to widgets widgetsLayout->addWidget( mixerNameLayout ); m_wsMixers = new TQWidgetStack( centralWidget(), "MixerWidgetStack" ); @@ -267,9 +267,9 @@ KMixWindow::saveConfig() config->writeEntry( "ValueStyle", "None" ); if ( m_toplevelOrientation == Qt::Vertical ) - config->writeEntry( "Orientation","Vertical" ); + config->writeEntry( "Qt::Orientation","Vertical" ); else - config->writeEntry( "Orientation","Horizontal" ); + config->writeEntry( "Qt::Orientation","Horizontal" ); config->writeEntry( "Autostart", m_autoStart ); // save mixer widgets @@ -305,7 +305,7 @@ KMixWindow::loadConfig() m_multiDriverMode = config->readBoolEntry("MultiDriver", false); m_surroundView = config->readBoolEntry("Experimental-ViewSurround", false ); m_gridView = config->readBoolEntry("Experimental-ViewGrid", false ); - const TQString& orientationString = config->readEntry("Orientation", "Horizontal"); + const TQString& orientationString = config->readEntry("Qt::Orientation", "Horizontal"); TQString mixerMasterCard = config->readEntry( "MasterMixer", "" ); Mixer::setMasterCard(mixerMasterCard); TQString masterDev = config->readEntry( "MasterMixerDevice", "" ); @@ -522,11 +522,11 @@ KMixWindow::applyPrefs( KMixPrefDlg *prefDlg ) } if ( prefDlg->_rbVertical->isChecked() ) { //TQString "For a change of language to take place, quit and restart KDiff3."; - //kdDebug(67100) << "KMix should change to Vertical layout\n"; + //kdDebug(67100) << "KMix should change toQt::Vertical tqlayout\n"; m_toplevelOrientation = Qt::Vertical; } else if ( prefDlg->_rbHorizontal->isChecked() ) { - //kdDebug(67100) << "KMix should change to Horizontal layout\n"; + //kdDebug(67100) << "KMix should change toQt::Horizontal tqlayout\n"; m_toplevelOrientation = Qt::Horizontal; } m_autoStart = prefDlg->m_autoStartChk->isChecked(); @@ -551,7 +551,7 @@ KMixWindow::applyPrefs( KMixPrefDlg *prefDlg ) show(); } - this->repaint(); // make KMix look fast (saveConfig() often uses several seconds) + this->tqrepaint(); // make KMix look fast (saveConfig() often uses several seconds) kapp->processEvents(); saveConfig(); } diff --git a/kmix/kmix.h b/kmix/kmix.h index 398c88d8..09e4cb15 100644 --- a/kmix/kmix.h +++ b/kmix/kmix.h @@ -27,7 +27,7 @@ #include <config.h> #endif -// include files for Qt +// include files for TQt #include <tqstring.h> #include <tqmap.h> @@ -55,6 +55,7 @@ class KMixWindow : public KMainWindow { Q_OBJECT + TQ_OBJECT public: KMixWindow(); diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp index c0fed889..200ee035 100644 --- a/kmix/kmixapplet.cpp +++ b/kmix/kmixapplet.cpp @@ -66,11 +66,11 @@ extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("kmix"); return new KMixApplet(configFile, KPanelApplet::Normal, - parent, "kmixapplet"); + tqparent, "kmixapplet"); } } @@ -84,10 +84,10 @@ static const TQColor mutedHighColor = "#FFFFFF"; static const TQColor mutedLowColor = "#808080"; static const TQColor mutedBackColor = "#000000"; -AppletConfigDialog::AppletConfigDialog( TQWidget * parent, const char * name ) - : KDialogBase( KDialogBase::Plain, TQString::null, +AppletConfigDialog::AppletConfigDialog( TQWidget * tqparent, const char * name ) + : KDialogBase( KDialogBase::Plain, TQString(), KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel, - KDialogBase::Ok, parent, name, false, true) + KDialogBase::Ok, tqparent, name, false, true) { setPlainCaption(i18n("Configure - Mixer Applet")); TQFrame* page = plainPage(); @@ -150,9 +150,9 @@ bool AppletConfigDialog::useCustomColors() const KMixApplet::KMixApplet( const TQString& configFile, Type t, - TQWidget *parent, const char *name ) + TQWidget *tqparent, const char *name ) - : KPanelApplet( configFile, t, KPanelApplet::Preferences | KPanelApplet::ReportBug | KPanelApplet::About, parent, name ), + : KPanelApplet( configFile, t, KPanelApplet::Preferences | KPanelApplet::ReportBug | KPanelApplet::About, tqparent, name ), m_mixerWidget(0), m_errorLabel(0), m_pref(0), m_aboutData( "kmix", I18N_NOOP("KMix Panel Applet"), APP_VERSION, "Mini Sound Mixer Applet", KAboutData::License_GPL, @@ -205,8 +205,8 @@ KMixApplet::KMixApplet( const TQString& configFile, Type t, // No mixer set by user (kmixappletrc_*) and more than one to choose // We do NOT know which mixer to use => ask the User m_errorLabel = new TQPushButton( i18n("Select Mixer"), this ); - m_errorLabel->setGeometry(0, 0, m_errorLabel->sizeHint().width(), m_errorLabel->sizeHint().height() ); - resize( m_errorLabel->sizeHint() ); + m_errorLabel->setGeometry(0, 0, m_errorLabel->tqsizeHint().width(), m_errorLabel->tqsizeHint().height() ); + resize( m_errorLabel->tqsizeHint() ); connect( m_errorLabel, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectMixer()) ); } else { @@ -243,13 +243,13 @@ void KMixApplet::saveConfig() cfg->writeEntry( "ColorCustom", _customColors ); - cfg->writeEntry( "ColorHigh", _colors.high.name() ); - cfg->writeEntry( "ColorLow", _colors.low.name() ); - cfg->writeEntry( "ColorBack", _colors.back.name() ); + cfg->writeEntry( "ColorHigh", TQString(_colors.high.name()) ); + cfg->writeEntry( "ColorLow", TQString(_colors.low.name()) ); + cfg->writeEntry( "ColorBack", TQString(_colors.back.name()) ); - cfg->writeEntry( "ColorMutedHigh", _colors.mutedHigh.name() ); - cfg->writeEntry( "ColorMutedLow", _colors.mutedLow.name() ); - cfg->writeEntry( "ColorMutedBack", _colors.mutedBack.name() ); + cfg->writeEntry( "ColorMutedHigh", TQString(_colors.mutedHigh.name()) ); + cfg->writeEntry( "ColorMutedLow", TQString(_colors.mutedLow.name()) ); + cfg->writeEntry( "ColorMutedBack", TQString(_colors.mutedBack.name()) ); //cfg->writeEntry( "ReversedDirection", reversedDir ); @@ -266,7 +266,7 @@ void KMixApplet::loadConfig() cfg->setGroup(0); _mixerId = cfg->readEntry( "Mixer", "undef" ); - _mixerName = cfg->readEntry( "MixerName", TQString::null ); + _mixerName = cfg->readEntry( "MixerName", TQString() ); _customColors = cfg->readBoolEntry( "ColorCustom", false ); @@ -325,7 +325,7 @@ void KMixApplet::selectMixer() lst, 1, FALSE, &ok, this ); if ( ok ) { - Mixer *mixer = Mixer::mixers().at( lst.findIndex( res ) ); + Mixer *mixer = Mixer::mixers().at( lst.tqfindIndex( res ) ); if (!mixer) KMessageBox::sorry( this, i18n("Invalid mixer entered.") ); else @@ -375,7 +375,7 @@ void KMixApplet::positionChange(Position pos) { loadConfig(); setColors(); - const TQSize panelAppletConstrainedSize = sizeHint(); + const TQSize panelAppletConstrainedSize = tqsizeHint(); m_mixerWidget->setGeometry( 0, 0, panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() ); resize( panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() ); //setFixedSize(panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() ); @@ -401,7 +401,7 @@ void KMixApplet::resizeEvent(TQResizeEvent *e) } - // resizing changes our own sizeHint(), because we must take the new PanelSize in account. + // resizing changes our own tqsizeHint(), because we must take the new PanelSize in account. // So updateGeometry() is amust for us. //kdDebug(67100) << "KMixApplet::resizeEvent(). UPDATE GEOMETRY" << endl; updateGeometry(); @@ -414,35 +414,35 @@ void KMixApplet::updateGeometrySlot() { } -TQSize KMixApplet::sizeHint() const { - //kdDebug(67100) << "KMixApplet::sizeHint()\n"; +TQSize KMixApplet::tqsizeHint() const { + //kdDebug(67100) << "KMixApplet::tqsizeHint()\n"; TQSize qsz; if ( m_errorLabel !=0 ) { - qsz = m_errorLabel->sizeHint(); + qsz = m_errorLabel->tqsizeHint(); } else if ( m_mixerWidget != 0) { - qsz = m_mixerWidget->sizeHint(); + qsz = m_mixerWidget->tqsizeHint(); } else { // During construction of m_mixerWidget or if something goes wrong: - // Return something that should resemble our former sizeHint(). + // Return something that should resemble our former tqsizeHint(). qsz = size(); } - //kdDebug(67100) << "KMixApplet::sizeHint() leftright =" << qsz << "\n"; + //kdDebug(67100) << "KMixApplet::tqsizeHint() leftright =" << qsz << "\n"; return qsz; } /** - We need widthForHeight() and heigthForWidth() only because KPanelApplet::updateLayout does relayouts + We need widthForHeight() and heigthForWidth() only because KPanelApplet::updateLayout does retqlayouts using this method. Actually we ignore the passed paramater and just return our preferred size. */ int KMixApplet::widthForHeight(int) const { - //kdDebug(67100) << "KMixApplet::widthForHeight() = " << sizeHint().width() << endl; - return sizeHint().width(); + //kdDebug(67100) << "KMixApplet::widthForHeight() = " << tqsizeHint().width() << endl; + return tqsizeHint().width(); } int KMixApplet::heightForWidth(int) const { - //kdDebug(67100) << "KMixApplet::heightForWidth() = " << sizeHint().height() << endl; - return sizeHint().height(); + //kdDebug(67100) << "KMixApplet::heightForWidth() = " << tqsizeHint().height() << endl; + return tqsizeHint().height(); } diff --git a/kmix/kmixapplet.h b/kmix/kmixapplet.h index 561a596f..1b997a5b 100644 --- a/kmix/kmixapplet.h +++ b/kmix/kmixapplet.h @@ -22,7 +22,7 @@ #ifndef KMIXAPPLET_H #define KMIXAPPLET_H -// Qt +// TQt #include <tqlayout.h> #include <tqptrlist.h> #include <tqwidget.h> @@ -43,8 +43,9 @@ class KMixApplet; class AppletConfigDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AppletConfigDialog( TQWidget * parent=0, const char * name=0 ); + AppletConfigDialog( TQWidget * tqparent=0, const char * name=0 ); virtual ~AppletConfigDialog() {}; void setActiveColors(const TQColor& high, const TQColor& low, const TQColor& back); @@ -70,10 +71,11 @@ class AppletConfigDialog : public KDialogBase class KMixApplet : public KPanelApplet { Q_OBJECT + TQ_OBJECT public: KMixApplet( const TQString& configFile, Type t = Normal, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); virtual ~KMixApplet(); struct Colors { @@ -86,7 +88,7 @@ public: void reportBug(); void paletteChange ( const TQPalette & oldPalette ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSizePolicy sizePolicy() const; int widthForHeight(int) const; int heightForWidth(int) const; diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp index 32372cb3..1a0763d5 100644 --- a/kmix/kmixdockwidget.cpp +++ b/kmix/kmixdockwidget.cpp @@ -48,8 +48,8 @@ #include "kwin.h" #include "viewdockareapopup.h" -KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *parent, const char *name, bool volumePopup, bool dockIconMuting ) - : KSystemTray( parent, name ), +KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *tqparent, const char *name, bool volumePopup, bool dockIconMuting ) + : KSystemTray( tqparent, name ), m_mixer(mixer), _dockAreaPopup(0L), _audioPlayer(0L), @@ -81,7 +81,7 @@ KMixDockWidget::~KMixDockWidget() void KMixDockWidget::createActions() { // Put "Mute" selector in context menu - (void)new KToggleAction( i18n( "M&ute" ), 0, this, TQT_SLOT( dockMute() ), + (void)new KToggleAction( i18n( "M&ute" ), 0, TQT_TQOBJECT(this), TQT_SLOT( dockMute() ), actionCollection(), "dock_mute" ); KAction *a = actionCollection()->action( "dock_mute" ); KPopupMenu *popupMenu = contextMenu(); @@ -89,7 +89,7 @@ void KMixDockWidget::createActions() // Put "Select Master Channel" dialog in context menu if ( m_mixer != 0 ) { - (void)new KAction( i18n("Select Master Channel..."), 0, this, TQT_SLOT(selectMaster()), + (void)new KAction( i18n("Select Master Channel..."), 0, TQT_TQOBJECT(this), TQT_SLOT(selectMaster()), actionCollection(), "select_master"); KAction *a2 = actionCollection()->action( "select_master" ); if (a2) a2->plug( popupMenu ); @@ -123,7 +123,7 @@ KMixDockWidget::createMasterVolWidget() m_mixer->readSetFromHWforceUpdate(); // after changing the master device, make sure to re-read (otherwise no "changed()" signals might get sent by the Mixer /* With the recently introduced TQSocketNotifier stuff, we can't rely on regular timer updates any longer. Also the readSetFromHWforceUpdate() won't be enough. As a workaround, we trigger - all "repaints" manually here. + all "tqrepaints" manually here. The call to m_mixer->readSetFromHWforceUpdate() is most likely superfluous, even if we don't use TQSocketNotifier (e.g. in backends OSS, Solaris, ...) */ setVolumeTip(); @@ -135,8 +135,8 @@ KMixDockWidget::createMasterVolWidget() * */ // connect( m_mixer, TQT_SIGNAL(newVolumeLevels()), _dockAreaPopup, TQT_SLOT(refreshVolumeLevels()) ); - connect( m_mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(setVolumeTip() ) ); - connect( m_mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(slotUpdatePixmap() ) ); + connect( m_mixer, TQT_SIGNAL(newVolumeLevels()), TQT_TQOBJECT(this), TQT_SLOT(setVolumeTip() ) ); + connect( m_mixer, TQT_SIGNAL(newVolumeLevels()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdatePixmap() ) ); } void KMixDockWidget::slotUpdatePixmap() @@ -191,7 +191,7 @@ KMixDockWidget::setVolumeTip() } newToolTipValue = val + 10000*md->isMuted(); if ( _oldToolTipValue != newToolTipValue ) { - tip = i18n( "Volume at %1%" ).arg( val ); + tip = i18n( "Volume at %1%" ).tqarg( val ); if ( md->isMuted() ) { tip += i18n( " (Muted)" ); } @@ -267,7 +267,7 @@ KMixDockWidget::mousePressEvent(TQMouseEvent *me) // esken: Due to overwhelming request, LeftButton shows the ViewDockAreaPopup, if configured // to do so. Otherwise the main window will be shown. - if ( me->button() == LeftButton ) + if ( me->button() == Qt::LeftButton ) { if ( ! _volumePopup ) { // Case 1: User wants to show main window => This is the KSystemTray default action @@ -311,7 +311,7 @@ KMixDockWidget::mousePressEvent(TQMouseEvent *me) TQWidget::mousePressEvent(me); // KSystemTray's shouldn't do the default action for this return; } // LeftMouseButton pressed - else if ( me->button() == MidButton ) { + else if ( me->button() == Qt::MidButton ) { if ( ! _dockIconMuting ) { toggleActive(); } else { @@ -357,10 +357,10 @@ KMixDockWidget::wheelEvent(TQWheelEvent *e) } md->getVolume().setVolume(vol); m_mixer->commitVolumeChange(md); - // refresh the toolTip (Qt removes it on a MouseWheel event) - // Mhhh, it doesn't work. Qt does not show it again. + // refresh the toolTip (TQt removes it on a MouseWheel event) + // Mhhh, it doesn't work. TQt does not show it again. setVolumeTip(); - // Simulate a mouse move to make Qt show the tooltip again + // Simulate a mouse move to make TQt show the tooltip again TQApplication::postEvent( this, new TQMouseEvent( TQEvent::MouseMove, TQCursor::pos(), Qt::NoButton, Qt::NoButton ) ); } @@ -384,9 +384,9 @@ void KMixDockWidget::contextMenuAboutToShow( KPopupMenu* /* menu */ ) { KAction* showAction = actionCollection()->action("minimizeRestore"); - if ( parentWidget() && showAction ) + if ( tqparentWidget() && showAction ) { - if ( parentWidget()->isVisible() ) + if ( tqparentWidget()->isVisible() ) { showAction->setText( i18n("Hide Mixer Window") ); } diff --git a/kmix/kmixdockwidget.h b/kmix/kmixdockwidget.h index e536be4b..9efaefb6 100644 --- a/kmix/kmixdockwidget.h +++ b/kmix/kmixdockwidget.h @@ -39,11 +39,12 @@ class Volume; class KMixDockWidget : public KSystemTray { Q_OBJECT + TQ_OBJECT friend class KMixWindow; public: - KMixDockWidget(Mixer *, TQWidget *parent=0, const char *name=0, bool volumePopup=true, bool dockIconMuting=false); + KMixDockWidget(Mixer *, TQWidget *tqparent=0, const char *name=0, bool volumePopup=true, bool dockIconMuting=false); ~KMixDockWidget(); void setErrorPixmap(); diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp index 45fbbf31..322f2160 100644 --- a/kmix/kmixerwidget.cpp +++ b/kmix/kmixerwidget.cpp @@ -19,7 +19,7 @@ */ -// Qt +// TQt #include <tqlabel.h> #include <tqlayout.h> #include <tqslider.h> @@ -49,7 +49,7 @@ /** This widget is embedded in the KMix Main window. Each Hardware Mixer is visualized by one KMixerWidget. - KMixerWidget contains + KMixerWidget tqcontains (a) a headline where you can change Mixer's (if you got more than one Mixer) (b) a Tab with 2-4 Tabs (containing View's with sliders, switches and other GUI elements visualizing the Mixer) (c) A balancing slider @@ -57,8 +57,8 @@ */ KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName, MixDevice::DeviceCategory categoryMask, - TQWidget * parent, const char * name, ViewBase::ViewFlags vflags ) - : TQWidget( parent, name ), _mixer(mixer), m_balanceSlider(0), + TQWidget * tqparent, const char * name, ViewBase::ViewFlags vflags ) + : TQWidget( tqparent, name ), _mixer(mixer), m_balanceSlider(0), m_topLayout(0), m_id( _id ), _iconsEnabled( true ), _labelsEnabled( false ), _ticksEnabled( false ), @@ -76,13 +76,13 @@ KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName, { // No mixer found // !! Fix this: This is actually never shown! - TQBoxLayout *layout = new TQHBoxLayout( this ); + TQBoxLayout *tqlayout = new TQHBoxLayout( this ); TQString s = i18n("Invalid mixer"); if ( !mixerName.isEmpty() ) s.append(" \"").append(mixerName).append("\""); TQLabel *errorLabel = new TQLabel( s, this ); - errorLabel->setAlignment( TQLabel::AlignCenter | TQLabel::WordBreak ); - layout->addWidget( errorLabel ); + errorLabel->tqsetAlignment( TQLabel::AlignCenter | TQLabel::WordBreak ); + tqlayout->addWidget( errorLabel ); } } @@ -103,7 +103,7 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags) delete m_topLayout; } - // create main layout + // create main tqlayout m_topLayout = new TQVBoxLayout( this, 0, 3, "m_topLayout" ); // Create tabs of input + output + [...] @@ -133,11 +133,11 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags) // *** Lower part: Slider and Mixer Name ************************************************ TQHBoxLayout *balanceAndDetail = new TQHBoxLayout( m_topLayout, 8, "balanceAndDetail"); // Create the left-right-slider - m_balanceSlider = new TQSlider( -100, 100, 25, 0, TQSlider::Horizontal, this, "RightLeft" ); + m_balanceSlider = new TQSlider( -100, 100, 25, 0, Qt::Horizontal, this, "RightLeft" ); m_balanceSlider->setTickmarks( TQSlider::Below ); m_balanceSlider->setTickInterval( 25 ); - m_balanceSlider->setMinimumSize( m_balanceSlider->sizeHint() ); - m_balanceSlider->setFixedHeight( m_balanceSlider->sizeHint().height() ); + m_balanceSlider->setMinimumSize( m_balanceSlider->tqsizeHint() ); + m_balanceSlider->setFixedHeight( m_balanceSlider->tqsizeHint().height() ); TQLabel *mixerName = new TQLabel(this, "mixerName"); mixerName->setText( _mixer->mixerName() ); @@ -167,7 +167,7 @@ void KMixerWidget::possiblyAddView(ViewBase* vbase) _views.push_back(vbase); vbase ->createDeviceWidgets(); m_ioTab->addTab( vbase , vbase->caption() ); - connect( vbase, TQT_SIGNAL(toggleMenuBar()), parentWidget(), TQT_SLOT(toggleMenuBar()) ); + connect( vbase, TQT_SIGNAL(toggleMenuBar()), tqparentWidget(), TQT_SLOT(toggleMenuBar()) ); } } diff --git a/kmix/kmixerwidget.h b/kmix/kmixerwidget.h index 6e793ca6..06ea6745 100644 --- a/kmix/kmixerwidget.h +++ b/kmix/kmixerwidget.h @@ -59,11 +59,12 @@ class ViewSurround; class KMixerWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName, MixDevice::DeviceCategory categoryMask = MixDevice::ALL , - TQWidget *parent=0, const char *name=0, ViewBase::ViewFlags vflags=0 ); + TQWidget *tqparent=0, const char *name=0, ViewBase::ViewFlags vflags=0 ); ~KMixerWidget(); enum KMixerWidgetIO { OUTPUT=0, INPUT }; diff --git a/kmix/kmixprefdlg.cpp b/kmix/kmixprefdlg.cpp index dbf2ae93..2a2793e4 100644 --- a/kmix/kmixprefdlg.cpp +++ b/kmix/kmixprefdlg.cpp @@ -36,43 +36,43 @@ #include "kmixerwidget.h" -KMixPrefDlg::KMixPrefDlg( TQWidget *parent ) +KMixPrefDlg::KMixPrefDlg( TQWidget *tqparent ) : KDialogBase( Plain, i18n( "Configure" ), - Ok|Cancel|Apply, Ok, parent ) + Ok|Cancel|Apply, Ok, tqparent ) { // general buttons m_generalTab = plainPage( /* i18n("&General") */ ); - TQBoxLayout *layout = new TQVBoxLayout( m_generalTab ); - layout->setSpacing( KDialog::spacingHint() ); + TQBoxLayout *tqlayout = new TQVBoxLayout( m_generalTab ); + tqlayout->setSpacing( KDialog::spacingHint() ); m_dockingChk = new TQCheckBox( i18n("&Dock into panel"), m_generalTab ); - layout->addWidget( m_dockingChk ); + tqlayout->addWidget( m_dockingChk ); TQWhatsThis::add(m_dockingChk, i18n("Docks the mixer into the KDE panel")); m_volumeChk = new TQCheckBox(i18n("Enable system tray &volume control"), m_generalTab); - layout->addWidget(m_volumeChk); + tqlayout->addWidget(m_volumeChk); m_showTicks = new TQCheckBox( i18n("Show &tickmarks"), m_generalTab ); - layout->addWidget( m_showTicks ); + tqlayout->addWidget( m_showTicks ); TQWhatsThis::add(m_showTicks, i18n("Enable/disable tickmark scales on the sliders")); m_showLabels = new TQCheckBox( i18n("Show &labels"), m_generalTab ); - layout->addWidget( m_showLabels ); + tqlayout->addWidget( m_showLabels ); TQWhatsThis::add(m_showLabels, i18n("Enables/disables description labels above the sliders")); m_onLogin = new TQCheckBox( i18n("Restore volumes on login"), m_generalTab ); - layout->addWidget( m_onLogin ); + tqlayout->addWidget( m_onLogin ); m_dockIconMuting = new TQCheckBox( i18n("Middle click on system tray icon toggles muting"), m_generalTab ); - layout->addWidget( m_dockIconMuting ); + tqlayout->addWidget( m_dockIconMuting ); - TQBoxLayout *numbersLayout = new TQHBoxLayout( layout ); + TQBoxLayout *numbersLayout = new TQHBoxLayout( tqlayout ); TQButtonGroup *numbersGroup = new TQButtonGroup( 3, Qt::Horizontal, i18n("Numbers"), m_generalTab ); numbersGroup->setRadioButtonExclusive(true); TQLabel* qlbl = new TQLabel( i18n("Volume Values: "), m_generalTab ); @@ -91,14 +91,14 @@ KMixPrefDlg::KMixPrefDlg( TQWidget *parent ) numbersLayout->addStretch(); m_autoStartChk = new TQCheckBox( i18n("&Autostart"), m_generalTab ); - layout->addWidget( m_autoStartChk ); + tqlayout->addWidget( m_autoStartChk ); TQWhatsThis::add(m_autoStartChk, i18n("Automatically start mixer when you login")); - TQBoxLayout *orientationLayout = new TQHBoxLayout( layout ); - TQButtonGroup* orientationGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n("Orientation"), m_generalTab ); + TQBoxLayout *orientationLayout = new TQHBoxLayout( tqlayout ); + TQButtonGroup* orientationGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n("Qt::Orientation"), m_generalTab ); //orientationLayout->add(orientationGroup); orientationGroup->setRadioButtonExclusive(true); - TQLabel* qlb = new TQLabel( i18n("Slider Orientation: "), m_generalTab ); + TQLabel* qlb = new TQLabel( i18n("Slider Qt::Orientation: "), m_generalTab ); _rbHorizontal = new TQRadioButton(i18n("&Horizontal"), m_generalTab ); _rbVertical = new TQRadioButton(i18n("&Vertical" ), m_generalTab ); orientationGroup->insert(_rbHorizontal); @@ -112,7 +112,7 @@ KMixPrefDlg::KMixPrefDlg( TQWidget *parent ) orientationLayout->add(_rbVertical); orientationLayout->addStretch(); - layout->addStretch(); + tqlayout->addStretch(); enableButtonSeparator(true); connect( this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(apply()) ); diff --git a/kmix/kmixprefdlg.h b/kmix/kmixprefdlg.h index 2c299515..0840e05e 100644 --- a/kmix/kmixprefdlg.h +++ b/kmix/kmixprefdlg.h @@ -33,11 +33,12 @@ class KMixPrefDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT friend class KMixWindow; public: - KMixPrefDlg( TQWidget *parent ); + KMixPrefDlg( TQWidget *tqparent ); ~KMixPrefDlg(); signals: diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp index e10c46c8..eb03cfc7 100644 --- a/kmix/ksmallslider.cpp +++ b/kmix/ksmallslider.cpp @@ -36,22 +36,22 @@ static const TQColor mutedLowColor2 = "#808080"; static const TQColor backColor2 = "#000000"; */ -KSmallSlider::KSmallSlider( TQWidget *parent, const char *name ) - : TQWidget( parent, name ), _orientation( Qt::Vertical ) +KSmallSlider::KSmallSlider( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), _orientation( Qt::Vertical ) { init(); } -KSmallSlider::KSmallSlider( Qt::Orientation orientation, TQWidget *parent, const char *name ) - : TQWidget( parent, name ), _orientation( orientation ) +KSmallSlider::KSmallSlider( Qt::Orientation orientation, TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), _orientation( orientation ) { init(); } KSmallSlider::KSmallSlider( int minValue, int maxValue, int pageStep, int value, Qt::Orientation orientation, - TQWidget *parent, const char *name ) - : TQWidget( parent, name ), + TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), TQRangeControl( minValue, maxValue, 1, pageStep, value ), _orientation( orientation) { init(); @@ -68,7 +68,7 @@ void KSmallSlider::init() //track = TRUE; //setMouseTracking(true); grayed = false; - setFocusPolicy( TabFocus ); + setFocusPolicy( TQ_TabFocus ); colHigh = TQColor(0,255,0); colLow = TQColor(255,0,0); @@ -98,7 +98,7 @@ int KSmallSlider::valueFromPosition( int p ) const return TQRangeControl::valueFromPosition( avail - p, avail ); } else { - // Horizontal everything is fine. Slider values match with Coordinate System + //Qt::Horizontal everything is fine. Slider values match with Coordinate System return TQRangeControl::valueFromPosition( p, available() ); } } @@ -225,7 +225,7 @@ void KSmallSlider::paintEvent( TQPaintEvent * ) int sliderPos = positionFromValue( TQRangeControl::value() ); // ------------------------ draw 3d border --------------------------------------------- - style().drawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TRUE ); + tqstyle().tqdrawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), tqcolorGroup(), TRUE ); // ------------------------ draw lower/left part ---------------------------------------- @@ -286,7 +286,7 @@ void KSmallSlider::mousePressEvent( TQMouseEvent *e ) { //resetState(); - if ( e->button() == RightButton ) { + if ( e->button() == Qt::RightButton ) { return; } @@ -326,7 +326,7 @@ void KSmallSlider::wheelEvent( TQWheelEvent * e) } e->accept(); // Accept the event - // Hint: Qt autmatically triggers a valueChange() when we do setValue() + // Hint: TQt autmatically triggers a valueChange() when we do setValue() } void KSmallSlider::mouseReleaseEvent( TQMouseEvent * ) @@ -340,7 +340,7 @@ void KSmallSlider::mouseReleaseEvent( TQMouseEvent * ) void KSmallSlider::moveSlider( int pos ) { int a = available(); - int newPos = QMIN( a, QMAX( 0, pos ) ); // keep it inside the available bounds of the slider + int newPos = TQMIN( a, TQMAX( 0, pos ) ); // keep it inside the available bounds of the slider int newVal = valueFromPosition( newPos ); if ( newVal != TQRangeControl::value() ) { @@ -396,7 +396,7 @@ int KSmallSlider::goodPart( const TQPoint &p ) const } /***************** SIZE STUFF START ***************/ -TQSize KSmallSlider::sizeHint() const +TQSize KSmallSlider::tqsizeHint() const { //constPolish(); const int length = 25; @@ -409,7 +409,7 @@ TQSize KSmallSlider::sizeHint() const } -TQSize KSmallSlider::minimumSizeHint() const +TQSize KSmallSlider::tqminimumSizeHint() const { TQSize s(10,10); return s; @@ -486,7 +486,7 @@ void KSmallSlider::setGray( bool value ) { grayed = value; update(); - //repaint(); + //tqrepaint(); } } @@ -501,7 +501,7 @@ void KSmallSlider::setColors( TQColor high, TQColor low, TQColor back ) colLow = low; colBack = back; update(); - //repaint(); + //tqrepaint(); } void KSmallSlider::setGrayColors( TQColor high, TQColor low, TQColor back ) @@ -510,7 +510,7 @@ void KSmallSlider::setGrayColors( TQColor high, TQColor low, TQColor back ) grayLow = low; grayBack = back; update(); - //repaint(); + //tqrepaint(); } #include "ksmallslider.moc" diff --git a/kmix/ksmallslider.h b/kmix/ksmallslider.h index 62849f7b..23a84695 100644 --- a/kmix/ksmallslider.h +++ b/kmix/ksmallslider.h @@ -29,21 +29,22 @@ #include <tqpixmap.h> #include <tqrangecontrol.h> -class KSmallSlider : public TQWidget, public QRangeControl +class KSmallSlider : public TQWidget, public TQRangeControl { Q_OBJECT + TQ_OBJECT public: - KSmallSlider( TQWidget *parent, const char *name=0 ); - KSmallSlider( Qt::Orientation, TQWidget *parent, const char *name=0 ); + KSmallSlider( TQWidget *tqparent, const char *name=0 ); + KSmallSlider( Qt::Orientation, TQWidget *tqparent, const char *name=0 ); KSmallSlider( int minValue, int maxValue, int pageStep, int value, - Qt::Orientation, TQWidget *parent, const char *name=0 ); + Qt::Orientation, TQWidget *tqparent, const char *name=0 ); //virtual void setTracking( bool enable ); //bool tracking() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSizePolicy sizePolicy() const; - TQSize minimumSizeHint() const; + TQSize tqminimumSizeHint() const; int minValue() const; int maxValue() const; @@ -99,7 +100,7 @@ public slots: int goodPart( const TQPoint& ) const; //void initTicks(); - //QCOORD sliderPos; + //TQCOORD sliderPos; //int sliderVal; //State state; //bool track; diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp index 35ec4de8..17a5887d 100644 --- a/kmix/mdwenum.cpp +++ b/kmix/mdwenum.cpp @@ -46,22 +46,22 @@ */ MDWEnum::MDWEnum(Mixer *mixer, MixDevice* md, Qt::Orientation orientation, - TQWidget* parent, ViewBase* mw, const char* name) : - MixDeviceWidget(mixer,md,false,orientation,parent,mw,name), + TQWidget* tqparent, ViewBase* mw, const char* name) : + MixDeviceWidget(mixer,md,false,orientation,tqparent,mw,name), _label(0), _enumCombo(0), _layout(0) { // create actions (on _mdwActions, see MixDeviceWidget) // KStdAction::showMenubar() is in MixDeviceWidget now - new KToggleAction( i18n("&Hide"), 0, this, TQT_SLOT(setDisabled()), _mdwActions, "hide" ); - new KAction( i18n("C&onfigure Shortcuts..."), 0, this, TQT_SLOT(defineKeys()), _mdwActions, "keys" ); + new KToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" ); + new KAction( i18n("C&onfigure Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" ); // create widgets createWidgets(); /* !!! remove this for production version */ - m_keys->insert( "Next Value", i18n( "Next Value" ), TQString::null, - KShortcut(), KShortcut(), this, TQT_SLOT( nextEnumId() ) ); + m_keys->insert( "Next Value", i18n( "Next Value" ), TQString(), + KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( nextEnumId() ) ); installEventFilter( this ); // filter for popup } @@ -75,21 +75,21 @@ void MDWEnum::createWidgets() { if ( _orientation == Qt::Vertical ) { _layout = new TQVBoxLayout( this ); - _layout->setAlignment(Qt::AlignHCenter); + _layout->tqsetAlignment(TQt::AlignHCenter); } else { _layout = new TQHBoxLayout( this ); - _layout->setAlignment(Qt::AlignVCenter); + _layout->tqsetAlignment(TQt::AlignVCenter); } TQToolTip::add( this, m_mixdevice->name() ); //this->setStretchFactor( _layout, 0 ); //TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum); - //_layout->setSizePolicy(qsp); + //_layout->tqsetSizePolicy(qsp); //_layout->setSpacing(KDialog::spacingHint()); _label = new TQLabel( m_mixdevice->name(), this); _layout->addWidget(_label); - _label->setFixedHeight(_label->sizeHint().height()); + _label->setFixedHeight(_label->tqsizeHint().height()); _enumCombo = new KComboBox( FALSE, this, "mixerCombo" ); // ------------ fill ComboBox start ------------ int maxEnumId= m_mixdevice->enumValues().count(); @@ -98,8 +98,8 @@ void MDWEnum::createWidgets() } // ------------ fill ComboBox end -------------- _layout->addWidget(_enumCombo); - _enumCombo->setFixedHeight(_enumCombo->sizeHint().height()); - connect( _enumCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( setEnumId( int ) ) ); + _enumCombo->setFixedHeight(_enumCombo->tqsizeHint().height()); + connect( _enumCombo, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( setEnumId( int ) ) ); TQToolTip::add( _enumCombo, m_mixdevice->name() ); //_layout->addSpacing( 4 ); @@ -127,13 +127,13 @@ void MDWEnum::showContextMenu() menu->popup( pos ); } -TQSize MDWEnum::sizeHint() const { +TQSize MDWEnum::tqsizeHint() const { if ( _layout != 0 ) { - return _layout->sizeHint(); + return _layout->tqsizeHint(); } else { - // layout not (yet) created - return TQWidget::sizeHint(); + // tqlayout not (yet) created + return TQWidget::tqsizeHint(); } } @@ -188,13 +188,13 @@ void MDWEnum::setDisabled( bool value ) { } /** - * An event filter for the various QWidgets. We watch for Mouse press Events, so + * An event filter for the various TQWidgets. We watch for Mouse press Events, so * that we can popup the context menu. */ bool MDWEnum::eventFilter( TQObject* obj, TQEvent* e ) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent *qme = static_cast<TQMouseEvent*>(e); + TQMouseEvent *qme = TQT_TQMOUSEEVENT(e); if (qme->button() == Qt::RightButton) { showContextMenu(); return true; diff --git a/kmix/mdwenum.h b/kmix/mdwenum.h index a541f155..d0ec1bec 100644 --- a/kmix/mdwenum.h +++ b/kmix/mdwenum.h @@ -42,15 +42,16 @@ class ViewBase; class MDWEnum : public MixDeviceWidget { Q_OBJECT + TQ_OBJECT public: MDWEnum( Mixer *mixer, MixDevice* md, Qt::Orientation orientation, - TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); + TQWidget* tqparent = 0, ViewBase* mw = 0, const char* name = 0); ~MDWEnum(); void addActionToPopup( KAction *action ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; bool eventFilter( TQObject* obj, TQEvent* e ); public slots: diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp index 81d51668..3867af9f 100644 --- a/kmix/mdwslider.cpp +++ b/kmix/mdwslider.cpp @@ -58,15 +58,15 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md, bool showMuteLED, bool showRecordLED, bool small, Qt::Orientation orientation, - TQWidget* parent, ViewBase* mw, const char* name) : - MixDeviceWidget(mixer,md,small,orientation,parent,mw,name), + TQWidget* tqparent, ViewBase* mw, const char* name) : + MixDeviceWidget(mixer,md,small,orientation,tqparent,mw,name), m_linked(true), m_valueStyle( NNONE), m_iconLabel( 0 ), m_muteLED( 0 ), m_recordLED( 0 ), m_label( 0 ), _layout(0) { // create actions (on _mdwActions, see MixDeviceWidget) - new KToggleAction( i18n("&Split Channels"), 0, this, TQT_SLOT(toggleStereoLinked()), + new KToggleAction( i18n("&Split Channels"), 0, TQT_TQOBJECT(this), TQT_SLOT(toggleStereoLinked()), _mdwActions, "stereo" ); - new KToggleAction( i18n("&Hide"), 0, this, TQT_SLOT(setDisabled()), _mdwActions, "hide" ); + new KToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" ); KToggleAction *a = new KToggleAction(i18n("&Muted"), 0, 0, 0, _mdwActions, "mute" ); connect( a, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleMuted()) ); @@ -76,17 +76,17 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md, connect( a, TQT_SIGNAL(toggled(bool)), TQT_SLOT( toggleRecsrc()) ); } - new KAction( i18n("C&onfigure Global Shortcuts..."), 0, this, TQT_SLOT(defineKeys()), _mdwActions, "keys" ); + new KAction( i18n("C&onfigure Global Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" ); // create widgets createWidgets( showMuteLED, showRecordLED ); - m_keys->insert( "Increase volume", i18n( "Increase Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString::null, - KShortcut(), KShortcut(), this, TQT_SLOT( increaseVolume() ) ); - m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString::null, - KShortcut(), KShortcut(), this, TQT_SLOT( decreaseVolume() ) ); - m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString::null, - KShortcut(), KShortcut(), this, TQT_SLOT( toggleMuted() ) ); + m_keys->insert( "Increase volume", i18n( "Increase Volume of '%1'" ).tqarg(m_mixdevice->name().utf8().data()), TQString(), + KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) ); + m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).tqarg(m_mixdevice->name().utf8().data()), TQString(), + KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( decreaseVolume() ) ); + m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).tqarg(m_mixdevice->name().utf8().data()), TQString(), + KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleMuted() ) ); installEventFilter( this ); // filter for popup @@ -115,25 +115,25 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) { if ( _orientation == Qt::Vertical ) { _layout = new TQVBoxLayout( this ); - _layout->setAlignment(Qt::AlignCenter); + _layout->tqsetAlignment(TQt::AlignCenter); } else { _layout = new TQHBoxLayout( this ); - _layout->setAlignment(Qt::AlignCenter); + _layout->tqsetAlignment(TQt::AlignCenter); } // -- MAIN SLIDERS LAYOUT --- TQBoxLayout *slidersLayout; if ( _orientation == Qt::Vertical ) { slidersLayout = new TQHBoxLayout( _layout ); - slidersLayout->setAlignment(Qt::AlignVCenter); + slidersLayout->tqsetAlignment(TQt::AlignVCenter); } else { slidersLayout = new TQVBoxLayout( _layout ); - slidersLayout->setAlignment(Qt::AlignHCenter); + slidersLayout->tqsetAlignment(TQt::AlignHCenter); } - /* cesken: This is inconsistent. Why should vertical and horizontal layout differ? + /* cesken: This is inconsistent. Why should vertical and horizontal tqlayout differ? * Also it eats too much space - especially when you don't show sliders at all. * Even more on the vertical panel applet (see Bug #97667) if ( _orientation == Qt::Horizontal ) @@ -145,11 +145,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) TQBoxLayout *labelLayout; if ( _orientation == Qt::Vertical ) { labelLayout = new TQVBoxLayout( slidersLayout ); - labelLayout->setAlignment(Qt::AlignHCenter); + labelLayout->tqsetAlignment(TQt::AlignHCenter); } else { labelLayout = new TQHBoxLayout( slidersLayout ); - labelLayout->setAlignment(Qt::AlignVCenter); + labelLayout->tqsetAlignment(TQt::AlignVCenter); } if ( _orientation == Qt::Vertical ) { m_label = new VerticalText( this, m_mixdevice->name().utf8().data() ); @@ -183,22 +183,22 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) TQBoxLayout *sliLayout; if ( _orientation == Qt::Vertical ) { sliLayout = new TQVBoxLayout( slidersLayout ); - sliLayout->setAlignment(Qt::AlignHCenter); + sliLayout->tqsetAlignment(TQt::AlignHCenter); } else { sliLayout = new TQHBoxLayout( slidersLayout ); - sliLayout->setAlignment(Qt::AlignVCenter); + sliLayout->tqsetAlignment(TQt::AlignVCenter); } // --- ICON ---------------------------- TQBoxLayout *iconLayout; if ( _orientation == Qt::Vertical ) { iconLayout = new TQHBoxLayout( sliLayout ); - iconLayout->setAlignment(Qt::AlignVCenter); + iconLayout->tqsetAlignment(TQt::AlignVCenter); } else { iconLayout = new TQVBoxLayout( sliLayout ); - iconLayout->setAlignment(Qt::AlignHCenter); + iconLayout->tqsetAlignment(TQt::AlignHCenter); } m_iconLabel = 0L; @@ -213,36 +213,36 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) // --- MUTE LED if ( showMuteLED ) { - TQBoxLayout *ledlayout; + TQBoxLayout *ledtqlayout; if ( _orientation == Qt::Vertical ) { - ledlayout = new TQHBoxLayout( sliLayout ); - ledlayout->setAlignment(Qt::AlignVCenter); + ledtqlayout = new TQHBoxLayout( sliLayout ); + ledtqlayout->tqsetAlignment(TQt::AlignVCenter); } else { - ledlayout = new TQVBoxLayout( sliLayout ); - ledlayout->setAlignment(Qt::AlignHCenter); + ledtqlayout = new TQVBoxLayout( sliLayout ); + ledtqlayout->tqsetAlignment(TQt::AlignHCenter); } if( m_mixdevice->hasMute() ) { - ledlayout->addStretch(); + ledtqlayout->addStretch(); // create mute LED - m_muteLED = new KLedButton( Qt::green, KLed::On, KLed::Sunken, + m_muteLED = new KLedButton( TQt::green, KLed::On, KLed::Sunken, KLed::Circular, this, "MuteLED" ); m_muteLED->setFixedSize( TQSize(16, 16) ); m_muteLED->resize( TQSize(16, 16) ); - ledlayout->addWidget( m_muteLED ); + ledtqlayout->addWidget( m_muteLED ); TQToolTip::add( m_muteLED, i18n( "Mute" ) ); connect( m_muteLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(toggleMuted()) ); m_muteLED->installEventFilter( this ); - ledlayout->addStretch(); + ledtqlayout->addStretch(); } // has Mute LED else { // we don't have a MUTE LED. We create a dummy widget - // !! possibly not neccesary any more (we are layouted) + // !! possibly not neccesary any more (we are tqlayouted) TQWidget *qw = new TQWidget(this, "Spacer"); qw->setFixedSize( TQSize(16, 16) ); - ledlayout->addWidget(qw); + ledtqlayout->addWidget(qw); qw->installEventFilter( this ); } // has no Mute LED @@ -253,11 +253,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) TQBoxLayout *volLayout; if ( _orientation == Qt::Vertical ) { volLayout = new TQHBoxLayout( sliLayout ); - volLayout->setAlignment(Qt::AlignVCenter); + volLayout->tqsetAlignment(TQt::AlignVCenter); } else { volLayout = new TQVBoxLayout( sliLayout ); - volLayout->setAlignment(Qt::AlignHCenter); + volLayout->tqsetAlignment(TQt::AlignHCenter); } // Sliders and volume number indication @@ -273,11 +273,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) if ( _orientation == Qt::Vertical ) { slinumLayout = new TQVBoxLayout( volLayout ); - slinumLayout->setAlignment(Qt::AlignHCenter); + slinumLayout->tqsetAlignment(TQt::AlignHCenter); } else { slinumLayout = new TQHBoxLayout( volLayout ); - slinumLayout->setAlignment(Qt::AlignVCenter); + slinumLayout->tqsetAlignment(TQt::AlignVCenter); } // create labels to hold volume values (taken from qamix/kamix) @@ -285,7 +285,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) slinumLayout->addWidget( number ); number->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); number->setLineWidth( 2 ); - number->setMinimumWidth( number->sizeHint().width() ); + number->setMinimumWidth( number->tqsizeHint().width() ); number->setPaletteBackgroundColor( TQColor(190, 250, 190) ); // don't show the value by default number->hide(); @@ -302,7 +302,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) slider = new TQSlider( 0, maxvol, maxvol/10, maxvol - m_mixdevice->getVolume( chid ), _orientation, this, m_mixdevice->name().ascii() ); - slider->setMinimumSize( slider->sizeHint() ); + slider->setMinimumSize( slider->tqsizeHint() ); } slider->setBackgroundOrigin(AncestorOrigin); @@ -314,7 +314,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) slider->hide(); number->hide(); } - slinumLayout->addWidget( slider ); // add to layout + slinumLayout->addWidget( slider ); // add to tqlayout m_sliders.append ( slider ); // add to list _slidersChids.append(chid); // Remember slider-chid association connect( slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(volumeChange(int)) ); @@ -327,44 +327,44 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) sliLayout->addSpacing( 5 ); // --- LED LAYOUT TO CENTER --- - TQBoxLayout *reclayout; + TQBoxLayout *rectqlayout; if ( _orientation == Qt::Vertical ) { - reclayout = new TQHBoxLayout( sliLayout ); - reclayout->setAlignment(Qt::AlignVCenter); + rectqlayout = new TQHBoxLayout( sliLayout ); + rectqlayout->tqsetAlignment(TQt::AlignVCenter); } else { - reclayout = new TQVBoxLayout( sliLayout ); - reclayout->setAlignment(Qt::AlignHCenter); + rectqlayout = new TQVBoxLayout( sliLayout ); + rectqlayout->tqsetAlignment(TQt::AlignHCenter); } if( m_mixdevice->isRecordable() ) { - reclayout->addStretch(); - m_recordLED = new KLedButton( Qt::red, + rectqlayout->addStretch(); + m_recordLED = new KLedButton( TQt::red, m_mixdevice->isRecSource()?KLed::On:KLed::Off, KLed::Sunken, KLed::Circular, this, "RecordLED" ); m_recordLED->setFixedSize( TQSize(16, 16) ); - reclayout->addWidget( m_recordLED ); + rectqlayout->addWidget( m_recordLED ); connect(m_recordLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(setRecsrc(bool))); m_recordLED->installEventFilter( this ); TQToolTip::add( m_recordLED, i18n( "Record" ) ); - reclayout->addStretch(); + rectqlayout->addStretch(); } else { // we don't have a RECORD LED. We create a dummy widget - // !! possibly not neccesary any more (we are layouted) + // !! possibly not neccesary any more (we are tqlayouted) TQWidget *qw = new TQWidget(this, "Spacer"); qw->setFixedSize( TQSize(16, 16) ); - reclayout->addWidget(qw); + rectqlayout->addWidget(qw); qw->installEventFilter( this ); } // has no Record LED } // showRecordLED - layout()->activate(); + tqlayout()->activate(); } -QPixmap +TQPixmap MDWSlider::icon( int icontype ) { TQPixmap miniDevPM; @@ -432,13 +432,13 @@ MDWSlider::setIcon( int icontype ) m_iconLabel->resize( 10, 10 ); } else m_iconLabel->setPixmap( miniDevPM ); - m_iconLabel->setAlignment( Qt::AlignCenter ); + m_iconLabel->tqsetAlignment( TQt::AlignCenter ); } else { kdError(67100) << "Pixmap missing." << endl; } - layout()->activate(); + tqlayout()->activate(); } bool @@ -514,7 +514,7 @@ MDWSlider::setStereoLinked(bool value) if( slider && static_cast<TQSlider *>(slider)->tickmarks() ) setTicks( true ); - layout()->activate(); + tqlayout()->activate(); } @@ -529,7 +529,7 @@ MDWSlider::setLabeled(bool value) else m_label->hide(); - layout()->activate(); + tqlayout()->activate(); } void @@ -558,7 +558,7 @@ MDWSlider::setTicks( bool ticks ) } } - layout()->activate(); + tqlayout()->activate(); } void @@ -579,7 +579,7 @@ MDWSlider::setValueStyle( ValueStyle valueStyle ) } } } - layout()->activate(); + tqlayout()->activate(); } void @@ -592,7 +592,7 @@ MDWSlider::setIcons(bool value) else m_iconLabel->hide(); - layout()->activate(); + tqlayout()->activate(); } } // if it has an icon } @@ -925,7 +925,7 @@ void MDWSlider::showContextMenu() a = _mdwActions->action( "keys" ); if ( a && m_keys ) { - KActionSeparator sep( this ); + KActionSeparator sep( TQT_TQOBJECT(this) ); sep.plug( menu ); a->plug( menu ); } @@ -934,24 +934,24 @@ void MDWSlider::showContextMenu() menu->popup( pos ); } -TQSize MDWSlider::sizeHint() const { +TQSize MDWSlider::tqsizeHint() const { if ( _layout != 0 ) { - return _layout->sizeHint(); + return _layout->tqsizeHint(); } else { - // layout not (yet) created - return TQWidget::sizeHint(); + // tqlayout not (yet) created + return TQWidget::tqsizeHint(); } } /** - * An event filter for the various QWidgets. We watch for Mouse press Events, so + * An event filter for the various TQWidgets. We watch for Mouse press Events, so * that we can popup the context menu. */ bool MDWSlider::eventFilter( TQObject* obj, TQEvent* e ) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent *qme = static_cast<TQMouseEvent*>(e); + TQMouseEvent *qme = TQT_TQMOUSEEVENT(e); if (qme->button() == Qt::RightButton) { showContextMenu(); return true; @@ -959,7 +959,7 @@ bool MDWSlider::eventFilter( TQObject* obj, TQEvent* e ) } // Attention: We don't filter WheelEvents for KSmallSlider, because it handles WheelEvents itself else if ( (e->type() == TQEvent::Wheel) && !obj->isA("KSmallSlider") ) { - TQWheelEvent *qwe = static_cast<TQWheelEvent*>(e); + TQWheelEvent *qwe = TQT_TQWHEELEVENT(e); if (qwe->delta() > 0) { increaseVolume(); } diff --git a/kmix/mdwslider.h b/kmix/mdwslider.h index fad6d983..17836bd1 100644 --- a/kmix/mdwslider.h +++ b/kmix/mdwslider.h @@ -56,12 +56,13 @@ class ViewBase; class MDWSlider : public MixDeviceWidget { Q_OBJECT + TQ_OBJECT public: MDWSlider( Mixer *mixer, MixDevice* md, bool showMuteLED, bool showRecordLED, bool small, Qt::Orientation, - TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); + TQWidget* tqparent = 0, ViewBase* mw = 0, const char* name = 0); ~MDWSlider() {} void addActionToPopup( KAction *action ); @@ -76,7 +77,7 @@ public: void setValueStyle( ValueStyle valueStyle ); void setColors( TQColor high, TQColor low, TQColor back ); void setMutedColors( TQColor high, TQColor low, TQColor back ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; bool eventFilter( TQObject* obj, TQEvent* e ); TQSizePolicy sizePolicy() const; diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp index ee590146..7ee2b1e4 100644 --- a/kmix/mdwswitch.cpp +++ b/kmix/mdwswitch.cpp @@ -47,21 +47,21 @@ */ MDWSwitch::MDWSwitch(Mixer *mixer, MixDevice* md, bool small, Qt::Orientation orientation, - TQWidget* parent, ViewBase* mw, const char* name) : - MixDeviceWidget(mixer,md,small,orientation,parent,mw,name), + TQWidget* tqparent, ViewBase* mw, const char* name) : + MixDeviceWidget(mixer,md,small,orientation,tqparent,mw,name), _label(0) , _labelV(0) , _switchLED(0), _layout(0) { // create actions (on _mdwActions, see MixDeviceWidget) // KStdAction::showMenubar() is in MixDeviceWidget now - new KToggleAction( i18n("&Hide"), 0, this, TQT_SLOT(setDisabled()), _mdwActions, "hide" ); - new KAction( i18n("C&onfigure Shortcuts..."), 0, this, TQT_SLOT(defineKeys()), _mdwActions, "keys" ); + new KToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" ); + new KAction( i18n("C&onfigure Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" ); // create widgets createWidgets(); - m_keys->insert( "Toggle switch", i18n( "Toggle Switch" ), TQString::null, - KShortcut(), KShortcut(), this, TQT_SLOT( toggleSwitch() ) ); + m_keys->insert( "Toggle switch", i18n( "Toggle Switch" ), TQString(), + KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleSwitch() ) ); // The keys are loaded in KMixerWidget::loadConfig, see kmixerwidget.cpp (now: kmixtoolbox.cpp) //m_keys->readSettings(); @@ -79,11 +79,11 @@ void MDWSwitch::createWidgets() { if ( _orientation == Qt::Vertical ) { _layout = new TQVBoxLayout( this ); - _layout->setAlignment(Qt::AlignHCenter); + _layout->tqsetAlignment(TQt::AlignHCenter); } else { _layout = new TQHBoxLayout( this ); - _layout->setAlignment(Qt::AlignVCenter); + _layout->tqsetAlignment(TQt::AlignVCenter); } TQToolTip::add( this, m_mixdevice->name() ); @@ -92,11 +92,11 @@ void MDWSwitch::createWidgets() // --- LEDS -------------------------- if ( _orientation == Qt::Vertical ) { if( m_mixdevice->isRecordable() ) - _switchLED = new KLedButton( Qt::red, + _switchLED = new KLedButton( TQt::red, m_mixdevice->isRecSource()?KLed::On:KLed::Off, KLed::Sunken, KLed::Circular, this, "RecordLED" ); else - _switchLED = new KLedButton( Qt::yellow, KLed::On, KLed::Sunken, KLed::Circular, this, "SwitchLED" ); + _switchLED = new KLedButton( TQt::yellow, KLed::On, KLed::Sunken, KLed::Circular, this, "SwitchLED" ); _switchLED->setFixedSize(16,16); _labelV = new VerticalText( this, m_mixdevice->name().utf8().data() ); @@ -110,11 +110,11 @@ void MDWSwitch::createWidgets() else { if( m_mixdevice->isRecordable() ) - _switchLED = new KLedButton( Qt::red, + _switchLED = new KLedButton( TQt::red, m_mixdevice->isRecSource()?KLed::On:KLed::Off, KLed::Sunken, KLed::Circular, this, "RecordLED" ); else - _switchLED = new KLedButton( Qt::yellow, KLed::On, KLed::Sunken, KLed::Circular, this, "SwitchLED" ); + _switchLED = new KLedButton( TQt::yellow, KLed::On, KLed::Sunken, KLed::Circular, this, "SwitchLED" ); _switchLED->setFixedSize(16,16); _label = new TQLabel(m_mixdevice->name(), this, "SwitchName"); @@ -164,13 +164,13 @@ void MDWSwitch::showContextMenu() menu->popup( pos ); } -TQSize MDWSwitch::sizeHint() const { +TQSize MDWSwitch::tqsizeHint() const { if ( _layout != 0 ) { - return _layout->sizeHint(); + return _layout->tqsizeHint(); } else { - // layout not (yet) created - return TQWidget::sizeHint(); + // tqlayout not (yet) created + return TQWidget::tqsizeHint(); } } @@ -213,13 +213,13 @@ void MDWSwitch::setDisabled( bool value ) { } /** - * An event filter for the various QWidgets. We watch for Mouse press Events, so + * An event filter for the various TQWidgets. We watch for Mouse press Events, so * that we can popup the context menu. */ bool MDWSwitch::eventFilter( TQObject* obj, TQEvent* e ) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent *qme = static_cast<TQMouseEvent*>(e); + TQMouseEvent *qme = TQT_TQMOUSEEVENT(e); if (qme->button() == Qt::RightButton) { showContextMenu(); return true; diff --git a/kmix/mdwswitch.h b/kmix/mdwswitch.h index 3bb5eeab..4e2258ea 100644 --- a/kmix/mdwswitch.h +++ b/kmix/mdwswitch.h @@ -52,15 +52,16 @@ class ViewBase; class MDWSwitch : public MixDeviceWidget { Q_OBJECT + TQ_OBJECT public: MDWSwitch( Mixer *mixer, MixDevice* md, bool small, Qt::Orientation orientation, - TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); + TQWidget* tqparent = 0, ViewBase* mw = 0, const char* name = 0); ~MDWSwitch(); void addActionToPopup( KAction *action ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; void setBackgroundMode(BackgroundMode m); bool eventFilter( TQObject* obj, TQEvent* e ); diff --git a/kmix/mixdevice.cpp b/kmix/mixdevice.cpp index d5c9f9c2..d647488f 100644 --- a/kmix/mixdevice.cpp +++ b/kmix/mixdevice.cpp @@ -71,7 +71,7 @@ MixDevice::MixDevice(const MixDevice &md) : TQObject() } MixDevice::~MixDevice() { - // Clear MixDevices enum Strings (switch on auto-delete, so the QString's inside will be cleared) + // Clear MixDevices enum Strings (switch on auto-delete, so the TQString's inside will be cleared) _enumValues.setAutoDelete(true); _enumValues.clear(); } @@ -123,7 +123,7 @@ TQString& MixDevice::getPK() { void MixDevice::setPK(TQString &PK) { _pk = PK; // The key is used in the config file. It should not contain spaces - _pk.replace(' ', '_'); + _pk.tqreplace(' ', '_'); } /** diff --git a/kmix/mixdevice.h b/kmix/mixdevice.h index 8683ce2b..5dca6d72 100644 --- a/kmix/mixdevice.h +++ b/kmix/mixdevice.h @@ -16,9 +16,10 @@ * They will show whether there are pending changes from both sides. * Updates will be faster and more reliable by this. */ -class MixDevice : public QObject +class MixDevice : public TQObject { Q_OBJECT + TQ_OBJECT public: // For each ChannelType a special icon exists @@ -30,7 +31,7 @@ class MixDevice : public QObject // The DeviceCategory tells the type of the device - // It is used in bitmasks, so you must use values of 2^n . + // It is used in bittqmasks, so you must use values of 2^n . enum DeviceCategory { UNDEFINED= 0x00, SLIDER=0x01, SWITCH=0x02, ENUM=0x04, ALL=0xff }; diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp index b5418303..b7e3b3ce 100644 --- a/kmix/mixdevicewidget.cpp +++ b/kmix/mixdevicewidget.cpp @@ -54,12 +54,12 @@ */ MixDeviceWidget::MixDeviceWidget(Mixer *mixer, MixDevice* md, bool small, Qt::Orientation orientation, - TQWidget* parent, ViewBase* mw, const char* name) : - TQWidget( parent, name ), m_mixer(mixer), m_mixdevice( md ), m_mixerwidget( mw ), + TQWidget* tqparent, ViewBase* mw, const char* name) : + TQWidget( tqparent, name ), m_mixer(mixer), m_mixdevice( md ), m_mixerwidget( mw ), m_disabled( false ), _orientation( orientation ), m_small( small ) { _mdwActions = new KActionCollection( this ); - m_keys = new KGlobalAccel( this, "Keys" ); + m_keys = new KGlobalAccel( TQT_TQOBJECT(this), "Keys" ); } MixDeviceWidget::~MixDeviceWidget() @@ -109,7 +109,7 @@ void MixDeviceWidget::setMutedColors( TQColor , TQColor , TQColor ) { /* is virt void MixDeviceWidget::mousePressEvent( TQMouseEvent *e ) { - if ( e->button()==RightButton ) + if ( e->button()==Qt::RightButton ) showContextMenu(); else { TQWidget::mousePressEvent(e); diff --git a/kmix/mixdevicewidget.h b/kmix/mixdevicewidget.h index d3c533d8..d652a749 100644 --- a/kmix/mixdevicewidget.h +++ b/kmix/mixdevicewidget.h @@ -51,16 +51,17 @@ class Mixer; class ViewBase; class MixDeviceWidget - : public QWidget + : public TQWidget { Q_OBJECT + TQ_OBJECT public: enum ValueStyle { NNONE = 0, NABSOLUTE = 1, NRELATIVE = 2 } ; MixDeviceWidget( Mixer *mixer, MixDevice* md, bool small, Qt::Orientation orientation, - TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); + TQWidget* tqparent = 0, ViewBase* mw = 0, const char* name = 0); ~MixDeviceWidget(); void addActionToPopup( KAction *action ); diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp index 0e7c36fc..67960a53 100644 --- a/kmix/mixer.cpp +++ b/kmix/mixer.cpp @@ -474,7 +474,7 @@ void Mixer::setRecordSource( int devnum, bool on ) MixDevice* Mixer::masterDevice() { - return find( _masterDevicePK ); + return tqfind( _masterDevicePK ); } void Mixer::setMasterDevice(TQString &devPK) @@ -483,7 +483,7 @@ void Mixer::setMasterDevice(TQString &devPK) } -MixDevice* Mixer::find(TQString& devPK) +MixDevice* Mixer::tqfind(TQString& devPK) { MixDevice* md = 0; for( md = _mixerBackend->m_mixDevices.first(); md != 0; md = _mixerBackend->m_mixDevices.next() ) { diff --git a/kmix/mixer.h b/kmix/mixer.h index 80bd24ae..0b6d25c2 100644 --- a/kmix/mixer.h +++ b/kmix/mixer.h @@ -44,6 +44,7 @@ class KConfig; class Mixer : public TQObject, virtual public MixerIface { Q_OBJECT + TQ_OBJECT public: enum MixerError { ERR_PERM=1, ERR_WRITE, ERR_READ, ERR_NODEV, ERR_NOTSUPP, @@ -54,7 +55,7 @@ class Mixer : public TQObject, virtual public MixerIface static int numDrivers(); - MixDevice* find(TQString& devPK); + MixDevice* tqfind(TQString& devPK); void volumeSave( KConfig *config ); void volumeLoad( KConfig *config ); diff --git a/kmix/mixer_alsa9.cpp b/kmix/mixer_alsa9.cpp index effcd006..4037f342 100644 --- a/kmix/mixer_alsa9.cpp +++ b/kmix/mixer_alsa9.cpp @@ -77,7 +77,7 @@ Mixer_ALSA::identify( snd_mixer_selem_id_t *sid ) if ( name == "Master Mono" ) return MixDevice::VOLUME; if ( name == "PC Speaker" ) return MixDevice::VOLUME; if ( name == "Music" || name == "Synth" || name == "FM" ) return MixDevice::MIDI; - if ( name.find( "Headphone", 0, false ) != -1 ) return MixDevice::HEADPHONE; + if ( name.tqfind( "Headphone", 0, false ) != -1 ) return MixDevice::HEADPHONE; if ( name == "Bass" ) return MixDevice::BASS; if ( name == "Treble" ) return MixDevice::TREBLE; if ( name == "CD" ) return MixDevice::CD; @@ -85,14 +85,14 @@ Mixer_ALSA::identify( snd_mixer_selem_id_t *sid ) if ( name == "PCM" || name == "Wave" ) return MixDevice::AUDIO; if ( name == "Surround" ) return MixDevice::SURROUND_BACK; if ( name == "Center" ) return MixDevice::SURROUND_CENTERFRONT; - if ( name.find( "ac97", 0, false ) != -1 ) return MixDevice::AC97; - if ( name.find( "coaxial", 0, false ) != -1 ) return MixDevice::DIGITAL; - if ( name.find( "optical", 0, false ) != -1 ) return MixDevice::DIGITAL; - if ( name.find( "IEC958", 0, false ) != -1 ) return MixDevice::DIGITAL; - if ( name.find( "Mic" ) != -1 ) return MixDevice::MICROPHONE; - if ( name.find( "LFE" ) != -1 ) return MixDevice::SURROUND_LFE; - if ( name.find( "Monitor" ) != -1 ) return MixDevice::RECMONITOR; - if ( name.find( "3D", 0, false ) != -1 ) return MixDevice::SURROUND; // Should be probably some own icon + if ( name.tqfind( "ac97", 0, false ) != -1 ) return MixDevice::AC97; + if ( name.tqfind( "coaxial", 0, false ) != -1 ) return MixDevice::DIGITAL; + if ( name.tqfind( "optical", 0, false ) != -1 ) return MixDevice::DIGITAL; + if ( name.tqfind( "IEC958", 0, false ) != -1 ) return MixDevice::DIGITAL; + if ( name.tqfind( "Mic" ) != -1 ) return MixDevice::MICROPHONE; + if ( name.tqfind( "LFE" ) != -1 ) return MixDevice::SURROUND_LFE; + if ( name.tqfind( "Monitor" ) != -1 ) return MixDevice::RECMONITOR; + if ( name.tqfind( "3D", 0, false ) != -1 ) return MixDevice::SURROUND; // Should be probably some own icon return MixDevice::EXTERNAL; } @@ -115,7 +115,7 @@ Mixer_ALSA::open() // Card information if ((unsigned)m_devnum > 31) m_devnum = -1; - devName = m_devnum == -1 ? "default" : TQString("hw:%1").arg(m_devnum); + devName = m_devnum == -1 ? "default" : TQString("hw:%1").tqarg(m_devnum); TQString probeMessage; @@ -507,7 +507,7 @@ bool Mixer_ALSA::prepareUpdateFromHW() // Poll on fds with 10ms timeout // Hint: alsamixer has an infinite timeout, but we cannot do this because we would block - // the X11 event handling (Qt event loop) with this. + // the X11 event handling (TQt event loop) with this. //kdDebug(67100) << "Mixer_ALSA::prepareUpdate() 3\n"; int finished = poll(m_fds, m_count, 10); //kdDebug(67100) << "Mixer_ALSA::prepareUpdate() 4\n"; @@ -795,7 +795,7 @@ Mixer_ALSA::writeVolumeToHW( int devnum, Volume& volume ) return 0; } -QString +TQString Mixer_ALSA::errorText( int mixer_error ) { TQString l_s_errmsg; @@ -817,7 +817,7 @@ Mixer_ALSA::errorText( int mixer_error ) } -QString +TQString ALSA_getDriverName() { return "ALSA"; diff --git a/kmix/mixer_hpux.cpp b/kmix/mixer_hpux.cpp index 20ef91f3..82e1ad51 100644 --- a/kmix/mixer_hpux.cpp +++ b/kmix/mixer_hpux.cpp @@ -86,31 +86,31 @@ int Mixer_HPUX::open() else { /* Mixer is open. Now define properties */ - stereodevs = devmask = (1<<ID_PCM); /* activate pcm */ - recmask = 0; + stereodevs = devtqmask = (1<<ID_PCM); /* activate pcm */ + rectqmask = 0; /* check Input devices... */ if (AInputSources(audio) & AMonoMicrophoneMask) { - devmask |= (1<<ID_IN_MICROPHONE); - recmask |= (1<<ID_IN_MICROPHONE); + devtqmask |= (1<<ID_IN_MICROPHONE); + rectqmask |= (1<<ID_IN_MICROPHONE); } if (AInputSources(audio) & (ALeftAuxiliaryMask|ARightAuxiliaryMask)) { - devmask |= (1<<ID_IN_AUX); - recmask |= (1<<ID_IN_AUX); + devtqmask |= (1<<ID_IN_AUX); + rectqmask |= (1<<ID_IN_AUX); stereodevs |= (1<<ID_IN_AUX); } /* check Output devices... */ if (AOutputDestinations(audio) & AMonoIntSpeakerMask) { - devmask |= (1<<ID_OUT_INT_SPEAKER); + devtqmask |= (1<<ID_OUT_INT_SPEAKER); stereodevs |= (1<<ID_OUT_INT_SPEAKER); } /* implement later: ---------------- - if (AOutputDestinations(audio) & AMonoLineOutMask) devmask |= 64; // Line - if (AOutputDestinations(audio) & AMonoJackMask) devmask |= (1<<14); // Line1 - if (AOutputDestinations(audio) & AMonoHeadphoneMask) devmask |= (1<<15); // Line2 + if (AOutputDestinations(audio) & AMonoLineOutMask) devtqmask |= 64; // Line + if (AOutputDestinations(audio) & AMonoJackMask) devtqmask |= (1<<14); // Line1 + if (AOutputDestinations(audio) & AMonoHeadphoneMask) devtqmask |= (1<<15); // Line2 */ MaxVolume = 255; diff --git a/kmix/mixer_hpux.h b/kmix/mixer_hpux.h index 410758c9..85892b0f 100644 --- a/kmix/mixer_hpux.h +++ b/kmix/mixer_hpux.h @@ -28,7 +28,7 @@ protected: virtual int close(); Audio *audio; - unsigned int stereodevs,devmask, recmask, MaxVolume, i_recsrc; + unsigned int stereodevs,devtqmask, rectqmask, MaxVolume, i_recsrc; }; diff --git a/kmix/mixer_irix.cpp b/kmix/mixer_irix.cpp index eb407567..4a19e478 100644 --- a/kmix/mixer_irix.cpp +++ b/kmix/mixer_irix.cpp @@ -52,8 +52,8 @@ int Mixer_IRIX::open() } else { // Mixer is open. Now define properties - devmask = 1+128+2048; - recmask = 128; + devtqmask = 1+128+2048; + rectqmask = 128; i_recsrc = 128; stereodevs = 1+128+2048; MaxVolume = 255; diff --git a/kmix/mixer_oss.cpp b/kmix/mixer_oss.cpp index 7fcfb38e..5b51db16 100644 --- a/kmix/mixer_oss.cpp +++ b/kmix/mixer_oss.cpp @@ -108,31 +108,31 @@ int Mixer_OSS::open() } } - int devmask, recmask, i_recsrc, stereodevs; + int devtqmask, rectqmask, i_recsrc, stereodevs; // Mixer is open. Now define properties - if (ioctl(m_fd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) + if (ioctl(m_fd, SOUND_MIXER_READ_DEVMASK, &devtqmask) == -1) return Mixer::ERR_READ; - if (ioctl(m_fd, SOUND_MIXER_READ_RECMASK, &recmask) == -1) + if (ioctl(m_fd, SOUND_MIXER_READ_RECMASK, &rectqmask) == -1) return Mixer::ERR_READ; if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1) return Mixer::ERR_READ; if (ioctl(m_fd, SOUND_MIXER_READ_STEREODEVS, &stereodevs) == -1) return Mixer::ERR_READ; - if (!devmask) + if (!devtqmask) return Mixer::ERR_NODEV; int maxVolume =100; if( m_mixDevices.isEmpty() ) { int idx = 0; - while( devmask && idx < MAX_MIXDEVS ) + while( devtqmask && idx < MAX_MIXDEVS ) { - if( devmask & ( 1 << idx ) ) // device active? + if( devtqmask & ( 1 << idx ) ) // device active? { Volume vol( stereodevs & ( 1 << idx ) ? 2 : 1, maxVolume); readVolumeFromHW( idx, vol ); MixDevice* md = - new MixDevice( idx, vol, recmask & ( 1 << idx ), true, + new MixDevice( idx, vol, rectqmask & ( 1 << idx ), true, MixerDevNames[idx], MixerChannelTypes[idx]); md->setRecSource( isRecsrcHW( idx ) ); @@ -268,7 +268,7 @@ bool Mixer_OSS::setRecsrcHW( int devnum, bool on ) } // PORTING: Hint: Do not forget to set i_recsrc to the new valid - // record source mask. + // record source tqmask. return i_recsrc == oldrecsrc; } @@ -280,7 +280,7 @@ bool Mixer_OSS::isRecsrcHW( int devnum ) if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &recsrcMask) == -1) errormsg(Mixer::ERR_READ); else { - // test if device bit is set in record bit mask + // test if device bit is set in record bit tqmask isRecsrc = ( (recsrcMask & ( 1<<devnum)) != 0 ); } return isRecsrc; diff --git a/kmix/mixer_oss4.cpp b/kmix/mixer_oss4.cpp index 01b167aa..8543915b 100644 --- a/kmix/mixer_oss4.cpp +++ b/kmix/mixer_oss4.cpp @@ -120,7 +120,7 @@ MixDevice::ChannelType Mixer_OSS4::classifyAndRename(TQString &name, int flags) } else if ( (*it).startsWith ( "pcm" ) ) { - (*it).replace ( "pcm","PCM" ); + (*it).tqreplace ( "pcm","PCM" ); cType = MixDevice::AUDIO; } else if ( *it == "src" ) @@ -138,7 +138,7 @@ MixDevice::ChannelType Mixer_OSS4::classifyAndRename(TQString &name, int flags) } if ( (*it).startsWith("vmix") ) { - (*it).replace("vmix","Virtual Mixer"); + (*it).tqreplace("vmix","Virtual Mixer"); cType = MixDevice::VOLUME; } else if ( (*it).endsWith("vol") ) @@ -227,8 +227,8 @@ int Mixer_OSS4::open() TQString name = ext.extname; //skip vmix volume controls and mute controls - if ( (name.find("vmix") > -1 && name.find( "pcm") > -1) || - name.find("mute") > -1 + if ( (name.tqfind("vmix") > -1 && name.tqfind( "pcm") > -1) || + name.tqfind("mute") > -1 #ifdef MIXT_MUTE || (ext.type == MIXT_MUTE) #endif @@ -238,12 +238,12 @@ int Mixer_OSS4::open() } //fix for old legacy names, according to Hannu's suggestions - if ( name.contains('_') ) + if ( name.tqcontains('_') ) { name = name.section('_',1,1).lower(); } - if ( ext.flags & MIXF_RECVOL || ext.flags & MIXF_MONVOL || name.find(".in") > -1 ) + if ( ext.flags & MIXF_RECVOL || ext.flags & MIXF_MONVOL || name.tqfind(".in") > -1 ) { isCapture = true; } diff --git a/kmix/mixer_sun.cpp b/kmix/mixer_sun.cpp index 12806bda..10299add 100644 --- a/kmix/mixer_sun.cpp +++ b/kmix/mixer_sun.cpp @@ -89,7 +89,7 @@ const MixDevice::ChannelType MixerChannelTypes[] = }; // -// Mapping from device numbers to Sun port mask values +// Mapping from device numbers to Sun port tqmask values // const uint_t MixerSunPortMasks[] = { @@ -323,7 +323,7 @@ int Mixer_SUN::writeVolumeToHW( int devnum, Volume &volume ) // // Now, based on the devnum that we are writing to, update the appropriate - // volume field and twiddle the appropriate bitmask to enable/mute the + // volume field and twiddle the appropriate bittqmask to enable/mute the // device as necessary. // switch ( devnum ) diff --git a/kmix/mixertoolbox.cpp b/kmix/mixertoolbox.cpp index 66e0241c..c4953221 100644 --- a/kmix/mixertoolbox.cpp +++ b/kmix/mixertoolbox.cpp @@ -146,16 +146,16 @@ void MixerToolBox::initMixer(TQPtrList<Mixer> &mixers, bool multiDriverMode, TQS * %3, the mixer number, is a number: it does not contain colons. */ TQString mixerName = mixer->mixerName(); - mixerName.replace(":","_"); + mixerName.tqreplace(":","_"); TQString primaryKeyOfMixer = TQString("%1::%2:%3") - .arg(driverName) - .arg(mixerName) - .arg(mixerNums[mixer->mixerName()]); + .tqarg(driverName) + .tqarg(mixerName) + .tqarg(mixerNums[mixer->mixerName()]); // The following 3 replaces are for not messing up the config file - primaryKeyOfMixer.replace("]","_"); - primaryKeyOfMixer.replace("[","_"); // not strictly neccesary, but lets play safe - primaryKeyOfMixer.replace(" ","_"); - primaryKeyOfMixer.replace("=","_"); + primaryKeyOfMixer.tqreplace("]","_"); + primaryKeyOfMixer.tqreplace("[","_"); // not strictly neccesary, but lets play safe + primaryKeyOfMixer.tqreplace(" ","_"); + primaryKeyOfMixer.tqreplace("=","_"); mixer->setID(primaryKeyOfMixer); diff --git a/kmix/verticaltext.cpp b/kmix/verticaltext.cpp index 77bda1af..723cb75b 100644 --- a/kmix/verticaltext.cpp +++ b/kmix/verticaltext.cpp @@ -24,10 +24,10 @@ #include <kdebug.h> -VerticalText::VerticalText(TQWidget * parent, const char * name, WFlags f) : TQWidget(parent,name,f) +VerticalText::VerticalText(TQWidget * tqparent, const char * name, WFlags f) : TQWidget(tqparent,name,f) { - resize(20,100 /*parent->height() */ ); - setMinimumSize(20,10); // neccesary for smooth integration into layouts (we only care for the widths). + resize(20,100 /*tqparent->height() */ ); + setMinimumSize(20,10); // neccesary for smooth integration into tqlayouts (we only care for the widths). } VerticalText::~VerticalText() { @@ -46,7 +46,7 @@ void VerticalText::paintEvent ( TQPaintEvent * /*event*/ ) { paint.drawText( -height()+2, width(), TQString::fromUtf8(name()) ); } -TQSize VerticalText::sizeHint() const { +TQSize VerticalText::tqsizeHint() const { return TQSize(20,100); // !! UGLY. Should be reworked } diff --git a/kmix/verticaltext.h b/kmix/verticaltext.h index f68df4f4..b7f94f4d 100644 --- a/kmix/verticaltext.h +++ b/kmix/verticaltext.h @@ -3,13 +3,13 @@ #include <tqwidget.h> -class VerticalText : public QWidget +class VerticalText : public TQWidget { public: - VerticalText(TQWidget * parent, const char * name, WFlags f = 0); + VerticalText(TQWidget * tqparent, const char * name, WFlags f = 0); ~VerticalText(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSizePolicy sizePolicy () const; protected: diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp index 3948e60e..b26a7374 100644 --- a/kmix/viewapplet.cpp +++ b/kmix/viewapplet.cpp @@ -20,7 +20,7 @@ #include "viewapplet.h" -// Qt +// TQt #include <tqwidget.h> #include <tqlayout.h> #include <tqsize.h> @@ -36,13 +36,13 @@ #include "mdwslider.h" #include "mixer.h" -ViewApplet::ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position position ) - : ViewBase(parent, name, TQString::null, mixer, WStyle_Customize|WStyle_NoBorder, vflags) +ViewApplet::ViewApplet(TQWidget* tqparent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position position ) + : ViewBase(tqparent, name, TQString(), mixer, WStyle_Customize|WStyle_NoBorder, vflags) { setBackgroundOrigin(AncestorOrigin); // remove the menu bar action, that is put by the "ViewBase" constructor in _actions. //KToggleAction *m = static_cast<KToggleAction*>(KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBarSlot()), _actions )); - _actions->remove( KStdAction::showMenubar(this, TQT_SLOT(toggleMenuBarSlot()), _actions) ); + _actions->remove( KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBarSlot()), _actions) ); if ( position == KPanelApplet::pLeft || position == KPanelApplet::pRight ) { @@ -56,11 +56,11 @@ ViewApplet::ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBas if ( _viewOrientation == Qt::Horizontal ) { _layoutMDW = new TQHBoxLayout( this ); - setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); + tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); } else { _layoutMDW = new TQVBoxLayout( this ); - setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); } @@ -118,8 +118,8 @@ TQWidget* ViewApplet::add(MixDevice *md) false, // Show Mute LED false, // Show Record LED true, // Small - sliderOrientation, // Orientation - this, // parent + sliderOrientation, // Qt::Orientation + this, // tqparent this, // View widget md->name().latin1() ); @@ -139,10 +139,10 @@ void ViewApplet::constructionFinished() { } -TQSize ViewApplet::sizeHint() const { - // Basically out main layout knows very good what the sizes should be - TQSize qsz = _layoutMDW->sizeHint(); - //kdDebug(67100) << "ViewApplet::sizeHint(): NewSize is " << qsz << "\n"; +TQSize ViewApplet::tqsizeHint() const { + // Basically out main tqlayout knows very good what the sizes should be + TQSize qsz = _layoutMDW->tqsizeHint(); + //kdDebug(67100) << "ViewApplet::tqsizeHint(): NewSize is " << qsz << "\n"; return qsz; } @@ -196,7 +196,7 @@ void ViewApplet::resizeEvent(TQResizeEvent *qre) // kdDebug(67100) << "ViewApplet::resizeEvent(). SHOULD resize _layoutMDW to " << qre->size() << endl; //TQWidget::resizeEvent(qre); - // resizing changes our own sizeHint(), because we must take the new PanelSize in account. + // resizing changes our own tqsizeHint(), because we must take the new PanelSize in account. // So updateGeometry() is amust for us. updateGeometry(); } @@ -230,7 +230,7 @@ void ViewApplet::refreshVolumeLevels() { void ViewApplet::configurationUpdate() { updateGeometry(); //_layoutMDW->activate(); - constructionFinished(); // contains "_layoutMDW->activate();" + constructionFinished(); // tqcontains "_layoutMDW->activate();" emit appletContentChanged(); kdDebug(67100) << "ViewApplet::configurationUpdate()" << endl; // the following "emit" is only here to be picked up by KMixApplet, because it has to diff --git a/kmix/viewapplet.h b/kmix/viewapplet.h index 80dc417e..9b9e1b9c 100644 --- a/kmix/viewapplet.h +++ b/kmix/viewapplet.h @@ -13,8 +13,9 @@ class Mixer; class ViewApplet : public ViewBase { Q_OBJECT + TQ_OBJECT public: - ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position pos); + ViewApplet(TQWidget* tqparent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position pos); ~ViewApplet(); virtual int count(); @@ -24,7 +25,7 @@ public: virtual void constructionFinished(); virtual void configurationUpdate(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSizePolicy sizePolicy() const; virtual void resizeEvent(TQResizeEvent*); @@ -39,7 +40,7 @@ private: TQBoxLayout* _layoutMDW; // Position of the applet (pLeft, pRight, pTop, pBottom) //KPanelApplet::Position _KMIXposition; - // Orientation of the applet (horizontal or vertical) + // Qt::Orientation of the applet (horizontal or vertical) Qt::Orientation _viewOrientation; }; diff --git a/kmix/viewbase.cpp b/kmix/viewbase.cpp index 5d23860d..b140fce7 100644 --- a/kmix/viewbase.cpp +++ b/kmix/viewbase.cpp @@ -37,8 +37,8 @@ #include "mixer.h" -ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, WFlags f, ViewBase::ViewFlags vflags) - : TQWidget(parent, name, f), _vflags(vflags), _caption(caption) +ViewBase::ViewBase(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, WFlags f, ViewBase::ViewFlags vflags) + : TQWidget(tqparent, name, f), _vflags(vflags), _caption(caption) { _mixer = mixer; _mixSet = new MixSet(); @@ -51,7 +51,7 @@ ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption, // Plug in the "showMenubar" action, if the caller wants it. Typically this is only neccesary for views in the KMix main window. if ( vflags & ViewBase::HasMenuBar ) { - KToggleAction *m = static_cast<KToggleAction*>(KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBarSlot()), _actions )); + KToggleAction *m = static_cast<KToggleAction*>(KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBarSlot()), _actions )); if ( vflags & ViewBase::MenuBarVisible ) { m->setChecked(true); } @@ -59,7 +59,7 @@ ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption, m->setChecked(false); } } - new KAction(i18n("&Channels"), 0, this, TQT_SLOT(configureView()), _actions, "toggle_channels"); + new KAction(i18n("&Channels"), 0, TQT_TQOBJECT(this), TQT_SLOT(configureView()), _actions, "toggle_channels"); connect ( _mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(refreshVolumeLevels()) ); } @@ -112,7 +112,7 @@ void ViewBase::createDeviceWidgets() // ---------- Popup stuff START --------------------- void ViewBase::mousePressEvent( TQMouseEvent *e ) { - if ( e->button()==RightButton ) + if ( e->button()==Qt::RightButton ) showContextMenu(); } diff --git a/kmix/viewbase.h b/kmix/viewbase.h index 581ac39e..d0d4063c 100644 --- a/kmix/viewbase.h +++ b/kmix/viewbase.h @@ -14,9 +14,10 @@ class MixDevice; /** * The ViewBase is a virtual base class, to be used for subclassing the real Mixer Views. */ -class ViewBase : public QWidget +class ViewBase : public TQWidget { Q_OBJECT + TQ_OBJECT public: typedef uint ViewFlags; @@ -31,7 +32,7 @@ public: Experimental_GridView = 0x2000 }; - ViewBase(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, WFlags=0, ViewFlags vflags=0); + ViewBase(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, WFlags=0, ViewFlags vflags=0); virtual ~ViewBase(); // Subclasses must define this method. It is called by the ViewBase() constuctor. diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp index 60289aad..38b942dc 100644 --- a/kmix/viewdockareapopup.cpp +++ b/kmix/viewdockareapopup.cpp @@ -21,7 +21,7 @@ #include "viewdockareapopup.h" -// Qt +// TQt #include <tqwidget.h> #include <tqevent.h> #include <tqlayout.h> @@ -40,15 +40,15 @@ #include "mixer.h" #include "kmixdockwidget.h" -// !! Do NOT remove or mask out "WType_Popup" +// !! Do NOT remove or tqmask out "WType_Popup" // Users will not be able to close the Popup without opening the KMix main window then. // See Bug #93443, #96332 and #96404 for further details. -- esken -ViewDockAreaPopup::ViewDockAreaPopup(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW ) - : ViewBase(parent, name, TQString::null, mixer, WStyle_Customize | WType_Popup | Qt::WStyle_DialogBorder, vflags), _mdw(0), _dock(dockW) +ViewDockAreaPopup::ViewDockAreaPopup(TQWidget* tqparent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW ) + : ViewBase(tqparent, name, TQString(), mixer, WStyle_Customize | WType_Popup | TQt::WStyle_DialogBorder, vflags), _mdw(0), _dock(dockW) { - TQBoxLayout *layout = new TQHBoxLayout( this ); + TQBoxLayout *tqlayout = new TQHBoxLayout( this ); _frame = new TQFrame( this ); - layout->addWidget( _frame ); + tqlayout->addWidget( _frame ); _frame->setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised ); _frame->setLineWidth( 1 ); @@ -70,7 +70,7 @@ void ViewDockAreaPopup::mousePressEvent(TQMouseEvent *) Hide the popup: This should work automatically, when the user clicks outside the bounds of this popup: Alas - it does not work. - Why it does not work, I do not know: this->isPopup() returns "true", so Qt should + Why it does not work, I do not know: this->isPopup() returns "true", so TQt should properly take care of it in TQWidget. */ if ( ! this->hasMouse() ) { @@ -128,7 +128,7 @@ TQWidget* ViewDockAreaPopup::add(MixDevice *md) false, // Show Record LED false, // Small Qt::Vertical, // Direction: only 1 device, so doesn't matter - _frame, // parent + _frame, // tqparent 0, // Is "NULL", so that there is no RMB-popup _dockDevice->name().latin1() ); _layoutMDW->addItem( new TQSpacerItem( 5, 20 ), 0, 2 ); @@ -163,9 +163,9 @@ int ViewDockAreaPopup::advice() { } } -TQSize ViewDockAreaPopup::sizeHint() const { - // kdDebug(67100) << "ViewDockAreaPopup::sizeHint(): NewSize is " << _mdw->sizeHint() << "\n"; - return( _mdw->sizeHint() ); +TQSize ViewDockAreaPopup::tqsizeHint() const { + // kdDebug(67100) << "ViewDockAreaPopup::tqsizeHint(): NewSize is " << _mdw->tqsizeHint() << "\n"; + return( _mdw->tqsizeHint() ); } void ViewDockAreaPopup::constructionFinished() { @@ -173,8 +173,8 @@ void ViewDockAreaPopup::constructionFinished() { _mdw->move(0,0); _mdw->show(); - _mdw->resize(_mdw->sizeHint() ); - resize(sizeHint()); + _mdw->resize(_mdw->tqsizeHint() ); + resize(tqsizeHint()); } diff --git a/kmix/viewdockareapopup.h b/kmix/viewdockareapopup.h index 7f0c1bf1..71100ec1 100644 --- a/kmix/viewdockareapopup.h +++ b/kmix/viewdockareapopup.h @@ -18,8 +18,9 @@ class TQTime; class ViewDockAreaPopup : public ViewBase { Q_OBJECT + TQ_OBJECT public: - ViewDockAreaPopup(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW); + ViewDockAreaPopup(TQWidget* tqparent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW); ~ViewDockAreaPopup(); MixDevice* dockDevice(); @@ -31,7 +32,7 @@ public: virtual void refreshVolumeLevels(); virtual void showContextMenu(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; bool justHidden(); protected: diff --git a/kmix/viewgrid.cpp b/kmix/viewgrid.cpp index 59f03906..360953f8 100644 --- a/kmix/viewgrid.cpp +++ b/kmix/viewgrid.cpp @@ -21,7 +21,7 @@ #include "viewgrid.h" -// Qt +// TQt #include <tqwidget.h> // KDE @@ -35,8 +35,8 @@ /** */ -ViewGrid::ViewGrid(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) - : ViewBase(parent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) +ViewGrid::ViewGrid(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) + : ViewBase(tqparent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) { m_spacingHorizontal = 5; m_spacingVertical = 5; @@ -88,8 +88,8 @@ TQWidget* ViewGrid::add(MixDevice *md) mdw = new MDWEnum( _mixer, // the mixer for this device md, // MixDevice (parameter) - orientation, // Orientation - this, // parent + orientation, // Qt::Orientation + this, // tqparent this, // View widget md->name().latin1() ); @@ -101,8 +101,8 @@ TQWidget* ViewGrid::add(MixDevice *md) _mixer, // the mixer for this device md, // MixDevice (parameter) false, // Small - orientation, // Orientation - this, // parent + orientation, // Qt::Orientation + this, // tqparent this, // View widget md->name().latin1() ); @@ -117,8 +117,8 @@ TQWidget* ViewGrid::add(MixDevice *md) true, // Show Mute LED true, // Show Record LED false, // Small - orientation, // Orientation - this, // parent + orientation, // Qt::Orientation + this, // tqparent this, // View widget md->name().latin1() ); @@ -126,23 +126,23 @@ TQWidget* ViewGrid::add(MixDevice *md) return mdw; } -TQSize ViewGrid::sizeHint() const { - // kdDebug(67100) << "ViewGrid::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n"; - return( m_sizeHint); +TQSize ViewGrid::tqsizeHint() const { + // kdDebug(67100) << "ViewGrid::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n"; + return( m_tqsizeHint); } void ViewGrid::constructionFinished() { //_layoutMDW->activate(); - // do a manual layout + // do a manual tqlayout configurationUpdate(); } void ViewGrid::refreshVolumeLevels() { // kdDebug(67100) << "ViewGrid::refreshVolumeLevels()\n"; - m_sizeHint.setWidth (0); - m_sizeHint.setHeight(0); + m_tqsizeHint.setWidth (0); + m_tqsizeHint.setHeight(0); m_testingX = 0; m_testingY = 0; @@ -178,12 +178,12 @@ void ViewGrid::refreshVolumeLevels() { } /** - This implementation makes sure the Grid's geometry is updated + This implementation makes sure the Grid's tqgeometry is updated after hiding/showing channels. */ void ViewGrid::configurationUpdate() { - m_sizeHint.setWidth (0); - m_sizeHint.setHeight(0); + m_tqsizeHint.setWidth (0); + m_tqsizeHint.setHeight(0); m_testingX = 0; m_testingY = 0; @@ -195,9 +195,9 @@ void ViewGrid::configurationUpdate() { int xPos = m_testingX * m_spacingHorizontal; int yPos = m_testingY * m_spacingVertical ; mdw->move( xPos, yPos ); - mdw->resize( mdw->sizeHint() ); - int xMax = xPos + mdw->width() ; if ( xMax > m_sizeHint.width() ) m_sizeHint.setWidth(xMax); - int yMax = yPos + mdw->height(); if ( yMax > m_sizeHint.height() ) m_sizeHint.setHeight(yMax); + mdw->resize( mdw->tqsizeHint() ); + int xMax = xPos + mdw->width() ; if ( xMax > m_tqsizeHint.width() ) m_tqsizeHint.setWidth(xMax); + int yMax = yPos + mdw->height(); if ( yMax > m_tqsizeHint.height() ) m_tqsizeHint.setHeight(yMax); m_testingX += 5; if ( m_testingX > 50 ) { diff --git a/kmix/viewgrid.h b/kmix/viewgrid.h index 94b03446..d0608794 100644 --- a/kmix/viewgrid.h +++ b/kmix/viewgrid.h @@ -11,8 +11,9 @@ class Mixer; class ViewGrid : public ViewBase { Q_OBJECT + TQ_OBJECT public: - ViewGrid(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); + ViewGrid(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ~ViewGrid(); virtual int count(); @@ -22,7 +23,7 @@ public: virtual void configurationUpdate(); virtual void constructionFinished(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; public slots: virtual void refreshVolumeLevels(); @@ -32,7 +33,7 @@ private: unsigned int m_spacingVertical; // m_maxX and m_maxY are the highest coordiantes encountered - TQSize m_sizeHint; + TQSize m_tqsizeHint; unsigned int m_testingX; unsigned int m_testingY; diff --git a/kmix/viewinput.cpp b/kmix/viewinput.cpp index eeadc61b..fa6f06e3 100644 --- a/kmix/viewinput.cpp +++ b/kmix/viewinput.cpp @@ -25,8 +25,8 @@ #include "mixer.h" #include "mixdevicewidget.h" -ViewInput::ViewInput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) - : ViewSliders(parent, name, caption, mixer, vflags) +ViewInput::ViewInput(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) + : ViewSliders(tqparent, name, caption, mixer, vflags) { init(); connect ( _mixer, TQT_SIGNAL(newRecsrc()) , this, TQT_SLOT(refreshVolumeLevels()) ); // only the input widget has record sources diff --git a/kmix/viewinput.h b/kmix/viewinput.h index aa28c7d8..03aa101f 100644 --- a/kmix/viewinput.h +++ b/kmix/viewinput.h @@ -8,8 +8,9 @@ class Mixer; class ViewInput : public ViewSliders { Q_OBJECT + TQ_OBJECT public: - ViewInput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); + ViewInput(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ~ViewInput(); virtual void setMixSet(MixSet *mixset); diff --git a/kmix/viewoutput.cpp b/kmix/viewoutput.cpp index 9550b1d1..6340291b 100644 --- a/kmix/viewoutput.cpp +++ b/kmix/viewoutput.cpp @@ -25,8 +25,8 @@ #include "mixer.h" #include "mixdevicewidget.h" -ViewOutput::ViewOutput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) - : ViewSliders(parent, name, caption, mixer, vflags) +ViewOutput::ViewOutput(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) + : ViewSliders(tqparent, name, caption, mixer, vflags) { init(); } diff --git a/kmix/viewoutput.h b/kmix/viewoutput.h index d39c8680..9f3866dd 100644 --- a/kmix/viewoutput.h +++ b/kmix/viewoutput.h @@ -8,8 +8,9 @@ class Mixer; class ViewOutput : public ViewSliders { Q_OBJECT + TQ_OBJECT public: - ViewOutput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); + ViewOutput(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ~ViewOutput(); virtual void setMixSet(MixSet *mixset); diff --git a/kmix/viewsliders.cpp b/kmix/viewsliders.cpp index 80142f5c..1191f202 100644 --- a/kmix/viewsliders.cpp +++ b/kmix/viewsliders.cpp @@ -21,7 +21,7 @@ #include "viewsliders.h" -// Qt +// TQt #include <tqlayout.h> #include <tqwidget.h> @@ -37,8 +37,8 @@ * correctly because init() does not get called. * See ViewInput and ViewOutput for "real" implementations. */ -ViewSliders::ViewSliders(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) - : ViewBase(parent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) +ViewSliders::ViewSliders(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) + : ViewBase(tqparent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) { if ( _vflags & ViewBase::Vertical ) { _layoutMDW = new TQVBoxLayout(this); @@ -93,8 +93,8 @@ TQWidget* ViewSliders::add(MixDevice *md) true, // Show Mute LED true, // Show Record LED false, // Small - orientation, // Orientation - this, // parent + orientation, // Qt::Orientation + this, // tqparent this, // View widget md->name().latin1() ); @@ -102,9 +102,9 @@ TQWidget* ViewSliders::add(MixDevice *md) return mdw; } -TQSize ViewSliders::sizeHint() const { - // kdDebug(67100) << "ViewSliders::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n"; - return( _layoutMDW->sizeHint() ); +TQSize ViewSliders::tqsizeHint() const { + // kdDebug(67100) << "ViewSliders::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n"; + return( _layoutMDW->tqsizeHint() ); } void ViewSliders::constructionFinished() { diff --git a/kmix/viewsliders.h b/kmix/viewsliders.h index c4c0c3d2..c078fb8c 100644 --- a/kmix/viewsliders.h +++ b/kmix/viewsliders.h @@ -10,8 +10,9 @@ class Mixer; class ViewSliders : public ViewBase { Q_OBJECT + TQ_OBJECT public: - ViewSliders(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); + ViewSliders(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ~ViewSliders(); virtual int count(); @@ -20,7 +21,7 @@ public: virtual TQWidget* add(MixDevice *mdw); virtual void constructionFinished(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; public slots: virtual void refreshVolumeLevels(); diff --git a/kmix/viewsurround.cpp b/kmix/viewsurround.cpp index 02a7aace..7e653b32 100644 --- a/kmix/viewsurround.cpp +++ b/kmix/viewsurround.cpp @@ -21,7 +21,7 @@ #include "viewsurround.h" -// Qt +// TQt #include <tqlabel.h> #include <tqlayout.h> #include <tqwidget.h> @@ -39,8 +39,8 @@ * Demonstration verion of a "surround view" * Not really usable right now. */ -ViewSurround::ViewSurround(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) - : ViewBase(parent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) +ViewSurround::ViewSurround(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) + : ViewBase(tqparent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) { _mdSurroundFront = 0; _mdSurroundBack = 0; @@ -135,26 +135,26 @@ TQWidget* ViewSurround::add(MixDevice *md) switch ( md->type() ) { case MixDevice::VOLUME: - _layoutSurround->addWidget(mdw ,0,0, Qt::AlignBottom | Qt::AlignLeft); + _layoutSurround->addWidget(mdw ,0,0, TQt::AlignBottom | TQt::AlignLeft); break; case MixDevice::SURROUND_BACK: - _layoutSurround->addWidget(mdw ,2,0, Qt::AlignTop | Qt::AlignLeft); + _layoutSurround->addWidget(mdw ,2,0, TQt::AlignTop | TQt::AlignLeft); break; case MixDevice::SURROUND_LFE: - _layoutSurround->addWidget(mdw,1,3, Qt::AlignVCenter | Qt::AlignRight ); break; + _layoutSurround->addWidget(mdw,1,3, TQt::AlignVCenter | TQt::AlignRight ); break; break; case MixDevice::SURROUND_CENTERFRONT: - _layoutSurround->addWidget(mdw,0,2, Qt::AlignTop | Qt::AlignHCenter); break; + _layoutSurround->addWidget(mdw,0,2, TQt::AlignTop | TQt::AlignHCenter); break; break; case MixDevice::SURROUND_CENTERBACK: - _layoutSurround->addWidget(mdw,2,2, Qt::AlignBottom | Qt::AlignHCenter); break; + _layoutSurround->addWidget(mdw,2,2, TQt::AlignBottom | TQt::AlignHCenter); break; break; case MixDevice::SURROUND: case MixDevice::AC97: default: - // Add as slider to the layout on the left side + // Add as slider to the tqlayout on the left side _layoutSliders->add(mdw); break; } // switch(type) @@ -162,9 +162,9 @@ TQWidget* ViewSurround::add(MixDevice *md) return mdw; } -TQSize ViewSurround::sizeHint() const { - // kdDebug(67100) << "ViewSurround::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n"; - return( _layoutMDW->sizeHint() ); +TQSize ViewSurround::tqsizeHint() const { + // kdDebug(67100) << "ViewSurround::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n"; + return( _layoutMDW->tqsizeHint() ); } void ViewSurround::constructionFinished() { @@ -180,39 +180,39 @@ void ViewSurround::constructionFinished() { // rear speaker support in this sound card rowOfSpeaker = 1; } - _layoutSurround->addWidget(personLabel ,rowOfSpeaker, 2, Qt::AlignHCenter | Qt::AlignVCenter); + _layoutSurround->addWidget(personLabel ,rowOfSpeaker, 2, TQt::AlignHCenter | TQt::AlignVCenter); if ( _mdSurroundFront != 0 ) { MixDeviceWidget *mdw = createMDW(_mdSurroundFront, true, Qt::Vertical); - _layoutSurround->addWidget(mdw,0,4, Qt::AlignBottom | Qt::AlignRight); + _layoutSurround->addWidget(mdw,0,4, TQt::AlignBottom | TQt::AlignRight); _mdws.append(mdw); TQLabel* speakerIcon = new TQLabel("Speaker", this); icon = UserIcon( "SpeakerFrontLeft" ); if ( ! icon.isNull()) speakerIcon->setPixmap(icon); - _layoutSurround->addWidget(speakerIcon,0,1, Qt::AlignTop | Qt::AlignLeft); + _layoutSurround->addWidget(speakerIcon,0,1, TQt::AlignTop | TQt::AlignLeft); speakerIcon = new TQLabel("Speaker", this); icon = UserIcon( "SpeakerFrontRight" ); if ( ! icon.isNull()) speakerIcon->setPixmap(icon); - _layoutSurround->addWidget(speakerIcon,0,3, Qt::AlignTop | Qt::AlignRight); + _layoutSurround->addWidget(speakerIcon,0,3, TQt::AlignTop | TQt::AlignRight); } if ( _mdSurroundBack != 0 ) { MixDeviceWidget *mdw = createMDW(_mdSurroundBack, true, Qt::Vertical); - _layoutSurround->addWidget(mdw,2,4, Qt::AlignTop | Qt::AlignRight); + _layoutSurround->addWidget(mdw,2,4, TQt::AlignTop | TQt::AlignRight); _mdws.append(mdw); TQLabel* speakerIcon = new TQLabel("Speaker", this); icon = UserIcon( "SpeakerRearLeft" ); if ( ! icon.isNull()) speakerIcon->setPixmap(icon); - _layoutSurround->addWidget(speakerIcon,2,1, Qt::AlignBottom | Qt::AlignLeft); + _layoutSurround->addWidget(speakerIcon,2,1, TQt::AlignBottom | TQt::AlignLeft); speakerIcon = new TQLabel("Speaker", this); icon = UserIcon( "SpeakerRearRight" ); if ( ! icon.isNull()) speakerIcon->setPixmap(icon); - _layoutSurround->addWidget(speakerIcon,2,3, Qt::AlignBottom | Qt::AlignRight); + _layoutSurround->addWidget(speakerIcon,2,3, TQt::AlignBottom | TQt::AlignRight); } @@ -259,8 +259,8 @@ MixDeviceWidget* ViewSurround::createMDW(MixDevice *md, bool small, Qt::Orientat false, // Show Mute LED false, // Show Record LED small, // Small - orientation, // Orientation - this, // parent + orientation, // Qt::Orientation + this, // tqparent this, // View widget md->name().latin1() ); diff --git a/kmix/viewsurround.h b/kmix/viewsurround.h index 6690d35a..d0bc3c4e 100644 --- a/kmix/viewsurround.h +++ b/kmix/viewsurround.h @@ -13,8 +13,9 @@ class Mixer; class ViewSurround : public ViewBase { Q_OBJECT + TQ_OBJECT public: - ViewSurround(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); + ViewSurround(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ~ViewSurround(); virtual int count(); @@ -23,7 +24,7 @@ public: virtual TQWidget* add(MixDevice *mdw); virtual void constructionFinished(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; public slots: virtual void refreshVolumeLevels(); diff --git a/kmix/viewswitches.cpp b/kmix/viewswitches.cpp index 15b555ac..cf5ac958 100644 --- a/kmix/viewswitches.cpp +++ b/kmix/viewswitches.cpp @@ -31,8 +31,8 @@ #include "mdwenum.h" #include "mixer.h" -ViewSwitches::ViewSwitches(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) - : ViewBase(parent, name, caption, mixer, 0, vflags) +ViewSwitches::ViewSwitches(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) + : ViewBase(tqparent, name, caption, mixer, 0, vflags) { // Create switch buttonGroup if ( _vflags & ViewBase::Vertical ) { @@ -46,7 +46,7 @@ ViewSwitches::ViewSwitches(TQWidget* parent, const char* name, const TQString & // Place enums right from the switches: This is done, so that there will be no // ugly space on the left side, when no Switch is shown. // Actually it is not really clear yet, why there is empty space at all: There are 0 items in - // the _layoutEnum, so it might be a sizeHint() or some other subtle layout issue. + // the _layoutEnum, so it might be a tqsizeHint() or some other subtle tqlayout issue. _layoutEnum = new TQVBoxLayout(_layoutMDW); } init(); @@ -92,8 +92,8 @@ TQWidget* ViewSwitches::add(MixDevice *md) mdw = new MDWEnum( _mixer, // the mixer for this device md, // MixDevice (parameter) - orientation, // Orientation - this, // parent + orientation, // Qt::Orientation + this, // tqparent this, // View widget md->name().latin1() ); @@ -107,8 +107,8 @@ TQWidget* ViewSwitches::add(MixDevice *md) _mixer, // the mixer for this device md, // MixDevice (parameter) false, // Small - orientation, // Orientation - this, // parent + orientation, // Qt::Orientation + this, // tqparent this, // View widget md->name().latin1() ); @@ -118,9 +118,9 @@ TQWidget* ViewSwitches::add(MixDevice *md) return mdw; } -TQSize ViewSwitches::sizeHint() const { - //kdDebug(67100) << "ViewSwitches::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n"; - return( _layoutMDW->sizeHint() ); +TQSize ViewSwitches::tqsizeHint() const { + //kdDebug(67100) << "ViewSwitches::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n"; + return( _layoutMDW->tqsizeHint() ); } void ViewSwitches::constructionFinished() { diff --git a/kmix/viewswitches.h b/kmix/viewswitches.h index 0946ab8a..39b81f40 100644 --- a/kmix/viewswitches.h +++ b/kmix/viewswitches.h @@ -10,8 +10,9 @@ class Mixer; class ViewSwitches : public ViewBase { Q_OBJECT + TQ_OBJECT public: - ViewSwitches(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); + ViewSwitches(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ~ViewSwitches(); virtual int count(); @@ -21,7 +22,7 @@ public: virtual void constructionFinished(); virtual void configurationUpdate(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; public slots: virtual void refreshVolumeLevels(); diff --git a/kmix/volume.cpp b/kmix/volume.cpp index 99dd180b..d2eb4314 100644 --- a/kmix/volume.cpp +++ b/kmix/volume.cpp @@ -34,9 +34,9 @@ int Volume::_channelMaskEnum[10] = MCUSTOM1, MCUSTOM2 }; -Volume::Volume( ChannelMask chmask, long maxVolume, long minVolume, bool isCapture ) +Volume::Volume( ChannelMask chtqmask, long maxVolume, long minVolume, bool isCapture ) { - init(chmask, maxVolume, minVolume, isCapture); + init(chtqmask, maxVolume, minVolume, isCapture); } @@ -56,22 +56,22 @@ Volume::Volume( int channels, long maxVolume ) { Volume::Volume( const Volume &v ) { - _chmask = v._chmask; + _chtqmask = v._chtqmask; _maxVolume = v._maxVolume; _minVolume = v._minVolume; _muted = v._muted; _isCapture = v._isCapture; - setVolume(v, (ChannelMask)v._chmask); + setVolume(v, (ChannelMask)v._chtqmask); // kdDebug(67100) << "Volume::copy-constructor initialized " << v << "\n"; } -void Volume::init( ChannelMask chmask, long maxVolume, long minVolume, bool isCapture ) +void Volume::init( ChannelMask chtqmask, long maxVolume, long minVolume, bool isCapture ) { for ( int i=0; i<= Volume::CHIDMAX; i++ ) { _volumes[i] = 0; } - _chmask = chmask; + _chtqmask = chtqmask; _maxVolume = maxVolume; _minVolume = minVolume; _isCapture = isCapture; @@ -82,7 +82,7 @@ void Volume::init( ChannelMask chmask, long maxVolume, long minVolume, bool isCa void Volume::setAllVolumes(long vol) { for ( int i=0; i<= Volume::CHIDMAX; i++ ) { - if ( (_channelMaskEnum[i]) & _chmask ) { + if ( (_channelMaskEnum[i]) & _chtqmask ) { // we are supposed to set it _volumes[i] = volrange(vol); } @@ -106,17 +106,17 @@ void Volume::setVolume( ChannelID chid, long vol) */ void Volume::setVolume(const Volume &v) { - setVolume(v, (ChannelMask)(v._chmask&_chmask) ); + setVolume(v, (ChannelMask)(v._chtqmask&_chtqmask) ); } /** * Copy the volume elements contained in v to this Volume object. * Only those elments are copied, that are supported in BOTH Volume objects - * and match the ChannelMask given by chmask. + * and match the ChannelMask given by chtqmask. */ -void Volume::setVolume(const Volume &v, ChannelMask chmask) { +void Volume::setVolume(const Volume &v, ChannelMask chtqmask) { for ( int i=0; i<= Volume::CHIDMAX; i++ ) { - if ( _channelMaskEnum[i] & _chmask & (int)chmask ) { + if ( _channelMaskEnum[i] & _chtqmask & (int)chtqmask ) { // we are supposed to copy it _volumes[i] = volrange(v._volumes[i]); } @@ -149,8 +149,8 @@ long Volume::getVolume(ChannelID chid) { } else { // check if channel is supported - int chmask = _channelMaskEnum[chid]; - if ( (chmask & _chmask) != 0 ) { + int chtqmask = _channelMaskEnum[chid]; + if ( (chtqmask & _chtqmask) != 0 ) { // channel is supported vol = _volumes[chid]; } @@ -162,11 +162,11 @@ long Volume::getVolume(ChannelID chid) { return vol; } -long Volume::getAvgVolume(ChannelMask chmask) { +long Volume::getAvgVolume(ChannelMask chtqmask) { int avgVolumeCounter = 0; long long sumOfActiveVolumes = 0; for ( int i=0; i<= Volume::CHIDMAX; i++ ) { - if ( (_channelMaskEnum[i] & _chmask) & (int)chmask ) { + if ( (_channelMaskEnum[i] & _chtqmask) & (int)chtqmask ) { avgVolumeCounter++; sumOfActiveVolumes += _volumes[i]; } @@ -180,10 +180,10 @@ long Volume::getAvgVolume(ChannelMask chmask) { return (long)sumOfActiveVolumes; } -long Volume::getTopStereoVolume(ChannelMask chmask) { +long Volume::getTopStereoVolume(ChannelMask chtqmask) { long long topVolumeCount = 0; for ( int i=0; i<= Volume::CHIDMAX; i++ ) { - if ( (_channelMaskEnum[i] & _chmask) & (int)chmask ) { + if ( (_channelMaskEnum[i] & _chtqmask) & (int)chtqmask ) { if ( topVolumeCount < _volumes[i] ) topVolumeCount = _volumes[i]; } @@ -194,7 +194,7 @@ long Volume::getTopStereoVolume(ChannelMask chmask) { int Volume::count() { int counter = 0; for ( int i=0; i<= Volume::CHIDMAX; i++ ) { - if ( _channelMaskEnum[i] & _chmask ) { + if ( _channelMaskEnum[i] & _chtqmask ) { counter++; } } @@ -225,7 +225,7 @@ std::ostream& operator<<(std::ostream& os, const Volume& vol) { if ( i != 0 ) { os << ","; } - if ( Volume::_channelMaskEnum[i] & vol._chmask ) { + if ( Volume::_channelMaskEnum[i] & vol._chtqmask ) { // supported channel: Print Volume os << vol._volumes[i]; } @@ -248,7 +248,7 @@ kdbgstream& operator<<(kdbgstream &os, const Volume& vol) { if ( i != 0 ) { os << ","; } - if ( Volume::_channelMaskEnum[i] & vol._chmask ) { + if ( Volume::_channelMaskEnum[i] & vol._chtqmask ) { // supported channel: Print Volume os << vol._volumes[i]; } diff --git a/kmix/volume.h b/kmix/volume.h index 9051ed0c..a731ad59 100644 --- a/kmix/volume.h +++ b/kmix/volume.h @@ -27,7 +27,7 @@ class Volume CUSTOM1 = 8, CUSTOM2 = 9, CHIDMAX = 9 }; - Volume( ChannelMask chmask = MALL, long maxVolume = 100, long minVolume=0, bool isCapture=false ); + Volume( ChannelMask chtqmask = MALL, long maxVolume = 100, long minVolume=0, bool isCapture=false ); Volume( const Volume &v ); Volume( int channels, long maxVolume ); @@ -37,13 +37,13 @@ class Volume void setAllVolumes(long vol); // Set all volumes to the ones given in vol void setVolume(const Volume &vol ); - // Set volumes as specified by the channel mask - void setVolume( const Volume &vol, ChannelMask chmask); + // Set volumes as specified by the channel tqmask + void setVolume( const Volume &vol, ChannelMask chtqmask); void setVolume( ChannelID chid, long volume); long getVolume(ChannelID chid); - long getAvgVolume(ChannelMask chmask); - long getTopStereoVolume(ChannelMask chmask); + long getAvgVolume(ChannelMask chtqmask); + long getTopStereoVolume(ChannelMask chtqmask); long operator[](int); long maxVolume(); long minVolume(); @@ -61,13 +61,13 @@ class Volume static int _channelMaskEnum[10]; bool _muted; bool _isCapture; // true, when the Volume represents capture/record levels - long _chmask; + long _chtqmask; long _volumes[CHIDMAX+1]; long _maxVolume; long _minVolume; private: - void init( ChannelMask chmask, long, long, bool ); + void init( ChannelMask chtqmask, long, long, bool ); long volrange( int vol ); long volrangeRec( int vol ); diff --git a/krec/krecconfig_files.h b/krec/krecconfig_files.h index f8f78691..0d610aab 100644 --- a/krec/krecconfig_files.h +++ b/krec/krecconfig_files.h @@ -29,6 +29,7 @@ class KRecConfigFilesWidget; class KRecConfigFiles : public KCModule { Q_OBJECT + TQ_OBJECT public: KRecConfigFiles( TQWidget*, const char* =0, const TQStringList& = TQStringList() ); ~KRecConfigFiles(); diff --git a/krec/krecconfig_fileswidget.cpp b/krec/krecconfig_fileswidget.cpp index 206eda1b..36e4521b 100644 --- a/krec/krecconfig_fileswidget.cpp +++ b/krec/krecconfig_fileswidget.cpp @@ -119,12 +119,12 @@ void KRecConfigFilesWidget::defaults() { } void KRecConfigFilesWidget::ratechanged( int index ) { - if ( _ratebox->find( index ) == _rateother ) _rateotherbox->setEnabled( true ); + if ( _ratebox->tqfind( index ) == _rateother ) _rateotherbox->setEnabled( true ); else _rateotherbox->setEnabled( false ); - if ( _ratebox->find( index ) == _rate48 ) _samplingRate = 48000; - if ( _ratebox->find( index ) == _rate44 ) _samplingRate = 44100; - if ( _ratebox->find( index ) == _rate22 ) _samplingRate = 22050; - if ( _ratebox->find( index ) == _rate11 ) _samplingRate = 11025; + if ( _ratebox->tqfind( index ) == _rate48 ) _samplingRate = 48000; + if ( _ratebox->tqfind( index ) == _rate44 ) _samplingRate = 44100; + if ( _ratebox->tqfind( index ) == _rate22 ) _samplingRate = 22050; + if ( _ratebox->tqfind( index ) == _rate11 ) _samplingRate = 11025; emit sRateChanged( _samplingRate ); } void KRecConfigFilesWidget::rateotherchanged( const TQString& text ) { @@ -132,13 +132,13 @@ void KRecConfigFilesWidget::rateotherchanged( const TQString& text ) { emit sRateChanged( _samplingRate ); } void KRecConfigFilesWidget::channelschanged( int index ) { - if ( _channelsbox->find( index ) == _channels2 ) _channels = 2; - if ( _channelsbox->find( index ) == _channels1 ) _channels = 1; + if ( _channelsbox->tqfind( index ) == _channels2 ) _channels = 2; + if ( _channelsbox->tqfind( index ) == _channels1 ) _channels = 1; emit sChannelsChanged( _channels ); } void KRecConfigFilesWidget::bitschanged( int index ) { - if ( _bitsbox->find( index ) == _bits16 ) _bits = 16; - if ( _bitsbox->find( index ) == _bits8 ) _bits = 8; + if ( _bitsbox->tqfind( index ) == _bits16 ) _bits = 16; + if ( _bitsbox->tqfind( index ) == _bits8 ) _bits = 8; emit sBitsChanged( _bits ); } diff --git a/krec/krecconfig_fileswidget.h b/krec/krecconfig_fileswidget.h index 458f0395..53064846 100644 --- a/krec/krecconfig_fileswidget.h +++ b/krec/krecconfig_fileswidget.h @@ -29,6 +29,7 @@ class TQLabel; class KRecConfigFilesWidget : public TQVBox { Q_OBJECT + TQ_OBJECT public: KRecConfigFilesWidget( TQWidget*, const char* =0 ); ~KRecConfigFilesWidget(); diff --git a/krec/krecconfigure.cpp b/krec/krecconfigure.cpp index c29d6b4a..65cb7497 100644 --- a/krec/krecconfigure.cpp +++ b/krec/krecconfigure.cpp @@ -87,13 +87,13 @@ KRecConfigGeneral::KRecConfigGeneral( TQWidget* p, const char*, const TQStringLi _tipofday = new TQCheckBox( i18n( "Show tip of the day at startup" ), this ); connect( _tipofday, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( tipofdaychanged( bool ) ) ); _layout->addWidget( _tipofday ); - TQBoxLayout* _tmplayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); + TQBoxLayout* _tmptqlayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); _enableAllMessages = new KPushButton( i18n( "Enable All Hidden Messages" ), this ); connect( _enableAllMessages, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableallmessagesclicked() ) ); - _tmplayout->addWidget( _enableAllMessages ); + _tmptqlayout->addWidget( _enableAllMessages ); TQLabel* _tmplbl = new TQLabel( i18n( "<qt><i>All messages with the \"Don't show this message again\" option are shown again after selecting this button.</i></qt>" ), this ); - _tmplayout->addWidget( _tmplbl ); - _layout->addLayout( _tmplayout ); + _tmptqlayout->addWidget( _tmplbl ); + _layout->addLayout( _tmptqlayout ); _layout->addStretch( 100 ); @@ -151,17 +151,17 @@ void KRecConfigGeneral::defaults() { void KRecConfigGeneral::displaychanged( int index ) { int verbose = _displaymode / 100; - if ( _displaybox->find( index ) == _display0 ) _displaymode = 0 + verbose * 100; - if ( _displaybox->find( index ) == _display1 ) _displaymode = 1 + verbose * 100; - if ( _displaybox->find( index ) == _display2 ) _displaymode = 2 + verbose * 100; - if ( _displaybox->find( index ) == _display3 ) _displaymode = 3 + verbose * 100; + if ( _displaybox->tqfind( index ) == _display0 ) _displaymode = 0 + verbose * 100; + if ( _displaybox->tqfind( index ) == _display1 ) _displaymode = 1 + verbose * 100; + if ( _displaybox->tqfind( index ) == _display2 ) _displaymode = 2 + verbose * 100; + if ( _displaybox->tqfind( index ) == _display3 ) _displaymode = 3 + verbose * 100; emit changed( true ); } void KRecConfigGeneral::framebasechanged( int index ) { - if ( _framebasebox->find( index ) == _framebase30 ) _framebase = 30; - if ( _framebasebox->find( index ) == _framebase25 ) _framebase = 25; - if ( _framebasebox->find( index ) == _framebase75 ) _framebase = 75; - if ( _framebasebox->find( index ) == _framebaseother ) { + if ( _framebasebox->tqfind( index ) == _framebase30 ) _framebase = 30; + if ( _framebasebox->tqfind( index ) == _framebase25 ) _framebase = 25; + if ( _framebasebox->tqfind( index ) == _framebase75 ) _framebase = 75; + if ( _framebasebox->tqfind( index ) == _framebaseother ) { _framebaseotherbox->setEnabled( true ); _framebase = _framebaseotherline->text().toInt(); kdDebug(60005) << k_funcinfo << "Framebase=" << _framebase << endl; diff --git a/krec/krecconfigure.h b/krec/krecconfigure.h index db061f2b..97c43fce 100644 --- a/krec/krecconfigure.h +++ b/krec/krecconfigure.h @@ -29,6 +29,7 @@ class KPushButton; class KRecConfigGeneral : public KCModule { Q_OBJECT + TQ_OBJECT public: KRecConfigGeneral( TQWidget*, const char* =0, const TQStringList& = TQStringList() ); ~KRecConfigGeneral(); diff --git a/krec/krecexport_template.cpp b/krec/krecexport_template.cpp index 3569268d..cfd5388c 100644 --- a/krec/krecexport_template.cpp +++ b/krec/krecexport_template.cpp @@ -70,17 +70,17 @@ kdDebug( 60005 ) << k_funcinfo << endl; emit running( running() ); } -Q_INT16 KRecExportItem::read16( char* array, int index ) { - Q_INT16 tmp; +TQ_INT16 KRecExportItem::read16( char* array, int index ) { + TQ_INT16 tmp; tmp = array[ index ] + ( array[ index + 1 ] << 8 ) & 0xff; return tmp; } /// Helper: writes an integer into an char* formated for wave-files -void KRecExportItem::write16( char* array, Q_INT16 value, int index ) { +void KRecExportItem::write16( char* array, TQ_INT16 value, int index ) { array[ index ] = ( value >> 0 ) & 0xff; array[ index + 1 ] = ( value >> 8 ) & 0xff; } -void KRecExportItem::write32( char* array, Q_INT32 value, int index ) { +void KRecExportItem::write32( char* array, TQ_INT32 value, int index ) { write16( array, value, index ); array[ index + 2 ] = ( value >> 16 ) & 0xff; array[ index + 3 ] = ( value >> 24 ) & 0xff; diff --git a/krec/krecexport_template.h b/krec/krecexport_template.h index aac9dac2..e41b7d85 100644 --- a/krec/krecexport_template.h +++ b/krec/krecexport_template.h @@ -31,6 +31,7 @@ */ class KRecExportItem : public TQObject { Q_OBJECT + TQ_OBJECT private: /// Controls wether an export is running, or not... bool _running; @@ -48,9 +49,9 @@ protected: int channels() const; /// Helpers for reading and writing to an char-array - Q_INT16 read16( char* array, int index ); - void write16( char* array, Q_INT16 value, int index ); - void write32( char* array, Q_INT32 value, int index ); + TQ_INT16 read16( char* array, int index ); + void write16( char* array, TQ_INT16 value, int index ); + void write32( char* array, TQ_INT32 value, int index ); public: ~KRecExportItem(); diff --git a/krec/krecexport_wave.h b/krec/krecexport_wave.h index 6390eb48..3fc4b865 100644 --- a/krec/krecexport_wave.h +++ b/krec/krecexport_wave.h @@ -21,6 +21,7 @@ class TQFile; class KRecExport_Wave : public KRecExportItem { Q_OBJECT + TQ_OBJECT public: KRecExport_Wave( TQObject*, const char* =0, const TQStringList& =0 ); ~KRecExport_Wave(); diff --git a/krec/krecfile.cpp b/krec/krecfile.cpp index a588d126..9004b211 100644 --- a/krec/krecfile.cpp +++ b/krec/krecfile.cpp @@ -37,7 +37,7 @@ void KRecFile::init() { _pos = 0; _size = 0; - _filename = TQString::null; + _filename = TQString(); _currentBuffer = 0; _dir = new KTempDir(); _config = new KSimpleConfig( _dir->name()+"project.rc", false ); @@ -76,7 +76,7 @@ KRecFile::KRecFile( const TQString &filename, TQObject* p, const char* n ) KTar *tar = new KTar( _filename, "application/x-gzip" ); tar->open( IO_ReadOnly ); - int i=0; while ( _filename.find( '/', i ) != -1 ) i++; // Find last '/' + int i=0; while ( _filename.tqfind( '/', i ) != -1 ) i++; // Find last '/' TQString basename = _filename.right( _filename.length()-i ); basename = basename.left( basename.length()-5 ); @@ -94,7 +94,7 @@ KRecFile::KRecFile( const TQString &filename, TQObject* p, const char* n ) _config->setGroup( "File-" + TQString::number( i ) ); newBuffer( KRecBuffer::fromConfig( _config, _dir->qDir(), this ) ); } - KRecGlobal::the()->message( i18n( "\'%1\' loaded." ).arg( filename ) ); + KRecGlobal::the()->message( i18n( "\'%1\' loaded." ).tqarg( filename ) ); delete tar; @@ -155,7 +155,7 @@ void KRecFile::save( const TQString &fname ) { KTar *tar = new KTar( tmpname, "application/x-gzip" ); tar->open( IO_WriteOnly ); - int i=0; while ( fname.find( '/', i ) != -1 ) i++; // Find last '/' + int i=0; while ( fname.tqfind( '/', i ) != -1 ) i++; // Find last '/' TQString basename = fname.right( fname.length()-i ); if ( basename.endsWith( ".krec" ) ) basename = basename.left( basename.length()-5 ); @@ -168,7 +168,7 @@ void KRecFile::save( const TQString &fname ) { delete tar; KIO::file_move( tmpname, filetosave, -1, true, false, true ); - KRecGlobal::the()->message( i18n( "Saving \"%1\" was successful." ).arg( filename() ) ); + KRecGlobal::the()->message( i18n( "Saving \"%1\" was successful." ).tqarg( filename() ) ); _saved = true; } @@ -263,7 +263,7 @@ void KRecFile::newBuffer( KRecBuffer* buffer ) { connect( buffer, TQT_SIGNAL( deleteSelf( KRecBuffer* ) ), this, TQT_SLOT( deleteBuffer( KRecBuffer* ) ) ); _buffers.append( buffer ); newSize( buffer, buffer->size() ); - _currentBuffer = _buffers.findIndex( buffer ); + _currentBuffer = _buffers.tqfindIndex( buffer ); emit sNewBuffer( buffer ); _saved = false; } @@ -295,7 +295,7 @@ KRecBuffer* KRecFile::getTopBuffer_buffer( int pos ) { return out; } int KRecFile::getTopBuffer_int( int pos ) { - return _buffers.findIndex( getTopBuffer_buffer( pos ) ); + return _buffers.tqfindIndex( getTopBuffer_buffer( pos ) ); } @@ -309,7 +309,7 @@ KRecBuffer::KRecBuffer( const TQString &filename, int startpos, bool a, KRecFile , _active( a ) , _pos( 0 ), _start( startpos ) , _title( _fileinfo->fileName() ) - , _comment( TQString::null ) + , _comment( TQString() ) { kdDebug( 60005 ) << k_funcinfo << filename << " " << startpos << endl; _open = _file->open( IO_Raw | IO_ReadWrite ); @@ -343,7 +343,7 @@ KRecBuffer* KRecBuffer::fromConfig( KConfig* config, TQDir* dir, KRecFile* p, co config->readBoolEntry( "Activated", true ), p, n ); tmp->setTitle( config->readEntry( "Title", tmp->filename() ) ); - tmp->setComment( config->readEntry( "Comment", TQString::null ) ); + tmp->setComment( config->readEntry( "Comment", TQString() ) ); return tmp; } @@ -429,13 +429,13 @@ void KRecBuffer::setActive( bool n ) { } void KRecBuffer::deleteBuffer() { - if ( KMessageBox::warningContinueCancel( KRecGlobal::the()->mainWidget(), i18n( "Do you really want to delete the selected part '%1'?" ).arg( filename() ), i18n("Delete Part?"), KStdGuiItem::del() ) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel( KRecGlobal::the()->mainWidget(), i18n( "Do you really want to delete the selected part '%1'?" ).tqarg( filename() ), i18n("Delete Part?"), KStdGuiItem::del() ) == KMessageBox::Continue ) _krecfile->deleteBuffer( this ); } float KRecBuffer::getSample( int pos, int /*channel*/ ) { - Q_INT16 tmp16; - Q_INT8 tmp8; + TQ_INT16 tmp16; + TQ_INT8 tmp8; float out; _file->at( _krecfile->samplesToOffset( pos ) ); if ( _krecfile->bits() == 16 ) { diff --git a/krec/krecfile.h b/krec/krecfile.h index 895a6a6d..b9b9bb64 100644 --- a/krec/krecfile.h +++ b/krec/krecfile.h @@ -28,6 +28,7 @@ class KRecFileViewWidget; class KRecFile : virtual public TQObject { Q_OBJECT + TQ_OBJECT friend class KRecFileWidget; public: KRecFile( TQObject*, const char* =0 ); @@ -125,6 +126,7 @@ class TQDataStream; class KRecBuffer : virtual public TQObject { Q_OBJECT + TQ_OBJECT public: KRecBuffer( const TQString &, int, bool, KRecFile*, const char* =0 ); ~KRecBuffer(); diff --git a/krec/krecfileview.cpp b/krec/krecfileview.cpp index 42911620..a5a989d8 100644 --- a/krec/krecfileview.cpp +++ b/krec/krecfileview.cpp @@ -77,7 +77,7 @@ kdDebug( 60005 ) << k_funcinfo << file << endl; } else { disconnect( this, TQT_SLOT( setPos( TQIODevice::Offset ) ) ); _filename->setText( i18n( "<no file>" ) ); - _timedisplay->newFilename( TQString::null ); + _timedisplay->newFilename( TQString() ); } } } diff --git a/krec/krecfileview.h b/krec/krecfileview.h index de47d0f4..bd2c39da 100644 --- a/krec/krecfileview.h +++ b/krec/krecfileview.h @@ -29,6 +29,7 @@ class KRecTimeDisplay; class KRecFileView : virtual public TQWidget { Q_OBJECT + TQ_OBJECT public: KRecFileView( TQWidget*, const char* =0 ); ~KRecFileView(); diff --git a/krec/krecfileviewhelpers.cpp b/krec/krecfileviewhelpers.cpp index a064dfea..26acdb2a 100644 --- a/krec/krecfileviewhelpers.cpp +++ b/krec/krecfileviewhelpers.cpp @@ -64,12 +64,12 @@ void KRecTimeBar::mouseReleaseEvent( TQMouseEvent* qme ) { void KRecTimeBar::newPos( int n ) { _pos = n; - repaint(); + tqrepaint(); } void KRecTimeBar::newSize( int n ) { _size = n; - repaint(); + tqrepaint(); } @@ -216,10 +216,10 @@ TQString KRecTimeDisplay::formatTime( const int mode, const int sample ) const { void KRecTimeDisplay::timeContextMenu( TQPopupMenu* menu ) { if ( !_filename.isNull() ) { menu->insertSeparator( 0 ); - menu->insertItem( i18n( "kByte: %1" ).arg( formatTime( 3, _posvalue ) ), -1, 0 ); - menu->insertItem( i18n( "[h:]m:s.f %1" ).arg( formatTime( 2, _posvalue ) ), -1, 0 ); - menu->insertItem( i18n( "[h:]m:s.s %1" ).arg( formatTime( 1, _posvalue ) ), -1, 0 ); - menu->insertItem( i18n( "%1 Samples" ).arg( formatTime( 0, _posvalue ) ), -1, 0 ); + menu->insertItem( i18n( "kByte: %1" ).tqarg( formatTime( 3, _posvalue ) ), -1, 0 ); + menu->insertItem( i18n( "[h:]m:s.f %1" ).tqarg( formatTime( 2, _posvalue ) ), -1, 0 ); + menu->insertItem( i18n( "[h:]m:s.s %1" ).tqarg( formatTime( 1, _posvalue ) ), -1, 0 ); + menu->insertItem( i18n( "%1 Samples" ).tqarg( formatTime( 0, _posvalue ) ), -1, 0 ); KPopupTitle *tmp = new KPopupTitle( menu ); tmp->setTitle( i18n( "Position" ) ); menu->insertItem( tmp, -1, 0 ); @@ -235,10 +235,10 @@ void KRecTimeDisplay::timeContextMenu( const TQPoint &point ) { void KRecTimeDisplay::sizeContextMenu( TQPopupMenu* menu ) { if ( !_filename.isNull() ) { menu->insertSeparator( 0 ); - menu->insertItem( i18n( "kByte: %1" ).arg( formatTime( 3, _sizevalue ) ), -1, 0 ); - menu->insertItem( i18n( "[h:]m:s.f %1" ).arg( formatTime( 2, _sizevalue ) ), -1, 0 ); - menu->insertItem( i18n( "[h:]m:s.s %1" ).arg( formatTime( 1, _sizevalue ) ), -1, 0 ); - menu->insertItem( i18n( "%1 Samples" ).arg( formatTime( 0, _sizevalue ) ), -1, 0 ); + menu->insertItem( i18n( "kByte: %1" ).tqarg( formatTime( 3, _sizevalue ) ), -1, 0 ); + menu->insertItem( i18n( "[h:]m:s.f %1" ).tqarg( formatTime( 2, _sizevalue ) ), -1, 0 ); + menu->insertItem( i18n( "[h:]m:s.s %1" ).tqarg( formatTime( 1, _sizevalue ) ), -1, 0 ); + menu->insertItem( i18n( "%1 Samples" ).tqarg( formatTime( 0, _sizevalue ) ), -1, 0 ); KPopupTitle *tmp = new KPopupTitle( menu ); tmp->setTitle( i18n( "Size" ) ); menu->insertItem( tmp, -1, 0 ); @@ -255,10 +255,10 @@ void KRecTimeDisplay::jumpToTime() { } TQString KRecTimeDisplay::positionText( int m, int n ) { - return i18n( "Position: %1" ).arg( formatTime( m,n ) ); + return i18n( "Position: %1" ).tqarg( formatTime( m,n ) ); } TQString KRecTimeDisplay::sizeText( int m, int n ) { - return i18n( "Size: %1" ).arg( formatTime( m,n ) ); + return i18n( "Size: %1" ).tqarg( formatTime( m,n ) ); } void AKLabel::mousePressEvent( TQMouseEvent* qme ) { diff --git a/krec/krecfileviewhelpers.h b/krec/krecfileviewhelpers.h index bd78c4d6..865d96fd 100644 --- a/krec/krecfileviewhelpers.h +++ b/krec/krecfileviewhelpers.h @@ -27,6 +27,7 @@ class KPopupMenu; class KRecTimeBar : public TQFrame { Q_OBJECT + TQ_OBJECT public: KRecTimeBar( TQWidget*, const char* =0 ); ~KRecTimeBar(); @@ -56,6 +57,7 @@ private: class KRecTimeDisplay : public TQFrame { Q_OBJECT + TQ_OBJECT public: KRecTimeDisplay( TQWidget*, const char* =0 ); ~KRecTimeDisplay(); @@ -92,6 +94,7 @@ private: class AKLabel : public TQLabel { Q_OBJECT + TQ_OBJECT public: AKLabel( TQWidget* p, const char* n=0, WFlags f=0 ) : TQLabel( p, n, f ) { init(); } AKLabel( const TQString& s, TQWidget* p, const char* n=0, WFlags f=0 ) : TQLabel( s, p, n, f ) { init(); } diff --git a/krec/krecfilewidgets.cpp b/krec/krecfilewidgets.cpp index 16f2db93..075a2151 100644 --- a/krec/krecfilewidgets.cpp +++ b/krec/krecfilewidgets.cpp @@ -64,8 +64,8 @@ kdDebug( 60005 ) << k_funcinfo << file << endl; for ( TQValueList<KRecBuffer*>::iterator it = _file->_buffers.begin(); it != _file->_buffers.end(); ++it ) { newBuffer( ( *it ) ); } - connect( _file, TQT_SIGNAL( sNewBuffer( KRecBuffer* ) ), this, TQT_SLOT( newBuffer( KRecBuffer* ) ) ); - connect( _file, TQT_SIGNAL( sDeleteBuffer( KRecBuffer* ) ), this, TQT_SLOT( deleteBuffer( KRecBuffer* ) ) ); + connect( _file, TQT_SIGNAL( sNewBuffer( KRecBuffer* ) ), TQT_TQOBJECT(this), TQT_SLOT( newBuffer( KRecBuffer* ) ) ); + connect( _file, TQT_SIGNAL( sDeleteBuffer( KRecBuffer* ) ), TQT_TQOBJECT(this), TQT_SLOT( deleteBuffer( KRecBuffer* ) ) ); //kdDebug( 60005 ) << _file->_currentBuffer << endl; } } @@ -98,7 +98,7 @@ void KRecFileWidget::mouseReleaseEvent( TQMouseEvent* qme ) { void KRecFileWidget::newBuffer( KRecBuffer* buffer ) { //kdDebug( 60005 ) << k_funcinfo << buffer << endl; KRecBufferWidget *tmp = new KRecBufferWidget( buffer, this ); - connect( tmp, TQT_SIGNAL( popupMenu( KRecBufferWidget*, TQPoint ) ), this, TQT_SLOT( popupMenu( KRecBufferWidget*, TQPoint ) ) ); + connect( tmp, TQT_SIGNAL( popupMenu( KRecBufferWidget*, TQPoint ) ), TQT_TQOBJECT(this), TQT_SLOT( popupMenu( KRecBufferWidget*, TQPoint ) ) ); bufferwidgets.append( tmp ); tmp->show(); resizeEvent(); @@ -119,12 +119,12 @@ void KRecFileWidget::deleteBuffer( KRecBuffer* buffer ) { void KRecFileWidget::popupMenu( KRecBufferWidget* bw, TQPoint pos ) { KPopupMenu tmp( this ); - KToggleAction* _activeaction = new KToggleAction( i18n( "Toggle Active/Disabled State" ), KShortcut(), this ); + KToggleAction* _activeaction = new KToggleAction( i18n( "Toggle Active/Disabled State" ), KShortcut(), TQT_TQOBJECT(this) ); _activeaction->setChecked( bw->buffer()->active() ); connect( _activeaction, TQT_SIGNAL( toggled( bool ) ), bw->buffer(), TQT_SLOT( setActive( bool ) ) ); - KAction* _removeaction = new KAction( i18n( "Remove This Part" ), "fileremove", KShortcut(), bw->buffer(), TQT_SLOT( deleteBuffer() ), this ); - KAction* _changetitle = new KAction( i18n( "Change Title of This Part" ), KShortcut(), bw, TQT_SLOT( changeTitle() ), this ); - KAction* _changecomment = new KAction( i18n( "Change Comment of This Part" ), KShortcut(), bw, TQT_SLOT( changeComment() ), this ); + KAction* _removeaction = new KAction( i18n( "Remove This Part" ), "fileremove", KShortcut(), bw->buffer(), TQT_SLOT( deleteBuffer() ), TQT_TQOBJECT(this) ); + KAction* _changetitle = new KAction( i18n( "Change Title of This Part" ), KShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeTitle() ), TQT_TQOBJECT(this) ); + KAction* _changecomment = new KAction( i18n( "Change Comment of This Part" ), KShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeComment() ), TQT_TQOBJECT(this) ); _activeaction->plug( &tmp ); _changetitle->plug( &tmp ); _changecomment->plug( &tmp ); @@ -147,7 +147,7 @@ KRecBufferWidget::KRecBufferWidget( KRecBuffer* buffer, TQWidget* p, const char* , _main_region( 0 ), _title_region( 0 ), _fileend_region( 0 ) , alreadyreadsize( 0 ) { - connect( _buffer, TQT_SIGNAL( somethingChanged() ), this, TQT_SLOT( update() ) ); + connect( _buffer, TQT_SIGNAL( somethingChanged() ), TQT_TQOBJECT(this), TQT_SLOT( update() ) ); kdDebug( 60005 ) << k_funcinfo << endl; } KRecBufferWidget::~KRecBufferWidget() { @@ -189,19 +189,19 @@ void KRecBufferWidget::initLayout() { void KRecBufferWidget::drawFrame( TQPainter* p ) { //kdDebug( 60005 ) << k_funcinfo << endl; if ( _buffer->active() ) - p->setBrush( colorGroup().highlight() ); + p->setBrush( tqcolorGroup().highlight() ); else - p->setBrush( colorGroup().highlight().dark() ); - p->setPen( TQPen( colorGroup().dark(), 1 ) ); + p->setBrush( tqcolorGroup().highlight().dark() ); + p->setPen( TQPen( tqcolorGroup().dark(), 1 ) ); p->drawRect( _title_region->boundingRect() ); p->drawRect( _fileend_region->boundingRect() ); p->setBrush( TQBrush() ); - p->setPen( TQPen( colorGroup().dark(), 1 ) ); + p->setPen( TQPen( tqcolorGroup().dark(), 1 ) ); p->drawRect( _main_region->boundingRect() ); - p->setPen( TQPen( colorGroup().highlightedText() ) ); - p->drawText( _title_region->boundingRect(), Qt::AlignCenter, _buffer->title() ); + p->setPen( TQPen( tqcolorGroup().highlightedText() ) ); + p->drawText( _title_region->boundingRect(), TQt::AlignCenter, _buffer->title() ); } void KRecBufferWidget::drawContents( TQPainter* p ) { @@ -220,7 +220,7 @@ void KRecBufferWidget::drawContents( TQPainter* p ) { p->setPen( TQPen( TQColor( 0,0,0 ) ) ); TQString comment = _buffer->comment(); if ( comment.isNull() ) comment = i18n( "Lots of Data" ); - p->drawText( _main_region->boundingRect(), Qt::AlignCenter, comment ); + p->drawText( _main_region->boundingRect(), TQt::AlignCenter, comment ); } void KRecBufferWidget::paintEvent( TQPaintEvent* ) { initLayout(); @@ -232,12 +232,12 @@ void KRecBufferWidget::paintEvent( TQPaintEvent* ) { void KRecBufferWidget::mousePressEvent( TQMouseEvent* qme ) { kdDebug( 60005 ) << k_funcinfo << endl; - if ( _main_region->contains( qme->pos() ) || _title_region->contains( qme->pos() ) ) + if ( _main_region->tqcontains( qme->pos() ) || _title_region->tqcontains( qme->pos() ) ) if ( qme->button() == Qt::RightButton ) emit popupMenu( this, qme->globalPos() ); } void KRecBufferWidget::mouseDoubleClickEvent( TQMouseEvent* qme ) { - if ( _title_region->contains( qme->pos() ) ) + if ( _title_region->tqcontains( qme->pos() ) ) _buffer->setActive( !_buffer->active() ); } diff --git a/krec/krecfilewidgets.h b/krec/krecfilewidgets.h index e183474b..9be59d50 100644 --- a/krec/krecfilewidgets.h +++ b/krec/krecfilewidgets.h @@ -37,6 +37,7 @@ class KToggleAction; class KRecFileWidget : public TQFrame { Q_OBJECT + TQ_OBJECT public: KRecFileWidget( KRecFile*, TQWidget*, const char* =0 ); ~KRecFileWidget(); @@ -57,6 +58,7 @@ private: class Sample : public TQObject { Q_OBJECT + TQ_OBJECT public: Sample() : _values( 0 ), _min( 0 ), _max( 0 ) {} @@ -75,6 +77,7 @@ private: class KRecBufferWidget : public TQFrame { Q_OBJECT + TQ_OBJECT public: KRecBufferWidget( KRecBuffer*, TQWidget*, const char* =0 ); ~KRecBufferWidget(); diff --git a/krec/krecglobal.cpp b/krec/krecglobal.cpp index 58822f50..e3d8c71b 100644 --- a/krec/krecglobal.cpp +++ b/krec/krecglobal.cpp @@ -58,7 +58,7 @@ void KRecGlobal::message( const TQString &text ) { if ( _statusbar ) _statusbar- bool KRecGlobal::registerExport( KRecExportItem* item ) { //kdDebug( 60005 ) << k_funcinfo << "About to register ExportItem for \"" << item->exportFormat() << "\" extensions:\"" << item->extensions() << "\"" << endl; - if ( !the()->_exports->find( item->exportFormat() ) ) { + if ( !the()->_exports->tqfind( item->exportFormat() ) ) { the()->_exports->insert( item->exportFormat(), item ); the()->_exportformats << item->exportFormat(); } @@ -66,7 +66,7 @@ bool KRecGlobal::registerExport( KRecExportItem* item ) { } KRecExportItem* KRecGlobal::getExportItem( const TQString &exportFormat ) { - KRecExportItem *tmp = _exports->find( exportFormat ); + KRecExportItem *tmp = _exports->tqfind( exportFormat ); return tmp->newItem(); } diff --git a/krec/krecglobal.h b/krec/krecglobal.h index 102dc3f8..698ab0a0 100644 --- a/krec/krecglobal.h +++ b/krec/krecglobal.h @@ -27,6 +27,7 @@ class KRecExportItem; class KRecGlobal : public TQObject { Q_OBJECT + TQ_OBJECT private: KRecGlobal( TQObject* =0, const char* =0 ); ~KRecGlobal(); @@ -45,7 +46,7 @@ public: /** * Returns a pointer to the mainwidget. * Usefull to display Messageboxes, etc correctly without beeing a - * TQWidget or knowing about a parent TQWidget. + * TQWidget or knowing about a tqparent TQWidget. */ TQWidget* mainWidget(); diff --git a/krec/krecnewproperties.cpp b/krec/krecnewproperties.cpp index 12d386ed..56ec7228 100644 --- a/krec/krecnewproperties.cpp +++ b/krec/krecnewproperties.cpp @@ -34,8 +34,8 @@ #include <klocale.h> KRecNewProperties::KRecNewProperties( TQWidget* p, const char* n ) - : TQDialog( p,n, 0, Qt::WType_Dialog|Qt::WStyle_Customize|Qt::WStyle_DialogBorder ) - , _filename( TQString::null ) + : TQDialog( p,n, 0, TQt::WType_Dialog|TQt::WStyle_Customize|TQt::WStyle_DialogBorder ) + , _filename( TQString() ) , _samplerate( 44100 ), _channels( 2 ), _bits( 16 ) { kdDebug( 60005 ) << k_funcinfo << endl; @@ -53,7 +53,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; labelfont.setPointSize( labelfont.pointSize()*3/2 ); captionlabel->setFont( labelfont ); captionlabel->setText( i18n( "Properties for the new File" ) ); - captionlabel->setAlignment( AlignCenter ); + captionlabel->tqsetAlignment( AlignCenter ); _layout->addWidget( captionlabel ); _filewidget = new KRecConfigFilesWidget( this ); @@ -74,7 +74,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; _layout->addWidget( new KSeparator( KSeparator::HLine, this ) ); _layout->addWidget( _btnWidget ); - setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); + tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); } KRecNewProperties::~KRecNewProperties() { kdDebug( 60005 ) << k_funcinfo << endl; diff --git a/krec/krecnewproperties.h b/krec/krecnewproperties.h index 886ffdef..2bd6cc06 100644 --- a/krec/krecnewproperties.h +++ b/krec/krecnewproperties.h @@ -28,6 +28,7 @@ class KRecConfigFilesWidget; class KRecNewProperties : public TQDialog { Q_OBJECT + TQ_OBJECT public: KRecNewProperties( TQWidget*, const char* =0 ); ~KRecNewProperties(); diff --git a/krec/krecord.cpp b/krec/krecord.cpp index 3bd18c72..2ff21e34 100644 --- a/krec/krecord.cpp +++ b/krec/krecord.cpp @@ -119,7 +119,7 @@ void KRecPrivate::saveFile() { } void KRecPrivate::saveAsFile() { //kdDebug( 60005 ) << k_funcinfo << endl; - if ( _currentFile ) pSaveFile( TQString::null ); + if ( _currentFile ) pSaveFile( TQString() ); } void KRecPrivate::pSaveFile( const TQString &filename ) { if ( !_currentFile ) @@ -138,7 +138,7 @@ bool KRecPrivate::closeFile() { //kdDebug( 60005 ) << k_funcinfo << endl; if ( _currentFile ) { if ( !_currentFile->saved() ) { - int choice = KMessageBox::questionYesNoCancel( _impl, i18n( "The document \"%1\" has been modified.\nDo you want to save it?" ).arg( _currentFile->filename() ), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() ); + int choice = KMessageBox::questionYesNoCancel( _impl, i18n( "The document \"%1\" has been modified.\nDo you want to save it?" ).tqarg( _currentFile->filename() ), TQString(), KStdGuiItem::save(), KStdGuiItem::discard() ); if ( choice == KMessageBox::Yes ) saveFile(); if ( choice == KMessageBox::Cancel ) return false; // go on if KMessageBox::No @@ -156,7 +156,7 @@ void KRecPrivate::exportFile() { if ( _currentFile ) { TQString filename = KFileDialog::getSaveFileName( "", KRecGlobal::the()->exportFormatEndings(), _impl, "Export File As" ); if ( !filename.isNull() ) { - int lastdot = filename.find( '.', -5 ); + int lastdot = filename.tqfind( '.', -5 ); TQString ending = filename.right( filename.length()-lastdot-1 ); _exportitem = KRecGlobal::the()->getExportItemForEnding( ending ); if ( _exportitem ) { @@ -164,7 +164,7 @@ void KRecPrivate::exportFile() { if ( _exportitem->initialize( filename ) ) { connect( _exportitem, TQT_SIGNAL( getData( TQByteArray& ) ), _currentFile, TQT_SLOT( getData( TQByteArray& ) ) ); connect( _currentFile, TQT_SIGNAL( endReached() ), _exportitem, TQT_SLOT( stop() ) ); - connect( _currentFile, TQT_SIGNAL( endReached() ), this, TQT_SLOT( endExportFile() ) ); + connect( _currentFile, TQT_SIGNAL( endReached() ), TQT_TQOBJECT(this), TQT_SLOT( endExportFile() ) ); _exportitem->start(); } } else @@ -179,13 +179,13 @@ void KRecPrivate::exportFile() { "you did everything right, please file a bugreport saying what " \ "you where about to do and please quote the following line:<br />" \ "%1</li>" \ - "</ul></qt>" ).arg( KRecGlobal::the()->exportFormatEndings() ), + "</ul></qt>" ).tqarg( KRecGlobal::the()->exportFormatEndings() ), i18n( "Could not determine encodingmethod" ) ); } } else KRecGlobal::the()->message( i18n( "There is nothing to export." ) ); checkActions(); } -void KRecPrivate::endExportFile() { TQTimer::singleShot( 20, this, TQT_SLOT( endExportFile2() ) ); } +void KRecPrivate::endExportFile() { TQTimer::singleShot( 20, TQT_TQOBJECT(this), TQT_SLOT( endExportFile2() ) ); } void KRecPrivate::endExportFile2() { _exportitem->finalize(); disconnect( _currentFile, 0, _exportitem, 0 ); @@ -248,7 +248,7 @@ void KRecPrivate::toEnd() { } void KRecPrivate::forceTipOfDay() { - KTipDialog::showTip( _impl, TQString::null, true ); + KTipDialog::showTip( _impl, TQString(), true ); } void KRecPrivate::execaRtsControl() { @@ -264,12 +264,12 @@ void KRecPrivate::execKMix() { */ -KRecord::KRecord(TQWidget *parent, const char *name ) - : KMainWindow(parent,name) +KRecord::KRecord(TQWidget *tqparent, const char *name ) + : KMainWindow(tqparent,name) , d( new KRecPrivate( this ) ) { kdDebug( 60005 ) << k_funcinfo << endl; - //kdDebug( 60005 )<<"KRecord::KRecord( TQWidget *"<<parent<<", const char* "<<name<<" )"<<endl; // (DEBUG) + //kdDebug( 60005 )<<"KRecord::KRecord( TQWidget *"<<tqparent<<", const char* "<<name<<" )"<<endl; // (DEBUG) KRecGlobal::the()->setMainWidget( this ); KRecGlobal::the()->setStatusBar( statusBar() ); @@ -290,7 +290,7 @@ KRecord::KRecord(TQWidget *parent, const char *name ) KStdAction::save( d, TQT_SLOT( saveFile() ), actionCollection() ); KStdAction::saveAs( d, TQT_SLOT( saveAsFile() ), actionCollection() ); KStdAction::close( d, TQT_SLOT( closeFile() ), actionCollection() ); - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); KStdAction::tipOfDay( d, TQT_SLOT( forceTipOfDay() ), actionCollection() ); @@ -298,11 +298,11 @@ KRecord::KRecord(TQWidget *parent, const char *name ) d, TQT_SLOT( exportFile() ), actionCollection(), "export_file" ); d->aRecord = new KAction( i18n( "&Record" ), KShortcut( Key_R ), - this, TQT_SLOT( startRec() ), actionCollection(), "player_record" ); + TQT_TQOBJECT(this), TQT_SLOT( startRec() ), actionCollection(), "player_record" ); d->aPlay = new KAction( i18n( "&Play" ), KShortcut( Key_P ), - this, TQT_SLOT( startPlay() ), actionCollection(), "player_play" ); + TQT_TQOBJECT(this), TQT_SLOT( startPlay() ), actionCollection(), "player_play" ); d->aStop = new KAction( i18n( "&Stop" ), KShortcut( Key_S ), - this, TQT_SLOT( stopRec() ), actionCollection(), "player_stop" ); + TQT_TQOBJECT(this), TQT_SLOT( stopRec() ), actionCollection(), "player_stop" ); d->aThru = new KToggleAction( i18n( "Play Through" ), KShortcut( CTRL + Key_P), actionCollection(), "play_thru" ); connect( d->aThru, TQT_SIGNAL( toggled( bool ) ), d, TQT_SLOT( playthru( bool ) ) ); diff --git a/krec/krecord.h b/krec/krecord.h index 034f0557..1fd4e08f 100644 --- a/krec/krecord.h +++ b/krec/krecord.h @@ -31,9 +31,10 @@ class KRecPrivate; class KRecord : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /// Constructor - KRecord( TQWidget* /*parent*/=0, const char* /*name*/=0 ); + KRecord( TQWidget* /*tqparent*/=0, const char* /*name*/=0 ); /// Destructor ~KRecord(); public slots: diff --git a/krec/krecord_private.h b/krec/krecord_private.h index 407f3f0a..ab1debde 100644 --- a/krec/krecord_private.h +++ b/krec/krecord_private.h @@ -45,6 +45,7 @@ namespace KSettings { class Dialog; } class KRecPrivate : public TQObject { Q_OBJECT + TQ_OBJECT public: /// Constructor KRecPrivate( KRecord*, const char* =0 ); @@ -129,6 +130,7 @@ public: class KRecMainWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: KRecMainWidget( TQWidget* p, const char* n=0 ) : TQWidget( p,n ) { _layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight, 2 ); diff --git a/krec/mp3_export/krecexport_mp3.h b/krec/mp3_export/krecexport_mp3.h index e6481309..0eeae152 100644 --- a/krec/mp3_export/krecexport_mp3.h +++ b/krec/mp3_export/krecexport_mp3.h @@ -23,6 +23,7 @@ class TQFile; class KRecExport_MP3 : public KRecExportItem { Q_OBJECT + TQ_OBJECT public: KRecExport_MP3( TQObject*, const char* =0, const TQStringList& =0 ); ~KRecExport_MP3(); diff --git a/krec/ogg_export/krecexport_ogg.cpp b/krec/ogg_export/krecexport_ogg.cpp index e2b495dd..61b18265 100644 --- a/krec/ogg_export/krecexport_ogg.cpp +++ b/krec/ogg_export/krecexport_ogg.cpp @@ -95,7 +95,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; vorbis_comment_add_tag ( &vc, const_cast<char *>( "kde-encoder" ), const_cast<char *>( "KRec" ) ); if ( write_vorbis_comments ) { - TQDateTime dt = TQDateTime::currentDateTime(); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); vorbis_comment_add_tag ( &vc, const_cast<char *>( "title" ), const_cast<char *>( "" ) ); vorbis_comment_add_tag ( &vc, const_cast<char *>( "artist" ), diff --git a/krec/ogg_export/krecexport_ogg.h b/krec/ogg_export/krecexport_ogg.h index 787f8e34..93036990 100644 --- a/krec/ogg_export/krecexport_ogg.h +++ b/krec/ogg_export/krecexport_ogg.h @@ -27,6 +27,7 @@ class TQFile; class KRecExport_OGG : public KRecExportItem { Q_OBJECT + TQ_OBJECT public: KRecExport_OGG( TQObject*, const char* =0, const TQStringList& =0 ); ~KRecExport_OGG(); diff --git a/kscd/ChangeLog b/kscd/ChangeLog index 24eeb3ee..ab561f86 100644 --- a/kscd/ChangeLog +++ b/kscd/ChangeLog @@ -148,7 +148,7 @@ Tue Jan 18 17:27:26 2000 Dirk Försterling <milliByte@DeathsDoor.com> * Added automatic storing of CDDB records downloaded from CDDB server to local harddrive. - * Fixed bug with routine connecting signals, over and over again, + * Fixed bug with routine connecting Q_SIGNALS, over and over again, causing routines to be called too many time, annoying CDDB server admins. Happens when a new CDDB (remote) request was issued. @@ -225,7 +225,7 @@ Fri May 15 18:28:40 1998 Bernd Johannes Wuebben <wuebben@math.cornell.edu> Tue Apr 14 05:17:36 1998 Bernd Johannes Wuebben <wuebben@math.cornell.edu> - * layout corrections for kscd magic dialog + * tqlayout corrections for kscd magic dialog Sat Jan 17 21:36:27 1998 Bernd Johannes Wuebben <wuebben@math.cornell.edu> @@ -6,4 +6,4 @@ AJS: o fix eject button o don't show "no disc" error on startup o direct digital playback -o better GUI layout for LCD panel +o better GUI tqlayout for LCD panel diff --git a/kscd/bwlednum.cpp b/kscd/bwlednum.cpp index 4bfb16b6..fdc2beba 100644 --- a/kscd/bwlednum.cpp +++ b/kscd/bwlednum.cpp @@ -36,8 +36,8 @@ static char segs[14][8] = {25, 0, 0, 0, 0, 0, 0, 0} }; // blank -BW_LED_Number::BW_LED_Number( TQWidget *parent, const char *name ) - : TQFrame( parent, name ){ +BW_LED_Number::BW_LED_Number( TQWidget *tqparent, const char *name ) + : TQFrame( tqparent, name ){ offcolor = TQColor(100,0,0); @@ -84,7 +84,7 @@ void BW_LED_Number::setLEDColor( const TQColor& fgColor, const TQColor& bgColor fgcolor = fgColor; bgcolor = bgColor; - TQColorGroup old_cg = this->colorGroup(); + TQColorGroup old_cg = this->tqcolorGroup(); TQColorGroup new_cg( fgColor, bgColor, @@ -168,9 +168,9 @@ void BW_LED_Number::setSmallLED(bool a_boolean){ } -void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool repaint ){ +void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool tqrepaint ){ - // printf("drawSymbol repaint = %d\n",repaint); + // printf("drawSymbol tqrepaint = %d\n",tqrepaint); TQPoint pos; @@ -194,7 +194,7 @@ void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool repaint ){ pos = TQPoint( Xoffset , Yoffset ); - if(repaint){ + if(tqrepaint){ // this draw the non-illumintated segments @@ -222,7 +222,7 @@ void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool repaint ){ } } } - else{ // we are not repainting ourselves due to a repaint event but rather + else{ // we are not tqrepainting ourselves due to a tqrepaint event but rather // genuinely changing the symbol that is to be displayed for(int l = 0; l <= NUM_OF_SEGMENTS -1; l++){ @@ -277,7 +277,7 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter TQPoint pt = pos; - TQColorGroup g = colorGroup(); + TQColorGroup g = tqcolorGroup(); TQColor lightColor,darkColor; if ( erase ){ @@ -297,7 +297,7 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter TQPointArray pts; - pt.ry() += (QCOORD)Width/2; + pt.ry() += (TQCOORD)Width/2; if (erase){ @@ -355,7 +355,7 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter p.setPen(g.light()); break; case 2 : - pt.rx() += (QCOORD)(Segment_Length); + pt.rx() += (TQCOORD)(Segment_Length); if (erase) @@ -382,7 +382,7 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter break; case 3 : - pt.ry() += (QCOORD)Segment_Length; + pt.ry() += (TQCOORD)Segment_Length; p.setPen(g.background()); @@ -402,7 +402,7 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter break; case 4 : - pt.ry() += (QCOORD)(Segment_Length +1); + pt.ry() += (TQCOORD)(Segment_Length +1); p.fillRect(pt.x(), pt.y(), Width , Segment_Length - Width - Width/2 ,brush); if (erase) p.setPen(offcolor); @@ -421,8 +421,8 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter break; case 5 : - pt.rx() += (QCOORD)(Segment_Length ); - pt.ry() += (QCOORD)(Segment_Length +1); + pt.rx() += (TQCOORD)(Segment_Length ); + pt.ry() += (TQCOORD)(Segment_Length +1); p.fillRect(pt.x() - Width +1 ,pt.y(), Width , Segment_Length - Width - Width/2 ,brush); @@ -446,7 +446,7 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter break; case 6 : - pt.ry() += (QCOORD)(Segment_Length*2 ); + pt.ry() += (TQCOORD)(Segment_Length*2 ); p.fillRect(pt.x() + Width ,pt.y() -Width , Segment_Length -2* Width , Width ,brush); @@ -471,13 +471,13 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter break; case 7 : - pt.rx() += (QCOORD)(Segment_Length/2); - pt.ry() += (QCOORD)(Segment_Length*2); + pt.rx() += (TQCOORD)(Segment_Length/2); + pt.ry() += (TQCOORD)(Segment_Length*2); p.fillRect(pt.x() ,pt.y() - Width , Width , Width ,brush); break; case 8 : - pt.ry() += (QCOORD)(Segment_Length/2 + Width/2); - pt.rx() += (QCOORD)(Segment_Length/2 - Width/2 + 1); + pt.ry() += (TQCOORD)(Segment_Length/2 + Width/2); + pt.rx() += (TQCOORD)(Segment_Length/2 - Width/2 + 1); if (!show_off_colon && erase) { p.setBrush(bgcolor); @@ -494,8 +494,8 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter break; case 9 : - pt.ry() += (QCOORD)(3*Segment_Length/2 + Width/2); - pt.rx() += (QCOORD)(Segment_Length/2 - Width/2 + 1); + pt.ry() += (TQCOORD)(3*Segment_Length/2 + Width/2); + pt.rx() += (TQCOORD)(Segment_Length/2 - Width/2 + 1); if (!show_off_colon && erase) { p.setBrush(bgcolor); @@ -514,7 +514,7 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter else{ - pt.ry() += (QCOORD)Width/2; + pt.ry() += (TQCOORD)Width/2; switch ( seg_number ) { case 0 : @@ -524,37 +524,37 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter p.fillRect(pt.x()+Width,pt.y()- Width , Segment_Length -2* Width, Width ,brush); break; case 2 : - pt.rx() += (QCOORD)(Segment_Length); + pt.rx() += (TQCOORD)(Segment_Length); p.fillRect(pt.x()-Width,pt.y()+ Width/2, Width , Segment_Length - Width -Width/2 ,brush); break; case 3 : - pt.ry() += (QCOORD)Segment_Length; + pt.ry() += (TQCOORD)Segment_Length; p.fillRect(pt.x() + Width ,pt.y() - Width, Segment_Length- 2* Width, Width ,brush); break; case 4 : - pt.ry() += (QCOORD)(Segment_Length ); + pt.ry() += (TQCOORD)(Segment_Length ); p.fillRect(pt.x(), pt.y(), Width , Segment_Length - Width - Width/2 ,brush); break; case 5 : - pt.rx() += (QCOORD)(Segment_Length ); - pt.ry() += (QCOORD)(Segment_Length ); + pt.rx() += (TQCOORD)(Segment_Length ); + pt.ry() += (TQCOORD)(Segment_Length ); p.fillRect(pt.x() - Width ,pt.y(), Width , Segment_Length - Width - Width/2 ,brush); break; case 6 : - pt.ry() += (QCOORD)(Segment_Length*2); + pt.ry() += (TQCOORD)(Segment_Length*2); p.fillRect(pt.x() + Width ,pt.y() -Width , Segment_Length -2* Width , Width ,brush); break; case 7 : - pt.rx() += (QCOORD)(Segment_Length/2); - pt.ry() += (QCOORD)(Segment_Length*2); + pt.rx() += (TQCOORD)(Segment_Length/2); + pt.ry() += (TQCOORD)(Segment_Length*2); p.fillRect(pt.x() ,pt.y() - Width , Width , Width ,brush); break; case 8 : - pt.ry() += (QCOORD)(Segment_Length/2 + Width/2); - pt.rx() += (QCOORD)(Segment_Length/2 - Width/2 + 1); + pt.ry() += (TQCOORD)(Segment_Length/2 + Width/2); + pt.rx() += (TQCOORD)(Segment_Length/2 - Width/2 + 1); if (!show_off_colon && erase) { p.setBrush(bgcolor); brush.setColor(bgcolor); @@ -569,8 +569,8 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter break; case 9 : - pt.ry() += (QCOORD)(3*Segment_Length/2 + Width/2); - pt.rx() += (QCOORD)(Segment_Length/2 - Width/2 + 1); + pt.ry() += (TQCOORD)(3*Segment_Length/2 + Width/2); + pt.rx() += (TQCOORD)(Segment_Length/2 - Width/2 + 1); if (!show_off_colon && erase) { p.setBrush(bgcolor); diff --git a/kscd/bwlednum.h b/kscd/bwlednum.h index 5652832f..76bc10a8 100644 --- a/kscd/bwlednum.h +++ b/kscd/bwlednum.h @@ -17,13 +17,14 @@ #include "tqbitarray.h" -class BW_LED_Number : public QFrame +class BW_LED_Number : public TQFrame { Q_OBJECT + TQ_OBJECT public: - BW_LED_Number( TQWidget *parent=0, const char *name=0 ); + BW_LED_Number( TQWidget *tqparent=0, const char *name=0 ); ~BW_LED_Number(); void setSmallLED(bool ); // if you LED is small it might look better @@ -67,7 +68,7 @@ private: bool seg_contained_in( char c, char* seg); void drawSegment( const TQPoint &, char, TQPainter &, int, bool = FALSE ); - void drawSymbol( TQPainter *p,char s ,bool repaint); + void drawSymbol( TQPainter *p,char s ,bool tqrepaint); char* old_segments; char* current_segments; diff --git a/kscd/cddbdlg.cpp b/kscd/cddbdlg.cpp index e574ba92..13efb8b7 100644 --- a/kscd/cddbdlg.cpp +++ b/kscd/cddbdlg.cpp @@ -33,8 +33,8 @@ struct mytoc unsigned absframe; }; -CDDBDlg::CDDBDlg( TQWidget* parent, const char* name ) - : KDialogBase( parent, name, false, i18n( "CD Editor" ), +CDDBDlg::CDDBDlg( TQWidget* tqparent, const char* name ) + : KDialogBase( tqparent, name, false, i18n( "CD Editor" ), Ok|Cancel|User1|User2, Ok, true ) { KGlobal::locale()->insertCatalogue("libkcddb"); @@ -90,7 +90,7 @@ void CDDBDlg::submitFinished(KCDDB::CDDB::Result r) else { TQString str = i18n("Error sending record.\n\n%1") - .arg(KCDDB::CDDB::resultToString(r)); + .tqarg(KCDDB::CDDB::resultToString(r)); KMessageBox::error(this, str, i18n("Record Submission")); } } // submitFinished() diff --git a/kscd/cddbdlg.h b/kscd/cddbdlg.h index b8f3c90a..cee86052 100644 --- a/kscd/cddbdlg.h +++ b/kscd/cddbdlg.h @@ -12,9 +12,10 @@ class CDInfoDialogBase; class CDDBDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CDDBDlg(TQWidget* parent, const char* name = 0); + CDDBDlg(TQWidget* tqparent, const char* name = 0); ~CDDBDlg(); void setData( diff --git a/kscd/configWidget.cpp b/kscd/configWidget.cpp index bae787e9..4d8e03fb 100644 --- a/kscd/configWidget.cpp +++ b/kscd/configWidget.cpp @@ -45,8 +45,8 @@ extern "C" { class SpecialComboBox : public KComboBox { public: - SpecialComboBox(TQWidget* parent, const char* name) - : KComboBox(parent, name) + SpecialComboBox(TQWidget* tqparent, const char* name) + : KComboBox(tqparent, name) {} // TQComboBox::setCurrentText replaces the current text if @@ -59,14 +59,14 @@ public: } ; /* - * Constructs a configWidget which is a child of 'parent', with the + * Constructs a configWidget which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -configWidget::configWidget(KSCD* player, TQWidget* parent, const char* name) - : configWidgetUI(parent, name), +configWidget::configWidget(KSCD* player, TQWidget* tqparent, const char* name) + : configWidgetUI(tqparent, name), mPlayer(player) { if (!name) diff --git a/kscd/configWidget.h b/kscd/configWidget.h index 7269ca42..5072d930 100644 --- a/kscd/configWidget.h +++ b/kscd/configWidget.h @@ -31,9 +31,10 @@ class SpecialComboBox; class configWidget : public configWidgetUI { Q_OBJECT + TQ_OBJECT public: - configWidget(KSCD* player, TQWidget* parent = 0, const char* name = 0); + configWidget(KSCD* player, TQWidget* tqparent = 0, const char* name = 0); ~configWidget(); protected: diff --git a/kscd/configWidgetUI.ui b/kscd/configWidgetUI.ui index 83f9aca0..6cf302cc 100644 --- a/kscd/configWidgetUI.ui +++ b/kscd/configWidgetUI.ui @@ -1,13 +1,13 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>configWidgetUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>configWidgetUI</cstring> </property> <property name="enabled"> <bool>true</bool> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -52,7 +52,7 @@ <string>The background color that will be used for the LCD display.</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_Docking</cstring> </property> @@ -63,7 +63,7 @@ <string>When this option is selected an icon will appear in the system tray. Note that KsCD will <i>not</i> quit when the window is closed if a system tray icon is displayed. You may quit KsCD by clicking the Quit button or right-clicking on the system tray icon and selecting the appropriate entry.</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_TrackAnnouncement</cstring> </property> @@ -84,14 +84,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>292</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -123,7 +123,7 @@ </font> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -136,7 +136,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -167,7 +167,7 @@ <string>This option controls the number of seconds KsCD will skip when the skip forwards or backwards buttons are pressed.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -178,7 +178,7 @@ <cstring>kcfg_SkipDelta</cstring> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_Autoplay</cstring> </property> @@ -189,7 +189,7 @@ <string>When this option is selected the CD will start playing automatically upon being inserted into the CD-ROM.</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_EjectOnFinish</cstring> </property> @@ -200,7 +200,7 @@ <string>When this option is selected the CD will automatically eject when it is finished.</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_StopExit</cstring> </property> @@ -221,7 +221,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>171</width> <height>81</height> @@ -230,7 +230,7 @@ </spacer> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -249,7 +249,7 @@ <string>The CD-ROM device to use when playing CDs. This will typically look something like "/dev/cdrom". To have KsCD autodetect your CD-ROM, leave this field empty.</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -260,7 +260,7 @@ <cstring>kcfg_AudioDevice</cstring> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_DigitalPlayback</cstring> </property> @@ -277,7 +277,7 @@ <string>When this option is selected KsCD will attempt to play the CD using direct digital playback. This option is useful if the CD-ROM is not connected directly to the sound output on the computer. Note that digital playback consumes more system resources than the normal method of playback.</string> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -293,7 +293,7 @@ <cstring>kcfg_AudioDevice</cstring> </property> </widget> - <widget class="QFrame" row="2" column="2"> + <widget class="TQFrame" row="2" column="2"> <property name="name"> <cstring>audioSystemFrame</cstring> </property> @@ -306,7 +306,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox9</cstring> </property> @@ -317,7 +317,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_SelectEncoding</cstring> </property> @@ -328,7 +328,7 @@ <string>When this option is selected, you have the ability to select encoding for the results of a CDDB request. The standard describes CDDB results as being strictly Latin1. This is not true, as non-English speaking users often use other 8-bit encodings.</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>AUTO</string> @@ -401,7 +401,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>45</height> @@ -445,11 +445,11 @@ <tabstop>kcfg_DigitalPlayback</tabstop> <tabstop>kcfg_AudioDevice</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>kcfg_DigitalPlayback_toggled( bool )</slot> <slot>kcfg_SelectEncoding_toggled(bool)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kfontrequester.h</includehint> diff --git a/kscd/docking.cpp b/kscd/docking.cpp index 705c2ca8..ca85b914 100644 --- a/kscd/docking.cpp +++ b/kscd/docking.cpp @@ -38,13 +38,13 @@ #include <kdebug.h> -DockWidget::DockWidget( KSCD* parent, const char *name) - : KSystemTray( parent, name ) +DockWidget::DockWidget( KSCD* tqparent, const char *name) + : KSystemTray( tqparent, name ) { m_popup = 0; setPixmap( loadIcon("cdsmall") ); - KActionCollection* actionCollection = parent->actionCollection(); + KActionCollection* actionCollection = tqparent->actionCollection(); m_backAction = actionCollection->action("Previous"); m_forwardAction = actionCollection->action("Next"); m_backPix = loadIcon("player_start"); @@ -53,11 +53,11 @@ DockWidget::DockWidget( KSCD* parent, const char *name) // popup menu for right mouse button TQPopupMenu* popup = contextMenu(); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play/Pause"), parent, TQT_SLOT(playClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_stop", KIcon::Small), i18n("Stop"), parent, TQT_SLOT(stopClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_end", KIcon::Small), i18n("Next"), parent, TQT_SLOT(nextClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_start", KIcon::Small), i18n("Previous"), parent, TQT_SLOT(prevClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_eject", KIcon::Small), i18n("Eject"), parent, TQT_SLOT(ejectClicked())); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play/Pause"), tqparent, TQT_SLOT(playClicked())); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_stop", KIcon::Small), i18n("Stop"), tqparent, TQT_SLOT(stopClicked())); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_end", KIcon::Small), i18n("Next"), tqparent, TQT_SLOT(nextClicked())); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_start", KIcon::Small), i18n("Previous"), tqparent, TQT_SLOT(prevClicked())); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_eject", KIcon::Small), i18n("Eject"), tqparent, TQT_SLOT(ejectClicked())); TQToolTip::add(this, kapp->aboutData()->programName()); } @@ -120,10 +120,10 @@ void DockWidget::setToolTip(const TQString& text) void DockWidget::wheelEvent(TQWheelEvent *e) { - if (e->orientation() == Horizontal) + if (e->orientation() ==Qt::Horizontal) return; - KSCD* kscd = dynamic_cast<KSCD*>(parent()); + KSCD* kscd = dynamic_cast<KSCD*>(tqparent()); if (kscd == 0) return; diff --git a/kscd/docking.h b/kscd/docking.h index 52fceebd..2ffc431a 100644 --- a/kscd/docking.h +++ b/kscd/docking.h @@ -46,9 +46,10 @@ class KPassivePopup; class DockWidget : public KSystemTray { Q_OBJECT + TQ_OBJECT public: - DockWidget( KSCD* parent, const char *name=0); + DockWidget( KSCD* tqparent, const char *name=0); ~DockWidget(); public slots: diff --git a/kscd/kcompactdisc.cpp b/kscd/kcompactdisc.cpp index c412a932..83a9c532 100644 --- a/kscd/kcompactdisc.cpp +++ b/kscd/kcompactdisc.cpp @@ -98,13 +98,13 @@ const TQString KCompactDisc::defaultDevice = DEFAULT_CD_DEVICE; const unsigned KCompactDisc::missingDisc = (unsigned)-1; KCompactDisc::KCompactDisc(InformationMode infoMode) : - m_device(TQString::null), + m_device(TQString()), m_status(0), - m_previousStatus(123456), + m_previoustqStatus(123456), m_discId(missingDisc), m_previousDiscId(0), - m_artist(TQString::null), - m_title(TQString::null), + m_artist(TQString()), + m_title(TQString()), m_track(0), m_previousTrack(99999999), m_infoMode(infoMode) @@ -143,7 +143,7 @@ unsigned KCompactDisc::discPosition() const return cur_pos_abs * 1000 - FRAMES_TO_MS(m_trackStartFrames[0]); } -TQString KCompactDisc::discStatus(int status) +TQString KCompactDisc::disctqStatus(int status) { TQString message; @@ -280,14 +280,14 @@ bool KCompactDisc::setDevice( kdDebug() << "Device change: " << (digitalPlayback ? "WM_CDDA, " : "WM_CDIN, ") << m_device << ", " - << (digitalPlayback ? audioSystem : TQString::null) << ", " - << (digitalPlayback ? audioDevice : TQString::null) << ", status: " - << discStatus(status) << endl; + << (digitalPlayback ? audioSystem : TQString()) << ", " + << (digitalPlayback ? audioDevice : TQString()) << ", status: " + << disctqStatus(status) << endl; if (status < 0) { // Severe (OS-level) error. - m_device = TQString::null; + m_device = TQString(); } else { @@ -295,19 +295,19 @@ bool KCompactDisc::setDevice( setVolume(volume); } - m_previousStatus = m_status = wm_cd_status(); + m_previoustqStatus = m_status = wm_cd_status(); if (m_infoMode == Asynchronous) timerExpired(); else timer.start(1000, true); - return m_device != TQString::null; + return m_device != TQString(); } void KCompactDisc::setVolume(unsigned volume) { int status = wm_cd_volume(volume, WM_BALANCE_SYMMETRED); - kdDebug() << "Volume change: " << volume << ", status: " << discStatus(status) << endl; + kdDebug() << "Volume change: " << volume << ", status: " << disctqStatus(status) << endl; } void KCompactDisc::stop() @@ -323,7 +323,7 @@ const TQString &KCompactDisc::trackArtist() const const TQString &KCompactDisc::trackArtist(unsigned track) const { if (NO_DISC || !TRACK_VALID(track)) - return TQString::null; + return TQString(); return m_trackArtists[track - 1]; } @@ -357,7 +357,7 @@ const TQString &KCompactDisc::trackTitle() const const TQString &KCompactDisc::trackTitle(unsigned track) const { if (NO_DISC || !TRACK_VALID(track)) - return TQString::null; + return TQString(); return m_trackTitles[track - 1]; } @@ -378,11 +378,11 @@ void KCompactDisc::timerExpired() { m_status = wm_cd_status(); - if (WM_CDS_NO_DISC(m_status) || (m_device == TQString::null)) + if (WM_CDS_NO_DISC(m_status) || (m_device == TQString())) { - if (m_previousStatus != m_status) + if (m_previoustqStatus != m_status) { - m_previousStatus = m_status; + m_previoustqStatus = m_status; m_discId = missingDisc; m_previousDiscId = 0; m_trackArtists.clear(); @@ -428,7 +428,7 @@ void KCompactDisc::timerExpired() else { m_trackArtists.append(i18n("Unknown Artist")); - m_trackTitles.append(i18n("Track %1").arg(TQString::number(i).rightJustify(2, '0'))); + m_trackTitles.append(i18n("Track %1").tqarg(TQString::number(i).rightJustify(2, '0'))); } // FIXME: KDE4 // track.length = cd->trk[i - 1].length; @@ -450,12 +450,12 @@ void KCompactDisc::timerExpired() } if (isPlaying()) { - m_previousStatus = m_status; + m_previoustqStatus = m_status; // Update the current playing position. emit trackPlaying(m_track, trackPosition()); } else - if (m_previousStatus != m_status) + if (m_previoustqStatus != m_status) { // If we are not playing, then we are either paused, or stopped. switch (m_status) @@ -467,7 +467,7 @@ void KCompactDisc::timerExpired() emit trayOpening(); break; default: - if (m_previousStatus == WM_CDM_PLAYING || m_previousStatus == WM_CDM_PAUSED + if (m_previoustqStatus == WM_CDM_PLAYING || m_previoustqStatus == WM_CDM_PAUSED && m_status == WM_CDM_STOPPED) { emit discStopped(); @@ -475,7 +475,7 @@ void KCompactDisc::timerExpired() break; } - m_previousStatus = m_status; + m_previoustqStatus = m_status; } } diff --git a/kscd/kcompactdisc.h b/kscd/kcompactdisc.h index f71189a8..10d5eabb 100644 --- a/kscd/kcompactdisc.h +++ b/kscd/kcompactdisc.h @@ -34,7 +34,7 @@ * @see #discChanged(): A disc was inserted or removed. * @see #trayOpening(): A disc is being removed. * - * The progress of playout is modelled by these signals: + * The progress of ptqlayout is modelled by these signals: * * @see #trackPlaying(): A track started playing, or is still playing. * @see #trackPaused(): A track was paused. @@ -44,9 +44,10 @@ * positive numbers; zero is not a valid track number. */ class KCompactDisc : - public QObject + public TQObject { Q_OBJECT + TQ_OBJECT public: enum InformationMode { @@ -63,12 +64,12 @@ public: void eject(); /** - * Start playout at given position of track. + * Start ptqlayout at given position of track. */ void play(unsigned startTrack = 0, unsigned startTrackPosition = 0, unsigned endTrack = 0); /** - * Pause/resume playout. + * Pause/resume ptqlayout. */ void pause(); @@ -89,13 +90,13 @@ public: const TQString &device = defaultDevice, unsigned volume = 50, bool digitalPlayback = true, - const TQString &audioSystem = TQString::null, - const TQString &audioDevice = TQString::null); + const TQString &audioSystem = TQString(), + const TQString &audioDevice = TQString()); void setVolume(unsigned volume); /** - * Stop playout. + * Stop ptqlayout. */ void stop(); @@ -280,7 +281,7 @@ private: TQTimer timer; TQString m_device; int m_status; - int m_previousStatus; + int m_previoustqStatus; unsigned m_discId; unsigned m_previousDiscId; TQString m_artist; @@ -291,8 +292,8 @@ private: TQStringList m_trackTitles; unsigned m_track; unsigned m_previousTrack; - void checkDeviceStatus(); - TQString discStatus(int status); + void checkDevicetqStatus(); + TQString disctqStatus(int status); class KCompactDiscPrivate *d; InformationMode m_infoMode; diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp index bb2b0ae5..ef944999 100644 --- a/kscd/kscd.cpp +++ b/kscd/kscd.cpp @@ -89,9 +89,9 @@ bool stoppedByUser = false; The GUI part *****************************************************************************/ -KSCD::KSCD( TQWidget *parent, const char *name ) +KSCD::KSCD( TQWidget *tqparent, const char *name ) : DCOPObject("CDPlayer"), - kscdPanelDlg( parent, name, Qt::WDestructiveClose ), + kscdPanelDlg( tqparent, name, TQt::WDestructiveClose ), configDialog(0L), cddialog(0L), //!!!! jumpToTrack(0L), @@ -103,7 +103,7 @@ KSCD::KSCD( TQWidget *parent, const char *name ) random_current = random_list.begin(); cddb = new KCDDB::Client(); - connect(cddb, TQT_SIGNAL(finished(CDDB::Result)), this, TQT_SLOT(lookupCDDBDone(CDDB::Result))); + connect(cddb, TQT_SIGNAL(finished(CDDB::Result)), TQT_TQOBJECT(this), TQT_SLOT(lookupCDDBDone(CDDB::Result))); #if defined(BUILD_CDDA) audio_systems_list @@ -139,11 +139,11 @@ KSCD::KSCD( TQWidget *parent, const char *name ) /* FIXME check for return value */ setDevicePaths(/*Prefs::cdDevice(), Prefs::audioSystem(), Prefs::audioDevice()*/); - connect(m_cd, TQT_SIGNAL(trackPlaying(unsigned, unsigned)), this, TQT_SLOT(trackUpdate(unsigned, unsigned))); - connect(m_cd, TQT_SIGNAL(trackPaused(unsigned, unsigned)), this, TQT_SLOT(trackUpdate(unsigned, unsigned))); - connect(m_cd, TQT_SIGNAL(trackChanged(unsigned, unsigned)), this, TQT_SLOT(trackChanged(unsigned, unsigned))); - connect(m_cd, TQT_SIGNAL(discStopped()), this, TQT_SLOT(discStopped())); - connect(m_cd, TQT_SIGNAL(discChanged(unsigned)), this, TQT_SLOT(discChanged(unsigned))); + connect(m_cd, TQT_SIGNAL(trackPlaying(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(trackUpdate(unsigned, unsigned))); + connect(m_cd, TQT_SIGNAL(trackPaused(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(trackUpdate(unsigned, unsigned))); + connect(m_cd, TQT_SIGNAL(trackChanged(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(trackChanged(unsigned, unsigned))); + connect(m_cd, TQT_SIGNAL(discStopped()), TQT_TQOBJECT(this), TQT_SLOT(discStopped())); + connect(m_cd, TQT_SIGNAL(discChanged(unsigned)), TQT_TQOBJECT(this), TQT_SLOT(discChanged(unsigned))); connect( &queryledtimer, TQT_SIGNAL(timeout()), TQT_SLOT(togglequeryled()) ); connect( &titlelabeltimer, TQT_SIGNAL(timeout()), TQT_SLOT(titlelabeltimeout()) ); connect( &cycletimer, TQT_SIGNAL(timeout()), TQT_SLOT(cycletimeout()) ); @@ -160,8 +160,8 @@ KSCD::KSCD( TQWidget *parent, const char *name ) connect( songListCB, TQT_SIGNAL(activated(int)), TQT_SLOT(trackSelected(int))); connect( shufflePB, TQT_SIGNAL(clicked()), TQT_SLOT(randomSelected())); connect( cddbPB, TQT_SIGNAL(clicked()), TQT_SLOT(CDDialogSelected())); - connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), this, TQT_SLOT(setColors())); - connect(kapp, TQT_SIGNAL(iconChanged(int)), this, TQT_SLOT(setIcons())); + connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_TQOBJECT(this), TQT_SLOT(setColors())); + connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(setIcons())); TQToolTip::remove(songListCB); TQToolTip::add(songListCB, i18n("Track list")); @@ -170,24 +170,24 @@ KSCD::KSCD( TQWidget *parent, const char *name ) m_actions = new KActionCollection(this); KAction* action; - action = new KAction(i18n("Play/Pause"), Key_P, this, TQT_SLOT(playClicked()), m_actions, "Play/Pause"); - action = new KAction(i18n("Stop"), Key_S, this, TQT_SLOT(stopClicked()), m_actions, "Stop"); - action = new KAction(i18n("Previous"), Key_B, this, TQT_SLOT(prevClicked()), m_actions, "Previous"); - action = new KAction(i18n("Next"), Key_N, this, TQT_SLOT(nextClicked()), m_actions, "Next"); - action = KStdAction::quit(this, TQT_SLOT(quitClicked()), m_actions); - action = KStdAction::keyBindings(this, TQT_SLOT(configureKeys()), m_actions, "options_configure_shortcuts"); - action = KStdAction::keyBindings(this, TQT_SLOT(configureGlobalKeys()), m_actions, "options_configure_globals"); - action = KStdAction::preferences(this, TQT_SLOT(showConfig()), m_actions); - action = new KAction(i18n("Loop"), Key_L, this, TQT_SLOT(loopClicked()), m_actions, "Loop"); - action = new KAction(i18n("Eject"), CTRL + Key_E, this, TQT_SLOT(ejectClicked()), m_actions, "Eject"); - action = new KAction(i18n("Increase Volume"), Key_Plus, this, TQT_SLOT(incVolume()), m_actions, "IncVolume"); + action = new KAction(i18n("Play/Pause"), Key_P, TQT_TQOBJECT(this), TQT_SLOT(playClicked()), m_actions, "Play/Pause"); + action = new KAction(i18n("Stop"), Key_S, TQT_TQOBJECT(this), TQT_SLOT(stopClicked()), m_actions, "Stop"); + action = new KAction(i18n("Previous"), Key_B, TQT_TQOBJECT(this), TQT_SLOT(prevClicked()), m_actions, "Previous"); + action = new KAction(i18n("Next"), Key_N, TQT_TQOBJECT(this), TQT_SLOT(nextClicked()), m_actions, "Next"); + action = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quitClicked()), m_actions); + action = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), m_actions, "options_configure_shortcuts"); + action = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureGlobalKeys()), m_actions, "options_configure_globals"); + action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showConfig()), m_actions); + action = new KAction(i18n("Loop"), Key_L, TQT_TQOBJECT(this), TQT_SLOT(loopClicked()), m_actions, "Loop"); + action = new KAction(i18n("Eject"), CTRL + Key_E, TQT_TQOBJECT(this), TQT_SLOT(ejectClicked()), m_actions, "Eject"); + action = new KAction(i18n("Increase Volume"), Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(incVolume()), m_actions, "IncVolume"); KShortcut increaseVolume = action->shortcut(); increaseVolume.append( KKey( Key_Equal ) ); action->setShortcut( increaseVolume ); - action = new KAction(i18n("Decrease Volume"), Key_Minus, this, TQT_SLOT(decVolume()), m_actions, "DecVolume"); - action = new KAction(i18n("Options"), CTRL + Key_T, this, TQT_SLOT(showConfig()), m_actions, "Options"); - action = new KAction(i18n("Shuffle"), Key_R, this, TQT_SLOT(randomSelected()), m_actions, "Shuffle"); - action = new KAction(i18n("CDDB"), CTRL + Key_D, this, TQT_SLOT(CDDialogSelected()), m_actions, "CDDB"); + action = new KAction(i18n("Decrease Volume"), Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(decVolume()), m_actions, "DecVolume"); + action = new KAction(i18n("Options"), CTRL + Key_T, TQT_TQOBJECT(this), TQT_SLOT(showConfig()), m_actions, "Options"); + action = new KAction(i18n("Shuffle"), Key_R, TQT_TQOBJECT(this), TQT_SLOT(randomSelected()), m_actions, "Shuffle"); + action = new KAction(i18n("CDDB"), CTRL + Key_D, TQT_TQOBJECT(this), TQT_SLOT(CDDialogSelected()), m_actions, "CDDB"); m_actions->readShortcutSettings("Shortcuts"); @@ -210,9 +210,9 @@ KSCD::KSCD( TQWidget *parent, const char *name ) setDocking(Prefs::docking()); - setFocusPolicy(TQWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); - songListCB->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed); + songListCB->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed); adjustSize(); setFixedHeight(this->height()); } // KSCD @@ -227,25 +227,25 @@ KSCD::~KSCD() void KSCD::initGlobalShortcuts() { - m_globalAccel = new KGlobalAccel( this ); + m_globalAccel = new KGlobalAccel( TQT_TQOBJECT(this) ); //Definition of global shortcuts is based on 'local' shortcuts which follow //the WIN key. m_globalAccel->insert("Next", i18n("Next"), 0, KKey("WIN+N"), KKey("WIN+Right"), - this, TQT_SLOT(nextClicked())); + TQT_TQOBJECT(this), TQT_SLOT(nextClicked())); //NOTE: WIN+B collidates with amarok's default global shortcut. m_globalAccel->insert("Previous", i18n("Previous"), 0, KKey("WIN+B"), KKey("WIN+Left"), - this, TQT_SLOT(prevClicked())); + TQT_TQOBJECT(this), TQT_SLOT(prevClicked())); m_globalAccel->insert("Play/Pause", i18n("Play/Pause"), 0, KKey("WIN+P"), 0, - this, TQT_SLOT(playClicked())); + TQT_TQOBJECT(this), TQT_SLOT(playClicked())); m_globalAccel->insert("Stop", i18n("Stop"), 0, KKey("WIN+S"), 0, - this, TQT_SLOT(stopClicked())); + TQT_TQOBJECT(this), TQT_SLOT(stopClicked())); m_globalAccel->insert("IncVolume", i18n("Increase Volume"), 0, KKey("WIN+Plus"), KKey("WIN+Up"), - this, TQT_SLOT(incVolume())); + TQT_TQOBJECT(this), TQT_SLOT(incVolume())); m_globalAccel->insert("DecVolume", i18n("Decrease Volume"), 0, KKey("WIN+Minus"), KKey("WIN+Down"), - this, TQT_SLOT(decVolume())); + TQT_TQOBJECT(this), TQT_SLOT(decVolume())); m_globalAccel->insert("Shuffle", i18n("Shuffle"), 0, KKey("WIN+R"), 0, - this, TQT_SLOT(incVolume())); + TQT_TQOBJECT(this), TQT_SLOT(incVolume())); m_globalAccel->setConfigGroup( "GlobalShortcuts" ); m_globalAccel->readSettings( kapp->config() ); @@ -312,7 +312,7 @@ void KSCD::drawPanel() trackTimeLED[u]->setLEDoffColor(Prefs::backColor()); trackTimeLED[u]->setLEDColor(Prefs::ledColor(), Prefs::backColor()); trackTimeLED[u]->setGeometry(2 + u * 18, D, 23, 30); - connect(trackTimeLED[u], TQT_SIGNAL(clicked()), this, TQT_SLOT(cycleplaytimemode())); + connect(trackTimeLED[u], TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(cycleplaytimemode())); } setLEDs(-1); @@ -550,7 +550,7 @@ void KSCD::trackChanged(unsigned track, unsigned trackLength) justTheName = justTheName.right(justTheName.length() - 4); TQToolTip::remove(songListCB); - TQToolTip::add(songListCB, i18n("Current track: %1").arg(justTheName)); + TQToolTip::add(songListCB, i18n("Current track: %1").tqarg(justTheName)); } timeSlider->blockSignals(true); timeSlider->setRange(0, trackLength ? trackLength - 1 : 0); @@ -688,7 +688,7 @@ void KSCD::randomSelected() { setShuffle(Prefs::randomPlay()?0:1); - /* FIXME this helps us to display "Random" in Status line + /* FIXME this helps us to display "Random" in tqStatus line should it maybe to be replaced with symbol "RAND" or something others */ statuslabel->setText(Prefs::randomPlay()?i18n("Random"):i18n("Play")); } // randomSelected @@ -734,7 +734,7 @@ void KSCD::showConfig() configDialog = new KConfigDialog(this, "settings", Prefs::self()); - configDialog->setHelp(TQString::null); + configDialog->setHelp(TQString()); confWidget = new configWidget(this, 0, "Kscd"); @@ -765,7 +765,7 @@ void KSCD::showConfig() updateConfigDialog(confWidget); - connect(configDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(configDone())); + connect(configDialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(configDone())); configDialog -> show(); } // showConfig() @@ -800,7 +800,7 @@ void KSCD::setDevicePaths() { // This device did not seem usable. TQString str = i18n("CD-ROM read or access error (or no audio disc in drive).\n"\ - "Please make sure you have access permissions to:\n%1").arg( + "Please make sure you have access permissions to:\n%1").tqarg( KCompactDisc::urlToDevice(Prefs::cdDevice())); KMessageBox::error(this, str, i18n("Error")); } @@ -814,7 +814,7 @@ void KSCD::setDocking(bool dock) if (!m_dockWidget) { m_dockWidget = new DockWidget(this, "dockw"); - connect(m_dockWidget, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitClicked())); + connect(m_dockWidget, TQT_SIGNAL(quitSelected()), TQT_TQOBJECT(this), TQT_SLOT(quitClicked())); } m_dockWidget->show(); @@ -881,7 +881,7 @@ void KSCD::make_random_list() { do { selected = 1 + (int) randSequence.getLong(m_cd->tracks()); - rejected = (random_list.find(selected) != random_list.end()); + rejected = (random_list.tqfind(selected) != random_list.end()); } while(rejected == true); random_list.append(selected); } @@ -1211,8 +1211,8 @@ void KSCD::lookupCDDBDone(CDDB::Result result) CDInfoList::iterator it; TQStringList list; for ( it = cddb_info.begin(); it != cddb_info.end(); ++it ) { - list.append( TQString("%1, %2, %3").arg((*it).artist).arg((*it).title) - .arg((*it).genre)); + list.append( TQString("%1, %2, %3").tqarg((*it).artist).tqarg((*it).title) + .tqarg((*it).genre)); } bool ok(false); @@ -1245,7 +1245,7 @@ void KSCD::lookupCDDBDone(CDDB::Result result) void KSCD::setCDInfo(KCDDB::CDInfo info) { // Some sanity provisions to ensure that the number of records matches what - // the CD actually contains. + // the CD actually tqcontains. while (info.trackInfoList.count() < cddbInfo.trackInfoList.count()) { info.trackInfoList.append(KCDDB::TrackInfo()); @@ -1313,7 +1313,7 @@ int KSCD::currentPosition() return m_cd->trackPosition(); } -int KSCD::getStatus() +int KSCD::gettqStatus() { if (m_cd->isPlaying()) return 2; @@ -1419,62 +1419,62 @@ void KSCD::information(int i) { case 0: str = TQString("http://musicmoz.org/cgi-bin/ext.cgi?artist=%1") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 1: str = TQString("http://ubl.artistdirect.com/cgi-bin/gx.cgi/AppLogic+Search?select=MusicArtist&searchstr=%1&searchtype=NormalSearch") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 2: str = TQString("http://www.cduniverse.com/cgi-bin/cdubin.exe/rlinka/ean=%1") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 3: str = TQString("http://www.alltheweb.com/search?cat=web&q=%1") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 4: str = TQString("http://altavista.com/web/results?q=%1&kgs=0&kls=1&avkw=xytx") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 5: str = TQString("http://msxml.excite.com/_1_2UDOUB70SVHVHR__info.xcite/dog/results?otmpl=dog/webresults.htm&qkw=%1&qcat=web&qk=20&top=1&start=&ver=14060") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 6: str = TQString("http://www.google.com/search?q=%1") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 7: str = TQString("http://groups.google.com/groups?oi=djq&as_q=%1&num=20") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 8: str = TQString("http://www.hotbot.com/default.asp?prov=Inktomi&query=%1&ps=&loc=searchbox&tab=web") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 9: str = TQString("http://search.lycos.com/default.asp?lpv=1&loc=searchhp&tab=web&query=%1") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 10: str = TQString("http://search.dmoz.org/cgi-bin/search?search=%1") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 11: str = TQString("http://search.yahoo.com/bin/search?p=%1") - .arg(encodedArtist); + .tqarg(encodedArtist); break; default: @@ -1488,7 +1488,7 @@ void KSCD::information(int i) /** * Save state on session termination */ -bool KSCD::saveState(QSessionManager& /*sm*/) +bool KSCD::saveState(TQSessionManager& /*sm*/) { writeSettings(); KConfig* config = KApplication::kApplication()->sessionConfig(); @@ -1506,7 +1506,7 @@ void KSCD::keyPressEvent(TQKeyEvent* e) bool isNum; int value = e->text().toInt(&isNum); - if (e->key() == Qt::Key_F1) + if (e->key() == TQt::Key_F1) { kapp->invokeHelp(); } @@ -1540,7 +1540,7 @@ void KSCD::jumpTracks() TQString KSCD::currentTrackTitle() { int track = m_cd->track(); - return (track > -1) ? cddbInfo.trackInfoList[track-1].title : TQString::null; + return (track > -1) ? cddbInfo.trackInfoList[track-1].title : TQString(); } TQString KSCD::currentAlbum() @@ -1563,13 +1563,13 @@ TQStringList KSCD::trackList() return tracks; } -void KSCD::populateSongList(TQString infoStatus) +void KSCD::populateSongList(TQString infotqStatus) { // set the artist and title labels as well as the dock tooltip. - if (!infoStatus.isEmpty()) - artistlabel->setText(infoStatus); + if (!infotqStatus.isEmpty()) + artistlabel->setText(infotqStatus); else - artistlabel->setText(TQString("%1 - %2").arg(cddbInfo.artist, cddbInfo.title)); + artistlabel->setText(TQString("%1 - %2").tqarg(cddbInfo.artist, cddbInfo.title)); songListCB->clear(); for (unsigned i = 0; i < cddbInfo.trackInfoList.count(); i++) diff --git a/kscd/kscd.h b/kscd/kscd.h index f4903590..c6f2a8c1 100644 --- a/kscd/kscd.h +++ b/kscd/kscd.h @@ -72,6 +72,7 @@ typedef TQValueList<int> RandomList; class KSCD : public kscdPanelDlg, public KSessionManaged, virtual public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP // time display modes @@ -101,16 +102,16 @@ k_dcop: int currentTrack(); int currentTrackLength(); int currentPosition(); - int getStatus(); + int gettqStatus(); TQString currentTrackTitle(); TQString currentAlbum(); TQString currentArtist(); TQStringList trackList(); public: - KSCD( TQWidget *parent = 0, const char *name = 0 ); + KSCD( TQWidget *tqparent = 0, const char *name = 0 ); ~KSCD(); - virtual bool saveState(QSessionManager& sm); + virtual bool saveState(TQSessionManager& sm); void setDocking(bool dock); bool digitalPlayback(); @@ -174,7 +175,7 @@ protected: void calculateDisplayedTime(); void calculateDisplayedTime(int sec); void setSongListTo(int whichTrack); - void populateSongList(TQString infoStatus); + void populateSongList(TQString infotqStatus); void updatePlayPB(bool playing); void updateConfigDialog(configWidget* widget); diff --git a/kscd/kscdmagic/README b/kscd/kscdmagic/README index 64af4f6f..b2366190 100644 --- a/kscd/kscdmagic/README +++ b/kscd/kscdmagic/README @@ -15,14 +15,14 @@ Introduction This is a program for representing sounds visually from a CD or line input or piped from another program. It goes beyond the usual oscilliscope style program by combining an FFT and stereo positioning information to -give a two dimensional display. Some of the shapes I have observed are: +give a two dimensional display. Some of the tqshapes I have observed are: * Drums: clouds of color, fairly high * Clean guitar: several horizontal lines, low down * Rough guitar: a cloud, low down * Trumpet: Lots of horizontal lines everywhere * Flute: A single horizontal line, low down * Voice: A vertical line with some internal structure - * Synthesizer: All kinds of weird shapes! + * Synthesizer: All kinds of weird tqshapes! Synaesthesia can run in a window in X or full screen using SVGAlib. @@ -139,7 +139,7 @@ Changes Support for SDL. 2.0 - Bug fixes: Fixed problem in xlib.c that caused occasional segfaults, several endianness problems fixed. - New effects: Wave, heat, diamond shaped points. + New effects: Wave, heat, diamond tqshaped points. Piping sound now longer requires the twiddle factor. Yet another interface redesign. Partial support for LinuxPPC (pipe mode only) diff --git a/kscd/kscdmagic/syna.h b/kscd/kscdmagic/syna.h index d359a8c2..4d35e3e0 100644 --- a/kscd/kscdmagic/syna.h +++ b/kscd/kscdmagic/syna.h @@ -160,7 +160,7 @@ enum SoundSource { SourceLine, SourceCD, SourcePipe }; void cdOpen(char *cdromName); void cdClose(void); -void cdGetStatus(int &track, int &frames, SymbolID &state); +void cdGettqStatus(int &track, int &frames, SymbolID &state); void cdPlay(int trackFrame, int endFrame=-1); void cdStop(void); void cdPause(void); diff --git a/kscd/kscdmagic/xlib.c b/kscd/kscdmagic/xlib.c index b28a0650..6e1c1ed2 100644 --- a/kscd/kscdmagic/xlib.c +++ b/kscd/kscdmagic/xlib.c @@ -320,12 +320,12 @@ xdisplay *xalloc_display(const char *s, int xHint, int yHint, int x, int y, xlib xd->attributes->background_pixel = BlackPixel(xd->display, xd->screen); xd->attributes->border_pixel = BlackPixel(xd->display, xd->screen); - xd->attributes->event_mask = ButtonPressMask | StructureNotifyMask | ButtonReleaseMask | ButtonMotionMask | KeyPressMask | ExposureMask | KeyReleaseMask; + xd->attributes->event_tqmask = ButtonPressMask | StructureNotifyMask | ButtonReleaseMask | ButtonMotionMask | KeyPressMask | ExposureMask | KeyReleaseMask; xd->attributes->override_redirect = False; - xd->attr_mask = CWBackPixel | CWBorderPixel | CWEventMask; + xd->attr_tqmask = CWBackPixel | CWBorderPixel | CWEventMask; xd->classX = InputOutput; xd->xcolor.n = 0; - xd->parent_window = RootWindow(xd->display, xd->screen); + xd->tqparent_window = RootWindow(xd->display, xd->screen); defaultvisual = DefaultVisual(xd->display, xd->screen); xd->params = params; if (!params->usedefault) { @@ -403,10 +403,10 @@ xdisplay *xalloc_display(const char *s, int xHint, int yHint, int x, int y, xlib xd->lasty = 0; xd->font_struct = (XFontStruct *) NULL; - xd->window = XCreateWindow(xd->display, xd->parent_window, xHint, yHint, + xd->window = XCreateWindow(xd->display, xd->tqparent_window, xHint, yHint, xd->width, xd->height, xd->border_width, vis.depth, xd->classX, xd->visual, - xd->attr_mask, xd->attributes); + xd->attr_tqmask, xd->attributes); if (!xd->fixedcolormap && params->privatecolormap) { unsigned long pixels[256]; int i; diff --git a/kscd/kscdmagic/xlib.h b/kscd/kscdmagic/xlib.h index 73113292..fa079775 100644 --- a/kscd/kscdmagic/xlib.h +++ b/kscd/kscdmagic/xlib.h @@ -58,7 +58,7 @@ typedef struct { int privatecolormap; xlibparam *params; Display *display; - Window parent_window; + Window tqparent_window; Window window; unsigned int width, height; unsigned int border_width; @@ -66,9 +66,9 @@ typedef struct { int depth; unsigned int classX; Visual *visual; - unsigned long valuemask; + unsigned long valuetqmask; XSetWindowAttributes *attributes; - unsigned long attr_mask; + unsigned long attr_tqmask; XSizeHints sizehints; int screen; const char *window_name; diff --git a/kscd/ledlamp.cpp b/kscd/ledlamp.cpp index 96675921..93aa8000 100644 --- a/kscd/ledlamp.cpp +++ b/kscd/ledlamp.cpp @@ -26,7 +26,7 @@ #include "ledlamp.h" #include "ledlamp.moc" -LedLamp::LedLamp(TQWidget *parent, Type t) : TQFrame(parent), +LedLamp::LedLamp(TQWidget *tqparent, Type t) : TQFrame(tqparent), w( 10 ), h( 7 ), dx( 4 ) { // Make sure we're in a sane state diff --git a/kscd/ledlamp.h b/kscd/ledlamp.h index af37edc7..d7673998 100644 --- a/kscd/ledlamp.h +++ b/kscd/ledlamp.h @@ -26,14 +26,15 @@ #include <tqframe.h> -class LedLamp : public QFrame +class LedLamp : public TQFrame { Q_OBJECT + TQ_OBJECT public: enum Type { Rect, Loop }; - LedLamp(TQWidget *parent=0, Type t=Rect); + LedLamp(TQWidget *tqparent=0, Type t=Rect); enum State { On, Off }; @@ -41,10 +42,10 @@ public: State state() const { return s; } - void setState(State state) { s= state; repaint(false); } + void setState(State state) { s= state; tqrepaint(false); } - void toggleState() { if (s == On) s= Off; else if (s == Off) s= On; repaint(false); } + void toggleState() { if (s == On) s= Off; else if (s == Off) s= On; tqrepaint(false); } public slots: void toggle() { toggleState(); }; void on() { setState(On); }; diff --git a/kscd/libwm/audio/audio_sun.c b/kscd/libwm/audio/audio_sun.c index bee50905..93ce78d2 100644 --- a/kscd/libwm/audio/audio_sun.c +++ b/kscd/libwm/audio/audio_sun.c @@ -54,13 +54,13 @@ * a marker into the audio stream; when the audio device driver encounters the * marker, it increments a field in a status structure. When we see that * field go up, we grab the next status structure from the queue and send it - * to the parent process. + * to the tqparent process. * * The minimum size of the queue depends on the latency of the audio stream. */ -#define QSIZE 500 +#define TQSIZE 500 -struct cdda_block queue[QSIZE]; +struct cdda_block queue[TQSIZE]; int qtail; int qstart; @@ -199,7 +199,7 @@ sun_audio_ready( void ) * Start at the correct queue position. */ if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) perror("AUDIO_GETINFO"); - qtail = info.play.eof % QSIZE; + qtail = info.play.eof % TQSIZE; qstart = qtail; queue[qtail].status = WM_CDM_PLAYING; @@ -284,11 +284,11 @@ sun_audio_send_status( void ) int qhead; /* - * Now send the most current status information to our parent. + * Now send the most current status information to our tqparent. */ if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) perror("AUDIO_GETINFO"); - qhead = info.play.eof % QSIZE; + qhead = info.play.eof % TQSIZE; if (qhead != qstart && playing) { @@ -367,7 +367,7 @@ sun_audio_play(unsigned char *rawbuf, long buflen, struct cdda_block *blk) perror("audio mark"); } else - qtail = (qtail + 1) % QSIZE; + qtail = (qtail + 1) % TQSIZE; fcntl(aufd, F_SETFL, 0); diff --git a/kscd/libwm/cddaslave.c b/kscd/libwm/cddaslave.c index b378f95d..dac475e8 100644 --- a/kscd/libwm/cddaslave.c +++ b/kscd/libwm/cddaslave.c @@ -169,7 +169,7 @@ receive_command(struct cdda_device *dev, struct cdda_block* blk) if (read(0, inbuf, 1) <= 0) { wmcdda_close(dev); oops->wmaudio_close(); -/* ERRORLOG("cddaslave: parent died, exit\n");*/ +/* ERRORLOG("cddaslave: tqparent died, exit\n");*/ exit(0); } diff --git a/kscd/libwm/cdtext.c b/kscd/libwm/cdtext.c index bb4e19b8..fafd039f 100644 --- a/kscd/libwm/cdtext.c +++ b/kscd/libwm/cdtext.c @@ -21,8 +21,8 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> -#ifdef libunicode - #include <unicode.h> +#ifdef libtqunicode + #include <tqunicode.h> #endif #include "include/wm_config.h" @@ -155,12 +155,12 @@ void get_data_from_cdtext_pack( int arr = pack->header_field_id2_tracknumber; int i; int language_block; - int unicode; + int tqunicode; language_block = (pack->header_field_id4_block_no >> 4) & 0x07; - unicode = pack->header_field_id4_block_no & 0x80; + tqunicode = pack->header_field_id4_block_no & 0x80; - if(!unicode) + if(!tqunicode) { for(i = 0; i < DATAFIELD_LENGHT_IN_PACK; i++) { @@ -180,7 +180,7 @@ void get_data_from_cdtext_pack( } } } -#ifdef libunicode +#ifdef libtqunicode else /* doublebytes ;-) */ { for(i = 0; i < DATAFIELD_LENGHT_IN_PACK; i += 2) @@ -203,7 +203,7 @@ void get_data_from_cdtext_pack( } #else else { - wm_lib_message(WM_MSG_LEVEL_ERROR | WM_MSG_CLASS, "can't handle unicode"); + wm_lib_message(WM_MSG_LEVEL_ERROR | WM_MSG_CLASS, "can't handle tqunicode"); } #endif } @@ -315,9 +315,9 @@ get_glob_cdtext(struct wm_drive *d, int redo) { wm_cdtext_info.blocks[j] = lp_block; wm_cdtext_info.blocks[j]->block_code = code; - wm_cdtext_info.blocks[j]->block_unicode = pack->header_field_id4_block_no & 0x80; + wm_cdtext_info.blocks[j]->block_tqunicode = pack->header_field_id4_block_no & 0x80; wm_lib_message(WM_MSG_LEVEL_DEBUG | WM_MSG_CLASS, - "CDTEXT INFO: created a new language block; code %i, %s characters\n", code, lp_block->block_unicode?"doublebyte":"singlebyte"); + "CDTEXT INFO: created a new language block; code %i, %s characters\n", code, lp_block->block_tqunicode?"doublebyte":"singlebyte"); /* unsigned char block_encoding; not jet! cdtext_string* block_encoding_text; diff --git a/kscd/libwm/database.c b/kscd/libwm/database.c index 62d66a32..617905eb 100644 --- a/kscd/libwm/database.c +++ b/kscd/libwm/database.c @@ -192,7 +192,7 @@ nomem: #ifndef NDEBUG fprintf(stderr, "WorkMan was run without a home directory, probably by a system daemon.\n"); - fprintf(stderr, "It doesn't know where to find "); + fprintf(stderr, "It doesn't know where to tqfind "); if (no_rc) { fprintf(stderr, "your personal preferences file "); diff --git a/kscd/libwm/include/wm_cdtext.h b/kscd/libwm/include/wm_cdtext.h index e843ee95..ba481be0 100644 --- a/kscd/libwm/include/wm_cdtext.h +++ b/kscd/libwm/include/wm_cdtext.h @@ -44,7 +44,7 @@ typedef unsigned char cdtext_string[MAX_LENGHT_OF_CDTEXT_STRING]; struct cdtext_info_block { /* management */ unsigned char block_code; - unsigned char block_unicode; /* 0 - single chars, 1 - doublebytes */ + unsigned char block_tqunicode; /* 0 - single chars, 1 - doublebytes */ unsigned char block_encoding; /* orange book -? */ cdtext_string* block_encoding_text; diff --git a/kscd/libwm/include/wm_scsi.h b/kscd/libwm/include/wm_scsi.h index f67e8035..5f11ea7e 100644 --- a/kscd/libwm/include/wm_scsi.h +++ b/kscd/libwm/include/wm_scsi.h @@ -30,7 +30,7 @@ #include "wm_struct.h" -#define WM_ERR_SCSI_INQUIRY_FAILED -1 +#define WM_ERR_SCSI_INTQUIRY_FAILED -1 int wm_scsi_mode_sense( struct wm_drive *d, unsigned char page, unsigned char *buf ); diff --git a/kscd/libwm/plat_hpux.c b/kscd/libwm/plat_hpux.c index c5a6991f..a52d341f 100644 --- a/kscd/libwm/plat_hpux.c +++ b/kscd/libwm/plat_hpux.c @@ -118,7 +118,7 @@ wmcd_open( struct wm_drive *d ) /* Now fill in the relevant parts of the wm_drive structure. */ fd = d->fd; - /* Default drive is the HP one, which might not respond to INQUIRY */ + /* Default drive is the HP one, which might not respond to INTQUIRY */ strcpy(&vendor, "TOSHIBA"); strcpy(&model, "XM-3301"); rev[0] = '\0'; diff --git a/kscd/libwm/plat_linux.c b/kscd/libwm/plat_linux.c index 8852ba16..1d473ce2 100644 --- a/kscd/libwm/plat_linux.c +++ b/kscd/libwm/plat_linux.c @@ -43,7 +43,7 @@ #if 0 /* this breaks the build on ia64 and s390 for example. sys/types.h is already included and should provide __u64. - please tell where we really need this and let's try to find + please tell where we really need this and let's try to tqfind a working #if case for everyone ... adrian@suse.de */ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,50)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21) && LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) #undef __GNUC__ diff --git a/kscd/libwm/plat_linux_audio.c b/kscd/libwm/plat_linux_audio.c index e5608adf..690a36e5 100644 --- a/kscd/libwm/plat_linux_audio.c +++ b/kscd/libwm/plat_linux_audio.c @@ -57,13 +57,13 @@ static char plat_linux_audio_id[] = "$Id$"; * a marker into the audio stream; when the audio device driver encounters the * marker, it increments a field in a status structure. When we see that * field go up, we grab the next status structure from the queue and send it - * to the parent process. + * to the tqparent process. * * The minimum size of the queue depends on the latency of the audio stream. */ -#define QSIZE 500 +#define TQSIZE 500 -struct cdda_block queue[QSIZE]; +struct cdda_block queue[TQSIZE]; int qtail; int qstart; @@ -200,7 +200,7 @@ wmaudio_ready( void ) * Start at the correct queue position. */ if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) perror("AUDIO_GETINFO"); - qtail = info.play.eof % QSIZE; + qtail = info.play.eof % TQSIZE; qstart = qtail; queue[qtail].status = WMCDDA_OK; @@ -275,11 +275,11 @@ wmaudio_send_status( void ) int qhead; /* - * Now send the most current status information to our parent. + * Now send the most current status information to our tqparent. */ if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) perror("AUDIO_GETINFO"); - qhead = info.play.eof % QSIZE; + qhead = info.play.eof % TQSIZE; if (qhead != qstart && playing) { @@ -357,7 +357,7 @@ wmaudio_play(unsigned char *rawbuf, long buflen, struct cdda_block *blk) perror("audio mark"); } else - qtail = (qtail + 1) % QSIZE; + qtail = (qtail + 1) % TQSIZE; fcntl(aufd, F_SETFL, 0); diff --git a/kscd/libwm/plat_news.c b/kscd/libwm/plat_news.c index 4b9f2ef7..304ebfda 100644 --- a/kscd/libwm/plat_news.c +++ b/kscd/libwm/plat_news.c @@ -181,7 +181,7 @@ int gen_get_drive_status( struct wm_drive *d, int oldmode, int *mode, int *pos, int *track, int *index) { - struct CD_Status sc; + struct CD_tqStatus sc; /* If we can't get status, the CD is ejected, so default to that. */ *mode = WM_CDM_EJECTED; @@ -199,7 +199,7 @@ gen_get_drive_status( struct wm_drive *d, int oldmode, } /* Disc is ejected. Close the device. */ - if (CD_GetStatus(d->fd, &sc)) + if (CD_GettqStatus(d->fd, &sc)) { gen_close(d); return (0); diff --git a/kscd/libwm/plat_sun.c b/kscd/libwm/plat_sun.c index 4e61d68f..8d09efee 100644 --- a/kscd/libwm/plat_sun.c +++ b/kscd/libwm/plat_sun.c @@ -111,7 +111,7 @@ sigthawinit( void ) struct sigaction sa; sa.sa_handler = thawme; - sigemptyset(&sa.sa_mask); + sigemptyset(&sa.sa_tqmask); sa.sa_flags = 0; sigaction(SIGTHAW, &sa, NULL); @@ -400,7 +400,7 @@ gen_get_drive_status( struct wm_drive *d, * Now install the no-op signal handler. */ new_sig.sa_handler = do_nothing; - memset(&new_sig.sa_mask, 0, sizeof(new_sig.sa_mask)); + memset(&new_sig.sa_tqmask, 0, sizeof(new_sig.sa_tqmask)); new_sig.sa_flags = 0; if (sigaction(SIGALRM, &new_sig, &old_sig)) perror("sigaction"); diff --git a/kscd/libwm/plat_sun_audio.c b/kscd/libwm/plat_sun_audio.c index 6ef62d7b..3c9dfdc1 100644 --- a/kscd/libwm/plat_sun_audio.c +++ b/kscd/libwm/plat_sun_audio.c @@ -59,13 +59,13 @@ static char plat_sun_audio_id[] = "$Id$"; * a marker into the audio stream; when the audio device driver encounters the * marker, it increments a field in a status structure. When we see that * field go up, we grab the next status structure from the queue and send it - * to the parent process. + * to the tqparent process. * * The minimum size of the queue depends on the latency of the audio stream. */ -#define QSIZE 500 +#define TQSIZE 500 -struct cdda_block queue[QSIZE]; +struct cdda_block queue[TQSIZE]; int qtail; int qstart; @@ -204,7 +204,7 @@ wmaudio_ready( void ) * Start at the correct queue position. */ if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) perror("AUDIO_GETINFO"); - qtail = info.play.eof % QSIZE; + qtail = info.play.eof % TQSIZE; qstart = qtail; queue[qtail].status = WMCDDA_OK; @@ -279,11 +279,11 @@ wmaudio_send_status( void ) int qhead; /* - * Now send the most current status information to our parent. + * Now send the most current status information to our tqparent. */ if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) perror("AUDIO_GETINFO"); - qhead = info.play.eof % QSIZE; + qhead = info.play.eof % TQSIZE; if (qhead != qstart && playing) { @@ -361,7 +361,7 @@ wmaudio_play(unsigned char *rawbuf, long buflen, struct cdda_block *blk) perror("audio mark"); } else - qtail = (qtail + 1) % QSIZE; + qtail = (qtail + 1) % TQSIZE; fcntl(aufd, F_SETFL, 0); diff --git a/kscd/libwm/plat_svr4.c b/kscd/libwm/plat_svr4.c index 3ccaf4c4..dad4e8af 100644 --- a/kscd/libwm/plat_svr4.c +++ b/kscd/libwm/plat_svr4.c @@ -314,7 +314,7 @@ wm_scsi( struct wm_drive *d, unsigned char *xcdb, int cdblen, sb.SCB.sc_link = (struct sb *) NULL; sb.SCB.sc_resid = 0; - scs.ss_op = SS_REQSEN; + scs.ss_op = SS_RETQSEN; scs.ss_lun = 0; scs.ss_addr1 = 0; scs.ss_addr = 0; diff --git a/kscd/libwm/scsi.c b/kscd/libwm/scsi.c index 11570146..c3c1d342 100644 --- a/kscd/libwm/scsi.c +++ b/kscd/libwm/scsi.c @@ -38,7 +38,7 @@ #include "include/wm_cdrom.h" #include "include/wm_cdtext.h" -#define SCMD_INQUIRY 0x12 +#define SCMD_INTQUIRY 0x12 #define SCMD_MODE_SELECT 0x15 #define SCMD_MODE_SENSE 0x1a #define SCMD_START_STOP 0x1b @@ -48,14 +48,14 @@ #define SCMD_PLAY_AUDIO_MSF 0x47 #define SCMD_PAUSE_RESUME 0x4b -#define SUBQ_STATUS_INVALID 0x00 -#define SUBQ_STATUS_PLAY 0x11 -#define SUBQ_STATUS_PAUSE 0x12 -#define SUBQ_STATUS_DONE 0x13 -#define SUBQ_STATUS_ERROR 0x14 -#define SUBQ_STATUS_NONE 0x15 -#define SUBQ_STATUS_NO_DISC 0x17 /* Illegal, but Toshiba returns it. */ -#define SUBQ_ILLEGAL 0xff +#define SUBTQ_STATUS_INVALID 0x00 +#define SUBTQ_STATUS_PLAY 0x11 +#define SUBTQ_STATUS_PAUSE 0x12 +#define SUBTQ_STATUS_DONE 0x13 +#define SUBTQ_STATUS_ERROR 0x14 +#define SUBTQ_STATUS_NONE 0x15 +#define SUBTQ_STATUS_NO_DISC 0x17 /* Illegal, but Toshiba returns it. */ +#define SUBTQ_ILLEGAL 0xff #define PAGE_AUDIO 0x0e #define LEADOUT 0xaa @@ -194,14 +194,14 @@ wm_scsi_mode_select( struct wm_drive *d, unsigned char *buf, unsigned char len ) } /* - * Send an INQUIRY command to get the drive type. + * Send an INTQUIRY command to get the drive type. * * d Drive structure * vendor Buffer for vendor name (8 bytes + null) * model Buffer for model name (16 bytes + null) * rev Buffer for revision level (4 bytes + null) * - * The above string lengths apply to the SCSI INQUIRY command. The + * The above string lengths apply to the SCSI INTQUIRY command. The * actual WorkMan drive structure reserves 31 bytes + NULL per entry. * * If the model name begins with "CD-ROM" and zero or more spaces, that will @@ -216,7 +216,7 @@ wm_scsi_get_drive_type( struct wm_drive *d, char *vendor, memset(buf, 0, 36); wm_lib_message(WM_MSG_CLASS_SCSI | WM_MSG_LEVEL_INFO, "Sending SCSI inquiry command...\n"); - if (sendscsi(d, buf, 36, 1, SCMD_INQUIRY, 0, 0, 0, 36, 0,0,0,0,0,0,0)) + if (sendscsi(d, buf, 36, 1, SCMD_INTQUIRY, 0, 0, 0, 36, 0,0,0,0,0,0,0)) { sprintf( vendor, WM_STR_GENVENDOR); sprintf( model, WM_STR_GENMODEL); @@ -346,20 +346,20 @@ wm_scsi2_get_drive_status(struct wm_drive *d, int oldmode, } /* If we can't read status, the CD has been ejected. */ - buf[1] = SUBQ_ILLEGAL; + buf[1] = SUBTQ_ILLEGAL; if (sendscsi(d, buf, sizeof(buf), 1, SCMD_READ_SUBCHANNEL, 2, 64, 1, 0, 0, 0, sizeof(buf) / 256, sizeof(buf) % 256, 0,0,0)) return (0); switch (buf[1]) { - case SUBQ_STATUS_PLAY: + case SUBTQ_STATUS_PLAY: *mode = WM_CDM_PLAYING; *track = buf[6]; *ind = buf[7]; *pos = buf[9] * 60 * 75 + buf[10] * 75 + buf[11]; break; - case SUBQ_STATUS_PAUSE: + case SUBTQ_STATUS_PAUSE: if (oldmode == WM_CDM_PLAYING || oldmode == WM_CDM_PAUSED) { *mode = WM_CDM_PAUSED; @@ -374,13 +374,13 @@ wm_scsi2_get_drive_status(struct wm_drive *d, int oldmode, break; /* - * SUBQ_STATUS_DONE is sometimes returned when the CD is idle, + * SUBTQ_STATUS_DONE is sometimes returned when the CD is idle, * even though the spec says it should only be returned when an * audio play operation finishes. */ - case SUBQ_STATUS_DONE: - case SUBQ_STATUS_NONE: - case SUBQ_STATUS_INVALID: + case SUBTQ_STATUS_DONE: + case SUBTQ_STATUS_NONE: + case SUBTQ_STATUS_INVALID: if (oldmode == WM_CDM_PLAYING) *mode = WM_CDM_TRACK_DONE; else @@ -390,16 +390,16 @@ wm_scsi2_get_drive_status(struct wm_drive *d, int oldmode, /* * This usually means there's no disc in the drive. */ - case SUBQ_STATUS_NO_DISC: + case SUBTQ_STATUS_NO_DISC: break; /* * This usually means the user ejected the CD manually. */ - case SUBQ_STATUS_ERROR: + case SUBTQ_STATUS_ERROR: break; - case SUBQ_ILLEGAL: /* call didn't really succeed */ + case SUBTQ_ILLEGAL: /* call didn't really succeed */ break; default: diff --git a/kscd/panel.ui b/kscd/panel.ui index 3b6b218a..6f8cec6a 100644 --- a/kscd/panel.ui +++ b/kscd/panel.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>kscdPanelDlg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>kscdPanelDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -25,28 +25,28 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>songListCB</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>timeIcon</cstring> </property> @@ -57,7 +57,7 @@ <string>Track progress</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>timeSlider</cstring> </property> @@ -92,14 +92,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>volumeIcon</cstring> </property> @@ -110,7 +110,7 @@ <string>Volume control</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>volumeSlider</cstring> </property> @@ -126,9 +126,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <grid> <property name="name"> @@ -137,7 +137,7 @@ <property name="spacing"> <number>1</number> </property> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>ejectPB</cstring> </property> @@ -148,7 +148,7 @@ <bool>true</bool> </property> </widget> - <widget class="QFrame" row="0" column="2" rowspan="3" colspan="2"> + <widget class="TQFrame" row="0" column="2" rowspan="3" colspan="2"> <property name="name"> <cstring>backdrop</cstring> </property> @@ -160,7 +160,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>270</width> <height>80</height> @@ -201,15 +201,15 @@ <property name="margin"> <number>2</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame" row="0" column="0" rowspan="2" colspan="2"> + <widget class="TQFrame" row="0" column="0" rowspan="2" colspan="2"> <property name="name"> <cstring>frameleds</cstring> </property> @@ -221,7 +221,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>35</height> @@ -234,15 +234,15 @@ <enum>Raised</enum> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>statuslabel</cstring> </property> <property name="text"> - <string>Status</string> + <string>tqStatus</string> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>volumelabel</cstring> </property> @@ -250,12 +250,12 @@ <string>Vol: --</string> </property> </widget> - <widget class="QLabel" row="0" column="3"> + <widget class="TQLabel" row="0" column="3"> <property name="name"> <cstring>totaltimelabel</cstring> </property> </widget> - <widget class="QLabel" row="1" column="3"> + <widget class="TQLabel" row="1" column="3"> <property name="name"> <cstring>tracklabel</cstring> </property> @@ -263,7 +263,7 @@ <string>--/--</string> </property> </widget> - <widget class="QWidget" row="0" column="4" rowspan="2" colspan="1"> + <widget class="TQWidget" row="0" column="4" rowspan="2" colspan="1"> <property name="name"> <cstring>symbols</cstring> </property> @@ -275,7 +275,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>30</width> <height>0</height> @@ -285,7 +285,7 @@ <string>Vol: --</string> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>artistlabel</cstring> </property> @@ -293,7 +293,7 @@ <string>Artist</string> </property> </widget> - <widget class="QLabel" row="3" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>titlelabel</cstring> </property> @@ -305,7 +305,7 @@ </widget> </vbox> </widget> - <widget class="QPushButton" row="3" column="0"> + <widget class="TQPushButton" row="3" column="0"> <property name="name"> <cstring>shufflePB</cstring> </property> @@ -319,7 +319,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="3" column="3"> + <widget class="TQPushButton" row="3" column="3"> <property name="name"> <cstring>infoPB</cstring> </property> @@ -330,7 +330,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>playPB</cstring> </property> @@ -341,7 +341,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>stopPB</cstring> </property> @@ -355,7 +355,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="3" column="2"> + <widget class="TQPushButton" row="3" column="2"> <property name="name"> <cstring>cddbPB</cstring> </property> @@ -366,7 +366,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>repeatPB</cstring> </property> @@ -383,7 +383,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>nextPB</cstring> </property> @@ -394,7 +394,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>prevPB</cstring> </property> @@ -457,12 +457,12 @@ <tabstop>cddbPB</tabstop> <tabstop>infoPB</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>playClicked()</slot> <slot>stopClicked()</slot> <slot>prevClicked()</slot> <slot>ejectClicked()</slot> <slot returnType="bool">nextClicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/libkcddb/asynccddbplookup.cpp b/libkcddb/asynccddbplookup.cpp index d2584adf..d51ef386 100644 --- a/libkcddb/asynccddbplookup.cpp +++ b/libkcddb/asynccddbplookup.cpp @@ -224,7 +224,7 @@ namespace KCDDB } } - QString + TQString AsyncCDDBPLookup::readLine() { return TQString::fromUtf8(socket_->readLine()); @@ -294,7 +294,7 @@ namespace KCDDB sendQuit(); } - QString + TQString AsyncCDDBPLookup::stateToString() const { switch (state_) diff --git a/libkcddb/asynccddbplookup.h b/libkcddb/asynccddbplookup.h index 17b72f48..dc578e64 100644 --- a/libkcddb/asynccddbplookup.h +++ b/libkcddb/asynccddbplookup.h @@ -30,6 +30,7 @@ namespace KCDDB class AsyncCDDBPLookup : public CDDBPLookup { Q_OBJECT + TQ_OBJECT public: diff --git a/libkcddb/asynchttplookup.h b/libkcddb/asynchttplookup.h index 80926211..897b4791 100644 --- a/libkcddb/asynchttplookup.h +++ b/libkcddb/asynchttplookup.h @@ -29,6 +29,7 @@ namespace KCDDB { Q_OBJECT + TQ_OBJECT public: diff --git a/libkcddb/asynchttpsubmit.h b/libkcddb/asynchttpsubmit.h index 89ab8313..fcb8ec35 100644 --- a/libkcddb/asynchttpsubmit.h +++ b/libkcddb/asynchttpsubmit.h @@ -26,6 +26,7 @@ namespace KCDDB class AsyncHTTPSubmit : public HTTPSubmit { Q_OBJECT + TQ_OBJECT public: AsyncHTTPSubmit(const TQString& from, const TQString& hostname, uint port); virtual ~AsyncHTTPSubmit(); diff --git a/libkcddb/asyncsmtpsubmit.h b/libkcddb/asyncsmtpsubmit.h index 9bcf84eb..24d10439 100644 --- a/libkcddb/asyncsmtpsubmit.h +++ b/libkcddb/asyncsmtpsubmit.h @@ -27,6 +27,7 @@ namespace KCDDB class AsyncSMTPSubmit : public SMTPSubmit { Q_OBJECT + TQ_OBJECT public: AsyncSMTPSubmit(const TQString& hostname, uint port, const TQString& username, diff --git a/libkcddb/cache.cpp b/libkcddb/cache.cpp index 01c5dec0..127fc6ba 100644 --- a/libkcddb/cache.cpp +++ b/libkcddb/cache.cpp @@ -30,7 +30,7 @@ namespace KCDDB { - QString + TQString Cache::fileName( const TQString &category, const TQString &discid, const TQString &cacheDir ) { TQDir dir( cacheDir ); diff --git a/libkcddb/categories.cpp b/libkcddb/categories.cpp index 5b86a5f5..97ec6acf 100644 --- a/libkcddb/categories.cpp +++ b/libkcddb/categories.cpp @@ -25,7 +25,7 @@ KCDDB::Categories::Categories() const TQString KCDDB::Categories::cddb2i18n(const TQString &category) const { - int index = m_cddb.findIndex(category.stripWhiteSpace()); + int index = m_cddb.tqfindIndex(category.stripWhiteSpace()); if (index != -1) { return m_i18n[index]; @@ -38,7 +38,7 @@ const TQString KCDDB::Categories::cddb2i18n(const TQString &category) const const TQString KCDDB::Categories::i18n2cddb(const TQString &category) const { - int index = m_i18n.findIndex(category.stripWhiteSpace()); + int index = m_i18n.tqfindIndex(category.stripWhiteSpace()); if (index != -1) { return m_cddb[index]; diff --git a/libkcddb/cddb.cpp b/libkcddb/cddb.cpp index f0ee84e0..c11e086c 100644 --- a/libkcddb/cddb.cpp +++ b/libkcddb/cddb.cpp @@ -43,12 +43,12 @@ namespace KCDDB // Empty. } - QString + TQString CDDB::trackOffsetListToId() { return trackOffsetListToId( trackOffsetList_ ); } - QString + TQString CDDB::trackOffsetListToId( const TrackOffsetList & list ) { // Taken from version by Michael Matz in kio_audiocd. @@ -74,7 +74,7 @@ namespace KCDDB return TQString::number( id, 16 ).rightJustify( 8, '0' ); } - QString + TQString CDDB::trackOffsetListToString() { TQString ret; @@ -100,14 +100,14 @@ namespace KCDDB bool CDDB::parseGreeting( const TQString & line ) { - uint serverStatus = statusCode( line ); + uint servertqStatus = statusCode( line ); - if ( 200 == serverStatus ) + if ( 200 == servertqStatus ) { kdDebug(60010) << "Server response: read-only" << endl; readOnly_ = true; } - else if ( 201 == serverStatus ) + else if ( 201 == servertqStatus ) { kdDebug(60010) << "Server response: read-write" << endl; } @@ -123,9 +123,9 @@ namespace KCDDB bool CDDB::parseHandshake( const TQString & line ) { - uint serverStatus = statusCode( line ); + uint servertqStatus = statusCode( line ); - if ( ( 200 != serverStatus ) && ( 402 != serverStatus ) ) + if ( ( 200 != servertqStatus ) && ( 402 != servertqStatus ) ) { kdDebug(60010) << "Handshake was too tight. Letting go." << endl; return false; @@ -141,9 +141,9 @@ namespace KCDDB { TQStringList tokenList = TQStringList::split( ' ', line ); - uint serverStatus = tokenList[ 0 ].toUInt(); + uint servertqStatus = tokenList[ 0 ].toUInt(); - return serverStatus; + return servertqStatus; } /* CDDB::Transport @@ -157,7 +157,7 @@ namespace KCDDB return SMTP; }*/ - QString + TQString CDDB::resultToString(Result r) { switch (r) @@ -200,7 +200,7 @@ namespace KCDDB } } -/* QString +/* TQString CDDB::transportToString(uint t) { switch (Transport(t)) diff --git a/libkcddb/cddb.h b/libkcddb/cddb.h index 04d754c0..d82ea599 100644 --- a/libkcddb/cddb.h +++ b/libkcddb/cddb.h @@ -66,8 +66,8 @@ namespace KCDDB static TQString resultToString(Result); static TQString trackOffsetListToId( const TrackOffsetList & ); - static TQString clientName() { return TQString::fromLatin1("libkcddb"); } - static TQString clientVersion() { return TQString::fromLatin1("0.31"); } + static TQString clientName() { return TQString::tqfromLatin1("libkcddb"); } + static TQString clientVersion() { return TQString::tqfromLatin1("0.31"); } protected: bool parseGreeting( const TQString & ); diff --git a/libkcddb/cddbplookup.cpp b/libkcddb/cddbplookup.cpp index cd287b99..db62cbae 100644 --- a/libkcddb/cddbplookup.cpp +++ b/libkcddb/cddbplookup.cpp @@ -40,10 +40,10 @@ namespace KCDDB CDDBPLookup::sendHandshake() { TQString handshake = TQString( "cddb hello %1 %2 %3 %4" ) - .arg( user_ ) - .arg( localHostName_ ) - .arg( clientName() ) - .arg( clientVersion() ); + .tqarg( user_ ) + .tqarg( localHostName_ ) + .tqarg( clientName() ) + .tqarg( clientVersion() ); writeLine( handshake ); } @@ -58,8 +58,8 @@ namespace KCDDB CDDBPLookup::sendQuery() { TQString query = TQString( "cddb query %1 %2" ) - .arg( trackOffsetListToId() ) - .arg( trackOffsetListToString() ); + .tqarg( trackOffsetListToId() ) + .tqarg( trackOffsetListToString() ); writeLine( query ); } @@ -71,8 +71,8 @@ namespace KCDDB TQString discid = match.second; TQString readRequest = TQString( "cddb read %1 %2" ) - .arg( category_ ) - .arg( discid ); + .tqarg( category_ ) + .tqarg( discid ); writeLine( readRequest ); } @@ -93,7 +93,7 @@ namespace KCDDB } } - Q_LONG + TQ_LONG CDDBPLookup::writeLine( const TQString & line ) { if ( !isConnected() ) diff --git a/libkcddb/cddbplookup.h b/libkcddb/cddbplookup.h index c7983cde..de20e532 100644 --- a/libkcddb/cddbplookup.h +++ b/libkcddb/cddbplookup.h @@ -42,7 +42,7 @@ namespace KCDDB void close(); protected: - Q_LONG writeLine( const TQString & ); + TQ_LONG writeLine( const TQString & ); bool isConnected() { return KNetwork::KClientSocketBase::Connected == socket_->state(); } diff --git a/libkcddb/cdinfo.cpp b/libkcddb/cdinfo.cpp index bf69f853..eee89d87 100644 --- a/libkcddb/cdinfo.cpp +++ b/libkcddb/cdinfo.cpp @@ -177,7 +177,7 @@ namespace KCDDB } } - int slashPos = dtitle.find('/'); + int slashPos = dtitle.tqfind('/'); if (-1 == slashPos) { @@ -198,7 +198,7 @@ namespace KCDDB return true; } - QString + TQString CDInfo::toString(bool submit) const { TQString s; @@ -209,18 +209,18 @@ namespace KCDDB if (submit) { s += "#\n"; - s += TQString("# Submitted via: %1 %2\n").arg(CDDB::clientName(), + s += TQString("# Submitted via: %1 %2\n").tqarg(CDDB::clientName(), CDDB::clientVersion()); } s += "DISCID=" + escape( id ) + "\n"; s += createLine("DTITLE",escape( artist ) + " / " + escape( title )); - s += "DYEAR=" + (0 == year ? TQString::null : TQString::number(year)) + "\n"; + s += "DYEAR=" + (0 == year ? TQString() : TQString::number(year)) + "\n"; s += createLine("DGENRE",escape( genre )); for (uint i = 0; i < trackInfoList.count(); ++i) { - s += createLine(TQString("TTITLE%1").arg(i), + s += createLine(TQString("TTITLE%1").tqarg(i), escape( trackInfoList[ i ].title)); } @@ -228,7 +228,7 @@ namespace KCDDB for (uint i = 0; i < trackInfoList.count(); ++i) { - s += createLine(TQString("EXTT%1").arg(i), escape(trackInfoList[i].extt)); + s += createLine(TQString("EXTT%1").tqarg(i), escape(trackInfoList[i].extt)); } s +="PLAYORDER=\n"; @@ -238,7 +238,7 @@ namespace KCDDB // Creates a line in the form NAME=VALUE, and splits it into several // lines if the line gets longer than 256 chars - QString + TQString CDInfo::createLine(const TQString& name, const TQString& value) const { Q_ASSERT(name.length() < 254); @@ -251,11 +251,11 @@ namespace KCDDB while (tmpValue.length() > maxLength) { - lines += TQString("%1=%2\n").arg(name,tmpValue.left(maxLength)); + lines += TQString("%1=%2\n").tqarg(name,tmpValue.left(maxLength)); tmpValue = tmpValue.mid(maxLength); } - lines += TQString("%1=%2\n").arg(name,tmpValue); + lines += TQString("%1=%2\n").tqarg(name,tmpValue); return lines; } @@ -270,25 +270,25 @@ namespace KCDDB } } - QString + TQString CDInfo::escape( const TQString& value ) { TQString s = value; - s.replace( "\\", "\\\\" ); - s.replace( "\n", "\\n" ); - s.replace( "\t", "\\t" ); + s.tqreplace( "\\", "\\\\" ); + s.tqreplace( "\n", "\\n" ); + s.tqreplace( "\t", "\\t" ); return s; } - QString + TQString CDInfo::unescape( const TQString& value ) { TQString s = value; - s.replace( "\\n", "\n" ); - s.replace( "\\t", "\t" ); - s.replace( "\\\\", "\\" ); + s.tqreplace( "\\n", "\n" ); + s.tqreplace( "\\t", "\t" ); + s.tqreplace( "\\\\", "\\" ); return s; } @@ -296,7 +296,7 @@ namespace KCDDB void CDInfo::clear() { - id = artist = title = genre = extd = TQString::null; + id = artist = title = genre = extd = TQString(); length = year = revision = 0; trackInfoList.clear(); } diff --git a/libkcddb/cdinfodialogbase.ui b/libkcddb/cdinfodialogbase.ui index 76ee8141..dcebf8fb 100644 --- a/libkcddb/cdinfodialogbase.ui +++ b/libkcddb/cdinfodialogbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>CDInfoDialogBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CDInfoDialogBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,15 +16,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="5" column="2"> + <widget class="TQLabel" row="5" column="2"> <property name="name"> <cstring>lb_revision</cstring> </property> @@ -40,7 +40,7 @@ <string>Use the name of the artist if there is no title.</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>lb_category</cstring> </property> @@ -51,7 +51,7 @@ <cstring>m_category</cstring> </property> </widget> - <widget class="QLabel" row="5" column="1"> + <widget class="TQLabel" row="5" column="1"> <property name="name"> <cstring>m_id</cstring> </property> @@ -67,7 +67,7 @@ <string>Write names as "first last", not "last, first". Omit any leading "The". Use "Various" for compilations.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lb_artist</cstring> </property> @@ -78,7 +78,7 @@ <cstring>m_artist</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lb_year</cstring> </property> @@ -89,7 +89,7 @@ <cstring>m_year</cstring> </property> </widget> - <widget class="QLabel" row="4" column="2"> + <widget class="TQLabel" row="4" column="2"> <property name="name"> <cstring>lb_genre</cstring> </property> @@ -122,7 +122,7 @@ <number>0</number> </property> </widget> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_multiple</cstring> </property> @@ -138,7 +138,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lb_comment</cstring> </property> @@ -149,7 +149,7 @@ <cstring>le_discInfo</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lb_title</cstring> </property> @@ -174,7 +174,7 @@ <string>Avoid custom values, as they will be written to CDDB as-is.</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>lb_id</cstring> </property> @@ -182,7 +182,7 @@ <string>Disc Id:</string> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>lb_length</cstring> </property> @@ -190,12 +190,12 @@ <string>Length:</string> </property> </widget> - <widget class="QLabel" row="5" column="3"> + <widget class="TQLabel" row="5" column="3"> <property name="name"> <cstring>m_revision</cstring> </property> </widget> - <widget class="QLabel" row="3" column="3"> + <widget class="TQLabel" row="3" column="3"> <property name="name"> <cstring>m_length</cstring> </property> @@ -274,9 +274,9 @@ <string>For a CD-Extra, set title to "Data".</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -292,14 +292,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>231</width> <height>41</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_changeEncoding</cstring> </property> @@ -309,7 +309,7 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lb_playingOrder</cstring> </property> @@ -329,27 +329,27 @@ <connections> <connection> <sender>m_trackList</sender> - <signal>selectionChanged(QListViewItem*)</signal> + <signal>selectionChanged(TQListViewItem*)</signal> <receiver>CDInfoDialogBase</receiver> - <slot>slotTrackSelected(QListViewItem*)</slot> + <slot>slotTrackSelected(TQListViewItem*)</slot> </connection> <connection> <sender>m_trackList</sender> - <signal>doubleClicked(QListViewItem*,const QPoint&,int)</signal> + <signal>doubleClicked(TQListViewItem*,const TQPoint&,int)</signal> <receiver>CDInfoDialogBase</receiver> - <slot>slotTrackDoubleClicked(QListViewItem*,const QPoint&,int)</slot> + <slot>slotTrackDoubleClicked(TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>m_artist</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>CDInfoDialogBase</receiver> - <slot>artistChanged(const QString&)</slot> + <slot>artistChanged(const TQString&)</slot> </connection> <connection> <sender>m_genre</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>CDInfoDialogBase</receiver> - <slot>genreChanged(const QString&)</slot> + <slot>genreChanged(const TQString&)</slot> </connection> <connection> <sender>m_multiple</sender> @@ -376,7 +376,7 @@ </tabstops> <includes> <include location="local" impldecl="in implementation">kdialog.h</include> - <include location="local" impldecl="in implementation">qdatetime.h</include> + <include location="local" impldecl="in implementation">tqdatetime.h</include> <include location="local" impldecl="in declaration">libkcddb/cdinfo.h</include> <include location="local" impldecl="in declaration">libkcddb/cddb.h</include> <include location="local" impldecl="in declaration">libkcddb/categories.h</include> @@ -397,29 +397,29 @@ <variable access="public">static const unsigned TRACK_TITLE = 2;</variable> <variable access="public">static const unsigned TRACK_COMMENT = 3;</variable> </variables> -<signals> +<Q_SIGNALS> <signal>play(int i)</signal> <signal>discInfoClicked()</signal> <signal>trackInfoClicked(unsigned)</signal> -</signals> -<slots> - <slot access="protected">slotTrackSelected( QListViewItem * item )</slot> +</Q_SIGNALS> +<Q_SLOTS> + <slot access="protected">slotTrackSelected( TQListViewItem * item )</slot> <slot access="protected">slotNextTrack()</slot> - <slot access="protected">slotTrackDoubleClicked( QListViewItem * item, const QPoint &, int column )</slot> + <slot access="protected">slotTrackDoubleClicked( TQListViewItem * item, const TQPoint &, int column )</slot> <slot>setInfo( const KCDDB::CDInfo & info, KCDDB::TrackOffsetList & trackStartFrames )</slot> - <slot>artistChanged( const QString & newArtist )</slot> - <slot>genreChanged( const QString & newGenre )</slot> + <slot>artistChanged( const TQString & newArtist )</slot> + <slot>genreChanged( const TQString & newGenre )</slot> <slot>slotMultipleArtists( bool hasMultipleArtist )</slot> <slot access="private">slotChangeEncoding()</slot> -</slots> +</Q_SLOTS> <functions> <function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">destroy()</function> - <function returnType="QString">framesTime( unsigned frames )</function> + <function returnType="TQString">framesTime( unsigned frames )</function> <function returnType="KCDDB::CDInfo">info() const</function> </functions> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/libkcddb/cdinfodialogbase.ui.h b/libkcddb/cdinfodialogbase.ui.h index e33ad487..35447aaa 100644 --- a/libkcddb/cdinfodialogbase.ui.h +++ b/libkcddb/cdinfodialogbase.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -83,7 +83,7 @@ void CDInfoDialogBase::setInfo( const KCDDB::CDInfo &info, KCDDB::TrackOffsetLis item->setText(TRACK_NUMBER, TQString().sprintf("%02d", i + 1)); item->setText(TRACK_TIME, framesTime(trackStartFrames[i + ((i + 1 < tracks) ? 1 : 2)] - trackStartFrames[i])); TQString title = info.trackInfoList[i].title; - int separator = title.find(SEPARATOR); + int separator = title.tqfind(SEPARATOR); if (info.artist != "Various" || separator == -1 || !m_multiple->isChecked() ) { item->setText(TRACK_ARTIST, ""); @@ -179,7 +179,7 @@ void CDInfoDialogBase::slotMultipleArtists( bool hasMultipleArtist) for (TQListViewItem *item = m_trackList->firstChild(); item; item=item->nextSibling()) { TQString title = item->text(TRACK_TITLE); - int separator = title.find(SEPARATOR); + int separator = title.tqfind(SEPARATOR); if (separator != -1) { // Artists probably entered already @@ -196,7 +196,7 @@ void CDInfoDialogBase::slotMultipleArtists( bool hasMultipleArtist) TQString artist = item->text(TRACK_ARTIST); if (!artist.isEmpty()) { - item->setText(TRACK_ARTIST, TQString::null); + item->setText(TRACK_ARTIST, TQString()); item->setText(TRACK_TITLE, artist + SEPARATOR + item->text(TRACK_TITLE)); } } diff --git a/libkcddb/cdinfoencodingwidget.cpp b/libkcddb/cdinfoencodingwidget.cpp index 42d0e506..0cf47196 100644 --- a/libkcddb/cdinfoencodingwidget.cpp +++ b/libkcddb/cdinfoencodingwidget.cpp @@ -28,9 +28,9 @@ namespace KCDDB { - CDInfoEncodingWidget::CDInfoEncodingWidget(TQWidget* parent, const TQString& artist, + CDInfoEncodingWidget::CDInfoEncodingWidget(TQWidget* tqparent, const TQString& artist, const TQString& title, const TQStringList& songTitles) - : CDInfoEncodingWidgetBase(parent), m_artist(artist), m_title(title), + : CDInfoEncodingWidgetBase(tqparent), m_artist(artist), m_title(title), m_songTitles(songTitles) { encodingCombo->insertStringList(KGlobal::charsets()->descriptiveEncodingNames()); @@ -62,7 +62,7 @@ namespace KCDDB songsBox->clear(); songsBox->insertStringList(newTitles); - titleLabel->setText(i18n("artist - cdtitle", "%1 - %2").arg( + titleLabel->setText(i18n("artist - cdtitle", "%1 - %2").tqarg( codec->toUnicode(m_artist.latin1()), codec->toUnicode(m_title.latin1()))); } } diff --git a/libkcddb/cdinfoencodingwidget.h b/libkcddb/cdinfoencodingwidget.h index 7182b44f..a5fa8522 100644 --- a/libkcddb/cdinfoencodingwidget.h +++ b/libkcddb/cdinfoencodingwidget.h @@ -27,8 +27,9 @@ namespace KCDDB class CDInfoEncodingWidget : public CDInfoEncodingWidgetBase { Q_OBJECT + TQ_OBJECT public: - CDInfoEncodingWidget(TQWidget* parent, const TQString& artist, const TQString& title, + CDInfoEncodingWidget(TQWidget* tqparent, const TQString& artist, const TQString& title, const TQStringList& songTitles); TQString selectedEncoding(); diff --git a/libkcddb/cdinfoencodingwidgetbase.ui b/libkcddb/cdinfoencodingwidgetbase.ui index e5156908..a3ffa82b 100644 --- a/libkcddb/cdinfoencodingwidgetbase.ui +++ b/libkcddb/cdinfoencodingwidgetbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>CDInfoEncodingWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CDInfoEncodingWidgetBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>encodingLabel</cstring> </property> @@ -24,12 +24,12 @@ <string>Encoding:</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>encodingCombo</cstring> </property> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -40,7 +40,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>titleLabel</cstring> </property> @@ -51,11 +51,11 @@ <string></string> </property> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>songsBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>250</height> @@ -66,5 +66,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/libkcddb/client.h b/libkcddb/client.h index 3aeb3bd6..33728783 100644 --- a/libkcddb/client.h +++ b/libkcddb/client.h @@ -40,9 +40,10 @@ namespace KCDDB * cddb->lookup(discSignature); * CDInfo info = cddb->bestLookupResponse();</code> */ - class KDE_EXPORT Client : public QObject + class KDE_EXPORT Client : public TQObject { Q_OBJECT + TQ_OBJECT public: diff --git a/libkcddb/genres.cpp b/libkcddb/genres.cpp index 423e80fc..ac1b86ad 100644 --- a/libkcddb/genres.cpp +++ b/libkcddb/genres.cpp @@ -97,7 +97,7 @@ KCDDB::Genres::Genres() const TQString KCDDB::Genres::cddb2i18n(const TQString &genre) const { TQString userDefinedGenre = genre.stripWhiteSpace(); - int index = m_cddb.findIndex(userDefinedGenre); + int index = m_cddb.tqfindIndex(userDefinedGenre); if (index != -1) { return m_i18n[index]; @@ -111,7 +111,7 @@ const TQString KCDDB::Genres::cddb2i18n(const TQString &genre) const const TQString KCDDB::Genres::i18n2cddb(const TQString &genre) const { TQString userDefinedGenre = genre.stripWhiteSpace(); - int index = m_i18n.findIndex(userDefinedGenre); + int index = m_i18n.tqfindIndex(userDefinedGenre); if (index != -1) { return m_cddb[index]; diff --git a/libkcddb/httplookup.cpp b/libkcddb/httplookup.cpp index c360c423..c3a942d3 100644 --- a/libkcddb/httplookup.cpp +++ b/libkcddb/httplookup.cpp @@ -40,7 +40,7 @@ namespace KCDDB HTTPLookup::sendQuery() { TQString cmd = TQString( "cddb query %1 %2" ) - .arg( trackOffsetListToId(), trackOffsetListToString() ) ; + .tqarg( trackOffsetListToId(), trackOffsetListToString() ) ; makeURL( cmd ); Result result = fetchURL(); @@ -55,7 +55,7 @@ namespace KCDDB TQString discid = match.second; TQString cmd = TQString( "cddb read %1 %2" ) - .arg( category_, discid ); + .tqarg( category_, discid ); makeURL( cmd ); Result result = fetchURL(); @@ -80,10 +80,10 @@ namespace KCDDB // The whole query has to constructed each time as the // CDDB CGI script expects the parameters in strict order - cgiURL_.setQuery( TQString::null ); + cgiURL_.setQuery( TQString() ); TQString hello = TQString("%1 %2 %3 %4") - .arg(user_, localHostName_, clientName(), clientVersion()); + .tqarg(user_, localHostName_, clientName(), clientVersion()); cgiURL_.addQueryItem( "cmd", cmd ); cgiURL_.addQueryItem( "hello", hello ); diff --git a/libkcddb/httplookup.h b/libkcddb/httplookup.h index b8f9c179..ae720f5e 100644 --- a/libkcddb/httplookup.h +++ b/libkcddb/httplookup.h @@ -38,6 +38,7 @@ namespace KCDDB { Q_OBJECT + TQ_OBJECT public: diff --git a/libkcddb/kcmcddb/cddbconfigwidget.cpp b/libkcddb/kcmcddb/cddbconfigwidget.cpp index 442efd12..ec08253a 100644 --- a/libkcddb/kcmcddb/cddbconfigwidget.cpp +++ b/libkcddb/kcmcddb/cddbconfigwidget.cpp @@ -38,8 +38,8 @@ #include <tqbuttongroup.h> #include <tqcheckbox.h> -CDDBConfigWidget::CDDBConfigWidget(TQWidget * parent, const char * name) - : CDDBConfigWidgetBase(parent, name) +CDDBConfigWidget::CDDBConfigWidget(TQWidget * tqparent, const char * name) + : CDDBConfigWidgetBase(tqparent, name) { // Connections from widgets are made in designer. diff --git a/libkcddb/kcmcddb/cddbconfigwidget.h b/libkcddb/kcmcddb/cddbconfigwidget.h index e927284c..647d4717 100644 --- a/libkcddb/kcmcddb/cddbconfigwidget.h +++ b/libkcddb/kcmcddb/cddbconfigwidget.h @@ -27,10 +27,11 @@ class CDDBConfigWidget : public CDDBConfigWidgetBase { Q_OBJECT + TQ_OBJECT public: - CDDBConfigWidget(TQWidget * parent = 0, const char * name = 0); + CDDBConfigWidget(TQWidget * tqparent = 0, const char * name = 0); protected slots: diff --git a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui index 2158159a..71ed425d 100644 --- a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui +++ b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>CDDBConfigWidgetBase</class> <comment>Used for configuring libkcddb.</comment> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CDDBConfigWidgetBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -23,11 +23,11 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -38,7 +38,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>kcfg_cachePolicy</cstring> </property> @@ -63,7 +63,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>cacheOnly</cstring> </property> @@ -74,7 +74,7 @@ <string>Only check in the local cache for CD information.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>cacheAndRemote</cstring> </property> @@ -85,7 +85,7 @@ <string>Check for locally cached CD information before trying to look up at remote CDDB server.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>remoteOnly</cstring> </property> @@ -98,7 +98,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>serverBox</cstring> </property> @@ -115,7 +115,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>TextLabel7</cstring> </property> @@ -126,7 +126,7 @@ <cstring>kcfg_hostname</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel9</cstring> </property> @@ -137,7 +137,7 @@ <cstring>kcfg_lookupTransport</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>CDDB</string> @@ -163,7 +163,7 @@ <string>Show &Mirror List</string> </property> </widget> - <widget class="QSpinBox" row="0" column="4"> + <widget class="TQSpinBox" row="0" column="4"> <property name="name"> <cstring>kcfg_port</cstring> </property> @@ -185,21 +185,21 @@ <string>Port to connect to on CDDB server.</string> </property> </widget> - <widget class="QLabel" row="0" column="3"> + <widget class="TQLabel" row="0" column="3"> <property name="name"> <cstring>TextLabel8</cstring> </property> <property name="text"> <string>&Port:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>kcfg_port</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_hostname</cstring> </property> @@ -220,11 +220,11 @@ </widget> </grid> </widget> - <widget class="QWidgetStack"> + <widget class="TQWidgetStack"> <property name="name"> <cstring>cacheLocationsParent</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WStackPage</cstring> </property> @@ -243,7 +243,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>260</height> @@ -252,7 +252,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -263,12 +263,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>kcfg_emailAddress</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -286,14 +286,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>240</height> </size> </property> </spacer> - <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_submitTransport</cstring> </property> @@ -314,7 +314,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>21</height> @@ -331,14 +331,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>21</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="1" rowspan="1" colspan="3"> + <widget class="TQLabel" row="1" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -346,7 +346,7 @@ <string>Server:</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="6"> + <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>radioButton8</cstring> </property> @@ -367,14 +367,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>140</height> </size> </property> </spacer> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>radioButton6</cstring> </property> @@ -390,23 +390,23 @@ <cstring>kcfg_httpSubmitServer</cstring> </property> </widget> - <widget class="QLabel" row="1" column="6"> + <widget class="TQLabel" row="1" column="6"> <property name="name"> <cstring>textLabel1_2</cstring> </property> <property name="text"> <string>Port:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QSpinBox" row="1" column="7"> + <widget class="TQSpinBox" row="1" column="7"> <property name="name"> <cstring>kcfg_httpSubmitPort</cstring> </property> </widget> - <widget class="QLabel" row="3" column="1" rowspan="1" colspan="4"> + <widget class="TQLabel" row="3" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel9_2</cstring> </property> @@ -414,7 +414,7 @@ <string>Reply-To:</string> </property> </widget> - <widget class="QLabel" row="4" column="1" rowspan="1" colspan="4"> + <widget class="TQLabel" row="4" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -430,7 +430,7 @@ <string>SMTP server:</string> </property> </widget> - <widget class="QLabel" row="5" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="5" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -446,12 +446,12 @@ <string>Port:</string> </property> </widget> - <widget class="QLineEdit" row="3" column="5" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="3" column="5" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_replyTo</cstring> </property> </widget> - <widget class="QCheckBox" row="6" column="1" rowspan="1" colspan="7"> + <widget class="TQCheckBox" row="6" column="1" rowspan="1" colspan="7"> <property name="name"> <cstring>needsAuthenticationBox</cstring> </property> @@ -459,12 +459,12 @@ <string>Server needs authentication</string> </property> </widget> - <widget class="QLineEdit" row="4" column="5" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="4" column="5" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_smtpHostname</cstring> </property> </widget> - <widget class="QLabel" row="7" column="2" rowspan="1" colspan="3"> + <widget class="TQLabel" row="7" column="2" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -472,7 +472,7 @@ <string>Username:</string> </property> </widget> - <widget class="QLineEdit" row="7" column="5" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="7" column="5" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_smtpUsername</cstring> </property> @@ -488,7 +488,7 @@ </sizepolicy> </property> </widget> - <widget class="QSpinBox" row="5" column="3" rowspan="1" colspan="2"> + <widget class="TQSpinBox" row="5" column="3" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_smtpPort</cstring> </property> @@ -517,7 +517,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>260</width> <height>20</height> @@ -580,13 +580,13 @@ <tabstop>kcfg_port</tabstop> <tabstop>kcfg_lookupTransport</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot access="protected">protocolChanged()</slot> <slot access="protected">showMirrorList()</slot> <slot access="protected">needAuthenticationChanged(bool)</slot> -</slots> -<layoutdefaults spacing="11" margin="6"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="11" margin="6"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>klineedit.h</includehint> diff --git a/libkcddb/kcmcddb/kcmcddb.cpp b/libkcddb/kcmcddb/kcmcddb.cpp index 3688ba6a..fa10bc4a 100644 --- a/libkcddb/kcmcddb/kcmcddb.cpp +++ b/libkcddb/kcmcddb/kcmcddb.cpp @@ -45,8 +45,8 @@ typedef KGenericFactory<CDDBModule, TQWidget> KCDDBFactory; K_EXPORT_COMPONENT_FACTORY ( kcm_cddb, KCDDBFactory( "kcmcddb" ) ) -CDDBModule::CDDBModule(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(parent, name) +CDDBModule::CDDBModule(TQWidget *tqparent, const char *name, const TQStringList &) + : KCModule(tqparent, name) { KGlobal::locale()->insertCatalogue("libkcddb"); setButtons(Default | Apply); @@ -58,10 +58,10 @@ CDDBModule::CDDBModule(TQWidget *parent, const char *name, const TQStringList &) addConfig(cfg, widget_); - TQVBoxLayout * layout = new TQVBoxLayout(this, 0); + TQVBoxLayout * tqlayout = new TQVBoxLayout(this, 0); - layout->addWidget(widget_); - layout->addStretch(); + tqlayout->addWidget(widget_); + tqlayout->addStretch(); setQuickHelp(i18n("CDDB is used to get information like artist, title and song-names in CD's")); @@ -84,8 +84,8 @@ CDDBModule::checkSettings() const config.readConfig(); if (config.smtpHostname().isEmpty() || config.emailAddress().isEmpty() - || !config.emailAddress().contains("@") || - (!config.replyTo().isEmpty() && !config.replyTo().contains("@"))) + || !config.emailAddress().tqcontains("@") || + (!config.replyTo().isEmpty() && !config.replyTo().tqcontains("@"))) { if (config.submitTransport() == KCDDB::Submit::SMTP) diff --git a/libkcddb/kcmcddb/kcmcddb.h b/libkcddb/kcmcddb/kcmcddb.h index 36d42e6f..84978228 100644 --- a/libkcddb/kcmcddb/kcmcddb.h +++ b/libkcddb/kcmcddb/kcmcddb.h @@ -30,10 +30,11 @@ class KConfigDialogManager; class CDDBModule : public KCModule { Q_OBJECT + TQ_OBJECT public: - CDDBModule(TQWidget * parent, const char *name, const TQStringList &); + CDDBModule(TQWidget * tqparent, const char *name, const TQStringList &); public slots: diff --git a/libkcddb/libkcddb.kcfg b/libkcddb/libkcddb.kcfg index cbd123c7..938ac306 100644 --- a/libkcddb/libkcddb.kcfg +++ b/libkcddb/libkcddb.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <include>qdir.h</include> + <include>tqdir.h</include> <kcfgfile name="kcmcddbrc"/> <group name="Lookup"> <entry name="hostname" type="String"> @@ -28,7 +28,7 @@ <default>HTTP</default> </entry> <entry name="cacheLocations" type="PathList"> - <default code="true">QDir::homeDirPath()+"/.cddb/"</default> + <default code="true">TQDir::homeDirPath()+"/.cddb/"</default> </entry> </group> <group name="Submit"> diff --git a/libkcddb/lookup.cpp b/libkcddb/lookup.cpp index d7c15956..25c7599e 100644 --- a/libkcddb/lookup.cpp +++ b/libkcddb/lookup.cpp @@ -38,19 +38,19 @@ namespace KCDDB CDDB::Result Lookup::parseQuery( const TQString & line ) { - uint serverStatus = statusCode( line ); + uint servertqStatus = statusCode( line ); - if ( 200 == serverStatus ) + if ( 200 == servertqStatus ) { TQStringList tokenList = TQStringList::split( ' ', line ); - matchList_.append( qMakePair( tokenList[ 1 ], tokenList[ 2 ] ) ); + matchList_.append( tqMakePair( tokenList[ 1 ], tokenList[ 2 ] ) ); return Success; } - else if ( ( 211 == serverStatus ) || ( 210 == serverStatus ) ) + else if ( ( 211 == servertqStatus ) || ( 210 == servertqStatus ) ) { return MultipleRecordFound; } - else if ( 202 == serverStatus ) + else if ( 202 == servertqStatus ) { return NoRecordFound; } @@ -62,15 +62,15 @@ namespace KCDDB Lookup::parseExtraMatch( const TQString & line ) { TQStringList tokenList = TQStringList::split( ' ', line ); - matchList_.append( qMakePair( tokenList[ 0 ], tokenList[ 1 ] ) ); + matchList_.append( tqMakePair( tokenList[ 0 ], tokenList[ 1 ] ) ); } CDDB::Result Lookup::parseRead( const TQString & line ) { - uint serverStatus = statusCode( line ); + uint servertqStatus = statusCode( line ); - if ( 210 != serverStatus ) + if ( 210 != servertqStatus ) return ServerError; return Success; diff --git a/libkcddb/lookup.h b/libkcddb/lookup.h index 96538ac5..c11ad8e6 100644 --- a/libkcddb/lookup.h +++ b/libkcddb/lookup.h @@ -28,10 +28,10 @@ namespace KCDDB { - typedef QPair<TQString, TQString> CDDBMatch; + typedef TQPair<TQString, TQString> CDDBMatch; typedef TQValueList<CDDBMatch> CDDBMatchList; - class Lookup : public CDDB, public QObject + class Lookup : public CDDB, public TQObject { public: diff --git a/libkcddb/sites.cpp b/libkcddb/sites.cpp index 393740fe..18082587 100644 --- a/libkcddb/sites.cpp +++ b/libkcddb/sites.cpp @@ -41,10 +41,10 @@ namespace KCDDB url.setPort( 80 ); url.setPath( "/~cddb/cddb.cgi" ); - url.setQuery( TQString::null ); + url.setQuery( TQString() ); TQString hello = TQString("%1 %2 %3 %4") - .arg(user_, localHostName_, clientName(), clientVersion()); + .tqarg(user_, localHostName_, clientName(), clientVersion()); url.addQueryItem( "cmd", "sites" ); url.addQueryItem( "hello", hello ); diff --git a/libkcddb/smtpsubmit.cpp b/libkcddb/smtpsubmit.cpp index 07f34b61..9733ee40 100644 --- a/libkcddb/smtpsubmit.cpp +++ b/libkcddb/smtpsubmit.cpp @@ -43,7 +43,7 @@ namespace KCDDB KIO::Job* SMTPSubmit::createJob(const CDInfo& cdInfo) { url_.setQuery(TQString("to=%1&subject=cddb %2 %3&from=%4") - .arg(to_, cdInfo.category, cdInfo.id, from_)); + .tqarg(to_, cdInfo.category, cdInfo.id, from_)); kdDebug(60010) << "Url is: " << url_.prettyURL() << endl; return KIO::storedPut(diskData_.utf8(), url_, -1, false, false, false); diff --git a/libkcddb/submit.cpp b/libkcddb/submit.cpp index 63a0951b..8742469d 100644 --- a/libkcddb/submit.cpp +++ b/libkcddb/submit.cpp @@ -57,9 +57,9 @@ namespace KCDDB CDDB::Result Submit::parseWrite( const TQString & line ) { - uint serverStatus = statusCode( line ); + uint servertqStatus = statusCode( line ); - if ( 320 != serverStatus ) + if ( 320 != servertqStatus ) return ServerError; return Success; @@ -74,10 +74,10 @@ namespace KCDDB diskData_ += "# Track frame offsets:\n"; for (uint i=0; i < numTracks; i++) - diskData_ += TQString("#\t%1\n").arg(offsetList[i]); + diskData_ += TQString("#\t%1\n").tqarg(offsetList[i]); int l = offsetList[numTracks+1]/75; - diskData_ += TQString("# Disc length: %1 seconds\n").arg(l); + diskData_ += TQString("# Disc length: %1 seconds\n").tqarg(l); diskData_ += cdInfo.toString(true); @@ -91,7 +91,7 @@ namespace KCDDB << "data" << "folk" << "jazz" << "misc" << "newage" << "reggae" << "rock" << "soundtrack"; - if (validCategories.contains(c)) + if (validCategories.tqcontains(c)) return true; else return false; diff --git a/libkcddb/submit.h b/libkcddb/submit.h index 877b499a..512e69b9 100644 --- a/libkcddb/submit.h +++ b/libkcddb/submit.h @@ -34,7 +34,7 @@ namespace KIO namespace KCDDB { - class Submit : public CDDB, public QObject + class Submit : public CDDB, public TQObject { public: diff --git a/libkcddb/synccddbplookup.cpp b/libkcddb/synccddbplookup.cpp index b2be7618..ed102b9d 100644 --- a/libkcddb/synccddbplookup.cpp +++ b/libkcddb/synccddbplookup.cpp @@ -196,13 +196,13 @@ namespace KCDDB return Success; } - QString + TQString SyncCDDBPLookup::readLine() { if ( !isConnected() ) { kdDebug(60010) << "socket status: " << socket_->state() << endl; - return TQString::null; + return TQString(); } if (!socket_->canReadLine()) @@ -212,7 +212,7 @@ namespace KCDDB socket_->waitForMore(-1,&timeout); if (timeout) - return TQString::null; + return TQString(); } return TQString::fromUtf8(socket_->readLine()); diff --git a/libkcddb/test/asynccddblookuptest.h b/libkcddb/test/asynccddblookuptest.h index db4436e4..fb4b940f 100644 --- a/libkcddb/test/asynccddblookuptest.h +++ b/libkcddb/test/asynccddblookuptest.h @@ -6,9 +6,10 @@ using namespace KCDDB; -class AsyncCDDBLookupTest : public QObject +class AsyncCDDBLookupTest : public TQObject { Q_OBJECT + TQ_OBJECT public: diff --git a/libkcddb/test/asynchttplookuptest.h b/libkcddb/test/asynchttplookuptest.h index 7649f204..e323b5c6 100644 --- a/libkcddb/test/asynchttplookuptest.h +++ b/libkcddb/test/asynchttplookuptest.h @@ -6,9 +6,10 @@ using namespace KCDDB; -class AsyncHTTPLookupTest : public QObject +class AsyncHTTPLookupTest : public TQObject { Q_OBJECT + TQ_OBJECT public: diff --git a/libkcddb/test/asynchttpsubmittest.h b/libkcddb/test/asynchttpsubmittest.h index 6cce8ed2..0a1c8389 100644 --- a/libkcddb/test/asynchttpsubmittest.h +++ b/libkcddb/test/asynchttpsubmittest.h @@ -6,9 +6,10 @@ using namespace KCDDB; -class AsyncHTTPSubmitTest : public QObject +class AsyncHTTPSubmitTest : public TQObject { Q_OBJECT + TQ_OBJECT public: AsyncHTTPSubmitTest(); diff --git a/libkcddb/test/asyncsmtpsubmittest.h b/libkcddb/test/asyncsmtpsubmittest.h index 0e6f445e..01514feb 100644 --- a/libkcddb/test/asyncsmtpsubmittest.h +++ b/libkcddb/test/asyncsmtpsubmittest.h @@ -6,9 +6,10 @@ using namespace KCDDB; -class AsyncSMTPSubmitTest : public QObject +class AsyncSMTPSubmitTest : public TQObject { Q_OBJECT + TQ_OBJECT public: AsyncSMTPSubmitTest(); diff --git a/mpeglib/COPYING b/mpeglib/COPYING index b7047e29..d80c8b62 100644 --- a/mpeglib/COPYING +++ b/mpeglib/COPYING @@ -122,7 +122,7 @@ included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated +all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. @@ -244,7 +244,7 @@ linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline +structure tqlayouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the diff --git a/mpeglib/README b/mpeglib/README index 6e72c9b8..a2e7893a 100644 --- a/mpeglib/README +++ b/mpeglib/README @@ -8,7 +8,7 @@ PORTS MPEG I library. =============== -This library contains: +This library tqcontains: * mpeg I audio player (layer I,II,III (mp3)) * mpeg I video player diff --git a/mpeglib/example/cddaplay/Makefile.am b/mpeglib/example/cddaplay/Makefile.am index 49f42a2a..a7a5286c 100644 --- a/mpeglib/example/cddaplay/Makefile.am +++ b/mpeglib/example/cddaplay/Makefile.am @@ -10,7 +10,7 @@ cddaplay_SOURCES = cddaplay.cpp noinst_HEADERS = -cddaplay_LDFLAGS = $(all_libraries) +cddaplay_LDFLAGS = $(all_libraries) $(LIB_QT) cddaplay_LDADD = ../../lib/libmpeg.la \ diff --git a/mpeglib/example/mpgplay/Makefile.am b/mpeglib/example/mpgplay/Makefile.am index c76bd4d1..303823d3 100644 --- a/mpeglib/example/mpgplay/Makefile.am +++ b/mpeglib/example/mpgplay/Makefile.am @@ -10,7 +10,7 @@ mpgplay_SOURCES = mpgplay.cpp noinst_HEADERS = -mpgplay_LDFLAGS = $(all_libraries) +mpgplay_LDFLAGS = $(all_libraries) $(LIB_QT) mpgplay_LDADD = ../../lib/libmpeg.la \ $(THIS_LIB_LIBS) diff --git a/mpeglib/example/splay/Makefile.am b/mpeglib/example/splay/Makefile.am index 76e04cff..9da0145c 100644 --- a/mpeglib/example/splay/Makefile.am +++ b/mpeglib/example/splay/Makefile.am @@ -12,12 +12,12 @@ mp3framing_SOURCES = mp3framing.cpp noinst_HEADERS = -splay_LDFLAGS = $(all_libraries) +splay_LDFLAGS = $(all_libraries) $(LIB_QT) splay_LDADD = ../../lib/libmpeg.la \ $(THIS_LIB_LIBS) -mp3framing_LDFLAGS = $(all_libraries) +mp3framing_LDFLAGS = $(all_libraries) $(LIB_QT) mp3framing_LDADD = ../../lib/libmpeg.la \ $(THIS_LIB_LIBS) diff --git a/mpeglib/example/splay/mp3framing.cpp b/mpeglib/example/splay/mp3framing.cpp index 586899a3..ad17657c 100644 --- a/mpeglib/example/splay/mp3framing.cpp +++ b/mpeglib/example/splay/mp3framing.cpp @@ -30,8 +30,8 @@ using namespace std; #include <unistd.h> #define INPUT_SIZE 8192 -#define _QUEUE_FLOAT 1 -#define _QUEUE_INT 2 +#define _TQUEUE_FLOAT 1 +#define _TQUEUE_INT 2 void usage() { @@ -52,7 +52,7 @@ void initDSP(DSPWrapper* dsp) { int main(int argc, char** argv) { - int queueType=_QUEUE_INT; + int queueType=_TQUEUE_INT; int samples=8192; PCMFrame* outFrame; @@ -67,7 +67,7 @@ int main(int argc, char** argv) { break; } case 'f': { - queueType=_QUEUE_FLOAT; + queueType=_TQUEUE_FLOAT; break; } case 'c': { @@ -101,10 +101,10 @@ int main(int argc, char** argv) { // so we need a _FRAME_AUDIO_PCM type and we need // for splay at least MP3FRAMESIZE AudioFrameQueue* frameQueue; - if (queueType == _QUEUE_INT) { + if (queueType == _TQUEUE_INT) { frameQueue=new AudioFrameQueue(500,MP3FRAMESIZE,_FRAME_AUDIO_PCM); } - if (queueType == _QUEUE_FLOAT) { + if (queueType == _TQUEUE_FLOAT) { frameQueue=new AudioFrameQueue(100,MP3FRAMESIZE,_FRAME_AUDIO_FLOAT); } @@ -188,12 +188,12 @@ int main(int argc, char** argv) { // // we need to setup the dsp manually, when we do not play pcmFrames directly // - if (queueType == _QUEUE_INT) { + if (queueType == _TQUEUE_INT) { AudioFrame* audioFrame=frameQueue->getCurrent(); dsp->audioSetup(audioFrame); } - if (queueType == _QUEUE_FLOAT) { + if (queueType == _TQUEUE_FLOAT) { AudioFrame* audioFrame=frameQueue->getCurrent(); dsp->audioSetup(audioFrame->getStereo(),16, audioFrame->getSigned(), @@ -220,7 +220,7 @@ int main(int argc, char** argv) { - if (queueType == _QUEUE_INT) { + if (queueType == _TQUEUE_INT) { cout << "reading :"<<samples<<" data"<<endl; hasRead=frameQueue->copy(outFrame->getData(),samples); dsp->audioPlay((char*)outFrame->getData(),hasRead*sizeof(short int)); @@ -228,7 +228,7 @@ int main(int argc, char** argv) { } - if (queueType == _QUEUE_FLOAT) { + if (queueType == _TQUEUE_FLOAT) { int n; hasRead=frameQueue->copy(left,right,samples); diff --git a/mpeglib/example/tplay/Makefile.am b/mpeglib/example/tplay/Makefile.am index c79a2805..2f298a80 100644 --- a/mpeglib/example/tplay/Makefile.am +++ b/mpeglib/example/tplay/Makefile.am @@ -10,7 +10,7 @@ tplay_SOURCES = tplay.cpp noinst_HEADERS = -tplay_LDFLAGS = $(all_libraries) +tplay_LDFLAGS = $(all_libraries) $(LIB_QT) tplay_LDADD = ../../lib/libmpeg.la \ diff --git a/mpeglib/example/yaf/yafcdda/Makefile.am b/mpeglib/example/yaf/yafcdda/Makefile.am index 2930f348..287fc8ea 100644 --- a/mpeglib/example/yaf/yafcdda/Makefile.am +++ b/mpeglib/example/yaf/yafcdda/Makefile.am @@ -10,7 +10,7 @@ yaf_cdda_SOURCES = cdda_control.cpp noinst_HEADERS = -yaf_cdda_LDFLAGS = $(all_libraries) $(KDE_RPATH) +yaf_cdda_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) yaf_cdda_LDADD = ../yafxplayer/libyafxplayer.la \ diff --git a/mpeglib/example/yaf/yafcore/buffer.cpp b/mpeglib/example/yaf/yafcore/buffer.cpp index 3c58f0ee..3f3d6158 100644 --- a/mpeglib/example/yaf/yafcore/buffer.cpp +++ b/mpeglib/example/yaf/yafcore/buffer.cpp @@ -122,7 +122,7 @@ void Buffer::grow(int size) { } -int Buffer::find(char zeichen) { +int Buffer::tqfind(char zeichen) { int i; int nlen=len(); for(i=0;i<nlen;i++) { diff --git a/mpeglib/example/yaf/yafcore/buffer.h b/mpeglib/example/yaf/yafcore/buffer.h index 7c1a3d5c..165c607c 100644 --- a/mpeglib/example/yaf/yafcore/buffer.h +++ b/mpeglib/example/yaf/yafcore/buffer.h @@ -40,7 +40,7 @@ class KDE_EXPORT Buffer { void append(char* buffer,int buflen); - int find(char zeichen); + int tqfind(char zeichen); int len(); void setData(char* msg); diff --git a/mpeglib/example/yaf/yafcore/inputDecoder.cpp b/mpeglib/example/yaf/yafcore/inputDecoder.cpp index e24b7758..cc8aa0a5 100644 --- a/mpeglib/example/yaf/yafcore/inputDecoder.cpp +++ b/mpeglib/example/yaf/yafcore/inputDecoder.cpp @@ -173,13 +173,13 @@ void InputDecoder::doSomething(){ -int InputDecoder::getDecoderStatus() { +int InputDecoder::getDecodertqStatus() { return status; } -void InputDecoder::setDecoderStatus(int newState) { +void InputDecoder::setDecodertqStatus(int newState) { // First start a new thread with start()! // Their is no recovery if the thread status is set to exit! diff --git a/mpeglib/example/yaf/yafcore/inputDecoder.h b/mpeglib/example/yaf/yafcore/inputDecoder.h index 0a5623a0..6382228d 100644 --- a/mpeglib/example/yaf/yafcore/inputDecoder.h +++ b/mpeglib/example/yaf/yafcore/inputDecoder.h @@ -49,8 +49,8 @@ class KDE_EXPORT InputDecoder { virtual const char* processCommand(int command,const char* args); virtual void doSomething(); - virtual void setDecoderStatus(int status); - int getDecoderStatus(); + virtual void setDecodertqStatus(int status); + int getDecodertqStatus(); const char* getReturnCode(); diff --git a/mpeglib/example/yaf/yafcore/lineStack.cpp b/mpeglib/example/yaf/yafcore/lineStack.cpp index 871665ed..c72a1104 100644 --- a/mpeglib/example/yaf/yafcore/lineStack.cpp +++ b/mpeglib/example/yaf/yafcore/lineStack.cpp @@ -30,7 +30,7 @@ LineStack::~LineStack() { int LineStack::hasLine() { int nPos; - nPos=stack->find('\n'); + nPos=stack->tqfind('\n'); if (nPos == -1) return false; return true; @@ -45,7 +45,7 @@ void LineStack::nextLine(Buffer* nextLine) { char* data=stack->getData(); int nSize=stack->getSize(); - nPos=stack->find('\n'); + nPos=stack->tqfind('\n'); if (nPos == -1) { nextLine->clear(); return; diff --git a/mpeglib/example/yaf/yafcore/parser.cpp b/mpeglib/example/yaf/yafcore/parser.cpp index 21b27c6b..f9e8fdaa 100644 --- a/mpeglib/example/yaf/yafcore/parser.cpp +++ b/mpeglib/example/yaf/yafcore/parser.cpp @@ -101,7 +101,7 @@ void Parser::parse(char* strStart,int* nCommand){ int Parser::isOK(){ - // a Commandline ist valid when it contains : + // a Commandline ist valid when it tqcontains : // * 2 * (identifer/value) // * first identifier ist "Command" diff --git a/mpeglib/example/yaf/yafcore/yaf_control.cpp b/mpeglib/example/yaf/yafcore/yaf_control.cpp index 6e789588..6192f36b 100644 --- a/mpeglib/example/yaf/yafcore/yaf_control.cpp +++ b/mpeglib/example/yaf/yafcore/yaf_control.cpp @@ -37,7 +37,7 @@ void yaf_control(InputInterface* input, while(1) { - status=decoder->getDecoderStatus(); + status=decoder->getDecodertqStatus(); if (status == _DECODER_STATUS_EXIT) { break; diff --git a/mpeglib/example/yaf/yafmpgplay/Makefile.am b/mpeglib/example/yaf/yafmpgplay/Makefile.am index c9fd9b55..811e3d9a 100644 --- a/mpeglib/example/yaf/yafmpgplay/Makefile.am +++ b/mpeglib/example/yaf/yafmpgplay/Makefile.am @@ -11,7 +11,7 @@ yaf_mpgplay_SOURCES = mpg_control.cpp noinst_HEADERS = -yaf_mpgplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) +yaf_mpgplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) yaf_mpgplay_LDADD = ../yafcore/libyafcore.la \ diff --git a/mpeglib/example/yaf/yafsplay/Makefile.am b/mpeglib/example/yaf/yafsplay/Makefile.am index 463ec7db..40c8196d 100644 --- a/mpeglib/example/yaf/yafsplay/Makefile.am +++ b/mpeglib/example/yaf/yafsplay/Makefile.am @@ -11,7 +11,7 @@ yaf_splay_SOURCES = splay_control.cpp noinst_HEADERS = -yaf_splay_LDFLAGS = $(all_libraries) $(KDE_RPATH) +yaf_splay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) yaf_splay_LDADD = ../yafxplayer/libyafxplayer.la \ diff --git a/mpeglib/example/yaf/yaftplay/Makefile.am b/mpeglib/example/yaf/yaftplay/Makefile.am index 2d82700d..96b596ba 100644 --- a/mpeglib/example/yaf/yaftplay/Makefile.am +++ b/mpeglib/example/yaf/yaftplay/Makefile.am @@ -9,7 +9,7 @@ yaf_tplay_SOURCES = tplay_control.cpp noinst_HEADERS = -yaf_tplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) +yaf_tplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) yaf_tplay_LDADD = ../yafcore/libyafcore.la \ diff --git a/mpeglib/example/yaf/yafvorbis/Makefile.am b/mpeglib/example/yaf/yafvorbis/Makefile.am index f0a01965..d07fdbdf 100644 --- a/mpeglib/example/yaf/yafvorbis/Makefile.am +++ b/mpeglib/example/yaf/yafvorbis/Makefile.am @@ -10,7 +10,7 @@ yaf_vorbis_SOURCES = vorbis_control.cpp noinst_HEADERS = -yaf_vorbis_LDFLAGS = $(all_libraries) $(KDE_RPATH) +yaf_vorbis_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) yaf_vorbis_LDADD = \ ../yafcore/libyafcore.la \ diff --git a/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp b/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp index 4b3bf3b3..00e9a213 100644 --- a/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp +++ b/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp @@ -29,7 +29,7 @@ InputDecoderXPlayer::InputDecoderXPlayer(YafOutputStream* yafOutput) : this->yafOutput=yafOutput; ct=new CommandTableXPlayer(); - setDecoderStatus(_DECODER_STATUS_IDLE); + setDecodertqStatus(_DECODER_STATUS_IDLE); appendCommandTable(ct); majorMode=_PLAYER_MAJOR_MODE_OFF; setRuntimeInfo(false); @@ -161,7 +161,7 @@ const char* InputDecoderXPlayer::processCommand(int command,const char* args){ } if (command == _PLAYER_PLAY) { - setDecoderStatus(_DECODER_STATUS_WORKING); + setDecodertqStatus(_DECODER_STATUS_WORKING); setMajorMode(_PLAYER_MAJOR_MODE_PLAYING); return""; } @@ -186,7 +186,7 @@ const char* InputDecoderXPlayer::processCommand(int command,const char* args){ return "already output file selected"; } yafOutput->setStreamFile(args); - // now we have set the fifo. But we must say the parent + // now we have set the fifo. But we must say the tqparent // process that we start with waiting cout << "Command:0 Msg:fileopen before"<<endl; diff --git a/mpeglib/example/yaf/yafyuv/Makefile.am b/mpeglib/example/yaf/yafyuv/Makefile.am index 3400a34c..47767a3c 100644 --- a/mpeglib/example/yaf/yafyuv/Makefile.am +++ b/mpeglib/example/yaf/yafyuv/Makefile.am @@ -11,7 +11,7 @@ yaf_yuv_SOURCES = yuv_control.cpp noinst_HEADERS = -yaf_yuv_LDFLAGS = $(all_libraries) $(KDE_RPATH) +yaf_yuv_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) yaf_yuv_LDADD = ../yafxplayer/libyafxplayer.la \ diff --git a/mpeglib/lib/Makefile.am b/mpeglib/lib/Makefile.am index 74a7d181..3c6d115e 100644 --- a/mpeglib/lib/Makefile.am +++ b/mpeglib/lib/Makefile.am @@ -1,3 +1,5 @@ +INCLUDES= $(all_includes) + # player - Makefile.am SUBDIRS = frame util input output decoder \ diff --git a/mpeglib/lib/decoder/mpgPlugin.cpp b/mpeglib/lib/decoder/mpgPlugin.cpp index fd7170c8..510accbd 100644 --- a/mpeglib/lib/decoder/mpgPlugin.cpp +++ b/mpeglib/lib/decoder/mpgPlugin.cpp @@ -95,7 +95,7 @@ void MpgPlugin::decoder_loop() { //cout << "still initializing system stream"<<endl; } else { // if we have found a raw stream, - // make sure we pass as first argument a SEQ_START_CODE + // make sure we pass as first argument a SETQ_START_CODE if (mpegSystemHeader->getLayer() == _PACKET_SYSLAYER) { lSysLayer=true; mpegStreamPlayer->processSystemHeader(mpegSystemHeader); diff --git a/mpeglib/lib/frame/IOFrameQueue.h b/mpeglib/lib/frame/IOFrameQueue.h index d56f25aa..98780096 100644 --- a/mpeglib/lib/frame/IOFrameQueue.h +++ b/mpeglib/lib/frame/IOFrameQueue.h @@ -12,8 +12,8 @@ -#ifndef __IOFRAMEQUEUE_H -#define __IOFRAMEQUEUE_H +#ifndef __IOFRAMETQUEUE_H +#define __IOFRAMETQUEUE_H #include "frameQueue.h" #include <kdemacros.h> diff --git a/mpeglib/lib/frame/README b/mpeglib/lib/frame/README index 9e21059f..e54bd918 100644 --- a/mpeglib/lib/frame/README +++ b/mpeglib/lib/frame/README @@ -27,7 +27,7 @@ IOFrameQueues ============= IOFrameQueues deal with the problem, that you first start -with an empty FrameQueue (this is a FrameQueue which contains +with an empty FrameQueue (this is a FrameQueue which tqcontains prealloceated data, but the data is empty (eg:all pcm samples zero) Only after converting an "empty" Frame by a decoder (mp3decoder) the frame if "full" (== Frame with data) @@ -58,7 +58,7 @@ A IOFrameQueue, which allows converting "dataFrames back to continous stream". What is this? Lets say an application wants only 20 byte from a dataFrame which -contains 3KB of data? +tqcontains 3KB of data? There must be some mechanism to read less or more data from the queue. And the data should be written to a continus memory segment. diff --git a/mpeglib/lib/frame/audioFrameQueue.h b/mpeglib/lib/frame/audioFrameQueue.h index 7e7a01c0..0582af76 100644 --- a/mpeglib/lib/frame/audioFrameQueue.h +++ b/mpeglib/lib/frame/audioFrameQueue.h @@ -12,8 +12,8 @@ -#ifndef __AUDIOFRAMEQUE_H -#define __AUDIOFRAMEQUE_H +#ifndef __AUDIOFRAMETQUE_H +#define __AUDIOFRAMETQUE_H #include "IOFrameQueue.h" #include "floatFrame.h" diff --git a/mpeglib/lib/frame/frameQueue.h b/mpeglib/lib/frame/frameQueue.h index 27747aa3..6e42c678 100644 --- a/mpeglib/lib/frame/frameQueue.h +++ b/mpeglib/lib/frame/frameQueue.h @@ -13,8 +13,8 @@ -#ifndef __FRAMEQUEUE_H -#define __FRAMEQUEUE_H +#ifndef __FRAMETQUEUE_H +#define __FRAMETQUEUE_H #include "frame.h" diff --git a/mpeglib/lib/frame/framer.cpp b/mpeglib/lib/frame/framer.cpp index d380b2ec..2882864d 100644 --- a/mpeglib/lib/frame/framer.cpp +++ b/mpeglib/lib/frame/framer.cpp @@ -223,7 +223,7 @@ int Framer::read_frame(RawDataBuffer* ,RawDataBuffer* ) { void Framer::unsync(RawDataBuffer* ,int ) { if (lConstruct == false) { - // invalidate header in buffer + // tqinvalidate header in buffer cout << "direct virtual call Framer::unsync"<<endl; } } diff --git a/mpeglib/lib/mpegplay/decoderClass.cpp b/mpeglib/lib/mpegplay/decoderClass.cpp index e259c8e6..0e46f752 100644 --- a/mpeglib/lib/mpegplay/decoderClass.cpp +++ b/mpeglib/lib/mpegplay/decoderClass.cpp @@ -54,7 +54,7 @@ static const int zigzag_direct_mmx[64] = { -/* Bit masks used by bit i/o operations. */ +/* Bit tqmasks used by bit i/o operations. */ @@ -647,7 +647,7 @@ void DecoderClass::ParseReconBlock(int& n,int& mb_intra, * flush_bitsX <--> flushed += X; * next16bits &= bitMask[flushed]; * - * I've streamlined the code a lot, so that we don't have to mask + * I've streamlined the code a lot, so that we don't have to tqmask * out the low order bits and a few of the extra adds are removed. * bsmith */ diff --git a/mpeglib/lib/mpegplay/jrevdct.h b/mpeglib/lib/mpegplay/jrevdct.h index d280c2ce..24ab126f 100644 --- a/mpeglib/lib/mpegplay/jrevdct.h +++ b/mpeglib/lib/mpegplay/jrevdct.h @@ -24,7 +24,7 @@ extern "C" { #ifndef XMD_H typedef int INT32; typedef short INT16; -typedef char INT8; +// typedef char INT8; #endif typedef unsigned int UINT32; typedef unsigned short UINT16; diff --git a/mpeglib/lib/mpegplay/macroBlock.cpp b/mpeglib/lib/mpegplay/macroBlock.cpp index 2e35e551..730fdd62 100644 --- a/mpeglib/lib/mpegplay/macroBlock.cpp +++ b/mpeglib/lib/mpegplay/macroBlock.cpp @@ -329,7 +329,7 @@ int MacroBlock::reconstruct(int& recon_right_for, int& mb_motion_forw, int& mb_motion_back, PictureArray* pictureArray) { - int mask, i; + int tqmask, i; int zero_block_flag; int mb_row; int mb_col; @@ -364,11 +364,11 @@ int MacroBlock::reconstruct(int& recon_right_for, copyFunctions->startNOFloatSection(); - for (mask = 32, i = 0; i < 6; mask >>= 1, i++) { + for (tqmask = 32, i = 0; i < 6; tqmask >>= 1, i++) { /* If block exists... */ - if ((mb_intra) || (cbp & mask)) { + if ((mb_intra) || (cbp & tqmask)) { zero_block_flag = 0; //copyFunctions->endNOFloatSection(); decoderClass->ParseReconBlock(i,mb_intra, @@ -1067,7 +1067,7 @@ void MacroBlock::ReconSkippedBlock(unsigned char* source, if (width == 16) { if ((!right_half) && (!down_half)) { if (right & 0x1) { - /* No alignment, use bye copy */ + /* No tqalignment, use bye copy */ for (rr = 0; rr < 16; rr++) { memcpy(dest,source,sizeof(char)*16); diff --git a/mpeglib/lib/mpegplay/mpegExtension.cpp b/mpeglib/lib/mpegplay/mpegExtension.cpp index 657fe683..3fc89215 100644 --- a/mpeglib/lib/mpegplay/mpegExtension.cpp +++ b/mpeglib/lib/mpegplay/mpegExtension.cpp @@ -89,7 +89,7 @@ int MpegExtension::processExtra_bit_info(MpegVideoStream* mpegVideoStream) { -int MpegExtension::next_bits(int num,unsigned int mask, +int MpegExtension::next_bits(int num,unsigned int tqmask, MpegVideoStream* input) { unsigned int data; @@ -97,11 +97,11 @@ int MpegExtension::next_bits(int num,unsigned int mask, data=input->showBits(num); - /* Compare bit stream and mask. Set return value toTRUE if equal, FALSE if + /* Compare bit stream and tqmask. Set return value toTRUE if equal, FALSE if differs. */ - if (mask == data) { + if (tqmask == data) { return true; } return false; diff --git a/mpeglib/lib/mpegplay/mpegExtension.h b/mpeglib/lib/mpegplay/mpegExtension.h index 23b79c5b..3b0f1680 100644 --- a/mpeglib/lib/mpegplay/mpegExtension.h +++ b/mpeglib/lib/mpegplay/mpegExtension.h @@ -43,7 +43,7 @@ class MpegExtension { private: char* get_extra_bit_info(MpegVideoStream* mpegVideoStream); - int next_bits(int num,unsigned int mask,MpegVideoStream* input); + int next_bits(int num,unsigned int tqmask,MpegVideoStream* input); }; #endif diff --git a/mpeglib/lib/mpegplay/mpegSystemStream.cpp b/mpeglib/lib/mpegplay/mpegSystemStream.cpp index ca25d7e8..d4ec43a6 100644 --- a/mpeglib/lib/mpegplay/mpegSystemStream.cpp +++ b/mpeglib/lib/mpegplay/mpegSystemStream.cpp @@ -68,7 +68,7 @@ int MpegSystemStream::firstInitialize(MpegSystemHeader* mpegHeader) { } mpegHeader->setHeader(syncCode); - // SEQ_START_CODE: 1b3 + // SETQ_START_CODE: 1b3 if (mpegHeader->hasRAWHeader()) { // If we found a seq_heade_start code we assume // that we are a video only stream diff --git a/mpeglib/lib/mpegplay/mpegVideoBitWindow.h b/mpeglib/lib/mpegplay/mpegVideoBitWindow.h index 46abe44e..5c957e4d 100644 --- a/mpeglib/lib/mpegplay/mpegVideoBitWindow.h +++ b/mpeglib/lib/mpegplay/mpegVideoBitWindow.h @@ -53,10 +53,10 @@ class MpegVideoBitWindow { inline unsigned int showBits(int bits) { - unsigned int mask=nBitMask[bits]; + unsigned int tqmask=nBitMask[bits]; int shift=32-(bits); int bO; - shift=(curBits & mask)>>shift; + shift=(curBits & tqmask)>>shift; bO = bit_offset + bits; if (bO > 32) { return (shift | (*(buffer+1)>>(64-bO))); diff --git a/mpeglib/lib/mpegplay/mpegVideoStream.cpp b/mpeglib/lib/mpegplay/mpegVideoStream.cpp index 5e16b116..8ce1defd 100644 --- a/mpeglib/lib/mpegplay/mpegVideoStream.cpp +++ b/mpeglib/lib/mpegplay/mpegVideoStream.cpp @@ -48,7 +48,7 @@ int MpegVideoStream::firstInitialize(MpegVideoHeader* mpegHeader) { fill_videoBuffer(mpegSystemHeader); lHasStream=true; } - // now find SEQ_START_CODE + // now find SETQ_START_CODE hasBytes(4); mpegVideoBitWindow->flushByteOffset(); @@ -70,8 +70,8 @@ int MpegVideoStream::firstInitialize(MpegVideoHeader* mpegHeader) { int MpegVideoStream::isStartCode(unsigned int data) { switch(data) { - case SEQ_END_CODE: - case SEQ_START_CODE: + case SETQ_END_CODE: + case SETQ_START_CODE: case GOP_START_CODE: case PICTURE_START_CODE: case SLICE_MIN_START_CODE: @@ -125,7 +125,7 @@ int MpegVideoStream::nextPIC() { unsigned int data=showBits(32); if ( (data != PICTURE_START_CODE) && (data != GOP_START_CODE) && - (data != SEQ_START_CODE) ) { + (data != SETQ_START_CODE) ) { flushBits(8); return false; } diff --git a/mpeglib/lib/mpegplay/pesSystemStream.cpp b/mpeglib/lib/mpegplay/pesSystemStream.cpp index 10787f21..b9915fc2 100644 --- a/mpeglib/lib/mpegplay/pesSystemStream.cpp +++ b/mpeglib/lib/mpegplay/pesSystemStream.cpp @@ -192,7 +192,7 @@ int PESSystemStream::processMPEG2PacketHeader(MpegSystemHeader* mpegHeader){ //LIVID u_char original_or_copy : 1; u_char copyright : 1; - u_char data_alignment_indicator : 1; + u_char data_tqalignment_indicator : 1; u_char pes_priority : 1; u_char pes_scrambling_control : 2; u_char start_code_prefix : 2; // 0x02 diff --git a/mpeglib/lib/mpegplay/picture.cpp b/mpeglib/lib/mpegplay/picture.cpp index 6d8c1efe..b63f4989 100644 --- a/mpeglib/lib/mpegplay/picture.cpp +++ b/mpeglib/lib/mpegplay/picture.cpp @@ -63,7 +63,7 @@ int Picture::processPicture(MpegVideoStream* mpegVideoStream) { stamp=mpegVideoStream->getCurrentTimeStamp(); stamp->copyTo(startOfPicStamp); - // now invalidate the PTSFlag + // now tqinvalidate the PTSFlag stamp->setPTSFlag(false); diff --git a/mpeglib/lib/mpegplay/recon.cpp b/mpeglib/lib/mpegplay/recon.cpp index 6116157a..81350345 100644 --- a/mpeglib/lib/mpegplay/recon.cpp +++ b/mpeglib/lib/mpegplay/recon.cpp @@ -298,7 +298,7 @@ int Recon::ReconPMBlock(int bnum, } else { if (right_for & 0x1) { - /* No alignment, used byte copy */ + /* No tqalignment, used byte copy */ copyFunctions->copy8_byte(rindex1,index,row_size); @@ -498,7 +498,7 @@ int Recon::ReconBMBlock(int bnum, copyFunctions->copy8_src2linear_crop(rindex1,dct_start,index,row_size); } else { if (right_back & 0x1) { - /* No alignment, use byte copy */ + /* No tqalignment, use byte copy */ copyFunctions->copy8_byte(rindex1,index,row_size); diff --git a/mpeglib/lib/mpegplay/slice.h b/mpeglib/lib/mpegplay/slice.h index 10689d34..13556155 100644 --- a/mpeglib/lib/mpegplay/slice.h +++ b/mpeglib/lib/mpegplay/slice.h @@ -38,7 +38,7 @@ class Slice { /* Slice structure. */ - unsigned int vert_pos; /* Vertical position of slice. */ + unsigned int vert_pos; /*Qt::Vertical position of slice. */ unsigned int quant_scale; /* Quantization scale. */ MpegExtension* mpegExtension; /* Extra bit slice info. */ diff --git a/mpeglib/lib/mpegplay/startCodes.h b/mpeglib/lib/mpegplay/startCodes.h index c305a39f..94c2a56e 100644 --- a/mpeglib/lib/mpegplay/startCodes.h +++ b/mpeglib/lib/mpegplay/startCodes.h @@ -29,8 +29,8 @@ /* Start codes. */ -#define SEQ_END_CODE 0x000001b7 -#define SEQ_START_CODE 0x000001b3 +#define SETQ_END_CODE 0x000001b7 +#define SETQ_START_CODE 0x000001b3 #define GOP_START_CODE 0x000001b8 #define PICTURE_START_CODE 0x00000100 #define SLICE_MIN_START_CODE 0x00000101 @@ -42,7 +42,7 @@ //extension start code ids #define SEQUENCE_EXTENSION_ID 1 #define SEQUENCE_DISPLAY_EXTENSION_ID 2 -#define QUANT_MATRIX_EXTENSION_ID 3 +#define TQUANT_MATRIX_EXTENSION_ID 3 #define COPYRIGHT_EXTENSION_ID 4 #define SEQUENCE_SCALABLE_EXTENSION_ID 5 #define PICTURE_DISPLAY_EXTENSION_ID 7 diff --git a/mpeglib/lib/mpegplay/videoDecoder.cpp b/mpeglib/lib/mpegplay/videoDecoder.cpp index b1971795..b7144291 100644 --- a/mpeglib/lib/mpegplay/videoDecoder.cpp +++ b/mpeglib/lib/mpegplay/videoDecoder.cpp @@ -69,7 +69,7 @@ VideoDecoder::~VideoDecoder() { * * mpegVidRsrc -- * - * Parses bit stream until MB_QUANTUM number of + * Parses bit stream until MB_TQUANTUM number of * macroblocks have been decoded or current slice or * picture ends, whichever comes first. If the start * of a frame is encountered, the frame is time stamped @@ -121,7 +121,7 @@ int VideoDecoder::mpegVidRsrc(PictureArray* pictureArray) { mpegVideoStream->flushBits(32); packet->read_sys(data,vid_stream->bufferReader); */ - case SEQ_END_CODE: + case SETQ_END_CODE: case ISO_11172_END_CODE: /* handle ISO_11172_END_CODE too */ /* Display last frame. */ @@ -148,11 +148,11 @@ int VideoDecoder::mpegVidRsrc(PictureArray* pictureArray) { mpegVideoStream->next_start_code(); break; - case SEQ_START_CODE: + case SETQ_START_CODE: /* Sequence start code. Parse sequence header. */ if (ParseSeqHead() == false) { - printf("SEQ_START_CODE 1-error\n"); + printf("SETQ_START_CODE 1-error\n"); goto error; } goto done; @@ -204,8 +204,8 @@ int VideoDecoder::mpegVidRsrc(PictureArray* pictureArray) { break; } - /* Parse next MB_QUANTUM macroblocks. */ - for (i = 0; i < MB_QUANTUM; i++) { + /* Parse next MB_TQUANTUM macroblocks. */ + for (i = 0; i < MB_TQUANTUM; i++) { /* Check to see if actually a startcode and not a macroblock. */ data=mpegVideoStream->showBits(23); @@ -232,7 +232,7 @@ int VideoDecoder::mpegVidRsrc(PictureArray* pictureArray) { } } data=mpegVideoStream->showBits(23); - /* Check if we just finished a picture on the MB_QUANTUM macroblock */ + /* Check if we just finished a picture on the MB_TQUANTUM macroblock */ if (data == 0x0) { mpegVideoStream->next_start_code(); diff --git a/mpeglib/lib/mpegplay/videoDecoder.h b/mpeglib/lib/mpegplay/videoDecoder.h index cba45a29..695b424d 100644 --- a/mpeglib/lib/mpegplay/videoDecoder.h +++ b/mpeglib/lib/mpegplay/videoDecoder.h @@ -53,7 +53,7 @@ /* Number of macroblocks to process in one call to mpegVidRsrc. */ -#define MB_QUANTUM 100 +#define MB_TQUANTUM 100 /* Video stream structure. */ diff --git a/mpeglib/lib/output/outputStream.cpp b/mpeglib/lib/output/outputStream.cpp index ef209cbc..560ab75f 100644 --- a/mpeglib/lib/output/outputStream.cpp +++ b/mpeglib/lib/output/outputStream.cpp @@ -198,7 +198,7 @@ int OutputStream::getFrameusec() { -int OutputStream::waitStreamState(int method,int mask,int streamType) { +int OutputStream::waitStreamState(int method,int tqmask,int streamType) { int* waitState=NULL; switch(streamType) { @@ -216,9 +216,9 @@ int OutputStream::waitStreamState(int method,int mask,int streamType) { if (method == _OUTPUT_WAIT_METHOD_BLOCK) { abs_thread_mutex_lock(&stateChangeMut); - while ((*waitState &= mask)==0) { + while ((*waitState &= tqmask)==0) { cout << "waitStreamState:"<<waitState<<endl; - cout << "mask:"<<mask<<endl; + cout << "tqmask:"<<tqmask<<endl; abs_thread_cond_wait(&stateChangeCond,&stateChangeMut); } abs_thread_mutex_unlock(&stateChangeMut); diff --git a/mpeglib/lib/output/outputStream.h b/mpeglib/lib/output/outputStream.h index 9ef538fd..6dccd02e 100644 --- a/mpeglib/lib/output/outputStream.h +++ b/mpeglib/lib/output/outputStream.h @@ -105,10 +105,10 @@ class KDE_EXPORT OutputStream { // stream State handling - // we return the mask which triggerd (by "AND") - // or the current polled mask when method is POLL + // we return the tqmask which triggerd (by "AND") + // or the current polled tqmask when method is POLL // Note: you can only wait for "true" signals - virtual int waitStreamState(int method,int mask,int streamType); + virtual int waitStreamState(int method,int tqmask,int streamType); diff --git a/mpeglib/lib/splay/dxHead.h b/mpeglib/lib/splay/dxHead.h index da0f2eff..0bfc0bac 100644 --- a/mpeglib/lib/splay/dxHead.h +++ b/mpeglib/lib/splay/dxHead.h @@ -10,7 +10,7 @@ Copyright 1998 Xing Technology Corp. -----------------------------------------------------------*/ // A Xing header may be present in the ancillary // data field of the first frame of an mp3 bitstream -// The Xing header (optionally) contains +// The Xing header (optionally) tqcontains // frames total number of audio frames in the bitstream // bytes total number of bytes in the bitstream // toc table of contents diff --git a/mpeglib/lib/splay/mpegAudioFrame.cpp b/mpeglib/lib/splay/mpegAudioFrame.cpp index 807a23a6..d423a1fe 100644 --- a/mpeglib/lib/splay/mpegAudioFrame.cpp +++ b/mpeglib/lib/splay/mpegAudioFrame.cpp @@ -34,7 +34,7 @@ MpegAudioFrame::~MpegAudioFrame() { void MpegAudioFrame::unsync(RawDataBuffer* store,int ) { - // invalidate header in buffer + // tqinvalidate header in buffer unsigned char* start=store->ptr(); start[0]=0x0; start[1]=0x0; diff --git a/mpeglib/lib/splay/mpegAudioHeader.cpp b/mpeglib/lib/splay/mpegAudioHeader.cpp index 7e34b212..31e97563 100644 --- a/mpeglib/lib/splay/mpegAudioHeader.cpp +++ b/mpeglib/lib/splay/mpegAudioHeader.cpp @@ -116,7 +116,7 @@ int MpegAudioHeader::parseHeader(unsigned char* buf){ inputstereo= (mode==_MODE_SINGLE)?0:1; // - // frequency can be 0,1 or 2 but the mask above allows 3 as well + // frequency can be 0,1 or 2 but the tqmask above allows 3 as well // check now. if (frequency > 2) { DEBUG_HEADER(cout << "frequency value out of range"<<endl;) diff --git a/mpeglib/lib/util/abstract/threadQueue.cpp b/mpeglib/lib/util/abstract/threadQueue.cpp index 1b130ba9..fd8a4a39 100644 --- a/mpeglib/lib/util/abstract/threadQueue.cpp +++ b/mpeglib/lib/util/abstract/threadQueue.cpp @@ -12,7 +12,7 @@ #include "threadQueue.h" -#define _MAX_THREAD_IN_QUEUE 5 +#define _MAX_THREAD_IN_TQUEUE 5 #include <iostream> @@ -37,9 +37,9 @@ WaitThreadEntry::~WaitThreadEntry() { ThreadQueue::ThreadQueue() { - waitThreadEntries=new WaitThreadEntry* [_MAX_THREAD_IN_QUEUE]; + waitThreadEntries=new WaitThreadEntry* [_MAX_THREAD_IN_TQUEUE]; int i; - for(i=0;i<_MAX_THREAD_IN_QUEUE;i++) { + for(i=0;i<_MAX_THREAD_IN_TQUEUE;i++) { waitThreadEntries[i]=new WaitThreadEntry(); } abs_thread_mutex_init(&queueMut); @@ -56,7 +56,7 @@ ThreadQueue::~ThreadQueue() { exit(0); } int i; - for(i=0;i<_MAX_THREAD_IN_QUEUE;i++) { + for(i=0;i<_MAX_THREAD_IN_TQUEUE;i++) { delete waitThreadEntries[i]; } delete [] waitThreadEntries; @@ -73,14 +73,14 @@ void ThreadQueue::waitForExclusiveAccess() { } // wait size++; - if (size == _MAX_THREAD_IN_QUEUE) { - cout << "Aieee! ThreadQueue can only buffer:"<<_MAX_THREAD_IN_QUEUE<<endl; + if (size == _MAX_THREAD_IN_TQUEUE) { + cout << "Aieee! ThreadQueue can only buffer:"<<_MAX_THREAD_IN_TQUEUE<<endl; exit(0); } abs_thread_cond_t* waitCond=&(waitThreadEntries[insertPos]->waitCond); insertPos++; // wrap counter - if (insertPos == _MAX_THREAD_IN_QUEUE) { + if (insertPos == _MAX_THREAD_IN_TQUEUE) { insertPos=0; } abs_thread_cond_wait(waitCond,&queueMut); @@ -98,7 +98,7 @@ void ThreadQueue::releaseExclusiveAccess() { abs_thread_cond_t* waitCond=&(waitThreadEntries[removePos]->waitCond); removePos++; // wrap counter - if (removePos == _MAX_THREAD_IN_QUEUE) { + if (removePos == _MAX_THREAD_IN_TQUEUE) { removePos=0; } size--; diff --git a/mpeglib/lib/util/abstract/threadQueue.h b/mpeglib/lib/util/abstract/threadQueue.h index 4c650e21..765713b6 100644 --- a/mpeglib/lib/util/abstract/threadQueue.h +++ b/mpeglib/lib/util/abstract/threadQueue.h @@ -11,8 +11,8 @@ */ -#ifndef __THREADQUEUE_H -#define __THREADQUEUE_H +#ifndef __THREADTQUEUE_H +#define __THREADTQUEUE_H #include "abs_thread.h" diff --git a/mpeglib/lib/util/dynBuffer.cpp b/mpeglib/lib/util/dynBuffer.cpp index c93d5381..c1eb2a9d 100644 --- a/mpeglib/lib/util/dynBuffer.cpp +++ b/mpeglib/lib/util/dynBuffer.cpp @@ -132,7 +132,7 @@ void DynBuffer::grow(int size) { } -int DynBuffer::find(char zeichen) { +int DynBuffer::tqfind(char zeichen) { int i; int nlen=len(); for(i=0;i<nlen;i++) { diff --git a/mpeglib/lib/util/dynBuffer.h b/mpeglib/lib/util/dynBuffer.h index 7ba99d42..6d8b186b 100644 --- a/mpeglib/lib/util/dynBuffer.h +++ b/mpeglib/lib/util/dynBuffer.h @@ -39,7 +39,7 @@ class DynBuffer { void append(char* buffer,int buflen); - int find(char zeichen); + int tqfind(char zeichen); int len(); void setData(char* msg); diff --git a/mpeglib/lib/util/mmx/mmx_asm.h b/mpeglib/lib/util/mmx/mmx_asm.h index 8717eff5..d1c2a0bd 100644 --- a/mpeglib/lib/util/mmx/mmx_asm.h +++ b/mpeglib/lib/util/mmx/mmx_asm.h @@ -208,7 +208,7 @@ typedef union { : "X" (mem)) -#define maskmovq(regs,maskreg) mmx_r2ri (maskmovq, regs, maskreg) +#define tqmaskmovq(regs,tqmaskreg) mmx_r2ri (tqmaskmovq, regs, tqmaskreg) #define movntq_r2m(mmreg,var) mmx_r2m (movntq, mmreg, var) diff --git a/mpeglib/lib/util/render/dither/colorTableHighBit.cpp b/mpeglib/lib/util/render/dither/colorTableHighBit.cpp index 171f4e97..86b0b135 100644 --- a/mpeglib/lib/util/render/dither/colorTableHighBit.cpp +++ b/mpeglib/lib/util/render/dither/colorTableHighBit.cpp @@ -21,7 +21,7 @@ * Erik Corry's multi-byte dither routines. * * The basic idea is that the Init generates all the necessary tables. - * The tables incorporate the information about the layout of pixels + * The tables incorporate the information about the tqlayout of pixels * in the XImage, so that it should be able to cope with 15-bit, 16-bit * 24-bit (non-packed) and 32-bit (10-11 bits per color!) screens. * At present it cannot cope with 24-bit packed mode, since this involves @@ -131,9 +131,9 @@ void ColorTableHighBit::initHighColor(int thirty2,unsigned int redMask, unsigned int greenMask, unsigned int blueMask) { - unsigned PIXVAL red_mask = redMask; - unsigned PIXVAL green_mask =greenMask; - unsigned PIXVAL blue_mask = blueMask; + unsigned PIXVAL red_tqmask = redMask; + unsigned PIXVAL green_tqmask =greenMask; + unsigned PIXVAL blue_tqmask = blueMask; int CR, CB, i; @@ -197,12 +197,12 @@ void ColorTableHighBit::initHighColor(int thirty2,unsigned int redMask, * Set up entries 0-255 in rgb-to-pixel value tables. */ for (i = 0; i < 256; i++) { - r_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(red_mask)); - r_2_pix_alloc[i + 256] <<= free_bits_at_bottom(red_mask); - g_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(green_mask)); - g_2_pix_alloc[i + 256] <<= free_bits_at_bottom(green_mask); - b_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(blue_mask)); - b_2_pix_alloc[i + 256] <<= free_bits_at_bottom(blue_mask); + r_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(red_tqmask)); + r_2_pix_alloc[i + 256] <<= free_bits_at_bottom(red_tqmask); + g_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(green_tqmask)); + g_2_pix_alloc[i + 256] <<= free_bits_at_bottom(green_tqmask); + b_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(blue_tqmask)); + b_2_pix_alloc[i + 256] <<= free_bits_at_bottom(blue_tqmask); /* * If we have 16-bit output depth, then we double the value * in the top word. This means that we can write out both diff --git a/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp b/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp index 757f0676..1de9cc17 100644 --- a/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp +++ b/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp @@ -26,8 +26,8 @@ static unsigned short MMX16_Vredcoeff[] = {0x66, 0x66, 0x66, 0x66}; static unsigned short MMX16_Ugrncoeff[] = {0xffe8, 0xffe8, 0xffe8, 0xffe8}; static unsigned short MMX16_Vgrncoeff[] = {0xffcd, 0xffcd, 0xffcd, 0xffcd}; static unsigned short MMX16_Ycoeff[] = {0x4a, 0x4a, 0x4a, 0x4a}; -static unsigned short MMX16_redmask[] = {0xf800, 0xf800, 0xf800, 0xf800}; -static unsigned short MMX16_grnmask[] = {0x7e0, 0x7e0, 0x7e0, 0x7e0}; +static unsigned short MMX16_redtqmask[] = {0xf800, 0xf800, 0xf800, 0xf800}; +static unsigned short MMX16_grntqmask[] = {0x7e0, 0x7e0, 0x7e0, 0x7e0}; void dummy_dithermmx16() { cout << "MMX16_0"<<MMX16_0<<endl; @@ -38,8 +38,8 @@ void dummy_dithermmx16() { cout << "MMX16_Ugrncoeff:"<<MMX16_Ugrncoeff<<endl; cout << "MMX16_Vgrncoeff:"<<MMX16_Vgrncoeff<<endl; cout << "MMX16_Ycoeff:"<<MMX16_Ycoeff<<endl; - cout << "MMX16_redmask:"<<MMX16_redmask<<endl; - cout << "MMX16_grnmask:"<<MMX16_grnmask<<endl; + cout << "MMX16_redtqmask:"<<MMX16_redtqmask<<endl; + cout << "MMX16_grntqmask:"<<MMX16_grntqmask<<endl; cout << "MMX16_00FFw:"<<MMX16_00FFw<<endl; } @@ -114,11 +114,11 @@ void ditherBlock(unsigned char *lum, "punpcklbw %%mm4, %%mm4\n" "punpcklbw %%mm5, %%mm5\n" - "pand MMX16_redmask, %%mm4\n" + "pand MMX16_redtqmask, %%mm4\n" "psllw $3, %%mm5\n" // GREEN 1 "punpcklbw %%mm6, %%mm6\n" - "pand MMX16_grnmask, %%mm5\n" - "pand MMX16_redmask, %%mm6\n" + "pand MMX16_grntqmask, %%mm5\n" + "pand MMX16_redtqmask, %%mm6\n" "por %%mm5, %%mm4\n" // "psrlw $11, %%mm6\n" // BLUE 1 "movq %%mm3, %%mm5\n" // lum2 @@ -145,10 +145,10 @@ void ditherBlock(unsigned char *lum, "pmullw MMX16_Ycoeff, %%mm6\n" // lum3 "punpcklbw %%mm7, %%mm7\n" "psllw $3, %%mm5\n" // GREEN 2 - "pand MMX16_redmask, %%mm7\n" - "pand MMX16_redmask, %%mm3\n" + "pand MMX16_redtqmask, %%mm7\n" + "pand MMX16_redtqmask, %%mm3\n" "psrlw $11, %%mm7\n" // BLUE 2 - "pand MMX16_grnmask, %%mm5\n" + "pand MMX16_grntqmask, %%mm5\n" "por %%mm7, %%mm3\n" "movq (%2), %%mm7\n" // L4 load lum2 @@ -186,11 +186,11 @@ void ditherBlock(unsigned char *lum, "punpcklbw %%mm5, %%mm5\n" "punpcklbw %%mm6, %%mm6\n" "psllw $3, %%mm5\n" // GREEN 3 - "pand MMX16_redmask, %%mm4\n" + "pand MMX16_redtqmask, %%mm4\n" "psraw $6, %%mm3\n" // psr 6 "psraw $6, %%mm0\n" - "pand MMX16_redmask, %%mm6\n" // BLUE - "pand MMX16_grnmask, %%mm5\n" + "pand MMX16_redtqmask, %%mm6\n" // BLUE + "pand MMX16_grntqmask, %%mm5\n" "psrlw $11, %%mm6\n" // BLUE 3 "por %%mm5, %%mm4\n" "psraw $6, %%mm7\n" @@ -201,11 +201,11 @@ void ditherBlock(unsigned char *lum, "punpcklbw %%mm3, %%mm3\n" "punpcklbw %%mm0, %%mm0\n" "punpcklbw %%mm7, %%mm7\n" - "pand MMX16_redmask, %%mm3\n" - "pand MMX16_redmask, %%mm7\n" // BLUE + "pand MMX16_redtqmask, %%mm3\n" + "pand MMX16_redtqmask, %%mm7\n" // BLUE "psllw $3, %%mm0\n" // GREEN 4 "psrlw $11, %%mm7\n" - "pand MMX16_grnmask, %%mm0\n" + "pand MMX16_grntqmask, %%mm0\n" "por %%mm7, %%mm3\n" "por %%mm0, %%mm3\n" diff --git a/mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h b/mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h index 5c7ae574..6feeee6b 100644 --- a/mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h +++ b/mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h @@ -20,8 +20,8 @@ /* gcc 3.3.1 and later optimise the "not used" (only in asm code) symbols away. So we need to mark them as used. */ -#if defined(__GNUC_PREREQ__) && !defined(__GNUC_PREREQ) -#define __GNUC_PREREQ __GNUC_PREREQ__ +#if defined(__GNUC_PRERETQ__) && !defined(__GNUC_PREREQ) +#define __GNUC_PREREQ __GNUC_PRERETQ__ #endif #ifdef __GNUC_PREREQ #if __GNUC_PREREQ (3,1) diff --git a/mpeglib/lib/util/render/x11/initDisplay.cpp b/mpeglib/lib/util/render/x11/initDisplay.cpp index d0029eb6..2a62e721 100644 --- a/mpeglib/lib/util/render/x11/initDisplay.cpp +++ b/mpeglib/lib/util/render/x11/initDisplay.cpp @@ -128,7 +128,7 @@ void CreateFullColorWindow (XWindow* xwindow) { int depth; Visual *visual; XSetWindowAttributes xswa; - unsigned long mask; + unsigned long tqmask; unsigned int c_class; int screen; Display *dpy=xwindow->display; @@ -152,7 +152,7 @@ void CreateFullColorWindow (XWindow* xwindow) { cout << "visual is null"<<endl; return; } - mask = CWBackPixel | CWColormap | CWBorderPixel; + tqmask = CWBackPixel | CWColormap | CWBorderPixel; if (xwindow->colormap==0) { xswa.colormap = XCreateColormap(dpy, XRootWindow(dpy, screen), @@ -166,7 +166,7 @@ void CreateFullColorWindow (XWindow* xwindow) { /* xwindow->window = XCreateWindow(dpy, RootWindow(dpy, screen), x, y, w, h, (unsigned int) 1, depth, c_class, - visual, mask, &xswa); + visual, tqmask, &xswa); */ } diff --git a/mpeglib/lib/util/render/x11/x11Surface.cpp b/mpeglib/lib/util/render/x11/x11Surface.cpp index d7b8f052..0aaf7743 100644 --- a/mpeglib/lib/util/render/x11/x11Surface.cpp +++ b/mpeglib/lib/util/render/x11/x11Surface.cpp @@ -183,7 +183,7 @@ int X11Surface::open(int width, int height,const char *title, bool border) { } else { // depth is <= 8 // allocate memory for dithertables - // gets the rgb masks + // gets the rgb tqmasks initColorDisplay(xWindow); // create 8 bit dithertables // create private colormap diff --git a/mpeglib_artsplug/Makefile.am b/mpeglib_artsplug/Makefile.am index 5cc7af54..1fe9b85e 100644 --- a/mpeglib_artsplug/Makefile.am +++ b/mpeglib_artsplug/Makefile.am @@ -94,7 +94,7 @@ libarts_splay_la_LIBADD = $(top_builddir)/mpeglib/lib/libmpeg.la \ bin_PROGRAMS = mpeglibartsplay -mpeglibartsplay_LDFLAGS = $(ARTSC_LIBS) $(all_libraries) +mpeglibartsplay_LDFLAGS = $(ARTSC_LIBS) $(all_libraries) $(LIB_QT) mpeglibartsplay_SOURCES = mpeglibartsplay.cpp mpeglibartsplay_LDADD = -lsoundserver_idl \ diff --git a/mpeglib_artsplug/doemacs b/mpeglib_artsplug/doemacs index a875517d..f4497eca 100644 --- a/mpeglib_artsplug/doemacs +++ b/mpeglib_artsplug/doemacs @@ -1,6 +1,6 @@ -A=`find . | grep -v moc > flist.txt` +A=`tqfind . | grep -v tqmoc > flist.txt` A=`grep "\.cpp$" flist.txt >cpp.txt` A=`grep "\.h$" flist.txt >h.txt` A=`grep "\.c$" flist.txt >c.txt` diff --git a/mpg123_artsplugin/dxhead.h b/mpg123_artsplugin/dxhead.h index 16a6a0fc..c84b15c9 100644 --- a/mpg123_artsplugin/dxhead.h +++ b/mpg123_artsplugin/dxhead.h @@ -10,7 +10,7 @@ Copyright 1998 Xing Technology Corp. -----------------------------------------------------------*/ /* A Xing header may be present in the ancillary * data field of the first frame of an mp3 bitstream - * The Xing header (optionally) contains + * The Xing header (optionally) tqcontains * frames total number of audio frames in the bitstream * bytes total number of bytes in the bitstream * toc table of contents diff --git a/mpg123_artsplugin/mpg123/buffer.c b/mpg123_artsplugin/mpg123/buffer.c index 3c85b654..33b4c92b 100644 --- a/mpg123_artsplugin/mpg123/buffer.c +++ b/mpg123_artsplugin/mpg123/buffer.c @@ -95,7 +95,7 @@ void buffer_loop(struct audio_info_struct *ai, sigset_t *oldsigset) catchsignal (SIGINT, catch_interrupt); catchsignal (SIGUSR1, catch_usr1); - sigprocmask (SIG_SETMASK, oldsigset, NULL); + sigproctqmask (SIG_SETMASK, oldsigset, NULL); #ifndef NO_DECODE_AUDIO if (param.outmode == DECODE_AUDIO) { if (audio_open(ai) < 0) { diff --git a/mpg123_artsplugin/mpg123/common.c b/mpg123_artsplugin/mpg123/common.c index 65d658fd..cd7cc121 100644 --- a/mpg123_artsplugin/mpg123/common.c +++ b/mpg123_artsplugin/mpg123/common.c @@ -114,7 +114,7 @@ void (*catchsignal(int signum, void(*handler)()))() #endif new_sa.sa_handler = handler; - sigemptyset(&new_sa.sa_mask); + sigemptyset(&new_sa.sa_tqmask); new_sa.sa_flags = 0; if (sigaction(signum, &new_sa, &old_sa) == -1) return ((void (*)()) -1); diff --git a/mpg123_artsplugin/mpg123/httpget.c b/mpg123_artsplugin/mpg123/httpget.c index 71750115..12c6941f 100644 --- a/mpg123_artsplugin/mpg123/httpget.c +++ b/mpg123_artsplugin/mpg123/httpget.c @@ -83,7 +83,7 @@ void readstring (char *string, int maxlen, FILE *f) void encode64 (char *source,char *destination) { static char *Base64Digits = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; int n = 0; int ssiz=strlen(source); int i; diff --git a/mpg123_artsplugin/mpg123/layer3.c b/mpg123_artsplugin/mpg123/layer3.c index b4f33510..b012047a 100644 --- a/mpg123_artsplugin/mpg123/layer3.c +++ b/mpg123_artsplugin/mpg123/layer3.c @@ -612,7 +612,7 @@ static int pretab2[22] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; #define BITSHIFT ((sizeof(long)-1)*8) #define REFRESH_MASK \ while(num < BITSHIFT) { \ - mask |= ((unsigned long)getbyte(&bsi))<<(BITSHIFT-num); \ + tqmask |= ((unsigned long)getbyte(&bsi))<<(BITSHIFT-num); \ num += 8; \ part2remain -= 8; } @@ -626,10 +626,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, int *me; int num=getbitoffset(&bsi); - long mask; + long tqmask; /* we must split this, because for num==0 the shift is undefined if you do it in one step */ - mask = ((unsigned long) getbits(&bsi,num))<<BITSHIFT; - mask <<= 8-num; + tqmask = ((unsigned long) getbits(&bsi,num))<<BITSHIFT; + tqmask <<= 8-num; part2remain -= num; { @@ -702,10 +702,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, register short *val = h->table; REFRESH_MASK; while((y=*val++)<0) { - if (mask < 0) + if (tqmask < 0) val -= y; num--; - mask <<= 1; + tqmask <<= 1; } x = y >> 4; y &= 0xf; @@ -713,23 +713,23 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, if(x == 15 && h->linbits) { max[lwin] = cb; REFRESH_MASK; - x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); + x += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits); num -= h->linbits+1; - mask <<= h->linbits; - if(mask < 0) + tqmask <<= h->linbits; + if(tqmask < 0) *xrpnt = REAL_MUL(-ispow[x], v); else *xrpnt = REAL_MUL(ispow[x], v); - mask <<= 1; + tqmask <<= 1; } else if(x) { max[lwin] = cb; - if(mask < 0) + if(tqmask < 0) *xrpnt = REAL_MUL(-ispow[x], v); else *xrpnt = REAL_MUL(ispow[x], v); num--; - mask <<= 1; + tqmask <<= 1; } else *xrpnt = DOUBLE_TO_REAL(0.0); @@ -737,23 +737,23 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, if(y == 15 && h->linbits) { max[lwin] = cb; REFRESH_MASK; - y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); + y += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits); num -= h->linbits+1; - mask <<= h->linbits; - if(mask < 0) + tqmask <<= h->linbits; + if(tqmask < 0) *xrpnt = REAL_MUL(-ispow[y], v); else *xrpnt = REAL_MUL(ispow[y], v); - mask <<= 1; + tqmask <<= 1; } else if(y) { max[lwin] = cb; - if(mask < 0) + if(tqmask < 0) *xrpnt = REAL_MUL(-ispow[y], v); else *xrpnt = REAL_MUL(ispow[y], v); num--; - mask <<= 1; + tqmask <<= 1; } else *xrpnt = DOUBLE_TO_REAL(0.0); @@ -767,10 +767,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, REFRESH_MASK; while((a=*val++)<0) { - if (mask < 0) + if (tqmask < 0) val -= a; num--; - mask <<= 1; + tqmask <<= 1; } if(part2remain+num <= 0) { num -= part2remain+num; @@ -800,12 +800,12 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, if(part2remain+num <= 0) { break; } - if(mask < 0) + if(tqmask < 0) *xrpnt = -v; else *xrpnt = v; num--; - mask <<= 1; + tqmask <<= 1; } else *xrpnt = DOUBLE_TO_REAL(0.0); @@ -879,10 +879,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, register short *val = h->table; REFRESH_MASK; while((y=*val++)<0) { - if (mask < 0) + if (tqmask < 0) val -= y; num--; - mask <<= 1; + tqmask <<= 1; } x = y >> 4; y &= 0xf; @@ -891,23 +891,23 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, if (x == 15 && h->linbits) { max = cb; REFRESH_MASK; - x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); + x += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits); num -= h->linbits+1; - mask <<= h->linbits; - if(mask < 0) + tqmask <<= h->linbits; + if(tqmask < 0) *xrpnt++ = REAL_MUL(-ispow[x], v); else *xrpnt++ = REAL_MUL(ispow[x], v); - mask <<= 1; + tqmask <<= 1; } else if(x) { max = cb; - if(mask < 0) + if(tqmask < 0) *xrpnt++ = REAL_MUL(-ispow[x], v); else *xrpnt++ = REAL_MUL(ispow[x], v); num--; - mask <<= 1; + tqmask <<= 1; } else *xrpnt++ = DOUBLE_TO_REAL(0.0); @@ -915,23 +915,23 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, if (y == 15 && h->linbits) { max = cb; REFRESH_MASK; - y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); + y += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits); num -= h->linbits+1; - mask <<= h->linbits; - if(mask < 0) + tqmask <<= h->linbits; + if(tqmask < 0) *xrpnt++ = REAL_MUL(-ispow[y], v); else *xrpnt++ = REAL_MUL(ispow[y], v); - mask <<= 1; + tqmask <<= 1; } else if(y) { max = cb; - if(mask < 0) + if(tqmask < 0) *xrpnt++ = REAL_MUL(-ispow[y], v); else *xrpnt++ = REAL_MUL(ispow[y], v); num--; - mask <<= 1; + tqmask <<= 1; } else *xrpnt++ = DOUBLE_TO_REAL(0.0); @@ -947,10 +947,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, REFRESH_MASK; while((a=*val++)<0) { - if (mask < 0) + if (tqmask < 0) val -= a; num--; - mask <<= 1; + tqmask <<= 1; } if(part2remain+num <= 0) { num -= part2remain+num; @@ -978,12 +978,12 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, if(part2remain+num <= 0) { break; } - if(mask < 0) + if(tqmask < 0) *xrpnt++ = -v; else *xrpnt++ = v; num--; - mask <<= 1; + tqmask <<= 1; } else *xrpnt++ = DOUBLE_TO_REAL(0.0); diff --git a/mpg123_artsplugin/mpg123/xfermem.h b/mpg123_artsplugin/mpg123/xfermem.h index ae7e5afd..8d94c863 100644 --- a/mpg123_artsplugin/mpg123/xfermem.h +++ b/mpg123_artsplugin/mpg123/xfermem.h @@ -6,7 +6,7 @@ * * This is a stand-alone module which implements a unidirectional, * fast pipe using mmap(). Its primary use is to transfer large - * amounts of data from a parent process to its child process, + * amounts of data from a tqparent process to its child process, * with a buffer in between which decouples blocking conditions * on both sides. Control information is transferred between the * processes through a socketpair. See xftest.c for an example on diff --git a/noatun/library/Makefile.am b/noatun/library/Makefile.am index f3e1dfd9..951ba5a4 100644 --- a/noatun/library/Makefile.am +++ b/noatun/library/Makefile.am @@ -41,7 +41,7 @@ META_INCLUDES = $(srcdir)/noatun noinst_PROGRAMS = gentable gentable_SOURCES = gentable.cpp -gentable_LDFLAGS = $(KDE_EXTRA_RPATH) +gentable_LDFLAGS = $(KDE_EXTRA_RPATH) $(LIB_QT) magictable: gentable $(top_builddir)/noatun/library/gentable > magictable diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp index cf340f68..aaa4b9e6 100644 --- a/noatun/library/app.cpp +++ b/noatun/library/app.cpp @@ -69,7 +69,7 @@ NoatunApp::NoatunApp() // set the default config data // TODO: Maybe a first time wizard instead? KConfig *config=KGlobal::config(); // + - config->setGroup(TQString::null); // 1 + config->setGroup(TQString()); // 1 if (!config->readEntry("Modules").length()) { TQStringList modules; @@ -88,9 +88,9 @@ NoatunApp::NoatunApp() mLibraryLoader->add("dcopiface.plugin"); - new General(this); // 25 - new Plugins(this); // 149 -// new Types(this); + new General(TQT_TQOBJECT(this)); // 25 + new Plugins(TQT_TQOBJECT(this)); // 149 +// new Types(TQT_TQOBJECT(this)); mPlayer=new Player; // 139 d->effects=new Effects; // 1 @@ -122,7 +122,7 @@ NoatunApp::NoatunApp() } else { - config->setGroup(TQString::null); // 0 + config->setGroup(TQString()); // 0 player()->setVolume(config->readNumEntry("Volume", 100)); // 10 player()->loop(config->readNumEntry("LoopStyle", (int)Player::None)); mPlayer->engine()->setInitialized(); // 0 @@ -147,7 +147,7 @@ NoatunApp::~NoatunApp() { saveEngineState(); KConfig *config = KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("Volume", player()->volume()); config->writeEntry("LoopStyle", player()->loopStyle()); // for version continuity in the future @@ -212,14 +212,14 @@ bool NoatunApp::clearOnStart() const int NoatunApp::startupPlayMode() const { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); return config->readNumEntry("StartupPlayMode", autoPlay() ? Play : Restore); } void NoatunApp::setStartupPlayMode(int mode) { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("StartupPlayMode", mode); config->sync(); } @@ -227,7 +227,7 @@ void NoatunApp::setStartupPlayMode(int mode) void NoatunApp::setHackUpPlaylist(bool b) { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("HackUpPlaylist", b); config->sync(); } @@ -238,7 +238,7 @@ void NoatunApp::setFastMixer(bool b) if (whatBefore!=b) { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("FastMixer", b); config->sync(); player()->engine()->useHardwareMixer(b); @@ -256,7 +256,7 @@ void NoatunApp::setOneInstance(bool b) void NoatunApp::setLoopList(bool b) { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("LoopList", b); KGlobal::config()->sync(); } @@ -264,7 +264,7 @@ void NoatunApp::setLoopList(bool b) void NoatunApp::setAutoPlay(bool b) { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("AutoPlay", b); KGlobal::config()->sync(); } @@ -272,7 +272,7 @@ void NoatunApp::setAutoPlay(bool b) void NoatunApp::setRememberPositions(bool b) { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("RememberPositions", b); KGlobal::config()->sync(); } @@ -280,7 +280,7 @@ void NoatunApp::setRememberPositions(bool b) void NoatunApp::setSaveDirectory(const TQString &s) { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writePathEntry("SaveDirectory", s); config->sync(); } @@ -288,21 +288,21 @@ void NoatunApp::setSaveDirectory(const TQString &s) TQString NoatunApp::saveDirectory() const { KConfig *c=KGlobal::config(); - c->setGroup(TQString::null); + c->setGroup(TQString()); return c->readPathEntry("SaveDirectory", TQString(getenv("HOME"))); } TQString NoatunApp::titleFormat() const { KConfig *c=KGlobal::config(); - c->setGroup(TQString::null); + c->setGroup(TQString()); return c->readEntry("TitleFormat", "$(\"[\"author\"] - \")$(title)$(\" (\"bitrate\"kbps)\")"); } void NoatunApp::setTitleFormat(const TQString &format) { KConfig *c=KGlobal::config(); - c->setGroup(TQString::null); + c->setGroup(TQString()); return c->writeEntry("TitleFormat", format); } @@ -314,7 +314,7 @@ void NoatunApp::setClearOnStart(bool b) void NoatunApp::setClearOnOpen(bool b) { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("ClearOnOpen", b); config->sync(); } @@ -322,7 +322,7 @@ void NoatunApp::setClearOnOpen(bool b) void NoatunApp::setDisplayRemaining(bool b) { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("DisplayRemaining", b); config->sync(); } @@ -363,7 +363,7 @@ void NoatunApp::pluginMenuRemove(int id) NoatunStdAction::PluginActionMenu *NoatunApp::pluginActionMenu() { if (!mPluginActionMenu) - mPluginActionMenu = new NoatunStdAction::PluginActionMenu(this, "menu_actions"); + mPluginActionMenu = new NoatunStdAction::PluginActionMenu(TQT_TQOBJECT(this), "menu_actions"); return mPluginActionMenu; } @@ -450,7 +450,7 @@ TQString NoatunApp::mimeTypes() continue; const char *m = (*istr).c_str(); - if ((KServiceType::serviceType(m)) && !mimeTypes.contains(m)) + if ((KServiceType::serviceType(m)) && !mimeTypes.tqcontains(m)) { mimeTypes += m; mimeTypes += ' '; @@ -478,11 +478,11 @@ Playlist *NoatunApp::playlist() const return mLibraryLoader->playlist(); } -void NoatunApp::commitData(QSessionManager &) +void NoatunApp::commitData(TQSessionManager &) { } -void NoatunApp::saveState(QSessionManager &sm) +void NoatunApp::saveState(TQSessionManager &sm) { TQStringList restartCommand = sm.restartCommand(); sm.setRestartCommand( restartCommand ); @@ -502,7 +502,7 @@ TQImage NoatunApp::readPNG(const TQString &filename) void NoatunApp::restoreEngineState() { KConfig* config = KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); int state = config->readNumEntry("EngineState", Arts::posPlaying); switch (state) { @@ -522,7 +522,7 @@ void NoatunApp::restoreEngineState() void NoatunApp::saveEngineState() { KConfig* config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("EngineState", player()->engine()->state()); // we don't sync here since it's done in the destructor afterwards anyway } diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp index 27dbc686..226cc2d6 100644 --- a/noatun/library/cmodule.cpp +++ b/noatun/library/cmodule.cpp @@ -28,8 +28,8 @@ * General options *****************************************************************/ -General::General(TQObject *parent) - : CModule(i18n("General"), i18n("General Options"), "configure", parent) +General::General(TQObject *tqparent) + : CModule(i18n("General"), i18n("General Options"), "configure", tqparent) { mLoopList=new TQCheckBox(i18n("&Return to start of playlist on finish"), this); mLoopList->setChecked(napp->loopList()); @@ -58,7 +58,7 @@ General::General(TQObject *parent) TQWhatsThis::add(mTitleFormat, i18n( "Select a title to use for each file (in the playlist and user interface). " "Each element such as $(title) is replaced with the property with the name " - "as given in the parentheses. The properties include, but are not limited to: " + "as given in the tqparentheses. The properties include, but are not limited to: " "title, author, date, comments and album.")); TQLabel *dlsaver=new TQLabel(i18n("&Download folder:"), this); @@ -68,7 +68,7 @@ General::General(TQObject *parent) this, TQT_SLOT( slotRequesterClicked( KURLRequester * ))); TQWhatsThis::add(mDlSaver, i18n("When opening a non-local file, download it to the selected folder.")); - mPlayOnStartup = new TQButtonGroup(1, Horizontal, i18n("Play Behavior on Startup"), this); + mPlayOnStartup = new TQButtonGroup(1,Qt::Horizontal, i18n("Play Behavior on Startup"), this); mPlayOnStartup->setExclusive(true); mPlayOnStartup->insert( new TQRadioButton(i18n("Restore &play state"), mPlayOnStartup), @@ -83,29 +83,29 @@ General::General(TQObject *parent) NoatunApp::DontPlay ); - if (TQButton* b = mPlayOnStartup->find(napp->startupPlayMode())) + if (TQButton* b = mPlayOnStartup->tqfind(napp->startupPlayMode())) { b->toggle(); } - TQGridLayout *layout = new TQGridLayout(this, 0, KDialog::spacingHint()); - layout->setSpacing(KDialog::spacingHint()); + TQGridLayout *tqlayout = new TQGridLayout(this, 0, KDialog::spacingHint()); + tqlayout->setSpacing(KDialog::spacingHint()); - layout->addMultiCellWidget(mLoopList, 0, 0, 0, 1); - layout->addMultiCellWidget(mOneInstance, 2, 2, 0, 1); - layout->addMultiCellWidget(mClearOnOpen, 4, 4, 0, 1); - layout->addMultiCellWidget(mFastVolume, 5, 5, 0, 1); - layout->addMultiCellWidget(mRemaining, 6, 6, 0, 1); + tqlayout->addMultiCellWidget(mLoopList, 0, 0, 0, 1); + tqlayout->addMultiCellWidget(mOneInstance, 2, 2, 0, 1); + tqlayout->addMultiCellWidget(mClearOnOpen, 4, 4, 0, 1); + tqlayout->addMultiCellWidget(mFastVolume, 5, 5, 0, 1); + tqlayout->addMultiCellWidget(mRemaining, 6, 6, 0, 1); - layout->addWidget(titleLabel, 7, 0); - layout->addWidget(mTitleFormat, 7, 1); + tqlayout->addWidget(titleLabel, 7, 0); + tqlayout->addWidget(mTitleFormat, 7, 1); - layout->addWidget(dlsaver, 8, 0); - layout->addWidget(mDlSaver, 8, 1); + tqlayout->addWidget(dlsaver, 8, 0); + tqlayout->addWidget(mDlSaver, 8, 1); - layout->addMultiCellWidget(mPlayOnStartup, 9, 9, 0, 1); + tqlayout->addMultiCellWidget(mPlayOnStartup, 9, 9, 0, 1); - layout->setRowStretch(10, 1); + tqlayout->setRowStretch(10, 1); } diff --git a/noatun/library/cmodule.h b/noatun/library/cmodule.h index 89aa37f0..9a592075 100644 --- a/noatun/library/cmodule.h +++ b/noatun/library/cmodule.h @@ -22,8 +22,9 @@ class KURLRequester; class General : public CModule { Q_OBJECT + TQ_OBJECT public: - General(TQObject *parent=0); + General(TQObject *tqparent=0); virtual void save(); private slots: diff --git a/noatun/library/controls.cpp b/noatun/library/controls.cpp index dc67ffaa..1644f724 100644 --- a/noatun/library/controls.cpp +++ b/noatun/library/controls.cpp @@ -1,14 +1,14 @@ #include <noatun/controls.h> -L33tSlider::L33tSlider(TQWidget * parent, const char * name) : - TQSlider(parent,name), pressed(false) +L33tSlider::L33tSlider(TQWidget * tqparent, const char * name) : + TQSlider(tqparent,name), pressed(false) {} -L33tSlider::L33tSlider(Orientation o, TQWidget * parent, const char * name) : - TQSlider(o,parent,name), pressed(false) +L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * tqparent, const char * name) : + TQSlider(o,tqparent,name), pressed(false) {} L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value, - Orientation o, TQWidget * parent, const char * name) : - TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) + Qt::Orientation o, TQWidget * tqparent, const char * name) : + TQSlider(minValue, maxValue, pageStep, value, o, tqparent,name), pressed(false) {} bool L33tSlider::currentlyPressed() const @@ -24,7 +24,7 @@ void L33tSlider::setValue(int i) void L33tSlider::mousePressEvent(TQMouseEvent*e) { - if (e->button()!=RightButton) + if (e->button()!=Qt::RightButton) { pressed=true; TQSlider::mousePressEvent(e); @@ -52,8 +52,8 @@ void L33tSlider::wheelEvent(TQWheelEvent *e) SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver, - const char *member, TQObject* parent, const char* name ) - : KAction( text, accel, parent, name ) + const char *member, TQObject* tqparent, const char* name ) + : KAction( text, accel, tqparent, name ) { m_receiver = receiver; m_member = member; @@ -67,7 +67,7 @@ int SliderAction::plug( TQWidget *w, int index ) int id = KAction::getToolButtonID(); //Create it. - m_slider=new L33tSlider(0, 1000, 100, 0, Horizontal, toolBar); + m_slider=new L33tSlider(0, 1000, 100, 0,Qt::Horizontal, toolBar); m_slider->setMinimumWidth(10); toolBar->insertWidget(id, 10, m_slider, index ); @@ -91,12 +91,12 @@ return; /* if (pos == KToolBar::Left || pos == KToolBar::Right) { - m_slider->setOrientation(Vertical); + m_slider->setOrientationVertical); m_slider->setFixedWidth(m_slider->height()); } else { - m_slider->setOrientation(Horizontal); + m_slider->setOrientationHorizontal); m_slider->resize(m_slider->height(), m_slider->height()); } */ diff --git a/noatun/library/downloader.cpp b/noatun/library/downloader.cpp index cce6e4d9..d607ca6d 100644 --- a/noatun/library/downloader.cpp +++ b/noatun/library/downloader.cpp @@ -65,8 +65,8 @@ void DownloadItem::dequeue() -Downloader::Downloader(TQObject *parent) - : TQObject(parent), localfile(0), current(0), mJob(0), mTimeout(0) +Downloader::Downloader(TQObject *tqparent) + : TQObject(tqparent), localfile(0), current(0), mJob(0), mTimeout(0) { mStarted=false; mUnstartedQueue=new TQPtrList<Downloader::QueueItem>; @@ -105,7 +105,7 @@ static TQString nonExistantFile(const TQString &file) { i++; f=file; - f.insert(f.findRev('.'), '_'+TQString::number(i)); + f.insert(f.tqfindRev('.'), '_'+TQString::number(i)); } return f; } @@ -175,7 +175,7 @@ void Downloader::getNext() if (mQueue.isEmpty()) return; current=mQueue.take(0); - // open the QFile + // open the TQFile localfile=new TQFile(current->local); localfile->open(IO_ReadWrite | IO_Append); diff --git a/noatun/library/effects.cpp b/noatun/library/effects.cpp index a71e0b43..33a3b8ad 100644 --- a/noatun/library/effects.cpp +++ b/noatun/library/effects.cpp @@ -25,11 +25,11 @@ using namespace std; using namespace Arts; -class EffectConfigWidget : public QWidget +class EffectConfigWidget : public TQWidget { public: - EffectConfigWidget(Effect *e, TQWidget *parent=0) - : TQWidget(parent), mEf(e) + EffectConfigWidget(Effect *e, TQWidget *tqparent=0) + : TQWidget(tqparent), mEf(e) {} virtual ~EffectConfigWidget() @@ -102,7 +102,7 @@ TQString Effect::title() const TQString Effect::clean(const TQCString &name) { - int pos=name.findRev("::"); + int pos=name.tqfindRev("::"); if (pos>0) return name.right(name.length()-pos-2); return name; diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp index 334781a1..807f0e71 100644 --- a/noatun/library/effectview.cpp +++ b/noatun/library/effectview.cpp @@ -41,11 +41,11 @@ #include <tqvgroupbox.h> #include <tqwhatsthis.h> -class EffectListItem : public QListViewItem +class EffectListItem : public TQListViewItem { public: - EffectListItem(TQListView *parent, TQListViewItem *after, Effect *e) - : TQListViewItem(parent, after, e->title()), mEffect(e) + EffectListItem(TQListView *tqparent, TQListViewItem *after, Effect *e) + : TQListViewItem(tqparent, after, e->title()), mEffect(e) { } @@ -55,8 +55,8 @@ private: Effect *mEffect; }; -EffectList::EffectList(TQWidget *parent) - : KListView(parent) +EffectList::EffectList(TQWidget *tqparent) + : KListView(tqparent) { } @@ -85,9 +85,9 @@ void EffectView::show() namespace { -TQToolButton *newButton(const TQIconSet &iconSet, const TQString &textLabel, TQObject *receiver, const char * slot, TQWidget *parent, const char *name = 0) +TQToolButton *newButton(const TQIconSet &iconSet, const TQString &textLabel, TQObject *receiver, const char * slot, TQWidget *tqparent, const char *name = 0) { - TQToolButton *button = new TQToolButton(parent, name); + TQToolButton *button = new TQToolButton(tqparent, name); button->setIconSet(iconSet); button->setTextLabel(textLabel, true); TQObject::connect(button, TQT_SIGNAL(clicked()), receiver, slot); @@ -104,7 +104,7 @@ void EffectView::init(void) setCaption(i18n("Effects - Noatun")); setIcon(SmallIcon("effect")); - // Create widgets and layouts + // Create widgets and tqlayouts TQFrame *box = makeMainWidget(); TQVBoxLayout *boxLayout = new TQVBoxLayout(box, 0, KDialog::spacingHint()); @@ -116,7 +116,7 @@ void EffectView::init(void) TQHBoxLayout *topTopLayout = new TQHBoxLayout(topTopFrame, 0, KDialog::spacingHint()); topTopLayout->setAutoAdd(true); available = new KComboBox(false, topTopFrame); - TQToolButton *add = newButton(BarIconSet("down", KIcon::SizeSmall), i18n("Add"), this, TQT_SLOT(addEffect()), topTopFrame); + TQToolButton *add = newButton(BarIconSet("down", KIcon::SizeSmall), i18n("Add"), TQT_TQOBJECT(this), TQT_SLOT(addEffect()), topTopFrame); // Active TQHGroupBox *bottomBox = new TQHGroupBox(i18n("Active Effects"), box); @@ -153,10 +153,10 @@ void EffectView::init(void) // the buttons TQFrame *bottomLeftFrame = new TQFrame(bottomBox); TQVBoxLayout *bottomLeftLayout = new TQVBoxLayout(bottomLeftFrame, 0, KDialog::spacingHint()); - up = newButton(BarIconSet("up", KIcon::SizeSmall), i18n("Up"), this, TQT_SLOT(moveUp()), bottomLeftFrame); - down = newButton(BarIconSet("down", KIcon::SizeSmall), i18n("Down"), this, TQT_SLOT(moveDown()), bottomLeftFrame); - configure = newButton(BarIconSet("configure", KIcon::SizeSmall), i18n("Configure"), this, TQT_SLOT(configureEffect()), bottomLeftFrame); - remove = newButton(BarIconSet("remove", KIcon::SizeSmall), i18n("Remove"), this, TQT_SLOT(removeEffect()), bottomLeftFrame); + up = newButton(BarIconSet("up", KIcon::SizeSmall), i18n("Up"), TQT_TQOBJECT(this), TQT_SLOT(moveUp()), bottomLeftFrame); + down = newButton(BarIconSet("down", KIcon::SizeSmall), i18n("Down"), TQT_TQOBJECT(this), TQT_SLOT(moveDown()), bottomLeftFrame); + configure = newButton(BarIconSet("configure", KIcon::SizeSmall), i18n("Configure"), TQT_TQOBJECT(this), TQT_SLOT(configureEffect()), bottomLeftFrame); + remove = newButton(BarIconSet("remove", KIcon::SizeSmall), i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(removeEffect()), bottomLeftFrame); bottomLeftLayout->addWidget(up); bottomLeftLayout->addWidget(down); bottomLeftLayout->addWidget(configure); diff --git a/noatun/library/effectview.h b/noatun/library/effectview.h index 28b26c9f..c0946d89 100644 --- a/noatun/library/effectview.h +++ b/noatun/library/effectview.h @@ -36,6 +36,7 @@ class TQToolButton; class EffectView : public KDialogBase { Q_OBJECT + TQ_OBJECT public: EffectView(); @@ -74,8 +75,9 @@ private: class EffectList : public KListView { Q_OBJECT + TQ_OBJECT public: - EffectList(TQWidget *parent); + EffectList(TQWidget *tqparent); virtual bool acceptDrag(TQDropEvent *) const; virtual TQDragObject *dragObject() const; }; diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp index 00f26022..06693797 100644 --- a/noatun/library/engine.cpp +++ b/noatun/library/engine.cpp @@ -79,13 +79,13 @@ namespace VolumeControls else { #define ERROR { fd=-1; return; } - int devmask, recmask, i_recsrc, stereodevs; + int devtqmask, rectqmask, i_recsrc, stereodevs; // Mixer is open. Now define properties - if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) ERROR - if (ioctl(fd, SOUND_MIXER_READ_RECMASK, &recmask) == -1) ERROR + if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devtqmask) == -1) ERROR + if (ioctl(fd, SOUND_MIXER_READ_RECMASK, &rectqmask) == -1) ERROR if (ioctl(fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1) ERROR if (ioctl(fd, SOUND_MIXER_READ_STEREODEVS, &stereodevs) == -1) ERROR - if (!devmask) ERROR + if (!devtqmask) ERROR #undef ERROR } @@ -248,7 +248,7 @@ Noatun::StereoEffectStack *Engine::globalEffectStack() const { return &d->globa Noatun::Equalizer *Engine::equalizer() const { return &d->equalizer; } Noatun::Session *Engine::session() const { return &d->session; } -Engine::Engine(TQObject *parent) : TQObject(parent, "Engine"), mPlay(false) +Engine::Engine(TQObject *tqparent) : TQObject(tqparent, "Engine"), mPlay(false) { d=new EnginePrivate; // Connect to aRts @@ -482,15 +482,15 @@ bool Engine::initArts() X11CommConfig.sync(); } - cmdline = TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("kdeinit_wrapper"))); + cmdline = TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit_wrapper"))); cmdline += " "; if (rt) cmdline += TQFile::encodeName(KStandardDirs::findExe( - TQString::fromLatin1("artswrapper"))); + TQString::tqfromLatin1("artswrapper"))); else cmdline += TQFile::encodeName(KStandardDirs::findExe( - TQString::fromLatin1("artsd"))); + TQString::tqfromLatin1("artsd"))); cmdline += " "; cmdline += config.readEntry("Arguments","-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f").utf8(); diff --git a/noatun/library/equalizer.cpp b/noatun/library/equalizer.cpp index 61b10d01..ae86d00f 100644 --- a/noatun/library/equalizer.cpp +++ b/noatun/library/equalizer.cpp @@ -333,7 +333,7 @@ void Equalizer::enableUpdates(bool) } #undef EQ -#undef EQBACK +#undef ETQBACK #include "equalizer.moc" diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp index 098226a7..7758f35c 100644 --- a/noatun/library/equalizerview.cpp +++ b/noatun/library/equalizerview.cpp @@ -1,7 +1,7 @@ #include "vequalizer.h" -#define EQVIEW_CPP +#define ETQVIEW_CPP #include "equalizerview.h" -#undef EQVIEW_CPP +#undef ETQVIEW_CPP #include "equalizerwidget.h" #include "app.h" @@ -30,8 +30,8 @@ //////////////////////////////////////////////// // PresetList -PresetList::PresetList(TQWidget *parent, const char *name) - : KListView(parent, name) +PresetList::PresetList(TQWidget *tqparent, const char *name) + : KListView(tqparent, name) { setItemsRenameable(true); setRenameable(0, true); @@ -61,20 +61,20 @@ void PresetList::rename(TQListViewItem *item, int c) //////////////////////////////////////////////// // EqualizerLevel -EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band) - : TQWidget(parent), mBand(band) +EqualizerLevel::EqualizerLevel(TQWidget *tqparent, VBand band) + : TQWidget(tqparent), mBand(band) { - TQVBoxLayout *layout = new TQVBoxLayout(this, - 0, 0, "EqualizerLevel::layout"); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, + 0, 0, "EqualizerLevel::tqlayout"); mSlider = new TQSlider(-200, 200, 25, 0, Qt::Vertical, this, "EqualizerLevel::mSlider"); mSlider->setTickmarks(TQSlider::Left); mSlider->setTickInterval(25); - layout->addWidget(mSlider); + tqlayout->addWidget(mSlider); connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed(int))); mLabel = new TQLabel("", this, "EqualizerLevel::mLabel"); - mLabel->setAlignment(AlignHCenter | AlignVCenter); - layout->addWidget(mLabel); + mLabel->tqsetAlignment(AlignHCenter | AlignVCenter); + tqlayout->addWidget(mLabel); setMinimumHeight(200); // setMinimumWidth(kapp->fontMetrics().width("158kHz")); diff --git a/noatun/library/equalizerview.h b/noatun/library/equalizerview.h index 8c29aadb..d902f49b 100644 --- a/noatun/library/equalizerview.h +++ b/noatun/library/equalizerview.h @@ -1,5 +1,5 @@ -#ifndef EQUALIZERVIEW_H -#define EQUALIZERVIEW_H +#ifndef ETQUALIZERVIEW_H +#define ETQUALIZERVIEW_H #include <tqwidget.h> #include <kdialogbase.h> @@ -14,11 +14,12 @@ class TQHBoxLayout; class EqualizerWidget; -class EqualizerLevel : public QWidget +class EqualizerLevel : public TQWidget { Q_OBJECT + TQ_OBJECT public: - EqualizerLevel(TQWidget *parent, VBand band); + EqualizerLevel(TQWidget *tqparent, VBand band); public slots: void changed(); @@ -36,8 +37,9 @@ private: class PresetList : public KListView { Q_OBJECT + TQ_OBJECT public: - PresetList(TQWidget *parent, const char *name=0); + PresetList(TQWidget *tqparent, const char *name=0); public: void rename(TQListViewItem *item, int c); @@ -47,6 +49,7 @@ public: class EqualizerView : public KDialogBase { Q_OBJECT + TQ_OBJECT TQPtrList<EqualizerLevel> mBands; public: diff --git a/noatun/library/equalizerwidget.ui b/noatun/library/equalizerwidget.ui index 1432f59a..b68b2ff6 100644 --- a/noatun/library/equalizerwidget.ui +++ b/noatun/library/equalizerwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EqualizerWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EqualizerWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,22 +22,22 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1_2</cstring> </property> <property name="text"> <string>Pre&amp:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="buddy" stdset="0"> @@ -54,7 +54,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>1</width> <height>8</height> @@ -71,22 +71,22 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>1</width> <height>8</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>preampSlider</cstring> </property> @@ -115,14 +115,14 @@ <number>25</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> <property name="text"> <string>+/-</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -130,7 +130,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="1"> + <widget class="TQGroupBox" row="1" column="1"> <property name="name"> <cstring>bandsGroupBox</cstring> </property> @@ -141,7 +141,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>bandsFrame</cstring> </property> @@ -165,7 +165,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="1" column="2"> + <widget class="TQGroupBox" row="1" column="2"> <property name="name"> <cstring>presetsGroupBox</cstring> </property> @@ -176,7 +176,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQFrame" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>presetFrame</cstring> </property> @@ -201,7 +201,7 @@ <number>0</number> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>removePresetButton</cstring> </property> @@ -209,7 +209,7 @@ <string>&Remove</string> </property> </widget> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>addPresetButton</cstring> </property> @@ -227,7 +227,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>8</width> <height>16</height> @@ -236,15 +236,15 @@ </spacer> </grid> </widget> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>enabledCheckBox</cstring> </property> @@ -262,14 +262,14 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>8</width> <height>16</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -301,14 +301,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>8</width> <height>16</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>resetEqButton</cstring> </property> @@ -330,7 +330,7 @@ <tabstop>removePresetButton</tabstop> <tabstop>addPresetButton</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/noatun/library/globalvideo.h b/noatun/library/globalvideo.h index c070ab30..8203282d 100644 --- a/noatun/library/globalvideo.h +++ b/noatun/library/globalvideo.h @@ -4,9 +4,10 @@ #include "noatun/video.h" -class GlobalVideo : public QWidget +class GlobalVideo : public TQWidget { Q_OBJECT + TQ_OBJECT TQPopupMenu *menu; VideoFrame *video; diff --git a/noatun/library/ksaver.cpp b/noatun/library/ksaver.cpp index 40b3606c..fe2ed649 100644 --- a/noatun/library/ksaver.cpp +++ b/noatun/library/ksaver.cpp @@ -78,7 +78,7 @@ bool Noatun::KSaver::open(void) } else { - d->error = i18n("Could not write to %1.").arg(d->url.prettyURL()); + d->error = i18n("Could not write to %1.").tqarg(d->url.prettyURL()); return false; } } diff --git a/noatun/library/mimetypetree.cpp b/noatun/library/mimetypetree.cpp index 0370b048..a63b49f6 100644 --- a/noatun/library/mimetypetree.cpp +++ b/noatun/library/mimetypetree.cpp @@ -4,8 +4,8 @@ #include <tqheader.h> -MimeTypeTree::MimeTypeTree(TQWidget *parent) - : KListView(parent) +MimeTypeTree::MimeTypeTree(TQWidget *tqparent) + : KListView(tqparent) { KMimeType::List list=KMimeType::allMimeTypes(); TQDict<TQListViewItem> map; @@ -17,7 +17,7 @@ MimeTypeTree::MimeTypeTree(TQWidget *parent) for (; i != list.end(); ++i) { TQString mimetype = (*i)->name(); - int slash = mimetype.find("/"); + int slash = mimetype.tqfind("/"); TQString major = mimetype.left(slash); // hide all and inode majors @@ -38,7 +38,7 @@ MimeTypeTree::MimeTypeTree(TQWidget *parent) void MimeTypeTree::sel(TQListViewItem *item) { - TQListViewItem *p=item->parent(); + TQListViewItem *p=item->tqparent(); if (!p) return; TQString major=p->text(0); TQString minor=item->text(0); diff --git a/noatun/library/mimetypetree.h b/noatun/library/mimetypetree.h index 92af43ec..b3f7ccb7 100644 --- a/noatun/library/mimetypetree.h +++ b/noatun/library/mimetypetree.h @@ -6,7 +6,7 @@ * of Noatun linking to this, and to a GPL plugin, * where the GPL plugin does not use any code * in this class. However, it may link directly - * to the Qt Library, where Qt may be under any license. + * to the TQt Library, where TQt may be under any license. * * Debian, Gnome, and GNU must ALL DIE. * Especially GNU's stupid info pages. @@ -19,8 +19,9 @@ class MimeTypeTree : public KListView { Q_OBJECT + TQ_OBJECT public: - MimeTypeTree(TQWidget *parent); + MimeTypeTree(TQWidget *tqparent); private: TQListViewItem *addMajor(const TQString &name); diff --git a/noatun/library/noatun/app.h b/noatun/library/noatun/app.h index 0b8af3ee..8e8b0e1b 100644 --- a/noatun/library/noatun/app.h +++ b/noatun/library/noatun/app.h @@ -31,6 +31,7 @@ namespace NoatunStdAction class KDE_EXPORT NoatunApp : public KUniqueApplication { Q_OBJECT + TQ_OBJECT friend class Playlist; public: @@ -71,8 +72,8 @@ public: TQCString version() const; - virtual void commitData(QSessionManager &); - virtual void saveState(QSessionManager &); + virtual void commitData(TQSessionManager &); + virtual void saveState(TQSessionManager &); /** * The three startup modes how noatun should behave when it is diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h index 4c11aac7..02564048 100644 --- a/noatun/library/noatun/controls.h +++ b/noatun/library/noatun/controls.h @@ -20,14 +20,15 @@ class TQLabel; * @author Charles Samuels * @version 2.3 **/ -class KDE_EXPORT L33tSlider : public QSlider +class KDE_EXPORT L33tSlider : public TQSlider { Q_OBJECT + TQ_OBJECT public: - L33tSlider(TQWidget * parent, const char * name=0); - L33tSlider(Orientation, TQWidget * parent, const char * name=0); + L33tSlider(TQWidget * tqparent, const char * name=0); + L33tSlider(Qt::Orientation, TQWidget * tqparent, const char * name=0); L33tSlider(int minValue, int maxValue, int pageStep, int value, - Orientation, TQWidget * parent, const char * name=0); + Qt::Orientation, TQWidget * tqparent, const char * name=0); bool currentlyPressed() const; signals: @@ -56,9 +57,10 @@ private: class SliderAction : public KAction { Q_OBJECT + TQ_OBJECT public: SliderAction(const TQString& text, int accel, const TQObject *receiver, - const char *member, TQObject* parent, const char* name ); + const char *member, TQObject* tqparent, const char* name ); virtual int plug( TQWidget *w, int index = -1 ); virtual void unplug( TQWidget *w ); TQSlider* slider() const { return m_slider; } diff --git a/noatun/library/noatun/downloader.h b/noatun/library/noatun/downloader.h index a4c08ad7..7d711c26 100644 --- a/noatun/library/noatun/downloader.h +++ b/noatun/library/noatun/downloader.h @@ -63,9 +63,10 @@ private: /** * download playlistitems, in a queue based fasion **/ -class Downloader : public QObject +class Downloader : public TQObject { Q_OBJECT + TQ_OBJECT struct QueueItem { DownloadItem *notifier; @@ -74,7 +75,7 @@ Q_OBJECT }; public: - Downloader(TQObject *parent=0); + Downloader(TQObject *tqparent=0); virtual ~Downloader(); public slots: diff --git a/noatun/library/noatun/effects.h b/noatun/library/noatun/effects.h index 4c014a93..0480729d 100644 --- a/noatun/library/noatun/effects.h +++ b/noatun/library/noatun/effects.h @@ -94,9 +94,10 @@ private: * Noatuns effect stack * @author Charles Samuels **/ -class Effects : public QObject +class Effects : public TQObject { Q_OBJECT + TQ_OBJECT friend class Effect; public: Effects(); diff --git a/noatun/library/noatun/engine.h b/noatun/library/noatun/engine.h index b47eb087..3108ae84 100644 --- a/noatun/library/noatun/engine.h +++ b/noatun/library/noatun/engine.h @@ -30,12 +30,13 @@ class NoatunApp; * Does almost everything related to multimedia. * Most interfacing should be done with Player **/ -class KDE_EXPORT Engine : public QObject +class KDE_EXPORT Engine : public TQObject { Q_OBJECT + TQ_OBJECT friend class NoatunApp; public: - Engine(TQObject *parent=0); + Engine(TQObject *tqparent=0); ~Engine(); void setInitialized(); bool initialized() const; diff --git a/noatun/library/noatun/equalizer.h b/noatun/library/noatun/equalizer.h index d048d21d..744958b3 100644 --- a/noatun/library/noatun/equalizer.h +++ b/noatun/library/noatun/equalizer.h @@ -99,13 +99,14 @@ private: * @author Charles Samuels * @version 2.3 **/ -class Equalizer : public QObject +class Equalizer : public TQObject { friend class Band; friend class Preset; friend class Engine; Q_OBJECT + TQ_OBJECT public: Equalizer(); ~Equalizer(); diff --git a/noatun/library/noatun/player.h b/noatun/library/noatun/player.h index a61c2335..406f4f1b 100644 --- a/noatun/library/noatun/player.h +++ b/noatun/library/noatun/player.h @@ -19,9 +19,10 @@ class KLibrary; * @author Charles Samuels * @version 2.4 **/ -class KDE_EXPORT Player : public QObject +class KDE_EXPORT Player : public TQObject { Q_OBJECT + TQ_OBJECT friend class Effects; friend class PlaylistItemData; friend class PlaylistNotifier; @@ -41,7 +42,7 @@ public: enum LoopType { None=0, Song, Playlist, Random }; public: - Player(TQObject *parent=0); + Player(TQObject *tqparent=0); ~Player(); /** diff --git a/noatun/library/noatun/playlist.h b/noatun/library/noatun/playlist.h index 013d63a4..d1baa25d 100644 --- a/noatun/library/noatun/playlist.h +++ b/noatun/library/noatun/playlist.h @@ -326,12 +326,13 @@ private: * when you can call a Player method, unless, of course, you * ARE the playlist. **/ -class Playlist : public QObject +class Playlist : public TQObject { Q_OBJECT + TQ_OBJECT friend class PlaylistItemData; public: - Playlist(TQObject *parent, const char *name); + Playlist(TQObject *tqparent, const char *name); /** * on playlist unload, your playlist must * have current()==0 and emit playCurrent diff --git a/noatun/library/noatun/plugin.h b/noatun/library/noatun/plugin.h index 2bd8c994..d127ab9f 100644 --- a/noatun/library/noatun/plugin.h +++ b/noatun/library/noatun/plugin.h @@ -402,13 +402,14 @@ class NoatunListenerNotif; * * So far only used for ExitNotifier. **/ -class NoatunListener : public QObject +class NoatunListener : public TQObject { Q_OBJECT + TQ_OBJECT friend class NoatunListenerNotif; public: - NoatunListener(TQObject *parent=0); + NoatunListener(TQObject *tqparent=0); virtual ~NoatunListener(); signals: @@ -432,7 +433,7 @@ protected: class ExitNotifier : public NoatunListener { public: - ExitNotifier(int pid, TQObject *parent=0); + ExitNotifier(int pid, TQObject *tqparent=0); virtual ~ExitNotifier(); private: @@ -450,11 +451,12 @@ private: * * When noatunOk is false, then noatun has exited somehow. **/ -class BoolNotifier : public QObject +class BoolNotifier : public TQObject { Q_OBJECT + TQ_OBJECT public: - BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent=0); + BoolNotifier(bool *value, NoatunListener *listener, TQObject *tqparent=0); private slots: void event() {*mValue=false;} diff --git a/noatun/library/noatun/pref.h b/noatun/library/noatun/pref.h index 5a7d056e..a290e51c 100644 --- a/noatun/library/noatun/pref.h +++ b/noatun/library/noatun/pref.h @@ -13,6 +13,7 @@ class CModule; class NoatunPreferences : public KDialogBase { Q_OBJECT + TQ_OBJECT friend class CModule; public: @@ -53,19 +54,20 @@ private: * Create your GUI in constructor, reimplement reopen() and save() and * you're all set. **/ -class KDE_EXPORT CModule : public QWidget +class KDE_EXPORT CModule : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * arguments are short and long descriptions * for this module, respectively * - * parent is the object that is this modules virtual-parent. + * tqparent is the object that is this modules virtual-tqparent. * When that is deleted, this also will go away, automagically. **/ - CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *parent=0); + CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *tqparent=0); virtual ~CModule(); diff --git a/noatun/library/noatun/scrollinglabel.h b/noatun/library/noatun/scrollinglabel.h index 231d3158..94253d4a 100644 --- a/noatun/library/noatun/scrollinglabel.h +++ b/noatun/library/noatun/scrollinglabel.h @@ -28,12 +28,13 @@ * A clever label that scrolls its contents as soon as there is not enough * space to show everything at once. **/ -class ScrollingLabel : public QWidget +class ScrollingLabel : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ScrollingLabel(const TQString &initialText,TQWidget *parent, + ScrollingLabel(const TQString &initialText,TQWidget *tqparent, const char * name = 0); virtual ~ScrollingLabel(); @@ -43,8 +44,8 @@ class ScrollingLabel : public QWidget **/ virtual void setText(const TQString &text, int time = -1); - virtual TQSize sizeHint() const; - virtual TQSize minimumSizeHint() const; + virtual TQSize tqsizeHint() const; + virtual TQSize tqminimumSizeHint() const; /** * @return the label's text. diff --git a/noatun/library/noatun/stdaction.h b/noatun/library/noatun/stdaction.h index bfa34164..f7413e70 100644 --- a/noatun/library/noatun/stdaction.h +++ b/noatun/library/noatun/stdaction.h @@ -20,8 +20,9 @@ namespace NoatunStdAction class PlayAction : public KAction { Q_OBJECT + TQ_OBJECT public: - PlayAction(TQObject *parent, const char *name); + PlayAction(TQObject *tqparent, const char *name); private slots: void playing(); void notplaying(); @@ -33,8 +34,9 @@ private slots: class PlaylistAction : public KToggleAction { Q_OBJECT + TQ_OBJECT public: - PlaylistAction(TQObject *parent, const char *name); + PlaylistAction(TQObject *tqparent, const char *name); private slots: void shown(); void hidden(); @@ -47,8 +49,9 @@ private slots: class PluginActionMenu : public KActionMenu { Q_OBJECT + TQ_OBJECT public: - PluginActionMenu(TQObject *parent, const char *name); + PluginActionMenu(TQObject *tqparent, const char *name); /** * inserts the given @p action into the action-menu * @param action the action to insert @@ -80,8 +83,9 @@ private: class VisActionMenu : public KActionMenu { Q_OBJECT + TQ_OBJECT public: - VisActionMenu(TQObject *parent, const char *name); + VisActionMenu(TQObject *tqparent, const char *name); private slots: void fillPopup(); void toggleVisPlugin(int); @@ -97,8 +101,9 @@ private: class LoopActionMenu : public KActionMenu { Q_OBJECT + TQ_OBJECT public: - LoopActionMenu(TQObject *parent, const char *name); + LoopActionMenu(TQObject *tqparent, const char *name); private slots: void updateLooping(int); void loopNoneSelected(); @@ -116,48 +121,48 @@ private: /** * @return pointer to a KAction which opens the effects dialog on activation */ -KDE_EXPORT KAction *effects(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *effects(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to a KAction which opens the equalizer dialog on activation */ -KDE_EXPORT KAction *equalizer(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *equalizer(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to a KAction which goes back one track on activation */ -KDE_EXPORT KAction *back(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *back(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to a KAction which stops playback on activation */ -KDE_EXPORT KAction *stop(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *stop(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to a KAction which starts/pauses playback on activation */ -KDE_EXPORT KAction *playpause(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *playpause(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to a KAction which advances one track on activation */ -KDE_EXPORT KAction *forward(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *forward(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to a KToggleAction which shows/hides the playlist */ -KDE_EXPORT KToggleAction *playlist(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KToggleAction *playlist(TQObject *tqparent = 0, const char *name = 0); /** * loop action **/ -KDE_EXPORT LoopActionMenu *loop(TQObject *parent, const char *name); +KDE_EXPORT LoopActionMenu *loop(TQObject *tqparent, const char *name); /** * play action */ -KDE_EXPORT KAction *play(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *play(TQObject *tqparent = 0, const char *name = 0); /** * pause action */ -KDE_EXPORT KAction *pause(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *pause(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to the global PluginActionMenu object (there is only one instance) @@ -167,7 +172,7 @@ KDE_EXPORT PluginActionMenu *actions(); /** * @return pointer to a VisActionMenu object */ -KDE_EXPORT VisActionMenu *visualizations(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT VisActionMenu *visualizations(TQObject *tqparent = 0, const char *name = 0); /** * The global popupmenu of noatun, there's not two or three but only one of these :) diff --git a/noatun/library/noatun/stereobuttonaction.h b/noatun/library/noatun/stereobuttonaction.h index d6d6edb9..a364dba0 100644 --- a/noatun/library/noatun/stereobuttonaction.h +++ b/noatun/library/noatun/stereobuttonaction.h @@ -13,13 +13,14 @@ namespace NoatunStdAction class StereoButtonAction : public KAction { Q_OBJECT + TQ_OBJECT public: - StereoButtonAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0 ); - StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); - StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel = 0, TQObject* parent = 0, const char* name = 0 ); - StereoButtonAction(const TQString& text, const TQString& pix, int accel = 0, TQObject* parent = 0, const char* name = 0 ); - StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); - StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); + StereoButtonAction(const TQString& text, int accel = 0, TQObject* tqparent = 0, const char* name = 0 ); + StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); + StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel = 0, TQObject* tqparent = 0, const char* name = 0 ); + StereoButtonAction(const TQString& text, const TQString& pix, int accel = 0, TQObject* tqparent = 0, const char* name = 0 ); + StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); + StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); public slots: void disable(void); void enable(void); diff --git a/noatun/library/noatun/vequalizer.h b/noatun/library/noatun/vequalizer.h index d5ee7ecf..5e494472 100644 --- a/noatun/library/noatun/vequalizer.h +++ b/noatun/library/noatun/vequalizer.h @@ -4,7 +4,7 @@ * This file is hereby licensed under the GNU General Public License version * 2 or later at your option. * - * This file is licensed under the Qt Public License version 1 with the + * This file is licensed under the TQt Public License version 1 with the * condition that the licensed will be governed under the Laws of California * (USA) instead of Norway. Disputes will be settled in Santa Clara county * courts. @@ -36,8 +36,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef NOATUN_VEQUALIZER_H -#define NOATUN_VEQUALIZER_H +#ifndef NOATUN_VETQUALIZER_H +#define NOATUN_VETQUALIZER_H #include <tqptrlist.h> #include <tqobject.h> @@ -137,6 +137,7 @@ public: class KDE_EXPORT VInterpolation : public TQObject, public VBandsInterface { Q_OBJECT + TQ_OBJECT struct Private; Private *d; friend class VBand; @@ -176,6 +177,7 @@ class VPreset; class KDE_EXPORT VEqualizer : public TQObject, public VBandsInterface { Q_OBJECT + TQ_OBJECT friend class VBand; friend class VPreset; friend class Engine; diff --git a/noatun/library/noatun/video.h b/noatun/library/noatun/video.h index a659401e..217a8640 100644 --- a/noatun/library/noatun/video.h +++ b/noatun/library/noatun/video.h @@ -12,6 +12,7 @@ class TQPopupMenu; class VideoFrame : public KVideoWidget { Q_OBJECT + TQ_OBJECT struct Private; VideoFrame::Private *d; @@ -19,8 +20,8 @@ Q_OBJECT static VideoFrame *whose; public: - VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent=0, const char *name=0, WFlags f=0); - VideoFrame(TQWidget *parent = 0, const char *name=0, WFlags f=0); + VideoFrame(KXMLGUIClient *clientParent, TQWidget *tqparent=0, const char *name=0, WFlags f=0); + VideoFrame(TQWidget *tqparent = 0, const char *name=0, WFlags f=0); ~VideoFrame(); /** @@ -28,7 +29,7 @@ public: **/ static VideoFrame *playing(); - TQPopupMenu *popupMenu(TQWidget *parent); + TQPopupMenu *popupMenu(TQWidget *tqparent); TQPopupMenu *popupMenu() { return popupMenu(this); } public slots: diff --git a/noatun/library/noatunarts/Session_impl.cpp b/noatun/library/noatunarts/Session_impl.cpp index 63912801..edec216a 100644 --- a/noatun/library/noatunarts/Session_impl.cpp +++ b/noatun/library/noatunarts/Session_impl.cpp @@ -10,7 +10,7 @@ static bool compareArtsObjects(const Noatun::Listener &left, const Noatun::Liste return left._isEqual(right); } -list<Noatun::Listener>::iterator find(list<Noatun::Listener> &v, const Noatun::Listener &is, +list<Noatun::Listener>::iterator tqfind(list<Noatun::Listener> &v, const Noatun::Listener &is, bool (*compare)(const Noatun::Listener& left, const Noatun::Listener& right)) { for (list<Noatun::Listener>::iterator i=v.begin(); i!=v.end(); ++i) @@ -55,7 +55,7 @@ public: void removeListener(Noatun::Listener listener) { list<Listener>::iterator i= - find(listeners, listener, &compareArtsObjects); + tqfind(listeners, listener, &compareArtsObjects); if (i!=listeners.end()) listeners.erase(i); } diff --git a/noatun/library/noatunarts/StereoEffectStack_impl.cpp b/noatun/library/noatunarts/StereoEffectStack_impl.cpp index 684d9694..107f06e9 100644 --- a/noatun/library/noatunarts/StereoEffectStack_impl.cpp +++ b/noatun/library/noatunarts/StereoEffectStack_impl.cpp @@ -85,7 +85,7 @@ class StereoEffectStack_impl : public StereoEffectStack_skel, public StdSynthMod list<EffectEntry*>::iterator i = fx.begin(); bool found=false; - // seek through until we find 'after' + // seek through until we tqfind 'after' while(i != fx.end()) if((*i)->id == after) { diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp index 99b69cb3..72c67d1c 100644 --- a/noatun/library/noatunstdaction.cpp +++ b/noatun/library/noatunstdaction.cpp @@ -21,8 +21,8 @@ namespace NoatunStdAction { ///////////////////////////////////////////////////// -PlayAction::PlayAction(TQObject *parent, const char *name) - : KAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), parent, name) +PlayAction::PlayAction(TQObject *tqparent, const char *name) + : KAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), tqparent, name) { connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(playing())); connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(notplaying())); @@ -46,8 +46,8 @@ void PlayAction::notplaying() } ///////////////////////////////////////////////////// -PlaylistAction::PlaylistAction(TQObject *parent, const char *name) - : KToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), parent, name) +PlaylistAction::PlaylistAction(TQObject *tqparent, const char *name) + : KToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), tqparent, name) { setCheckedState(i18n("Hide Playlist")); connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(shown())); @@ -67,8 +67,8 @@ void PlaylistAction::hidden() //////////////////////////////////////////////////// -PluginActionMenu::PluginActionMenu(TQObject *parent, const char *name) - : KActionMenu(i18n("&Actions"), parent, name) +PluginActionMenu::PluginActionMenu(TQObject *tqparent, const char *name) + : KActionMenu(i18n("&Actions"), tqparent, name) { // kdDebug(66666) << k_funcinfo << "called" << endl; setEnabled(false); @@ -111,11 +111,11 @@ void PluginActionMenu::menuRemove(int id) //////////////////////////////////////////////////// -VisActionMenu::VisActionMenu(TQObject *parent, const char *name) - : KActionMenu(i18n("&Visualizations"), parent, name) +VisActionMenu::VisActionMenu(TQObject *tqparent, const char *name) + : KActionMenu(i18n("&Visualizations"), tqparent, name) { - connect(popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(fillPopup())); - connect(popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggleVisPlugin(int))); + connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillPopup())); + connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(toggleVisPlugin(int))); } void VisActionMenu::fillPopup() @@ -133,14 +133,14 @@ void VisActionMenu::fillPopup() { id = popupMenu()->insertItem((*i).name); mSpecMap[id] = (*i).specfile; - popupMenu()->setItemChecked(id, loaded.contains(*i)); + popupMenu()->setItemChecked(id, loaded.tqcontains(*i)); } } } void VisActionMenu::toggleVisPlugin(int id) { - if(!mSpecMap.contains(id)) + if(!mSpecMap.tqcontains(id)) return; TQString specfile = mSpecMap[id]; @@ -159,30 +159,30 @@ void VisActionMenu::toggleVisPlugin(int id) //////////////////////////////////////////////////// -LoopActionMenu::LoopActionMenu(TQObject *parent, const char *name) - : KActionMenu(i18n("&Loop"), parent, name) +LoopActionMenu::LoopActionMenu(TQObject *tqparent, const char *name) + : KActionMenu(i18n("&Loop"), tqparent, name) { mLoopNone = new KRadioAction(i18n("&None"), TQString::fromLocal8Bit("noatunloopnone"), - 0, this, TQT_SLOT(loopNoneSelected()), this, "loop_none"); + 0, TQT_TQOBJECT(this), TQT_SLOT(loopNoneSelected()), TQT_TQOBJECT(this), "loop_none"); mLoopNone->setExclusiveGroup("loopType"); insert(mLoopNone); mLoopSong = new KRadioAction(i18n("&Song"), TQString::fromLocal8Bit("noatunloopsong"), - 0, this, TQT_SLOT(loopSongSelected()), this, "loop_song"); + 0, TQT_TQOBJECT(this), TQT_SLOT(loopSongSelected()), TQT_TQOBJECT(this), "loop_song"); mLoopSong->setExclusiveGroup("loopType"); insert(mLoopSong); mLoopPlaylist = new KRadioAction(i18n("&Playlist"), TQString::fromLocal8Bit("noatunloopplaylist"), - 0, this, TQT_SLOT(loopPlaylistSelected()), this, "loop_playlist"); + 0, TQT_TQOBJECT(this), TQT_SLOT(loopPlaylistSelected()), TQT_TQOBJECT(this), "loop_playlist"); mLoopPlaylist->setExclusiveGroup("loopType"); insert(mLoopPlaylist); mLoopRandom = new KRadioAction(i18n("&Random"), TQString::fromLocal8Bit("noatunlooprandom"), - 0, this, TQT_SLOT(loopRandomSelected()), this, "loop_random"); + 0, TQT_TQOBJECT(this), TQT_SLOT(loopRandomSelected()), TQT_TQOBJECT(this), "loop_random"); mLoopRandom->setExclusiveGroup("loopType"); insert(mLoopRandom); - connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(updateLooping(int))); + connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), TQT_TQOBJECT(this), TQT_SLOT(updateLooping(int))); updateLooping(static_cast<int>(napp->player()->loopStyle())); } @@ -232,29 +232,29 @@ void LoopActionMenu::loopRandomSelected() //////////////////////////////////////////////////// -KAction *playpause(TQObject *parent, const char *name) +KAction *playpause(TQObject *tqparent, const char *name) { - return new PlayAction(parent, name); + return new PlayAction(tqparent, name); } -KAction *effects(TQObject *parent, const char *name) +KAction *effects(TQObject *tqparent, const char *name) { - return new KAction(i18n("&Effects..."), "effect", 0, napp, TQT_SLOT(effectView()), parent, name); + return new KAction(i18n("&Effects..."), "effect", 0, TQT_TQOBJECT(napp), TQT_SLOT(effectView()), tqparent, name); } -KAction *equalizer(TQObject *parent, const char *name) +KAction *equalizer(TQObject *tqparent, const char *name) { - return new KAction(i18n("E&qualizer..."), "equalizer", 0, napp, TQT_SLOT(equalizerView()), parent, name); + return new KAction(i18n("E&qualizer..."), "equalizer", 0, TQT_TQOBJECT(napp), TQT_SLOT(equalizerView()), tqparent, name); } -KAction *back(TQObject *parent, const char *name) +KAction *back(TQObject *tqparent, const char *name) { - return new KAction(i18n("&Back"), "player_start", 0, napp->player(), TQT_SLOT(back()), parent, name); + return new KAction(i18n("&Back"), "player_start", 0, TQT_TQOBJECT(napp->player()), TQT_SLOT(back()), tqparent, name); } -KAction *stop(TQObject *parent, const char *name) +KAction *stop(TQObject *tqparent, const char *name) { - StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "player_stop", 0, napp->player(), TQT_SLOT(stop()), parent, name); + StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "player_stop", 0, napp->player(), TQT_SLOT(stop()), tqparent, name); TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable())); TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable())); TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable())); @@ -265,14 +265,14 @@ KAction *stop(TQObject *parent, const char *name) return action; } -KAction *forward(TQObject *parent, const char *name) +KAction *forward(TQObject *tqparent, const char *name) { - return new KAction(i18n("&Forward"), "player_end", 0, napp->player(), TQT_SLOT(forward()), parent, name); + return new KAction(i18n("&Forward"), "player_end", 0, napp->player(), TQT_SLOT(forward()), tqparent, name); } -KAction *play(TQObject *parent, const char *name) +KAction *play(TQObject *tqparent, const char *name) { - StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "player_play", 0, napp->player(), TQT_SLOT(playpause()), parent, name); + StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "player_play", 0, napp->player(), TQT_SLOT(playpause()), tqparent, name); TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(disable())); TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable())); TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(enable())); @@ -283,9 +283,9 @@ KAction *play(TQObject *parent, const char *name) return action; } -KAction *pause(TQObject *parent, const char *name) +KAction *pause(TQObject *tqparent, const char *name) { - StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "player_pause", 0, napp->player(), TQT_SLOT(playpause()), parent, name); + StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "player_pause", 0, napp->player(), TQT_SLOT(playpause()), tqparent, name); TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable())); TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(disable())); TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable())); @@ -296,9 +296,9 @@ KAction *pause(TQObject *parent, const char *name) return action; } -LoopActionMenu *loop(TQObject *parent, const char *name) +LoopActionMenu *loop(TQObject *tqparent, const char *name) { - return new LoopActionMenu(parent, name); + return new LoopActionMenu(tqparent, name); } PluginActionMenu *actions() @@ -307,14 +307,14 @@ PluginActionMenu *actions() return napp->pluginActionMenu(); } -VisActionMenu *visualizations(TQObject *parent, const char *name) +VisActionMenu *visualizations(TQObject *tqparent, const char *name) { - return new VisActionMenu(parent, name); + return new VisActionMenu(tqparent, name); } -KToggleAction *playlist(TQObject *parent, const char *name) +KToggleAction *playlist(TQObject *tqparent, const char *name) { - return new PlaylistAction(parent, name); + return new PlaylistAction(tqparent, name); } KPopupMenu *ContextMenu::mContextMenu = 0; @@ -333,15 +333,15 @@ KPopupMenu *ContextMenu::createContextMenu(TQWidget *p) KHelpMenu *helpmenu = new KHelpMenu(contextMenu, kapp->aboutData(), false); KActionCollection* actions = new KActionCollection(helpmenu); - KStdAction::open(napp, TQT_SLOT(fileOpen()), actions)->plug(contextMenu); - KStdAction::quit(napp, TQT_SLOT(quit()), actions)->plug(contextMenu); + KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actions)->plug(contextMenu); + KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actions)->plug(contextMenu); contextMenu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), helpmenu->menu()); contextMenu->insertSeparator(); - KStdAction::preferences(napp, TQT_SLOT(preferences()), actions)->plug(contextMenu); - NoatunStdAction::playlist(contextMenu)->plug(contextMenu); - NoatunStdAction::effects(contextMenu)->plug(contextMenu); - NoatunStdAction::equalizer(napp)->plug(contextMenu); - NoatunStdAction::visualizations(napp)->plug(contextMenu); + KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actions)->plug(contextMenu); + NoatunStdAction::playlist(TQT_TQOBJECT(contextMenu))->plug(contextMenu); + NoatunStdAction::effects(TQT_TQOBJECT(contextMenu))->plug(contextMenu); + NoatunStdAction::equalizer(TQT_TQOBJECT(napp))->plug(contextMenu); + NoatunStdAction::visualizations(TQT_TQOBJECT(napp))->plug(contextMenu); napp->pluginActionMenu()->plug(contextMenu); return contextMenu; diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp index 268f7bd9..47e2d92a 100644 --- a/noatun/library/noatuntags/tags.cpp +++ b/noatun/library/noatuntags/tags.cpp @@ -177,8 +177,8 @@ Tags::~Tags() } -Control::Control(TagsGetter *parent) - : CModule(i18n("Tagging"), i18n("Settings for Tag Loaders"), "edit", parent) +Control::Control(TagsGetter *tqparent) + : CModule(i18n("Tagging"), i18n("Settings for Tag Loaders"), "edit", tqparent) { // todo (void)I18N_NOOP("Rescan All Tags"); @@ -201,7 +201,7 @@ Control::Control(TagsGetter *parent) ", and updates tags (e.g., ID3)", "Interval:"), intervalLine); TQSlider *slider=new TQSlider( - 0, 2000, 100, 0, Horizontal, intervalLine + 0, 2000, 100, 0,Qt::Horizontal, intervalLine ); TQSpinBox *spin=new TQSpinBox( 0, 2000, 10, intervalLine @@ -212,14 +212,14 @@ Control::Control(TagsGetter *parent) connect(slider, TQT_SIGNAL(valueChanged(int)), spin, TQT_SLOT(setValue(int))); connect(spin, TQT_SIGNAL(valueChanged(int)), slider, TQT_SLOT(setValue(int))); - slider->setValue(parent->interval()); - connect(slider, TQT_SIGNAL(valueChanged(int)), parent, TQT_SLOT(setInterval(int))); + slider->setValue(tqparent->interval()); + connect(slider, TQT_SIGNAL(valueChanged(int)), tqparent, TQT_SLOT(setInterval(int))); connect(onPlay, TQT_SIGNAL(toggled(bool)), intervalLine, TQT_SLOT(setEnabled(bool))); } - connect(onPlay, TQT_SIGNAL(toggled(bool)), parent, TQT_SLOT(setLoadAuto(bool))); + connect(onPlay, TQT_SIGNAL(toggled(bool)), tqparent, TQT_SLOT(setLoadAuto(bool))); - onPlay->setChecked(parent->loadAuto()); + onPlay->setChecked(tqparent->loadAuto()); } diff --git a/noatun/library/noatuntags/tagsgetter.h b/noatun/library/noatuntags/tagsgetter.h index 8b6eddb9..bd66ab3f 100644 --- a/noatun/library/noatuntags/tagsgetter.h +++ b/noatun/library/noatuntags/tagsgetter.h @@ -10,6 +10,7 @@ class TagsGetter : public TQObject, public PlaylistNotifier { Q_OBJECT + TQ_OBJECT public: TagsGetter(); void associate(Tags *t); @@ -47,8 +48,9 @@ private: class Control : public CModule { Q_OBJECT + TQ_OBJECT public: - Control(TagsGetter* parent); + Control(TagsGetter* tqparent); }; diff --git a/noatun/library/player.cpp b/noatun/library/player.cpp index 0b90952c..accdfd47 100644 --- a/noatun/library/player.cpp +++ b/noatun/library/player.cpp @@ -14,7 +14,7 @@ enum ArtsPOS { posIdle=0, posPlaying, posPaused }; -Player::Player(TQObject *parent) : TQObject(parent, "Player"), +Player::Player(TQObject *tqparent) : TQObject(tqparent, "Player"), position(-1), mLoopStyle(None), firstTimeout(true) { mEngine=new Engine; diff --git a/noatun/library/playlist.cpp b/noatun/library/playlist.cpp index 7cc28337..a86be118 100644 --- a/noatun/library/playlist.cpp +++ b/noatun/library/playlist.cpp @@ -62,12 +62,12 @@ TQString PlaylistItemData::title() const // "$(property)" TQString format=napp->titleFormat(); - TQRegExp find("(?:(?:\\\\\\\\))*\\$\\((.*)"); + TQRegExp tqfind("(?:(?:\\\\\\\\))*\\$\\((.*)"); int start=0; while (start != -1) { - start = find.search(format, start); + start = tqfind.search(format, start); if (start == -1) break; // test if there's an odd amount of backslashes @@ -81,8 +81,8 @@ TQString PlaylistItemData::title() const uint len=counter.cap(1).length()-1; // and half them, and remove one more - format.replace(start-1, len/2+1, ""); - start=start-1+len/2+find.cap(1).length()+3; + format.tqreplace(start-1, len/2+1, ""); + start=start-1+len/2+tqfind.cap(1).length()+3; continue; } @@ -96,12 +96,12 @@ TQString PlaylistItemData::title() const uint len=counter.cap(1).length(); // and half them - format.replace(start, len/2, ""); + format.tqreplace(start, len/2, ""); start=start+len/2; } // "sth"foo"sth" - TQString cont(find.cap(1)); + TQString cont(tqfind.cap(1)); TQString prefix,suffix,propname; unsigned int i=0; if (cont[i] == '"') @@ -150,18 +150,18 @@ TQString PlaylistItemData::title() const { // comments can contain newlines // these are not wanted in a formatted title - propval.replace('\n', ' '); + propval.tqreplace('\n', ' '); } if (propval.length()) { propval = prefix+propval+suffix; - format.replace(start, i+2, propval); + format.tqreplace(start, i+2, propval); start += propval.length(); } else { - format.replace(start, i+2, ""); + format.tqreplace(start, i+2, ""); } } return format; @@ -278,7 +278,7 @@ bool PlaylistItemData::operator != (const PlaylistItemData &d) const -Playlist::Playlist(TQObject *parent, const char *name) : TQObject(parent, name) +Playlist::Playlist(TQObject *tqparent, const char *name) : TQObject(tqparent, name) { napp->player()->connect(this, TQT_SIGNAL(playCurrent()), TQT_SLOT(playCurrent())); napp->player()->connect(this, TQT_SIGNAL(listHidden()), TQT_SIGNAL(playlistHidden())); @@ -356,7 +356,7 @@ TQValueList<PlaylistItem> Playlist::select( } else { - if ((*val).find(v, 0, caseSensitive)!=-1) + if ((*val).tqfind(v, 0, caseSensitive)!=-1) { list.append(i); limit--; diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp index 8b34deca..15fcad58 100644 --- a/noatun/library/playlistsaver.cpp +++ b/noatun/library/playlistsaver.cpp @@ -107,7 +107,7 @@ bool PlaylistSaver::metalist(const KURL &url) TQMap<TQString,TQString> map; map["playObject"]="Arts::StreamPlayObject"; - map["title"] = i18n("Stream from %1").arg(url.host()); + map["title"] = i18n("Stream from %1").tqarg(url.host()); KURL u(url); if (!u.hasPath()) @@ -144,7 +144,7 @@ bool PlaylistSaver::saveXML(const KURL &file, int ) else localFile = napp->tempSaveName(file.path()); - // QDom is a pain :) + // TQDom is a pain :) TQDomDocument doc("playlist"); doc.setContent(TQString("<!DOCTYPE XMLPlaylist><playlist version=\"1.0\" client=\"noatun\"/>")); @@ -186,7 +186,7 @@ bool PlaylistSaver::saveXML(const KURL &file, int ) return true; } -class NoatunXMLStructure : public QXmlDefaultHandler +class NoatunXMLStructure : public TQXmlDefaultHandler { public: PlaylistSaver *saver; @@ -231,7 +231,7 @@ public: }; -class MSASXStructure : public QXmlDefaultHandler +class MSASXStructure : public TQXmlDefaultHandler { public: PlaylistSaver *saver; @@ -291,7 +291,7 @@ public: if(a.qName(i).lower()=="href") { TQString filename=a.value(i); - if (filename.find(TQRegExp("^[a-zA-Z0-9]+:/"))==0) + if (filename.tqfind(TQRegExp("^[a-zA-Z0-9]+:/"))==0) { KURL url(filename); KMimeType::Ptr mimetype = KMimeType::findByURL(url); @@ -303,7 +303,7 @@ public: else { propMap["playObject"]="SplayPlayObject"; - propMap["title"] = i18n("Stream from %1").arg(url.host()); + propMap["title"] = i18n("Stream from %1").tqarg(url.host()); if (!url.hasPath()) url.setPath("/"); propMap["url"] = url.url(); @@ -316,7 +316,7 @@ public: { KURL u1; // we have to deal with a relative path - if (filename.find('/')) + if (filename.tqfind('/')) { u1.setPath(mAbsPath); //FIXME: how to get the path in this place? u1.setFileName(filename); @@ -448,8 +448,8 @@ bool PlaylistSaver::loadXML(const KURL &url, int opt) reset(); - // QXml is horribly documented - TQXmlInputSource source(&file); + // TQXml is horribly documented + TQXmlInputSource source(TQT_TQIODEVICE(&file)); TQXmlSimpleReader reader; if (opt == ASX || @@ -541,7 +541,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) if (filename.isEmpty()) continue; - if (filename.find(TQRegExp("^[a-zA-Z0-9]+:/"))==0) + if (filename.tqfind(TQRegExp("^[a-zA-Z0-9]+:/"))==0) { //kdDebug(66666) << k_funcinfo << "url filename = " << filename << endl; @@ -556,7 +556,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) { prop["playObject"]="SplayPlayObject"; // Default title, might be overwritten by #EXTINF later - prop["title"] = i18n("Stream from %1").arg(protourl.host()); + prop["title"] = i18n("Stream from %1").tqarg(protourl.host()); if (!protourl.hasPath()) protourl.setPath("/"); @@ -569,7 +569,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) { KURL u1; // we have to deal with a relative path - if (filename.find('/')) + if (filename.tqfind('/')) { u1.setPath(file.path(0)); u1.setFileName(filename); @@ -587,7 +587,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) { extinf.remove(0,8); // remove "#EXTINF:" //kdDebug(66666) << "EXTM3U extinf = '" << extinf << "'" << endl; - int timeTitleSep = extinf.find(',', 0); + int timeTitleSep = extinf.tqfind(',', 0); int length = (extinf.left(timeTitleSep)).toInt(); if (length>0) @@ -596,7 +596,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) TQString displayTitle=extinf.mid(timeTitleSep+1); if (!displayTitle.isEmpty()) { - int artistTitleSep = displayTitle.find(" - ",0); + int artistTitleSep = displayTitle.tqfind(" - ",0); if (artistTitleSep == -1) // no "artist - title" like format, just set it as title { prop["title"] = displayTitle; @@ -718,7 +718,7 @@ bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/) // some stupid Windows lusers like to be case insensitive TQStringList groups = list.groupList().grep(TQRegExp("^playlist$", false)); /* - if (!groups.count()) // didn't find "[playlist]", it's not a .pls file + if (!groups.count()) // didn't tqfind "[playlist]", it's not a .pls file return false; */ @@ -748,9 +748,9 @@ bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/) map["playObject"]="SplayPlayObject"; if (title.isEmpty()) - map["title"] = i18n("Stream from %1 (port: %2)").arg( url.host() ).arg( url.port() ); + map["title"] = i18n("Stream from %1 (port: %2)").tqarg( url.host() ).tqarg( url.port() ); else - map["title"] = i18n("Stream from %1, (ip: %2, port: %3)").arg( title ).arg( url.host() ).arg(url.port() ); + map["title"] = i18n("Stream from %1, (ip: %2, port: %3)").tqarg( title ).tqarg( url.host() ).tqarg(url.port() ); map["url"] = map["stream_"]= url.url(); diff --git a/noatun/library/plugin.cpp b/noatun/library/plugin.cpp index 3c5b6f5d..36c1a2cf 100644 --- a/noatun/library/plugin.cpp +++ b/noatun/library/plugin.cpp @@ -85,16 +85,16 @@ Visualization::Visualization(int timeout, int pid) // if this is a fork, do a cutesy arts thingy to get a remote // stack, otherwise, get it from localhost :) { - int parent=pid ? pid : getppid(); + int tqparent=pid ? pid : getppid(); if (getenv("NOATUN_PID")) - parent = TQString::fromLatin1(getenv("NOATUN_PID")).toInt(); + tqparent = TQString::tqfromLatin1(getenv("NOATUN_PID")).toInt(); DCOPClient c; c.attach(); TQCString appids[2]; - appids[0]=TQString("noatun-%1").arg(parent).local8Bit(); + appids[0]=TQString("noatun-%1").tqarg(tqparent).local8Bit(); appids[1]="noatun"; TQCString &appid=appids[0]; @@ -120,7 +120,7 @@ Visualization::Visualization(int timeout, int pid) if (!c.call(appid, "Noatun", "visStack()", TQByteArray(), replyType, replyData)) { - kdDebug(66666) << "Error communicating to parent noatun" << endl; + kdDebug(66666) << "Error communicating to tqparent noatun" << endl; } else { @@ -187,7 +187,7 @@ int Visualization::noatunPid() { if ((*i).left(6) != "noatun") continue; - int pid=(*i).mid((*i).find('-')+1).toInt(); + int pid=(*i).mid((*i).tqfind('-')+1).toInt(); return pid; } return -1; @@ -473,7 +473,7 @@ void StereoScope::setSamples(int len) -NoatunListener::NoatunListener(TQObject *parent) : TQObject(parent) +NoatunListener::NoatunListener(TQObject *tqparent) : TQObject(tqparent) { } NoatunListener::~NoatunListener() @@ -495,7 +495,7 @@ void NoatunListenerNotif::message() } -ExitNotifier::ExitNotifier(int pid, TQObject *parent) : NoatunListener(parent) +ExitNotifier::ExitNotifier(int pid, TQObject *tqparent) : NoatunListener(tqparent) { mNotif=new NoatunListenerNotif(this); @@ -504,7 +504,7 @@ ExitNotifier::ExitNotifier(int pid, TQObject *parent) : NoatunListener(parent) TQCString appids[2]; - appids[0]=TQString("noatun-%1").arg(pid).local8Bit(); + appids[0]=TQString("noatun-%1").tqarg(pid).local8Bit(); appids[1]="noatun"; appid=appids[0]; @@ -528,7 +528,7 @@ ExitNotifier::ExitNotifier(int pid, TQObject *parent) : NoatunListener(parent) if (!c.call(appid, "Noatun", "session()", TQByteArray(), replyType, replyData)) { - kdDebug(66666) << "Error communicating to parent noatun" << endl; + kdDebug(66666) << "Error communicating to tqparent noatun" << endl; } else { @@ -563,8 +563,8 @@ ExitNotifier::~ExitNotifier() delete mNotif; } -BoolNotifier::BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent) - : TQObject(parent) +BoolNotifier::BoolNotifier(bool *value, NoatunListener *listener, TQObject *tqparent) + : TQObject(tqparent) { connect(listener, TQT_SIGNAL(event()), TQT_SLOT(event())); mValue=value; diff --git a/noatun/library/plugin_deps.h b/noatun/library/plugin_deps.h index 330636e3..e52e73c1 100644 --- a/noatun/library/plugin_deps.h +++ b/noatun/library/plugin_deps.h @@ -9,9 +9,10 @@ class Visualization; class NoatunListener; -class TimerThingy : public QObject +class TimerThingy : public TQObject { Q_OBJECT + TQ_OBJECT public: TimerThingy(Visualization*); diff --git a/noatun/library/pluginloader.cpp b/noatun/library/pluginloader.cpp index 0897e76d..032761a0 100644 --- a/noatun/library/pluginloader.cpp +++ b/noatun/library/pluginloader.cpp @@ -81,7 +81,7 @@ bool LibraryLoader::loadAll(const TQStringList &modules) for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) { NoatunLibraryInfo info=getInfo(*i); - if (!info.type.contains("sm")) + if (!info.type.tqcontains("sm")) continue; loadSO(*i); } @@ -90,7 +90,7 @@ bool LibraryLoader::loadAll(const TQStringList &modules) for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) { NoatunLibraryInfo info=getInfo(*i); - if (!info.type.contains("playlist")) + if (!info.type.tqcontains("playlist")) continue; loadSO(*i); } @@ -106,7 +106,7 @@ bool LibraryLoader::loadAll(const TQStringList &modules) for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) { NoatunLibraryInfo info=getInfo(*i); - if (!info.type.contains("userinterface")) + if (!info.type.tqcontains("userinterface")) continue; loadSO(*i); } @@ -121,9 +121,9 @@ bool LibraryLoader::loadAll(const TQStringList &modules) for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) { NoatunLibraryInfo info=getInfo(*i); - if((!info.type.contains("playlist")) - && (!info.type.contains("userinterface")) - && (!info.type.contains("sm"))) + if((!info.type.tqcontains("playlist")) + && (!info.type.tqcontains("userinterface")) + && (!info.type.tqcontains("sm"))) { loadSO(*i); } @@ -139,7 +139,7 @@ NoatunLibraryInfo LibraryLoader::getInfo(const TQString &spec) const if (!TQFile::exists(specPath)) return info; KSimpleConfig file(specPath); - if (spec.find('/')>=0) + if (spec.tqfind('/')>=0) info.specfile=KURL(spec).fileName(); else info.specfile=spec; @@ -197,7 +197,7 @@ bool LibraryLoader::loadSO(const TQString &spec) plugInStart=(Plugin* (*)()) create; listitem->plugin=plugInStart(); - if (info.type.contains("playlist")) + if (info.type.tqcontains("playlist")) { //kdDebug(66666) << k_funcinfo << "Assigning mPlaylist to " << info.name << endl; mPlaylist=listitem->plugin->playlist(); @@ -329,7 +329,7 @@ TQValueList<NoatunLibraryInfo> LibraryLoader::loadedByType(const TQString &type) if (isLoaded(i.currentKey())) { NoatunLibraryInfo info = getInfo(i.currentKey()); - if (info.type.contains(type)) + if (info.type.tqcontains(type)) items.append(info); } } diff --git a/noatun/library/pluginmodule.cpp b/noatun/library/pluginmodule.cpp index 77047471..0cd47d6d 100644 --- a/noatun/library/pluginmodule.cpp +++ b/noatun/library/pluginmodule.cpp @@ -203,34 +203,34 @@ void Plugins::reopen() for(TQValueList<NoatunLibraryInfo>::Iterator i = available.begin(); i != available.end(); ++i) { - PluginListView *parent; + PluginListView *tqparent; bool exclusive = false; if((*i).type == "userinterface") { - parent = interfaceList; + tqparent = interfaceList; } else if((*i).type == "playlist") { - parent = playlistList; + tqparent = playlistList; exclusive = true; } else if((*i).type == "sm" || (*i).type=="hidden") { - parent = 0; + tqparent = 0; } else if ((*i).type == "visualization") { - parent = visList; + tqparent = visList; } else { - parent = otherList; + tqparent = otherList; } - if(parent) + if(tqparent) { - PluginListItem *item = new PluginListItem(exclusive, loaded.contains(*i), *i, parent); + PluginListItem *item = new PluginListItem(exclusive, loaded.tqcontains(*i), *i, tqparent); item->setText(0, (*i).name); item->setText(1, (*i).comment); item->setText(2, (*i).author); @@ -257,9 +257,9 @@ void Plugins::addPlugin(const NoatunLibraryInfo &info) if(item) item->setOn(true); } - if(mDeleted.contains(info.specfile)) + if(mDeleted.tqcontains(info.specfile)) mDeleted.remove(info.specfile); - else if(!mAdded.contains(info.specfile)) + else if(!mAdded.tqcontains(info.specfile)) mAdded.append(info.specfile); } @@ -291,9 +291,9 @@ void Plugins::removePlugin(const NoatunLibraryInfo &info) } } - if (mAdded.contains(info.specfile)) + if (mAdded.tqcontains(info.specfile)) mAdded.remove(info.specfile); - else if(!mDeleted.contains(info.specfile)) + else if(!mDeleted.tqcontains(info.specfile)) mDeleted.append(info.specfile); } @@ -382,7 +382,7 @@ void Plugins::save() TQValueList<NoatunLibraryInfo> loaded = loader.loaded(); for(TQValueList<NoatunLibraryInfo>::Iterator i = loaded.begin(); i != loaded.end(); ++i) { - if(!specList.contains((*i).specfile) && loader.isLoaded((*i).specfile)) + if(!specList.tqcontains((*i).specfile) && loader.isLoaded((*i).specfile)) specList += (*i).specfile; } @@ -398,7 +398,7 @@ void Plugins::showEvent(TQShowEvent *e) if(!shown) { shown = true; - KMessageBox::information(this, i18n("<qt>Changing your playlist plugin will stop playback. Different playlists may use different methods of storing information, so after changing playlists you may have to recreate your playlist.</qt>"), TQString::null, "Plugin warning"); + KMessageBox::information(this, i18n("<qt>Changing your playlist plugin will stop playback. Different playlists may use different methods of storing information, so after changing playlists you may have to recreate your playlist.</qt>"), TQString(), "Plugin warning"); } CModule::showEvent(e); } diff --git a/noatun/library/pluginmodule.h b/noatun/library/pluginmodule.h index 59ece235..c3818040 100644 --- a/noatun/library/pluginmodule.h +++ b/noatun/library/pluginmodule.h @@ -30,7 +30,7 @@ class KTabCtl; -class PluginListItem : public QCheckListItem +class PluginListItem : public TQCheckListItem { public: PluginListItem(const bool _exclusive, bool _checked, const NoatunLibraryInfo &_info, TQListView *_parent); @@ -51,6 +51,7 @@ private: class PluginListView : public KListView { Q_OBJECT + TQ_OBJECT friend class PluginListItem; @@ -75,6 +76,7 @@ private: class Plugins : public CModule { Q_OBJECT + TQ_OBJECT public: Plugins(TQObject *_parent = 0); virtual void save(); diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp index 658e7951..04e301ff 100644 --- a/noatun/library/pref.cpp +++ b/noatun/library/pref.cpp @@ -8,9 +8,9 @@ //#include <tqlabel.h> #include "cmodule.h" -NoatunPreferences::NoatunPreferences(TQWidget *parent) +NoatunPreferences::NoatunPreferences(TQWidget *tqparent) : KDialogBase(TreeList, i18n("Preferences - Noatun"), - Ok|Apply|Cancel|Help, Ok, parent, "NoatunPreferences", false, true) + Ok|Apply|Cancel|Help, Ok, tqparent, "NoatunPreferences", false, true) { resize(640, 480); // KDE is required to support 800x600 min. setShowIconsInTreeList(true); @@ -32,7 +32,7 @@ void NoatunPreferences::show() void NoatunPreferences::show(CModule *page) { - int index = pageIndex( static_cast<TQWidget *>(page->parent()) ); + int index = pageIndex( static_cast<TQWidget *>(TQT_TQWIDGET(page->tqparent())) ); if (index != -1) showPage(index); show(); @@ -65,29 +65,20 @@ CModule::CModule(const TQString &name, const TQString &description, const TQStri napp->preferencesBox()->add(this); - TQFrame *page=static_cast<TQFrame*>(parent()); + TQFrame *page=static_cast<TQFrame*>(TQT_TQWIDGET(tqparent())); (new TQHBoxLayout(page))->addWidget(this); } CModule::~CModule() { //kdDebug(66666) << k_funcinfo << endl; -#if QT_VERSION < 0x030102 && KDE_VERSION < KDE_MAKE_VERSION( 3, 1, 90 ) - // Due to a bug in Qt 3.1 and 3.1.1 no close events are sent to hidden - // widgets, causing the KJanusWidget to crash. This workaround is - // rather intrusive and should be used only in the affected versions - // to avoid hard to track bugs in the future. KDE HEAD (to become 3.2) - // has a workaround for this problem, and additionally it's fixed in - // Qt 3.1.2. - napp->sendPostedEvents(); -#endif napp->preferencesBox()->remove(this); } void CModule::ownerDeleted() { - TQObject *p=parent(); + TQObject *p=tqparent(); delete this; p->deleteLater(); } diff --git a/noatun/library/scrollinglabel.cpp b/noatun/library/scrollinglabel.cpp index 09d64678..682c4f6a 100644 --- a/noatun/library/scrollinglabel.cpp +++ b/noatun/library/scrollinglabel.cpp @@ -40,11 +40,11 @@ class ScrollingLabel::Private } // Order dependency. - QString text; - QString originalText; - QPixmap buf; - QTimer scrollTimer; - QTimer resetTimer; + TQString text; + TQString originalText; + TQPixmap buf; + TQTimer scrollTimer; + TQTimer resetTimer; int scrollSize; int pos; bool add; @@ -54,11 +54,11 @@ class ScrollingLabel::Private ScrollingLabel::ScrollingLabel ( - const QString & initialText, - QWidget * parent, + const TQString & initialText, + TQWidget * tqparent, const char * name ) - : TQWidget(parent, name) + : TQWidget(tqparent, name) { d = new Private; @@ -116,10 +116,10 @@ ScrollingLabel::_update() setFixedHeight(h); - d->scrollSize = QMAX(0, w - width()); + d->scrollSize = TQMAX(0, w - width()); d->buf.resize(w, h); - d->buf.fill(colorGroup().background()); + d->buf.fill(tqcolorGroup().background()); TQPainter p(&d->buf); p.setFont(font()); @@ -128,14 +128,14 @@ ScrollingLabel::_update() if (d->scroll && (d->scrollSize > 0)) d->scrollTimer.start(100, true); - repaint(false); + tqrepaint(false); } void ScrollingLabel::paintEvent(TQPaintEvent *) { bitBlt - (this, 0, 0, &d->buf, d->pos, 0, d->pos + width(), height(), Qt::CopyROP); + (this, 0, 0, &d->buf, d->pos, 0, d->pos + width(), height(), TQt::CopyROP); } void @@ -149,7 +149,7 @@ ScrollingLabel::scroll() { d->scrollTimer.stop(); - repaint(false); + tqrepaint(false); int scrollTime = 100; @@ -165,19 +165,19 @@ ScrollingLabel::scroll() d->scrollTimer.start(scrollTime, true); } - QSize -ScrollingLabel::sizeHint() const + TQSize +ScrollingLabel::tqsizeHint() const { return fontMetrics().boundingRect(d->text).size(); } - QSize -ScrollingLabel::minimumSizeHint() const + TQSize +ScrollingLabel::tqminimumSizeHint() const { return TQSize(0, fontMetrics().height()); } - QString + TQString ScrollingLabel::text() const { return d->text; diff --git a/noatun/library/stereobuttonaction.cpp b/noatun/library/stereobuttonaction.cpp index e8df0046..7d5d3936 100644 --- a/noatun/library/stereobuttonaction.cpp +++ b/noatun/library/stereobuttonaction.cpp @@ -3,28 +3,28 @@ namespace NoatunStdAction { -StereoButtonAction::StereoButtonAction(const TQString& text, int accel, TQObject* parent, const char* name ) - : KAction(text, accel, parent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, int accel, TQObject* tqparent, const char* name ) + : KAction(text, accel, tqparent, name) {} -StereoButtonAction::StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KAction(text, accel, receiver, slot, parent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) + : KAction(text, accel, receiver, slot, tqparent, name) {} -StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, TQObject* parent, const char* name ) - : KAction(text, pix, accel, parent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, TQObject* tqparent, const char* name ) + : KAction(text, pix, accel, tqparent, name) {} -StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, TQObject* parent, const char* name ) - : KAction(text, pix, accel, parent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, TQObject* tqparent, const char* name ) + : KAction(text, pix, accel, tqparent, name) {} -StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KAction(text, pix, accel, receiver, slot, parent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) + : KAction(text, pix, accel, receiver, slot, tqparent, name) {} -StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KAction(text, pix, accel, receiver, slot, parent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) + : KAction(text, pix, accel, receiver, slot, tqparent, name) {} void StereoButtonAction::disable(void) diff --git a/noatun/library/titleproxy.cpp b/noatun/library/titleproxy.cpp index ee62863c..bda84b18 100644 --- a/noatun/library/titleproxy.cpp +++ b/noatun/library/titleproxy.cpp @@ -157,11 +157,11 @@ void Proxy::sendRequest() //SLOT "%3" "%4" "\r\n" ) - .arg( m_url.path( -1 ).isEmpty() ? "/" : m_url.path( -1 ) ) - .arg( m_url.host() ) - .arg( m_icyMode ? TQString( "Icy-MetaData:1\r\n" ) : TQString::null ) - .arg( auth ? TQString( "Authorization: Basic " ).append( authString ) : TQString::null ) - .arg( NOATUN_VERSION ); + .tqarg( m_url.path( -1 ).isEmpty() ? "/" : m_url.path( -1 ) ) + .tqarg( m_url.host() ) + .tqarg( m_icyMode ? TQString( "Icy-MetaData:1\r\n" ) : TQString() ) + .tqarg( auth ? TQString( "Authorization: Basic " ).append( authString ) : TQString() ) + .tqarg( NOATUN_VERSION ); m_sockRemote.writeBlock( request.latin1(), request.length() ); @@ -172,9 +172,9 @@ void Proxy::sendRequest() //SLOT void Proxy::readRemote() //SLOT { m_connectSuccess = true; - Q_LONG index = 0; - Q_LONG bytesWrite = 0; - Q_LONG bytesRead = m_sockRemote.readBlock( m_pBuf, BUFSIZE ); + TQ_LONG index = 0; + TQ_LONG bytesWrite = 0; + TQ_LONG bytesRead = m_sockRemote.readBlock( m_pBuf, BUFSIZE ); if ( bytesRead == -1 ) { kdDebug(66666) << k_funcinfo << "Could not read remote data from socket, aborting" << endl; @@ -246,7 +246,7 @@ void Proxy::connectError() //SLOT // PRIVATE ////////////////////////////////////////////////////////////////////////////////////////// -bool Proxy::processHeader( Q_LONG &index, Q_LONG bytesRead ) +bool Proxy::processHeader( TQ_LONG &index, TQ_LONG bytesRead ) { while ( index < bytesRead ) { @@ -258,11 +258,11 @@ bool Proxy::processHeader( Q_LONG &index, Q_LONG bytesRead ) // Handle redirection TQString loc( "Location: " ); - int index = m_headerStr.find( loc ); + int index = m_headerStr.tqfind( loc ); if ( index >= 0 ) { int start = index + loc.length(); - int end = m_headerStr.find( "\n", index ); + int end = m_headerStr.tqfind( "\n", index ); m_url = m_headerStr.mid( start, end - start - 1 ); kdDebug(66666) << k_funcinfo << @@ -304,7 +304,7 @@ bool Proxy::processHeader( Q_LONG &index, Q_LONG bytesRead ) } } - if ( m_streamUrl.startsWith( "www.", true ) ) + if ( m_streamUrl.tqstartsWith( "www.", true ) ) m_streamUrl.prepend( "http://" ); m_sockProxy.writeBlock( m_headerStr.latin1(), m_headerStr.length() ); @@ -339,8 +339,8 @@ void Proxy::transmitData( const TQString &data ) emit metaData( m_streamName, m_streamGenre, m_streamUrl, m_bitRate, - extractStr(data, TQString::fromLatin1("StreamTitle")), - extractStr(data, TQString::fromLatin1("StreamUrl"))); + extractStr(data, TQString::tqfromLatin1("StreamTitle")), + extractStr(data, TQString::tqfromLatin1("StreamUrl"))); } @@ -360,15 +360,15 @@ void Proxy::error() TQString Proxy::extractStr( const TQString &str, const TQString &key ) { - int index = str.find( key, 0, true ); + int index = str.tqfind( key, 0, true ); if ( index == -1 ) { - return TQString::null; + return TQString(); } else { - index = str.find( "'", index ) + 1; - int indexEnd = str.find( "'", index ); + index = str.tqfind( "'", index ) + 1; + int indexEnd = str.tqfind( "'", index ); return str.mid( index, indexEnd - index ); } } diff --git a/noatun/library/titleproxy.h b/noatun/library/titleproxy.h index 7bbb3143..947ccff5 100644 --- a/noatun/library/titleproxy.h +++ b/noatun/library/titleproxy.h @@ -46,9 +46,10 @@ namespace TitleProxy * @short A proxy server for extracting metadata from Shoutcast streams. */ - class Proxy : public QObject + class Proxy : public TQObject { Q_OBJECT + TQ_OBJECT public: Proxy( KURL url ); ~Proxy(); @@ -74,7 +75,7 @@ namespace TitleProxy void connectError(); private: - bool processHeader( Q_LONG &index, Q_LONG bytesRead ); + bool processHeader( TQ_LONG &index, TQ_LONG bytesRead ); void transmitData( const TQString &data ); void error(); TQString extractStr( const TQString &str, const TQString &key ); @@ -108,13 +109,14 @@ namespace TitleProxy }; - class Server : public QServerSocket + class Server : public TQServerSocket { Q_OBJECT + TQ_OBJECT public: - Server( Q_UINT16 port, TQObject* parent ) - : TQServerSocket( port, 1, parent, "TitleProxyServer" ) {}; + Server( TQ_UINT16 port, TQObject* tqparent ) + : TQServerSocket( port, 1, tqparent, "TitleProxyServer" ) {}; signals: void connected( int socket ); diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp index c081d84b..a61e3eec 100644 --- a/noatun/library/vequalizer.cpp +++ b/noatun/library/vequalizer.cpp @@ -4,7 +4,7 @@ * This file is hereby licensed under the GNU General Public License version * 2 or later at your option. * - * This file is licensed under the Qt Public License version 1 with the + * This file is licensed under the TQt Public License version 1 with the * condition that the licensed will be governed under the Laws of California * (USA) instead of Norway. Disputes will be settled in Santa Clara county * courts. @@ -63,7 +63,7 @@ #include <math.h> #define EQ (napp->vequalizer()) -#define EQBACK (napp->player()->engine()->equalizer()) +#define ETQBACK (napp->player()->engine()->equalizer()) using std::vector; @@ -440,7 +440,7 @@ void VEqualizer::setBands(int num, bool interpolate) void VEqualizer::setPreamp(int preamp) { d->preamp = preamp; - EQBACK->preamp(pow(2,float(preamp)/100.0)); + ETQBACK->preamp(pow(2,float(preamp)/100.0)); emit changed(); emit preampChanged(); emit preampChanged(preamp); @@ -483,7 +483,7 @@ int VEqualizer::bands() const bool VEqualizer::isEnabled() const { - return bool(EQBACK->enabled()); + return bool(ETQBACK->enabled()); } int VEqualizer::preamp() const @@ -534,7 +534,7 @@ void VEqualizer::setLevels(const TQValueList<int> &levels) void VEqualizer::setEnabled(bool e) { update(true); // just in case - EQBACK->enabled((long)e); + ETQBACK->enabled((long)e); KConfig *config=kapp->config(); config->setGroup("Equalizer"); config->writeEntry("enabled", e); @@ -565,9 +565,9 @@ void VEqualizer::update(bool full) } } if (full) - EQBACK->set(levels, mids, widths); + ETQBACK->set(levels, mids, widths); else - EQBACK->levels(levels); + ETQBACK->levels(levels); } @@ -609,7 +609,7 @@ TQString VEqualizer::toString(const TQString &name) const { docElem.setAttribute("level", preamp()); docElem.setAttribute("name", name); - docElem.setAttribute("version", napp->version()); + docElem.setAttribute("version", TQString(napp->version())); } int bandc = bands(); @@ -764,7 +764,7 @@ VPreset VEqualizer::presetByFile(const TQString &file) KConfig *conf=KGlobal::config(); conf->setGroup("Equalizer"); TQStringList list=kapp->config()->readListEntry("presets"); - if (list.contains(file)) + if (list.tqcontains(file)) return VPreset(file); return VPreset(); } @@ -920,7 +920,7 @@ void VPreset::remove() emit EQ->removed(*this); - if (file().find(kapp->dirs()->localkdedir())==0) + if (file().tqfind(kapp->dirs()->localkdedir())==0) { TQFile f(file()); f.remove(); @@ -930,7 +930,7 @@ void VPreset::remove() #undef EQ -#undef EQBACK +#undef ETQBACK #include "vequalizer.moc" diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp index 94646315..e009b044 100644 --- a/noatun/library/video.cpp +++ b/noatun/library/video.cpp @@ -24,8 +24,8 @@ struct VideoFrame::Private }; -VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent, const char*name, WFlags f) - : KVideoWidget(clientParent, parent, name, f) +VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *tqparent, const char*name, WFlags f) + : KVideoWidget(clientParent, tqparent, name, f) { d = new Private; connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed())); @@ -33,8 +33,8 @@ VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent, const char frames.append(this); } -VideoFrame::VideoFrame(TQWidget *parent, const char *name, WFlags f) - : KVideoWidget(parent, name, f) +VideoFrame::VideoFrame(TQWidget *tqparent, const char *name, WFlags f) + : KVideoWidget(tqparent, name, f) { d = new Private; connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed())); @@ -62,9 +62,9 @@ VideoFrame *VideoFrame::playing() return whose; } -TQPopupMenu *VideoFrame::popupMenu(TQWidget *parent) +TQPopupMenu *VideoFrame::popupMenu(TQWidget *tqparent) { - TQPopupMenu *view = new TQPopupMenu(parent); + TQPopupMenu *view = new TQPopupMenu(tqparent); action( "half_size" )->plug( view ); action( "normal_size" )->plug( view ); action( "double_size" )->plug( view ); @@ -122,7 +122,7 @@ GlobalVideo::GlobalVideo() menu = video->popupMenu(this); // FIXME: How to obtain minimum size for top-level widgets? -// video->setMinimumSize(minimumSizeHint()); +// video->setMinimumSize(tqminimumSizeHint()); // video->setMinimumSize(101,35); video->setMinimumSize(128,96); @@ -151,7 +151,7 @@ void GlobalVideo::hide() void GlobalVideo::mouseReleaseEvent(TQMouseEvent *e) { - if (e->button() == RightButton) + if (e->button() == Qt::RightButton) { menu->exec(mapToGlobal(e->pos())); } diff --git a/noatun/modules/artseffects/extrastereo_impl.cc b/noatun/modules/artseffects/extrastereo_impl.cc index 3dc92705..28b02d8e 100644 --- a/noatun/modules/artseffects/extrastereo_impl.cc +++ b/noatun/modules/artseffects/extrastereo_impl.cc @@ -134,7 +134,7 @@ public: intense.min(0); intense.max(5); intense.value(e.intensity()); - intense.parent(hbox); + intense.tqparent(hbox); intense.show(); connect(intense,"value_changed", e, "intensity"); diff --git a/noatun/modules/artseffects/extrastereogui_impl.cc b/noatun/modules/artseffects/extrastereogui_impl.cc index b5a19bf0..92148ba0 100644 --- a/noatun/modules/artseffects/extrastereogui_impl.cc +++ b/noatun/modules/artseffects/extrastereogui_impl.cc @@ -7,7 +7,7 @@ namespace Arts { ExtraStereoGUI_impl::ExtraStereoGUI_impl() : TQWidget(0) { (new TQHBoxLayout(this))->setAutoAdd(true); - mSlider=new TQSlider(0,100,10, 0, Horizontal, this); + mSlider=new TQSlider(0,100,10, 0,Qt::Horizontal, this); mSlider->show(); show(); } diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp index dac6fbb3..86c4f500 100644 --- a/noatun/modules/excellent/userinterface.cpp +++ b/noatun/modules/excellent/userinterface.cpp @@ -67,12 +67,12 @@ Excellent::Excellent() { setAcceptDrops(true); - KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection()); - KStdAction::open(napp, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection()); + KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection()); setStandardToolBarMenuEnabled(true); - menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), actionCollection()); - KStdAction::preferences(napp, TQT_SLOT(preferences()), actionCollection()); + menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()), actionCollection()); + KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection()); // buttons NoatunStdAction::back(actionCollection(), "back"); @@ -82,7 +82,7 @@ Excellent::Excellent() NoatunStdAction::forward(actionCollection(), "forward"); NoatunStdAction::playlist(actionCollection(), "show_playlist"); - volumeAction = new KToggleAction(i18n("Show &Volume Control"), 0, this, TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol"); + volumeAction = new KToggleAction(i18n("Show &Volume Control"), 0, TQT_TQOBJECT(this), TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol"); volumeAction->setCheckedState(i18n("Hide &Volume Control")); NoatunStdAction::effects(actionCollection(), "effects"); NoatunStdAction::equalizer(actionCollection(), "equalizer"); @@ -94,11 +94,11 @@ Excellent::Excellent() napp->pluginActionMenu()->plug(menuBar(),3); toolBar("mainToolBar")->hide(); - // Who needs Qt Designer? + // Who needs TQt Designer? mainFrame = new TQHBox(this); mainFrame->setSpacing(KDialog::spacingHint()); mainFrame->setMargin(0); - slider = new L33tSlider(0, 1000, 10, 0, L33tSlider::Horizontal, mainFrame); + slider = new L33tSlider(0, 1000, 10, 0, Qt::Horizontal, mainFrame); slider->setTickmarks(TQSlider::NoMarks); elapsed = new TQLabel(mainFrame); @@ -107,10 +107,10 @@ Excellent::Excellent() labelFont.setBold(true); TQFontMetrics labelFontMetrics = labelFont; elapsed->setFont(labelFont); - elapsed->setAlignment(AlignCenter | AlignVCenter | ExpandTabs); + elapsed->tqsetAlignment(AlignCenter | AlignVCenter | ExpandTabs); elapsed->setText("--:--"); elapsed->setFixedHeight(labelFontMetrics.height()); - elapsed->setMinimumWidth(elapsed->sizeHint().width()); + elapsed->setMinimumWidth(elapsed->tqsizeHint().width()); // Doing this makes the slider the same heigh as the font. This is just plain wrong... //slider->setFixedHeight(labelFontMetrics.height()); @@ -121,9 +121,9 @@ Excellent::Excellent() labelFont = total->font(); labelFont.setBold(true); total->setFont(labelFont); - total->setAlignment(AlignCenter | AlignVCenter | ExpandTabs); + total->tqsetAlignment(AlignCenter | AlignVCenter | ExpandTabs); total->setText("--:--"); - total->setMinimumWidth(total->sizeHint().width()); + total->setMinimumWidth(total->tqsizeHint().width()); total->setText(""); statusBar()->addWidget(total, 0, true); @@ -186,7 +186,7 @@ Excellent::Excellent() break; } - for (TQPtrListIterator<TQObject> i(*children()); i.current(); ++i) + for (TQPtrListIterator<TQObject> i(childrenListObject()); i.current(); ++i) (*i)->installEventFilter(this); } @@ -248,7 +248,7 @@ bool Excellent::eventFilter(TQObject *o, TQEvent *e) { if (e->type() == TQEvent::Wheel) { - wheelEvent(static_cast<TQWheelEvent*>(e)); + wheelEvent(TQT_TQWHEELEVENT(e)); return true; } return TQWidget::eventFilter(o, e); @@ -335,7 +335,7 @@ void Excellent::showMenubar(void) } else { - KMessageBox::information(this, i18n("<qt>Press %1 to show the menubar.</qt>").arg(menubarAction->shortcut().toString()), TQString::null, "Hide Menu warning"); + KMessageBox::information(this, i18n("<qt>Press %1 to show the menubar.</qt>").tqarg(menubarAction->shortcut().toString()), TQString(), "Hide Menu warning"); menuBar()->hide(); } } @@ -373,7 +373,7 @@ void Excellent::handleLengthString(const TQString &text) void Excellent::growVolumeControl(void) { - volumeSlider = new L33tSlider(0, 100, 10, 0, Vertical, mainFrame); + volumeSlider = new L33tSlider(0, 100, 10, 0,Qt::Vertical, mainFrame); volumeSlider->setValue(100 - napp->player()->volume()); volumeSlider->show(); connect(volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(changeVolume(int))); diff --git a/noatun/modules/excellent/userinterface.h b/noatun/modules/excellent/userinterface.h index c6a958de..72628430 100644 --- a/noatun/modules/excellent/userinterface.h +++ b/noatun/modules/excellent/userinterface.h @@ -50,6 +50,7 @@ class KToggleAction; class Excellent : public KMainWindow, public UserInterface { Q_OBJECT + TQ_OBJECT public: Excellent(); diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp index 29d00935..d8a04537 100644 --- a/noatun/modules/htmlexport/htmlexport.cpp +++ b/noatun/modules/htmlexport/htmlexport.cpp @@ -36,7 +36,7 @@ void HTMLExport::slotExport() config->setGroup("HTMLExport"); // get output target - KURL url = KFileDialog::getSaveURL(TQString::null, + KURL url = KFileDialog::getSaveURL(TQString(), "text/html", 0, i18n("Export Playlist")); @@ -136,9 +136,9 @@ TQString HTMLExport::htmlEscape(const TQString &source) { // Escape characters that need to be escaped TQString temp = source; - temp.replace( TQRegExp("&"), "&" ); - temp.replace( TQRegExp("<"), "<" ); - temp.replace( TQRegExp(">"), ">" ); + temp.tqreplace( TQRegExp("&"), "&" ); + temp.tqreplace( TQRegExp("<"), "<" ); + temp.tqreplace( TQRegExp(">"), ">" ); return temp; } @@ -171,8 +171,8 @@ TQString HTMLExport::getColorByEntry(TQString s) } //////////////////////////////////// Settings //////////////////////////////////// -Prefs::Prefs(TQObject *parent) - : CModule(i18n("Playlist Export"), i18n("Colors & Settings for HTML Export"), "html", parent) +Prefs::Prefs(TQObject *tqparent) + : CModule(i18n("Playlist Export"), i18n("Colors & Settings for HTML Export"), "html", tqparent) { // Init Config @@ -213,19 +213,19 @@ Prefs::Prefs(TQObject *parent) txtColorLabel = new TQLabel( colorBox, "txtColorLabel" ); txtColorLabel->setText( i18n( "Text:" ) ); - txtColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + txtColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); bgColorLabel = new TQLabel( colorBox, "bgColorLabel" ); bgColorLabel->setText( i18n( "Background:" ) ); - bgColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + bgColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); headColorLabel = new TQLabel( colorBox, "headColorLabel" ); headColorLabel->setText( i18n( "Heading:" ) ); - headColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + headColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); hoverColorLabel = new TQLabel( colorBox, "hoverColorLabel" ); hoverColorLabel->setText( i18n( "Link hover:" ) ); - hoverColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + hoverColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); bgcolorLabel->setRowStretch(0, 1); diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h index 81047d3d..65f5c5e9 100644 --- a/noatun/modules/htmlexport/htmlexport.h +++ b/noatun/modules/htmlexport/htmlexport.h @@ -34,6 +34,7 @@ class KAction; class HTMLExport : public TQObject, public Plugin { Q_OBJECT + TQ_OBJECT NOATUNPLUGIND public: HTMLExport(); @@ -54,8 +55,9 @@ private slots: class Prefs : public CModule { Q_OBJECT + TQ_OBJECT public: - Prefs(TQObject *parent); + Prefs(TQObject *tqparent); virtual void save(); virtual void reopen(); diff --git a/noatun/modules/infrared/infrared.cpp b/noatun/modules/infrared/infrared.cpp index c9b31230..1bfe0aae 100644 --- a/noatun/modules/infrared/infrared.cpp +++ b/noatun/modules/infrared/infrared.cpp @@ -93,11 +93,11 @@ void InfraRed::slotCommand(const TQString &remote, const TQString &button, int r break; case IRPrefs::SeekBackward: // - 3 seconds - napp->player()->skipTo( QMAX(0, napp->player()->getTime() - 3000) ); + napp->player()->skipTo( TQMAX(0, napp->player()->getTime() - 3000) ); break; case IRPrefs::SeekForward: // + 3 seconds - napp->player()->skipTo( QMIN(napp->player()->getLength(), + napp->player()->skipTo( TQMIN(napp->player()->getLength(), napp->player()->getTime() + 3000) ); break; case IRPrefs::ShowPlaylist: diff --git a/noatun/modules/infrared/infrared.h b/noatun/modules/infrared/infrared.h index 870efbd5..cb58ff82 100644 --- a/noatun/modules/infrared/infrared.h +++ b/noatun/modules/infrared/infrared.h @@ -11,6 +11,7 @@ class Lirc; class InfraRed : public TQObject, public Plugin { Q_OBJECT + TQ_OBJECT NOATUNPLUGIND public: InfraRed(); diff --git a/noatun/modules/infrared/infrared.plugin b/noatun/modules/infrared/infrared.plugin index dab20149..4074e6b0 100644 --- a/noatun/modules/infrared/infrared.plugin +++ b/noatun/modules/infrared/infrared.plugin @@ -101,7 +101,7 @@ Comment[nds]=Noatun mit Dien Infraroot-Feernbedenen stüern Comment[ne]=तपाईà¤à¤•à¥‹ IR टाढाकोसà¤à¤— नियनà¥à¤¤à¥à¤°à¤£ नोवटà¥à¤¨ Comment[nl]=Bedien Noatun met uw infrarood afstandbediening Comment[nn]=Styr Noatun med ein infraraud fjernkontroll -Comment[pl]=Sterowanie Noatun za pomocÄ… pilota podczerwieni +Comment[pl]=Sterowanie Noatun za potqmocÄ… pilota podczerwieni Comment[pt]=Controle o Noatun com um comando à distância Comment[pt_BR]=Controlar o Noatun com seu controle-remoto infravermelho Comment[ro]=Controlează Noatun cu telecomanda în infraroÅŸu diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp index 548fd27d..52cae0ea 100644 --- a/noatun/modules/infrared/irprefs.cpp +++ b/noatun/modules/infrared/irprefs.cpp @@ -14,13 +14,13 @@ #include "irprefs.h" #include "lirc.h" -class CommandItem : public QListViewItem +class CommandItem : public TQListViewItem { public: CommandItem(TQListViewItem *remote, const TQString &name, IRPrefs::Action action, int interval) : TQListViewItem(remote, name, IRPrefs::actionName(action), - interval ? TQString().setNum(interval) : TQString::null), + interval ? TQString().setNum(interval) : TQString()), m_name(remote->text(0) + "::" + name), m_action(action), m_interval(interval) @@ -37,7 +37,7 @@ public: } void setInterval(int interval) { - setText(2, interval ? TQString().setNum(interval) : TQString::null); + setText(2, interval ? TQString().setNum(interval) : TQString()); m_interval = interval; } @@ -51,38 +51,38 @@ Lirc *IRPrefs::s_lirc = 0; bool IRPrefs::s_configRead = false; TQMap<TQString, IRPrefs::Command> IRPrefs::s_commands; -IRPrefs::IRPrefs(TQObject *parent) - : CModule(i18n("Infrared Control"), i18n("Configure Infrared Commands"), "remote", parent) +IRPrefs::IRPrefs(TQObject *tqparent) + : CModule(i18n("Infrared Control"), i18n("Configure Infrared Commands"), "remote", tqparent) { - TQGridLayout *layout = new TQGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint()); - layout->setColStretch(1, 1); + TQGridLayout *tqlayout = new TQGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint()); + tqlayout->setColStretch(1, 1); TQLabel *label = new TQLabel(i18n("Remote control &commands:"), this); - layout->addMultiCellWidget(label, 0, 0, 0, 4); + tqlayout->addMultiCellWidget(label, 0, 0, 0, 4); label->setBuddy(m_commands = new KListView(this)); - layout->addMultiCellWidget(m_commands, 1, 1, 0, 4); + tqlayout->addMultiCellWidget(m_commands, 1, 1, 0, 4); label = new TQLabel(i18n("&Action:"), this); - layout->addWidget(label, 2, 0); + tqlayout->addWidget(label, 2, 0); label->setBuddy(m_action = new KComboBox(this)); m_action->setEnabled(false); - layout->addWidget(m_action, 2, 1); + tqlayout->addWidget(m_action, 2, 1); m_repeat = new TQCheckBox(i18n("&Repeat"), this); m_repeat->setEnabled(false); - layout->addWidget(m_repeat, 2, 2); + tqlayout->addWidget(m_repeat, 2, 2); label = new TQLabel(i18n("&Interval:"), this); - layout->addWidget(label, 2, 3); + tqlayout->addWidget(label, 2, 3); label->setBuddy(m_interval = new KIntSpinBox(this)); m_interval->setMinValue(1); m_interval->setMaxValue(0xff); m_interval->setValue(10); m_interval->setEnabled(false); - layout->addWidget(m_interval, 2, 4); + tqlayout->addWidget(m_interval, 2, 4); connect(s_lirc, TQT_SIGNAL(remotesRead()), TQT_SLOT(reopen())); connect(m_commands, @@ -109,9 +109,9 @@ void IRPrefs::save() int i = 1; for (TQMap<TQString, Command>::ConstIterator it = s_commands.begin(); it != s_commands.end(); ++it) { - c->writePathEntry(TQString("Command_%1").arg(i), it.key()); - c->writeEntry(TQString("Action_%1").arg(i), (int)((*it).action)); - c->writeEntry(TQString("Interval_%1").arg(i), (*it).interval); + c->writePathEntry(TQString("Command_%1").tqarg(i), it.key()); + c->writeEntry(TQString("Action_%1").tqarg(i), (int)((*it).action)); + c->writeEntry(TQString("Interval_%1").tqarg(i), (*it).interval); ++i; } } @@ -152,7 +152,7 @@ void IRPrefs::reopen() for (TQStringList::ConstIterator btn = buttons.begin(); btn != buttons.end(); ++btn) { TQString key = *it + "::" + *btn; - if (s_commands.contains(key)) + if (s_commands.tqcontains(key)) new CommandItem(remote, *btn, s_commands[key].action, s_commands[key].interval); else new CommandItem(remote, *btn, None, 0); @@ -275,7 +275,7 @@ const TQString IRPrefs::actionName(Action action) case PreviousSection: return i18n("Previous Section"); } - return TQString::null; + return TQString(); } void IRPrefs::readConfig() @@ -288,9 +288,9 @@ void IRPrefs::readConfig() for (int i = 1; i <= count; ++i) { Command cmd; - cmd.action = (Action)(c->readNumEntry(TQString("Action_%1").arg(i))); - cmd.interval = c->readNumEntry(TQString("Interval_%1").arg(i)); - s_commands.insert(c->readPathEntry(TQString("Command_%1").arg(i)), cmd); + cmd.action = (Action)(c->readNumEntry(TQString("Action_%1").tqarg(i))); + cmd.interval = c->readNumEntry(TQString("Interval_%1").tqarg(i)); + s_commands.insert(c->readPathEntry(TQString("Command_%1").tqarg(i)), cmd); } s_configRead = true; } diff --git a/noatun/modules/infrared/irprefs.h b/noatun/modules/infrared/irprefs.h index 925acaa0..69d7f41f 100644 --- a/noatun/modules/infrared/irprefs.h +++ b/noatun/modules/infrared/irprefs.h @@ -15,6 +15,7 @@ class Lirc; class IRPrefs : public CModule { Q_OBJECT + TQ_OBJECT public: enum Action { @@ -24,7 +25,7 @@ public: NextSection, PreviousSection }; - IRPrefs(TQObject *parent); + IRPrefs(TQObject *tqparent); virtual void save(); diff --git a/noatun/modules/infrared/lirc.cpp b/noatun/modules/infrared/lirc.cpp index 363849c1..731bb5c1 100644 --- a/noatun/modules/infrared/lirc.cpp +++ b/noatun/modules/infrared/lirc.cpp @@ -12,8 +12,8 @@ #include "lirc.h" -Lirc::Lirc(TQObject *parent) - : TQObject(parent), +Lirc::Lirc(TQObject *tqparent) + : TQObject(tqparent), m_socket(0) { int sock = ::socket(PF_UNIX, SOCK_STREAM, 0); @@ -124,7 +124,7 @@ void Lirc::slotRead() { // <code> <repeat> <button name> <remote control name> line.remove(0, 17); // strip code - int pos = line.find(' '); + int pos = line.tqfind(' '); if (pos < 0) return; bool ok; @@ -133,7 +133,7 @@ void Lirc::slotRead() return; line.remove(0, pos + 1); - pos = line.find(' '); + pos = line.tqfind(' '); if (pos < 0) return; TQString btn = line.left(pos); @@ -153,11 +153,11 @@ void Lirc::update() const TQString Lirc::readLine() { if (!m_socket->bytesAvailable()) - return TQString::null; + return TQString(); TQString line = m_socket->readLine(); if (line.isEmpty()) - return TQString::null; + return TQString(); line.remove(line.length() - 1, 1); return line; diff --git a/noatun/modules/infrared/lirc.h b/noatun/modules/infrared/lirc.h index 8519bb8a..5f30d751 100644 --- a/noatun/modules/infrared/lirc.h +++ b/noatun/modules/infrared/lirc.h @@ -10,14 +10,15 @@ class TQSocket; typedef TQMap<TQString, TQStringList> Remotes; -class Lirc : public QObject +class Lirc : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - Lirc(TQObject *parent); + Lirc(TQObject *tqparent); /** * Destructor */ diff --git a/noatun/modules/kaiman/SKIN-SPECS b/noatun/modules/kaiman/SKIN-SPECS index bc3533ad..5d30b733 100644 --- a/noatun/modules/kaiman/SKIN-SPECS +++ b/noatun/modules/kaiman/SKIN-SPECS @@ -37,7 +37,7 @@ if the play button was 30 by 20, the resulting image file would be Note that images for buttons and numbers contain the items horizontally, the images for items contain the items vertically, the image for a font -contains 3 rows of 32 items, and the slider contains the background and +tqcontains 3 rows of 32 items, and the slider contains the background and handle horizontally or vertically (depending if a slider is horizontal or verticle, respectivley). @@ -56,7 +56,7 @@ options in the event that options are added to the skin spec in the future. PROPER TRANSPARENCY: The main background image uses a threshold of 1 (out of 256 levels) for the -window shape, the rest is used for partially overwiting the background when +window tqshape, the rest is used for partially overwiting the background when the Transparency option is true. Portions of items, buttons, sliders, numbers, and text that never change and @@ -80,7 +80,7 @@ Background: filename filename The background image file, the window will be the same size as this image. - Add transparency to this image for shaped skins, the cutoff threshold for + Add transparency to this image for tqshaped skins, the cutoff threshold for transparency is 1 on images with muli-level alpha (like in png). Transparency: flag @@ -95,8 +95,8 @@ Mask: filename (this is DEPRECATED!, for transparent skins just add transparency to the Background image, Mask remains merely for backwards compatibility) filename - The mask image file, only needed for skins which are shaped windows (not - rectangular). Contains a transparency mask for the main window. + The tqmask image file, only needed for skins which are tqshaped windows (not + rectangular). Contains a transparency tqmask for the main window. ========================== Text display @@ -125,7 +125,7 @@ Title/Album/Artist/Genre: filename length [extended] x y extended (optional, absence defaults to FALSE) - When TRUE, the image contains 3 additional lines for internation + When TRUE, the image tqcontains 3 additional lines for internation characters. The result is 6 lines of 32 characters each. ========================== @@ -151,9 +151,9 @@ Play/Pause/Stop/Shuffle/Repeat/ clip_filename (optional) When specified, defines an image with transparency to be used as the button's - draw clip mask. The clip mask is placed at location x, y The transparency is used to + draw clip tqmask. The clip tqmask is placed at location x, y The transparency is used to indicate the portions of the button that should be visible (drawn) and respond to - mouse clicks. If the image contains a multiple level alpha channel, the mask is reduced + mouse clicks. If the image contains a multiple level alpha channel, the tqmask is reduced such that levels above 50% are visible and those below 50% are not visible. ========================== @@ -175,9 +175,9 @@ Preset_1_/.../Preset_10_Button: filename prelight x y [clip_filename] clip_filename (optional) When specified, defines an image with transparency to be used as the button's - draw clip mask. The clip mask is placed at location x, y The transparency is used to + draw clip tqmask. The clip tqmask is placed at location x, y The transparency is used to indicate the portions of the button that should be visible (drawn) and respond to - mouse clicks. If the image contains a multiple level alpha channel, the mask is reduced + mouse clicks. If the image contains a multiple level alpha channel, the tqmask is reduced such that levels above 50% are visible and those below 50% are not visible. @@ -185,7 +185,7 @@ Preset_1_/.../Preset_10_Button: filename prelight x y [clip_filename] Items (with fixed number sections) ========================== -Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/Status/ +Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/tqStatus/ Minus/Total_Item: filename x y filename @@ -247,7 +247,7 @@ Digit_Large/Digit_Small_Default: filename Image file. Contains digits horizontally from 0 to 9, and a blank space. These two digits are a convenience function, if you want to use a digit more than - once it is quicker to load it into on of these two slots. Then when using the digit + once it is quicker to load it into on of these two Q_SLOTS. Then when using the digit in the number item type below, use the words 'Large' or 'Small' in place of the filename. @@ -354,15 +354,15 @@ Position/Volume/Balance_Dial: filename has_press_image has_prelight_image revers x, y, width, height: Marks the clipping region to draw the dial, basically the handle is not drawn - outside this region. (width and height will be ignored if a clip mask image + outside this region. (width and height will be ignored if a clip tqmask image is specified (see next option). clip_filename (optional) When specified, defines an image with transparency to be used as the dial's - draw clip mask. The clip mask is placed at x, y (above) and the image's dimensions + draw clip tqmask. The clip tqmask is placed at x, y (above) and the image's dimensions are used in place of width, height (above). The transparency is used to indicate the portions of the dial that should be visible (drawn) and respond to mouse clicks. - If the image contains a multiple level alpha channel, the mask is reduced such that + If the image contains a multiple level alpha channel, the tqmask is reduced such that levels above 50% are visible and those below 50% are not visible. ============================================================================== @@ -401,7 +401,7 @@ Option line: | # images | Normal | Pressed | Prelit | Items (all item images contained vertically) -------------------------- -Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/Status/Minus/Total_Item: filename x y +Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/tqStatus/Minus/Total_Item: filename x y Item: | # images | Image 1 | Image 2 | Image 3 | Image 4 | Image 5 | | total | | | | | | diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp index 5f241bc0..a318dbb6 100644 --- a/noatun/modules/kaiman/pref.cpp +++ b/noatun/modules/kaiman/pref.cpp @@ -31,8 +31,8 @@ #include "userinterface.h" -KaimanPrefDlg::KaimanPrefDlg(TQObject *parent ) - : CModule(i18n("Kaiman Skins"), i18n("Skin Selection for the Kaiman Plugin"), "style", parent) +KaimanPrefDlg::KaimanPrefDlg(TQObject *tqparent ) + : CModule(i18n("Kaiman Skins"), i18n("Skin Selection for the Kaiman Plugin"), "style", tqparent) { // create widgets TQVBoxLayout *topLayout = new TQVBoxLayout( this, 6, 11 ); @@ -76,7 +76,7 @@ void KaimanPrefDlg::reopen() KConfig *config=KGlobal::config(); config->setGroup("Kaiman"); TQString skin = config->readEntry( "SkinResource", Kaiman::DEFAULT_SKIN ); - TQListBoxItem *item = _skinList->findItem( skin ); + TQListBoxItem *item = _skinList->tqfindItem( skin ); if ( item ) _skinList->setCurrentItem( item ); else @@ -86,7 +86,7 @@ void KaimanPrefDlg::reopen() void KaimanPrefDlg::setSkin( TQString skin ) { - _skinList->setCurrentItem( _skinList->findItem( skin ) ); + _skinList->setCurrentItem( _skinList->tqfindItem( skin ) ); } @@ -104,8 +104,8 @@ void KaimanPrefDlg::readSkinDir( const TQString &dir ) if (!directory.exists()) return; - const QFileInfoList *list = directory.entryInfoList(); - QFileInfoListIterator it(*list); + const TQFileInfoList *list = directory.entryInfoList(); + TQFileInfoListIterator it(*list); while ( it.current() ) { kdDebug() << it.current()->absFilePath() << endl; diff --git a/noatun/modules/kaiman/pref.h b/noatun/modules/kaiman/pref.h index d252e394..dbdf935b 100644 --- a/noatun/modules/kaiman/pref.h +++ b/noatun/modules/kaiman/pref.h @@ -27,8 +27,9 @@ class TQLabel; class KaimanPrefDlg : public CModule { Q_OBJECT + TQ_OBJECT public: - KaimanPrefDlg( TQObject *parent ); + KaimanPrefDlg( TQObject *tqparent ); virtual ~KaimanPrefDlg(); virtual void save(); diff --git a/noatun/modules/kaiman/skins/circle/README b/noatun/modules/kaiman/skins/circle/README index d80082af..f2071dca 100644 --- a/noatun/modules/kaiman/skins/circle/README +++ b/noatun/modules/kaiman/skins/circle/README @@ -3,8 +3,8 @@ Author: Johne Ellis <gqview@geocities.ocm> Released: November 25, 1998 Version: 1.0 URL: http://www.geocities.com/SiliconValley/Haven/5235 -Comments: Skin with a doughnut shape to test shaped windows. - (skins with a shape mask) +Comments: Skin with a doughnut tqshape to test tqshaped windows. + (skins with a tqshape tqmask) Note: For transparency to work, GQmpeg 0.4.2 is required. Previous versions will work, but will be _ugly_. diff --git a/noatun/modules/kaiman/skins/circle/skindata b/noatun/modules/kaiman/skins/circle/skindata index 25268d22..57c07cc6 100644 --- a/noatun/modules/kaiman/skins/circle/skindata +++ b/noatun/modules/kaiman/skins/circle/skindata @@ -6,16 +6,16 @@ #Released: November 25, 1998 #Author: John Ellis <gqview@geocities.com> #URL: http://www.geocities.com/SiliconValley/Haven/5235/ -#Comments: Skin with a doughnut shape to test shaped windows. -# (skins with a shape mask) +#Comments: Skin with a doughnut tqshape to test tqshaped windows. +# (skins with a tqshape tqmask) #run 'gqmpeg -skinhelp' for help with coordinates. #simply comment out items you do not want to display #only Background is required. Background: back.png -#Mask is an image with transparency used to define a shaped window -Mask: back_mask.png +#Mask is an image with transparency used to define a tqshaped window +Mask: back_tqmask.png #Title: filename length x y Title: letters.png 23 32 86 diff --git a/noatun/modules/kaiman/skins/circle/skindata_alt b/noatun/modules/kaiman/skins/circle/skindata_alt index fb3e97f5..0bfda442 100644 --- a/noatun/modules/kaiman/skins/circle/skindata_alt +++ b/noatun/modules/kaiman/skins/circle/skindata_alt @@ -6,16 +6,16 @@ #Released: November 25, 1998 #Author: John Ellis <gqview@geocities.com> #URL: http://www.geocities.com/SiliconValley/Haven/5235/ -#Comments: Skin with a doughnut shape to test shaped windows. -# (skins with a shape mask) +#Comments: Skin with a doughnut tqshape to test tqshaped windows. +# (skins with a tqshape tqmask) #run 'gqmpeg -skinhelp' for help with coordinates. #simply comment out items you do not want to display #only Background is required. Background: back_sm.png -#Mask is an image with transparency used to define a shaped window -Mask: back_sm_mask.png +#Mask is an image with transparency used to define a tqshaped window +Mask: back_sm_tqmask.png #Title: filename length x y Title: letters.png 21 8 4 diff --git a/noatun/modules/kaiman/skins/k9/skindata b/noatun/modules/kaiman/skins/k9/skindata index 1fdc4320..d7d25a56 100644 --- a/noatun/modules/kaiman/skins/k9/skindata +++ b/noatun/modules/kaiman/skins/k9/skindata @@ -10,7 +10,7 @@ ###################################################### Background: knine-normal2.jpg -Mask: mask.png +Mask: tqmask.png Play_Button: play.jpg FALSE FALSE 55 133 89 166 Stop_Button: stop.jpg FALSE FALSE 28 124 52 145 diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp index 6b700230..621b0240 100644 --- a/noatun/modules/kaiman/style.cpp +++ b/noatun/modules/kaiman/style.cpp @@ -42,8 +42,8 @@ const bool KaimanStyleSlider::optionVertical = 1; const bool KaimanStyleSlider::optionReversed = 2; const bool KaimanStyleText::optionExtended = 1; -KaimanStyleElement::KaimanStyleElement(TQWidget *parent, const char *name) - : TQWidget(parent, name) +KaimanStyleElement::KaimanStyleElement(TQWidget *tqparent, const char *name) + : TQWidget(tqparent, name) { // Initialize everything to default values filename = ""; @@ -118,15 +118,15 @@ void KaimanStyleElement::loadPixmaps(TQString &val_s_filename) int w = (x==0) ? firstWidth : width; TQPixmap *part = new TQPixmap(w,h,pixmap.depth()); - part->fill(Qt::black); + part->fill(TQt::black); bitBlt(part,0,0,&pixmap,sourcex,sourcey,w,h); pixmaps.insert(i,part); - if(pixmap.mask()) + if(pixmap.tqmask()) { - TQBitmap maskpart(w,h); - bitBlt(&maskpart,0,0,pixmap.mask(),sourcex,sourcey,w,h); - part->setMask(maskpart); + TQBitmap tqmaskpart(w,h); + bitBlt(&tqmaskpart,0,0,pixmap.tqmask(),sourcex,sourcey,w,h); + part->setMask(tqmaskpart); } i++; @@ -142,7 +142,7 @@ void KaimanStyleElement::loadPixmaps(TQString &val_s_filename) for ( int i=0; i<pixmapNum; i++ ) { TQPixmap *pm = new TQPixmap(10, 10); - pm->fill(Qt::black); + pm->fill(TQt::black); pixmaps.insert( i, pm ); } } @@ -160,7 +160,7 @@ void KaimanStyleElement::setPixmap( int num ) if ( num<0 ) num = 0; _currentPixmap = num; - repaint( FALSE ); + tqrepaint( FALSE ); } } @@ -186,14 +186,14 @@ void KaimanStyleElement::dragEnterEvent( TQDragEnterEvent *event ) void KaimanStyleElement::dropEvent( TQDropEvent *event ) { - ((Kaiman*)(parentWidget()->parentWidget()))->doDropEvent(event); + ((Kaiman*)(tqparentWidget()->tqparentWidget()))->doDropEvent(event); } /***************************************************************************/ -KaimanStyleButton::KaimanStyleButton(TQWidget *parent, const char *name) - : KaimanStyleMasked(parent, name) +KaimanStyleButton::KaimanStyleButton(TQWidget *tqparent, const char *name) + : KaimanStyleMasked(tqparent, name) { i_b_lit = i_b_prelit = i_b_down = false; i_i_currentState = NormalUp; @@ -321,14 +321,14 @@ void KaimanStyleButton::updateButtonState() { } setPixmap( *I_pmIndex[i_i_currentState] ); - repaint(); + tqrepaint(); } /***********************************************************************/ -KaimanStyleSlider::KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name) - : KaimanStyleMasked( parent, name ) +KaimanStyleSlider::KaimanStyleSlider(int min, int max, TQWidget *tqparent, const char *name) + : KaimanStyleMasked( tqparent, name ) { _min = min; _max = max; @@ -349,7 +349,7 @@ void KaimanStyleSlider::setValue( int value ) if (value>_max) value=_max; if (value<_min) value=_min; _value = value; - repaint(); + tqrepaint(); } @@ -359,7 +359,7 @@ void KaimanStyleSlider::setValue( int value, int min, int max ) _min = min; _max = max; setValue( value ); - repaint(); + tqrepaint(); } } @@ -413,7 +413,7 @@ void KaimanStyleSlider::mouseReleaseEvent(TQMouseEvent *qme) { _down = false; releaseMouse(); - repaint(); + tqrepaint(); setValue( pos2value(qme->x(), qme->y()) ); emit newValue( value() ); @@ -465,7 +465,7 @@ void KaimanStyleSlider::enterEvent ( TQEvent * e ) if ( !_lit && optionPrelight ) { _lit = true; - repaint(); + tqrepaint(); } KaimanStyleMasked::enterEvent( e ); @@ -476,7 +476,7 @@ void KaimanStyleSlider::leaveEvent ( TQEvent * e ) if ( _lit ) { _lit = false; - repaint(); + tqrepaint(); } KaimanStyleMasked::leaveEvent( e ); @@ -486,8 +486,8 @@ void KaimanStyleSlider::leaveEvent ( TQEvent * e ) /***********************************************************************/ -KaimanStyleBackground::KaimanStyleBackground(TQWidget *parent, const char *name) - : KaimanStyleMasked( parent, name ) +KaimanStyleBackground::KaimanStyleBackground(TQWidget *tqparent, const char *name) + : KaimanStyleMasked( tqparent, name ) { i_b_move = false; } @@ -511,8 +511,8 @@ void KaimanStyleBackground::mouseMoveEvent(TQMouseEvent *qme) } if ( i_b_move ) { - TQWidget *p = parentWidget()->parentWidget(); - if ( !p ) p = parentWidget(); + TQWidget *p = tqparentWidget()->tqparentWidget(); + if ( !p ) p = tqparentWidget(); p->move( qme->globalPos() - i_point_dragStart ); } @@ -522,7 +522,7 @@ void KaimanStyleBackground::mouseMoveEvent(TQMouseEvent *qme) void KaimanStyleBackground::mousePressEvent(TQMouseEvent *qme) { - // On the background we move the shaped toplevel around + // On the background we move the tqshaped toplevel around if (!i_b_move) { i_point_dragStart = qme->pos(); i_point_lastPos = qme->globalPos(); @@ -533,8 +533,8 @@ void KaimanStyleBackground::mousePressEvent(TQMouseEvent *qme) /***********************************************************************/ -KaimanStyleValue::KaimanStyleValue(int min, int max, TQWidget *parent, const char *name) - : KaimanStyleMasked( parent, name ) +KaimanStyleValue::KaimanStyleValue(int min, int max, TQWidget *tqparent, const char *name) + : KaimanStyleMasked( tqparent, name ) { _min = min; _max = max; @@ -571,8 +571,8 @@ void KaimanStyleValue::setValue( int value, int min, int max ) /***********************************************************************/ -KaimanStyleNumber::KaimanStyleNumber(TQWidget *parent, const char *name) - : KaimanStyleElement( parent, name ) +KaimanStyleNumber::KaimanStyleNumber(TQWidget *tqparent, const char *name) + : KaimanStyleElement( tqparent, name ) { //kdDebug(66666) << k_funcinfo << "name = '" << name << "'" << endl; _value = 0; @@ -599,7 +599,7 @@ void KaimanStyleNumber::setValue( int value ) if ( _value!=value ) { _value = value; - repaint(); + tqrepaint(); } } @@ -640,8 +640,8 @@ void KaimanStyleNumber::paintEvent(TQPaintEvent */*qpe*/) /***********************************************************************/ -KaimanStyleText::KaimanStyleText(TQWidget *parent, const char *name) - : KaimanStyleElement( parent, name ) +KaimanStyleText::KaimanStyleText(TQWidget *tqparent, const char *name) + : KaimanStyleElement( tqparent, name ) { _pos = 0; _timer = new TQTimer( this ); @@ -667,7 +667,7 @@ void KaimanStyleText::setValue( TQString value ) _pos = 0; _direction = 1; _value = value; - repaint(); + tqrepaint(); } } @@ -698,7 +698,7 @@ void KaimanStyleText::timeout() // check new position if ( _pos+_direction>=0 && (int)_value.length()-(_pos+_direction)>=digits ) { _pos += _direction; - repaint(); + tqrepaint(); } _timer->start( _delay, TRUE ); @@ -735,8 +735,8 @@ void KaimanStyleText::paintEvent(TQPaintEvent */*qpe*/) /***********************************************************************/ -KaimanStyleAnimation::KaimanStyleAnimation(int delay, TQWidget *parent, const char *name) - : KaimanStyleMasked( parent, name ) +KaimanStyleAnimation::KaimanStyleAnimation(int delay, TQWidget *tqparent, const char *name) + : KaimanStyleMasked( tqparent, name ) { _delay = delay; _frame = 0; @@ -774,8 +774,8 @@ void KaimanStyleAnimation::timeout() /***********************************************************************/ -KaimanStyleState::KaimanStyleState(TQWidget *parent, const char *name) - : KaimanStyleMasked( parent, name ) +KaimanStyleState::KaimanStyleState(TQWidget *tqparent, const char *name) + : KaimanStyleMasked( tqparent, name ) { _value = 0; } @@ -799,10 +799,10 @@ void KaimanStyleState::mousePressEvent(TQMouseEvent *qme) /***********************************************************************/ -KaimanStyle::KaimanStyle( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +KaimanStyle::KaimanStyle( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { - i_qw_parent = parent; + i_qw_parent = tqparent; i_eventSemaphore = false; } @@ -1098,7 +1098,7 @@ void KaimanStyle::interpretTokens(TQStringList& ref_s_tokens) l_kse_elem->element = l_s_elem; if ( l_s_tokenTypes.left(1) == "V" ) { - // Vertical flag + //Qt::Vertical flag l_vertPixmaps = true; l_s_tokenTypes = l_s_tokenTypes.mid(1); } @@ -1332,7 +1332,7 @@ TQString KaimanStyle::getToken(TQString &val_s_string, char val_c_separator) TQString l_s_token; // Find the first occurrence of the separator - l_i_pos = val_s_string.find(val_c_separator, 0, false); + l_i_pos = val_s_string.tqfind(val_c_separator, 0, false); if ( l_i_pos == -1 ) { // No sparator! Then the whole string is the token l_s_token = val_s_string; @@ -1400,20 +1400,20 @@ bool KaimanStyle::eventFilter( TQObject *o, TQEvent *e ) TQMouseEvent *m = (TQMouseEvent*)e; // handle noatun context menu - if (m->button()==RightButton) { + if (m->button()==Qt::RightButton) { NoatunStdAction::ContextMenu::showContextMenu(); return true; } - TQPoint mousePos( m->x()+static_cast<TQWidget *>(o)->x(), - m->y()+static_cast<TQWidget *>(o)->y() ); + TQPoint mousePos( m->x()+TQT_TQWIDGET(o)->x(), + m->y()+TQT_TQWIDGET(o)->y() ); TQWidget *slider = 0; /* find slider that is under the mouse position */ for ( TQWidget *s = i_sliders.first(); s!=0; s=i_sliders.next() ) { TQRect sliderRect( s->pos(), s->size() ); - if ( sliderRect.contains(mousePos) ) slider = s; + if ( sliderRect.tqcontains(mousePos) ) slider = s; } /* the slider the mouse events instead of the visible widget */ @@ -1445,18 +1445,18 @@ bool KaimanStyle::loadPixmaps() l_kse_elem->loadPixmaps(l_s_tmpName); } - l_kse_elem = this->find("Background"); + l_kse_elem = this->tqfind("Background"); if ( l_kse_elem != 0 ) { l_pixmap_Background = l_kse_elem->pixmaps[0]; } - l_kse_elem = this->find("Mask"); + l_kse_elem = this->tqfind("Mask"); if ( l_kse_elem != 0 ) { l_pixmap_Mask = l_kse_elem->pixmaps[0]; } if ( (l_pixmap_Background != 0) && (l_pixmap_Mask != 0) ) { - // OK, background and mask are defined. So now I can calculate the shape + // OK, background and tqmask are defined. So now I can calculate the tqshape int l_i_width_Mask = l_pixmap_Mask->width(); int l_i_height_Mask = l_pixmap_Mask->height(); @@ -1468,11 +1468,11 @@ bool KaimanStyle::loadPixmaps() l_image_Mask.fill( 0xff ); uchar *l_c_pixel; - uint l_qcol_white = qRgb(255,255,255); + uint l_qcol_white = tqRgb(255,255,255); for (int l_i_x=0; l_i_x<l_i_width_Mask; l_i_x++) { for (int l_i_y=0; l_i_y < l_i_height_Mask; l_i_y++) { - if ( ((*((QRgb*) l_image_MaskOrig.scanLine(l_i_y)+l_i_x) & 0x00ffffff)) != (l_qcol_white & 0x00ffffff) ) { + if ( ((*((TQRgb*) l_image_MaskOrig.scanLine(l_i_y)+l_i_x) & 0x00ffffff)) != (l_qcol_white & 0x00ffffff) ) { l_c_pixel = (uchar *)l_image_Mask.scanLine(l_i_y); *(l_c_pixel + (l_i_x>>3) ) &= ~(1 << (l_i_x & 7)); } @@ -1492,7 +1492,7 @@ TQBitmap* KaimanStyle::Mask() return &i_bitmap_Mask; } -KaimanStyleElement* KaimanStyle::find(const char *val_s_elemName) +KaimanStyleElement* KaimanStyle::tqfind(const char *val_s_elemName) { for (uint i=0; i< I_styleElem.count(); i++) { if ( I_styleElem[i]->element == TQString(val_s_elemName)) { diff --git a/noatun/modules/kaiman/style.h b/noatun/modules/kaiman/style.h index 1f2bc788..6dd1fd3e 100644 --- a/noatun/modules/kaiman/style.h +++ b/noatun/modules/kaiman/style.h @@ -29,11 +29,12 @@ #include <tqevent.h> #include <tqptrvector.h> -class KaimanStyleElement : public QWidget +class KaimanStyleElement : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KaimanStyleElement(TQWidget *parent, const char *name=0); + KaimanStyleElement(TQWidget *tqparent, const char *name=0); ~KaimanStyleElement(); virtual void loadPixmaps(TQString &val_s_filename); @@ -72,15 +73,16 @@ private: class KaimanStyleMasked : public KaimanStyleElement { Q_OBJECT + TQ_OBJECT public: - KaimanStyleMasked(TQWidget *parent, const char *name=0) - : KaimanStyleElement( parent, name ) {}; + KaimanStyleMasked(TQWidget *tqparent, const char *name=0) + : KaimanStyleElement( tqparent, name ) {}; virtual void loadPixmaps(TQString &val_s_filename) { KaimanStyleElement::loadPixmaps( val_s_filename ); - if(pixmaps[0]->mask()) - setMask(*pixmaps[0]->mask()); + if(pixmaps[0]->tqmask()) + setMask(*pixmaps[0]->tqmask()); }; }; @@ -88,8 +90,9 @@ public: class KaimanStyleButton : public KaimanStyleMasked { Q_OBJECT + TQ_OBJECT public: - KaimanStyleButton(TQWidget *parent, const char *name=0); + KaimanStyleButton(TQWidget *tqparent, const char *name=0); ~KaimanStyleButton(); // Button states. @@ -125,8 +128,9 @@ private: class KaimanStyleSlider : public KaimanStyleMasked { Q_OBJECT + TQ_OBJECT public: - KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name=0); + KaimanStyleSlider(int min, int max, TQWidget *tqparent, const char *name=0); ~KaimanStyleSlider(); int value() { return _value; }; @@ -163,8 +167,9 @@ protected: class KaimanStyleBackground : public KaimanStyleMasked { Q_OBJECT + TQ_OBJECT public: - KaimanStyleBackground(TQWidget *parent, const char *name=0); + KaimanStyleBackground(TQWidget *tqparent, const char *name=0); ~KaimanStyleBackground(); protected: @@ -182,8 +187,9 @@ private: class KaimanStyleValue : public KaimanStyleMasked { Q_OBJECT + TQ_OBJECT public: - KaimanStyleValue(int min, int max, TQWidget *parent, const char *name=0); + KaimanStyleValue(int min, int max, TQWidget *tqparent, const char *name=0); ~KaimanStyleValue(); int value() { return _value; }; @@ -200,8 +206,9 @@ private: class KaimanStyleState : public KaimanStyleMasked { Q_OBJECT + TQ_OBJECT public: - KaimanStyleState(TQWidget *parent, const char *name=0); + KaimanStyleState(TQWidget *tqparent, const char *name=0); ~KaimanStyleState(); int value() { return _value; }; @@ -223,8 +230,9 @@ private: class KaimanStyleNumber : public KaimanStyleElement { Q_OBJECT + TQ_OBJECT public: - KaimanStyleNumber(TQWidget *parent, const char *name=0); + KaimanStyleNumber(TQWidget *tqparent, const char *name=0); ~KaimanStyleNumber(); virtual void loadPixmaps(TQString &val_s_filename); @@ -247,8 +255,9 @@ private: class KaimanStyleText : public KaimanStyleElement { Q_OBJECT + TQ_OBJECT public: - KaimanStyleText(TQWidget *parent, const char *name=0); + KaimanStyleText(TQWidget *tqparent, const char *name=0); ~KaimanStyleText(); virtual void loadPixmaps(TQString &val_s_filename); @@ -281,8 +290,9 @@ private: class KaimanStyleAnimation : public KaimanStyleMasked { Q_OBJECT + TQ_OBJECT public: - KaimanStyleAnimation(int delay, TQWidget *parent, const char *name=0); + KaimanStyleAnimation(int delay, TQWidget *tqparent, const char *name=0); ~KaimanStyleAnimation(); public slots: @@ -298,25 +308,26 @@ private: TQTimer *_timer; }; -class KaimanStyle : public QWidget +class KaimanStyle : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KaimanStyle(TQWidget *parent, const char *name=0); + KaimanStyle(TQWidget *tqparent, const char *name=0); ~KaimanStyle(); - enum { background, mask, play_Button, stop_Button, pause_Button, prev_Button, next_Button, repeat_Button, shuffle_Button, playlist_Button, mixer_Button, exit_Button, Iconify_Button, Config_Button, Alt_Skin_Button, Minute_Number, Second_Number, in_Rate_Number, in_Hz_Number, song_Number, status_Item, cPU_Number, digit_Large, digit_Small_Default, title, volume_Item, volume_Slider, position_Item, position_Slider }; + enum { background, tqmask, play_Button, stop_Button, pause_Button, prev_Button, next_Button, repeat_Button, shuffle_Button, playlist_Button, mixer_Button, exit_Button, Iconify_Button, Config_Button, Alt_Skin_Button, Minute_Number, Second_Number, in_Rate_Number, in_Hz_Number, song_Number, status_Item, cPU_Number, digit_Large, digit_Small_Default, title, volume_Item, volume_Slider, position_Item, position_Slider }; enum { ParsingError=1, FileNotFound }; /// Finds a style element, according to it's name. Returns 0 when element is not available. - KaimanStyleElement* find(const char* val_s_elemName); + KaimanStyleElement* tqfind(const char* val_s_elemName); /// Tries to load the given style and returns success (true) or failure (false) bool loadStyle(const TQString &styleName, const TQString &descFile="skindata" ); TQString skinName() { return i_skinName; }; - /// Returns the mask + /// Returns the tqmask TQBitmap* Mask(); virtual bool eventFilter( TQObject *o, TQEvent *e ); @@ -335,13 +346,13 @@ private: TQString i_s_styleBase; - // The mask of the complete style. Used for doing shaped windows + // The tqmask of the complete style. Used for doing tqshaped windows TQBitmap i_bitmap_Mask; /// All style elements are stored here. TQPtrVector<KaimanStyleElement> I_styleElem; - // The parent window. In other words: The container that holds all the KaimanStyleElement's + // The tqparent window. In other words: The container that holds all the KaimanStyleElement's TQWidget* i_qw_parent; TQPtrList<TQWidget> i_sliders; diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp index b1ae2570..4c3d4e28 100644 --- a/noatun/modules/kaiman/userinterface.cpp +++ b/noatun/modules/kaiman/userinterface.cpp @@ -88,10 +88,10 @@ Kaiman::Kaiman() if ( !changeStyle(skinName, "skindata") ) { - KMessageBox::sorry( this, i18n("Cannot load skin %1. Switching to default skin.").arg(skinName) ); + KMessageBox::sorry( this, i18n("Cannot load skin %1. Switching to default skin.").tqarg(skinName) ); if ( !changeStyle( DEFAULT_SKIN, "skindata" ) ) { - KMessageBox::error( this, i18n("Cannot load default skin %1.").arg(DEFAULT_SKIN) ); + KMessageBox::error( this, i18n("Cannot load default skin %1.").tqarg(DEFAULT_SKIN) ); TQTimer::singleShot( 0, this, TQT_SLOT(close()) ); return; } @@ -112,7 +112,7 @@ Kaiman::Kaiman() if( napp->player()->isPlaying() ) newSong(); - new KaimanPrefDlg(this); + new KaimanPrefDlg(TQT_TQOBJECT(this)); show(); } @@ -159,12 +159,12 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc ) if ( _style->Mask() != 0 ) { - // Set the shaped window form + // Set the tqshaped window form XShapeCombineMask( qt_xdisplay(), winId(), ShapeBounding, 0,0, _style->Mask()->handle(), ShapeSet ); } - KaimanStyleElement* item = _style->find("Background"); + KaimanStyleElement* item = _style->tqfind("Background"); setBackgroundMode(TQWidget::NoBackground); if ( item!=0 ) { @@ -173,53 +173,53 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc ) setFixedSize( item->width(), item->height()); } - item = _style->find("Playlist_Button"); + item = _style->tqfind("Playlist_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView()) ); - item = _style->find("Play_Button"); + item = _style->tqfind("Play_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) ); - item = _style->find("Pause_Button"); + item = _style->tqfind("Pause_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) ); - item = _style->find("Stop_Button"); + item = _style->tqfind("Stop_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop()) ); - item = _style->find("Next_Button"); + item = _style->tqfind("Next_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()) ); - item = _style->find("Prev_Button"); + item = _style->tqfind("Prev_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back()) ); - item = _style->find("Exit_Button"); + item = _style->tqfind("Exit_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(close()) ); - item = _style->find("Mixer_Button"); + item = _style->tqfind("Mixer_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(execMixer()) ); - item = _style->find("Iconify_Button"); + item = _style->tqfind("Iconify_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMinimized()) ); - item = _style->find("Alt_Skin_Button"); + item = _style->tqfind("Alt_Skin_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleSkin()) ); - item = _style->find("Repeat_Button"); + item = _style->tqfind("Repeat_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleLoop()) ); - item = _style->find("Shuffle_Button"); + item = _style->tqfind("Shuffle_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleShuffle()) ); - item = _style->find("Config_Button"); + item = _style->tqfind("Config_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp, TQT_SLOT(preferences()) ); - item = _style->find("Volume_Up_Button"); + item = _style->tqfind("Volume_Up_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeUp())); - item = _style->find("Volume_Down_Button"); + item = _style->tqfind("Volume_Down_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeDown())); KaimanStyleSlider* slider = - static_cast<KaimanStyleSlider*>(_style->find("Position_Slider")); + static_cast<KaimanStyleSlider*>(_style->tqfind("Position_Slider")); if( slider!=0 ) { connect( slider, TQT_SIGNAL(newValueDrag(int)), this, TQT_SLOT(seekStart(int)) ); @@ -228,18 +228,18 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc ) slider->setValue( 0, 0, 1000 ); } - slider = static_cast<KaimanStyleSlider*>(_style->find("Volume_Slider")); + slider = static_cast<KaimanStyleSlider*>(_style->tqfind("Volume_Slider")); if ( slider!=0 ) { connect(slider, TQT_SIGNAL(newValue(int)), this, TQT_SLOT(setVolume(int))); slider->setValue( napp->player()->volume(), 0, 100 ); } - KaimanStyleValue* volItem = static_cast<KaimanStyleValue*>(_style->find("Volume_Item")); + KaimanStyleValue* volItem = static_cast<KaimanStyleValue*>(_style->tqfind("Volume_Item")); if ( volItem ) volItem->setValue( napp->player()->volume(), 0, 100 ); - KaimanStyleText* titleItem = static_cast<KaimanStyleText*>(_style->find("Title")); + KaimanStyleText* titleItem = static_cast<KaimanStyleText*>(_style->tqfind("Title")); if ( titleItem ) titleItem->startAnimation( 300 ); @@ -291,23 +291,23 @@ void Kaiman::seekDrag( int value ) if ( !_style ) return; KaimanStyleValue* posItem = - static_cast<KaimanStyleValue*>(_style->find("Position_Item")); + static_cast<KaimanStyleValue*>(_style->tqfind("Position_Item")); if ( posItem ) posItem->setValue( value, 0, length ); KaimanStyleSlider* posSlider = - static_cast<KaimanStyleSlider*>(_style->find("Position_Slider")); + static_cast<KaimanStyleSlider*>(_style->tqfind("Position_Slider")); if ( posSlider ) posSlider->setValue( value, 0, length ); // update time KaimanStyleNumber* numItem = - static_cast<KaimanStyleNumber*>(_style->find("Minute_Number")); + static_cast<KaimanStyleNumber*>(_style->tqfind("Minute_Number")); if ( numItem ) numItem->setValue( value/60%60 ); - numItem = static_cast<KaimanStyleNumber*>(_style->find("Second_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Second_Number")); if ( numItem ) numItem->setValue( value % 60 ); } @@ -335,13 +335,13 @@ void Kaiman::toggleSkin() TQString oldDesc, newDesc; if ( _altSkin ) { - oldDesc = TQString::fromLatin1("skindata"); - newDesc = TQString::fromLatin1("alt_skindata"); + oldDesc = TQString::tqfromLatin1("skindata"); + newDesc = TQString::tqfromLatin1("alt_skindata"); } else { - newDesc = TQString::fromLatin1("skindata"); - oldDesc = TQString::fromLatin1("alt_skindata"); + newDesc = TQString::tqfromLatin1("skindata"); + oldDesc = TQString::tqfromLatin1("alt_skindata"); } if ( !changeStyle(skinName, newDesc) ) @@ -372,7 +372,7 @@ void Kaiman::volumeDown() void Kaiman::execMixer() { - kapp->startServiceByDesktopName ( TQString::fromLatin1("kmix"), TQString::null ); + kapp->startServiceByDesktopName ( TQString::tqfromLatin1("kmix"), TQString() ); } @@ -384,8 +384,8 @@ void Kaiman::timeout() return; // update volume - KaimanStyleSlider* l_elem_volslider = static_cast<KaimanStyleSlider*>(_style->find("Volume_Slider")); - KaimanStyleValue* l_elem_volitem = static_cast<KaimanStyleValue*>(_style->find("Volume_Item")); + KaimanStyleSlider* l_elem_volslider = static_cast<KaimanStyleSlider*>(_style->tqfind("Volume_Slider")); + KaimanStyleValue* l_elem_volitem = static_cast<KaimanStyleValue*>(_style->tqfind("Volume_Item")); if ( l_elem_volslider!=0 ) l_elem_volslider->setValue( napp->player()->volume(), 0, 100 ); if ( l_elem_volitem!=0 ) @@ -399,20 +399,20 @@ void Kaiman::timeout() sec = 0; KaimanStyleValue* posItem = - static_cast<KaimanStyleValue*>(_style->find("Position_Item")); + static_cast<KaimanStyleValue*>(_style->tqfind("Position_Item")); if ( posItem ) posItem->setValue( sec, 0, napp->player()->getLength()/1000 ); KaimanStyleSlider* posSlider = - static_cast<KaimanStyleSlider*>(_style->find("Position_Slider")); + static_cast<KaimanStyleSlider*>(_style->tqfind("Position_Slider")); if ( posSlider ) posSlider->setValue( sec, 0, napp->player()->getLength()/1000 ); // update time KaimanStyleNumber* numItem = - static_cast<KaimanStyleNumber*>(_style->find("Minute_Number")); + static_cast<KaimanStyleNumber*>(_style->tqfind("Minute_Number")); if ( numItem ) numItem->setValue( sec/60%60 ); - numItem = static_cast<KaimanStyleNumber*>(_style->find("Second_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Second_Number")); if ( numItem ) numItem->setValue( sec%60 ); } @@ -420,14 +420,14 @@ void Kaiman::timeout() const PlaylistItem &item = napp->playlist()->current(); KaimanStyleNumber* numItem = 0; - numItem = static_cast<KaimanStyleNumber*>(_style->find("In_Rate_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("In_Rate_Number")); if ( numItem ) numItem->setValue(item.property("bitrate").toInt()); TQString hzString = item.property("samplerate"); hzString.truncate(2); - numItem = static_cast<KaimanStyleNumber*>(_style->find("In_Hz_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("In_Hz_Number")); if ( numItem ) numItem->setValue(hzString.toInt()); } @@ -438,11 +438,11 @@ void Kaiman::updateMode() if ( !_style ) return; KaimanStyleButton* pause = - static_cast<KaimanStyleButton*>(_style->find("Pause_Button")); + static_cast<KaimanStyleButton*>(_style->tqfind("Pause_Button")); KaimanStyleButton* play = - static_cast<KaimanStyleButton*>(_style->find("Play_Button")); + static_cast<KaimanStyleButton*>(_style->tqfind("Play_Button")); KaimanStyleState* status = - static_cast<KaimanStyleState*>(_style->find("Status_Item")); + static_cast<KaimanStyleState*>(_style->tqfind("Status_Item")); if (napp->player()->isStopped() ) { @@ -469,7 +469,7 @@ void Kaiman::loopTypeChange( int ) { if ( !_style ) return; - KaimanStyleState* rep = static_cast<KaimanStyleState*>(_style->find("Repeat_Item")); + KaimanStyleState* rep = static_cast<KaimanStyleState*>(_style->tqfind("Repeat_Item")); if ( rep ) rep->setValue( napp->player()->loopStyle() ); } @@ -486,19 +486,19 @@ void Kaiman::newSongLen( int, int ) // update time KaimanStyleNumber* numItem = - static_cast<KaimanStyleNumber*>(_style->find("Minute_Total_Number")); + static_cast<KaimanStyleNumber*>(_style->tqfind("Minute_Total_Number")); if ( numItem ) numItem->setValue( len/60%60 ); - numItem = static_cast<KaimanStyleNumber*>(_style->find("Second_Total_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Second_Total_Number")); if ( numItem ) numItem->setValue( len%60 ); - numItem = static_cast<KaimanStyleNumber*>(_style->find("Song_Minute_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Song_Minute_Number")); if ( numItem ) numItem->setValue( len/60%60 ); - numItem = static_cast<KaimanStyleNumber*>(_style->find("Second_Minute_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Second_Minute_Number")); if ( numItem ) numItem->setValue( len%60 ); @@ -510,7 +510,7 @@ void Kaiman::newSong() { if ( !_style ) return; - KaimanStyleText* titleItem = static_cast<KaimanStyleText*>(_style->find("Title")); + KaimanStyleText* titleItem = static_cast<KaimanStyleText*>(_style->tqfind("Title")); if ( titleItem ) { TQString title = i18n("Noatun"); @@ -520,7 +520,7 @@ void Kaiman::newSong() if ( title.isEmpty() ) title = napp->player()->current().file(); - title = i18n("TITLE (LENGTH)", "%1 (%2)").arg(title, + title = i18n("TITLE (LENGTH)", "%1 (%2)").tqarg(title, napp->player()->current().lengthString()); } titleItem->setValue( title ); diff --git a/noatun/modules/kaiman/userinterface.h b/noatun/modules/kaiman/userinterface.h index 63b4133e..e1e2f8c6 100644 --- a/noatun/modules/kaiman/userinterface.h +++ b/noatun/modules/kaiman/userinterface.h @@ -35,11 +35,12 @@ class Player; class Kaiman : public KMainWindow, public UserInterface { Q_OBJECT + TQ_OBJECT public: Kaiman(); virtual ~Kaiman(); - bool changeStyle( const TQString &style, const TQString &desc=TQString::null ); + bool changeStyle( const TQString &style, const TQString &desc=TQString() ); public slots: void dropEvent( TQDropEvent * ); void doDropEvent( TQDropEvent * ); diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp index f35fddc7..877e5846 100644 --- a/noatun/modules/keyz/keyz.cpp +++ b/noatun/modules/keyz/keyz.cpp @@ -30,58 +30,58 @@ Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0) if ( !s_accel ) { s_accel = new KGlobalAccel( this, "noatunglobalaccel" ); - s_accel->insert( "PlayPause", i18n("Play/Pause"), TQString::null, + s_accel->insert( "PlayPause", i18n("Play/Pause"), TQString(), CTRL+ALT+Key_P, KKey::QtWIN+CTRL+Key_P, player, TQT_SLOT( playpause() )); - s_accel->insert( "Stop", i18n("Stop Playing"), TQString::null, + s_accel->insert( "Stop", i18n("Stop Playing"), TQString(), CTRL+ALT+Key_S, KKey::QtWIN+CTRL+Key_S, player, TQT_SLOT( stop() )); - s_accel->insert( "Back", i18n("Back"), TQString::null, + s_accel->insert( "Back", i18n("Back"), TQString(), CTRL+ALT+Key_Left, KKey::QtWIN+CTRL+Key_Left, player, TQT_SLOT( back() )); - s_accel->insert( "Forward", i18n("Forward"), TQString::null, + s_accel->insert( "Forward", i18n("Forward"), TQString(), CTRL+ALT+Key_Right, KKey::QtWIN+CTRL+Key_Right, player, TQT_SLOT( forward() )); - s_accel->insert( "Playlist", i18n("Show/Hide Playlist"), TQString::null, + s_accel->insert( "Playlist", i18n("Show/Hide Playlist"), TQString(), CTRL+ALT+Key_L, KKey::QtWIN+CTRL+Key_L, player, TQT_SLOT( toggleListView() )); - s_accel->insert( "OpenFile", i18n("Open File to Play"), TQString::null, + s_accel->insert( "OpenFile", i18n("Open File to Play"), TQString(), CTRL+ALT+Key_O, KKey::QtWIN+CTRL+Key_O, - napp, TQT_SLOT( fileOpen() )); - s_accel->insert( "Effects", i18n("Effects Configuration"), TQString::null, + TQT_TQOBJECT(napp), TQT_SLOT( fileOpen() )); + s_accel->insert( "Effects", i18n("Effects Configuration"), TQString(), CTRL+ALT+Key_E, KKey::QtWIN+CTRL+Key_E, - napp, TQT_SLOT( effectView() )); - s_accel->insert( "Preferences", i18n("Preferences"), TQString::null, + TQT_TQOBJECT(napp), TQT_SLOT( effectView() )); + s_accel->insert( "Preferences", i18n("Preferences"), TQString(), CTRL+ALT+Key_F, KKey::QtWIN+CTRL+Key_F, - napp, TQT_SLOT( preferences() )); - s_accel->insert( "VolumeUp", i18n("Volume Up"), TQString::null, + TQT_TQOBJECT(napp), TQT_SLOT( preferences() )); + s_accel->insert( "VolumeUp", i18n("Volume Up"), TQString(), CTRL+ALT+SHIFT+Key_Up, KKey::QtWIN+CTRL+SHIFT+Key_Up, this, TQT_SLOT( slotVolumeUp() )); - s_accel->insert( "VolumeDown", i18n("Volume Down"), TQString::null, + s_accel->insert( "VolumeDown", i18n("Volume Down"), TQString(), CTRL+ALT+SHIFT+Key_Down, KKey::QtWIN+CTRL+SHIFT+Key_Down, this, TQT_SLOT( slotVolumeDown() )); - s_accel->insert( "Mute", i18n("Mute"), TQString::null, + s_accel->insert( "Mute", i18n("Mute"), TQString(), CTRL+ALT+Key_M, KKey::QtWIN+CTRL+Key_M, this, TQT_SLOT( slotMute() )); - s_accel->insert( "SeekForward", i18n("Seek Forward"), TQString::null, + s_accel->insert( "SeekForward", i18n("Seek Forward"), TQString(), CTRL+ALT+SHIFT+Key_Right, KKey::QtWIN+CTRL+SHIFT+Key_Right, this, TQT_SLOT( slotForward() )); - s_accel->insert( "SeekBackward", i18n("Seek Backward"), TQString::null, + s_accel->insert( "SeekBackward", i18n("Seek Backward"), TQString(), CTRL+ALT+SHIFT+Key_Left, KKey::QtWIN+CTRL+SHIFT+Key_Left, this, TQT_SLOT( slotBackward() )); - s_accel->insert( "NextSection", i18n("Next Section"), TQString::null, + s_accel->insert( "NextSection", i18n("Next Section"), TQString(), 0, 0, this, TQT_SLOT( slotNextSection() )); - s_accel->insert( "PrevSection", i18n("Previous Section"), TQString::null, + s_accel->insert( "PrevSection", i18n("Previous Section"), TQString(), 0, 0, this, TQT_SLOT( slotPrevSection() )); - s_accel->insert( "CopyTitle", i18n("Copy Song Title to Clipboard"), TQString::null, + s_accel->insert( "CopyTitle", i18n("Copy Song Title to Clipboard"), TQString(), CTRL+ALT+Key_C, KKey::QtWIN+CTRL+Key_C, this, TQT_SLOT( slotCopyTitle() )); - s_accel->insert( "ToggleGUI", i18n("Show/Hide Main Window"), TQString::null, + s_accel->insert( "ToggleGUI", i18n("Show/Hide Main Window"), TQString(), CTRL+ALT+Key_W, KKey::QtWIN+CTRL+Key_W, - napp, TQT_SLOT( toggleInterfaces() )); + TQT_TQOBJECT(napp), TQT_SLOT( toggleInterfaces() )); s_accel->readSettings(); s_accel->updateConnections(); @@ -116,12 +116,12 @@ void Keyz::slotVolumeDown() void Keyz::slotForward() { - napp->player()->skipTo( QMIN(napp->player()->getLength(), napp->player()->getTime() + 3000) ); // + 3 seconds + napp->player()->skipTo( TQMIN(napp->player()->getLength(), napp->player()->getTime() + 3000) ); // + 3 seconds } void Keyz::slotBackward() { - napp->player()->skipTo( QMAX( 0, napp->player()->getTime() - 3000 )); // - 3 seconds + napp->player()->skipTo( TQMAX( 0, napp->player()->getTime() - 3000 )); // - 3 seconds } void Keyz::slotNextSection() @@ -170,13 +170,13 @@ void Keyz::slotMute() /////////////////////////////////////////////////////////////////// -KeyzPrefs::KeyzPrefs( TQObject *parent ) : +KeyzPrefs::KeyzPrefs( TQObject *tqparent ) : CModule( i18n("Keyz"), i18n("Shortcut Configuration"), "key_bindings", - parent ) + tqparent ) { - TQVBoxLayout *layout = new TQVBoxLayout( this ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); m_chooser = new KKeyChooser( Keyz::accel(), this ); - layout->addWidget( m_chooser ); + tqlayout->addWidget( m_chooser ); } void KeyzPrefs::save() diff --git a/noatun/modules/keyz/keyz.h b/noatun/modules/keyz/keyz.h index e6682531..b21e44f8 100644 --- a/noatun/modules/keyz/keyz.h +++ b/noatun/modules/keyz/keyz.h @@ -7,6 +7,7 @@ class Keyz : public TQObject, public Plugin { Q_OBJECT + TQ_OBJECT NOATUNPLUGIND public: @@ -35,9 +36,10 @@ private: class KeyzPrefs : public CModule { Q_OBJECT + TQ_OBJECT public: - KeyzPrefs( TQObject *parent ); + KeyzPrefs( TQObject *tqparent ); virtual void save(); private: diff --git a/noatun/modules/kjofol-skin/ChangeLog b/noatun/modules/kjofol-skin/ChangeLog index 537de012..b93bb4ee 100644 --- a/noatun/modules/kjofol-skin/ChangeLog +++ b/noatun/modules/kjofol-skin/ChangeLog @@ -46,12 +46,12 @@ ChangeLog (only lists MY changes) 2001-10-04 Stefan Gehn <sgehn@gmx.net> * Still fighting with analyzer and osci visualizations, now both are buffered and flicker-free -* fixed stupid bug in isGray(qRgb), now RGB(0,0,0) is treated as gray again :) +* fixed stupid bug in isGray(tqRgb), now RGB(0,0,0) is treated as gray again :) * commented out (hopefully) unneded debug-messages * added splash-screen for skins supporting it (only skin I know of: K-Nine) 2001-09-30 Stefan Gehn <sgehn@gmx.net> -* ignore alpha-channel of loaded files, they break applying masks to QPixmaps, +* ignore alpha-channel of loaded files, they break applying tqmasks to QPixmaps, result of this is text without transparency (this happened for two skins: adagio and xbs) @@ -62,7 +62,7 @@ ChangeLog (only lists MY changes) most fileformats in a proper way?) 2001-09-22 Stefan Gehn <sgehn@gmx.net> -* isGray(qRgb) is more tolerant, colors like rgb(162,163,162) are treated as gray too +* isGray(tqRgb) is more tolerant, colors like rgb(162,163,162) are treated as gray too This fixes some volume/pitch-sliders and makes using them a lot easier * made titletext move again (works with and without transparent text) @@ -72,7 +72,7 @@ ChangeLog (only lists MY changes) 2001-09-04 Stefan Gehn <sgehn@gmx.net> * added support for transparent fonts (a skin named steelforged still got problems though) for the moment this disables moving of titletext, - I have to find a new way to move it (bitblt on a masked QPixmap is tricky) + I have to find a new way to move it (bitblt on a tqmasked QPixmap is tricky) 2001-09-03 Stefan Gehn <sgehn@gmx.net> * added support for pitch-slider and its textlabel diff --git a/noatun/modules/kjofol-skin/helpers.cpp b/noatun/modules/kjofol-skin/helpers.cpp index 0a2a9e67..473c0e80 100644 --- a/noatun/modules/kjofol-skin/helpers.cpp +++ b/noatun/modules/kjofol-skin/helpers.cpp @@ -9,22 +9,22 @@ #ifndef KJHELPERS_CPP #define KJHELPERS_CPP -static int grayRgb(QRgb r) +static int grayRgb(TQRgb r) { - return qGray(qRed(r), qGreen(r), qBlue(r)); + return tqGray(tqRed(r), tqGreen(r), tqBlue(r)); } -static int isGray(QRgb r) +static int isGray(TQRgb r) { // this is more tolerant than the old version // i.e. RGB 162 163 162 is treated as gray too // too many broken skins around having such colors -// cerr << "r("<<qRed(r)<<","<<qGreen(r)<<","<<qBlue(r)<<")"<<endl; +// cerr << "r("<<tqRed(r)<<","<<tqGreen(r)<<","<<tqBlue(r)<<")"<<endl; - if ( (qRed(r)==qGreen(r)) || (qRed(r)+1==qGreen(r)) || (qRed(r)-1==qGreen(r))) + if ( (tqRed(r)==tqGreen(r)) || (tqRed(r)+1==tqGreen(r)) || (tqRed(r)-1==tqGreen(r))) { - if ( (qRed(r)==qBlue(r)) || (qRed(r)+1==qBlue(r)) || (qRed(r)-1==qBlue(r))) + if ( (tqRed(r)==tqBlue(r)) || (tqRed(r)+1==tqBlue(r)) || (tqRed(r)-1==tqBlue(r))) { // looks a bit like gray, so return true return (1); @@ -35,7 +35,7 @@ static int isGray(QRgb r) /* // mETz: wrong braces in the code below ?? - return (qRed(r)==qGreen(r)) && (qRed(r) == qBlue(r)); + return (tqRed(r)==tqGreen(r)) && (tqRed(r) == tqBlue(r)); */ } diff --git a/noatun/modules/kjofol-skin/kjbackground.cpp b/noatun/modules/kjofol-skin/kjbackground.cpp index 1c99b6ff..543d92cc 100644 --- a/noatun/modules/kjofol-skin/kjbackground.cpp +++ b/noatun/modules/kjofol-skin/kjbackground.cpp @@ -9,21 +9,21 @@ #include "kjbackground.h" -KJBackground::KJBackground(KJLoader *parent) - : KJWidget(parent) +KJBackground::KJBackground(KJLoader *tqparent) + : KJWidget(tqparent) { TQImage ibackground; - mBackground = parent->pixmap(parser()["backgroundimage"][1]); - ibackground = parent->image(parser()["backgroundimage"][1]); + mBackground = tqparent->pixmap(parser()["backgroundimage"][1]); + ibackground = tqparent->image(parser()["backgroundimage"][1]); - parent->setMask( getMask(ibackground) ); - parent->setFixedSize ( TQSize(mBackground.width(), mBackground.height()) ); + tqparent->setMask( getMask(ibackground) ); + tqparent->setFixedSize ( TQSize(mBackground.width(), mBackground.height()) ); - setRect(0,0,parent->width(),parent->height()); + setRect(0,0,tqparent->width(),tqparent->height()); } void KJBackground::paint(TQPainter *painter, const TQRect &rect) { - bitBlt(painter->device(), rect.topLeft(), &mBackground, rect, Qt::CopyROP); + bitBlt(painter->device(), rect.topLeft(), &mBackground, rect, TQt::CopyROP); } diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp index d051777e..7dbd9d99 100644 --- a/noatun/modules/kjofol-skin/kjbutton.cpp +++ b/noatun/modules/kjofol-skin/kjbutton.cpp @@ -30,8 +30,8 @@ * KJButton *******************************************/ -KJButton::KJButton(const TQStringList &i, KJLoader *parent) - : TQObject(0), KJWidget(parent), mTitle(i[0]), mShowPressed(false) +KJButton::KJButton(const TQStringList &i, KJLoader *tqparent) + : TQObject(0), KJWidget(tqparent), mTitle(i[0]), mShowPressed(false) { // kdDebug(66666) << k_funcinfo << "new button: " << i[0].latin1() << endl; mPushedPixmap = (i.count() >= 7); @@ -53,12 +53,12 @@ KJButton::KJButton(const TQStringList &i, KJLoader *parent) bool gotBack = false; // in case any of these keys is duplicated for(TQStringList::Iterator it = temp.begin(); it != temp.end(); ++it) { - if((*it).contains("bmp")) + if((*it).tqcontains("bmp")) { TQString pressedTmp = backgroundPressed((*it)); if(!pressedTmp.isEmpty()) { - mPressed = parent->pixmap(pressedTmp); + mPressed = tqparent->pixmap(pressedTmp); gotBack = true; } } @@ -67,7 +67,7 @@ KJButton::KJButton(const TQStringList &i, KJLoader *parent) // take background and darken the buttons rectangle // FIXME: what KPixmapEffect causes the desired effect? // intensity is the wrong one - KPixmap temp = parent->pixmap(parser()["backgroundimage"][1]); + KPixmap temp = tqparent->pixmap(parser()["backgroundimage"][1]); mPressed = (TQPixmap)KPixmapEffect::intensity ( temp, 1.2f ); gotBack = true; } @@ -79,7 +79,7 @@ KJButton::KJButton(const TQStringList &i, KJLoader *parent) { kdDebug(66666) << k_funcinfo << "Couldn't find valid background for button '" << mTitle << "', dafulting to backgroundimage" << endl; - mPressed = parent->pixmap(parser()["backgroundimage"][1]); + mPressed = tqparent->pixmap(parser()["backgroundimage"][1]); } // playlistbutton has to show if playlistwindow is open @@ -152,12 +152,12 @@ TQString KJButton::tip() void KJButton::paint(TQPainter *, const TQRect &) { if (mShowPressed) - bitBlt(KJWidget::parent(), rect().topLeft(), &mPressed, rect(), Qt::CopyROP); + bitBlt(KJWidget::tqparent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP); } bool KJButton::mousePress(const TQPoint &) { - bitBlt(KJWidget::parent(), rect().topLeft(), &mPressed, rect(), Qt::CopyROP); + bitBlt(KJWidget::tqparent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP); return true; } @@ -165,9 +165,9 @@ void KJButton::showPressed(bool b) { mShowPressed = b; if ( mShowPressed ) - repaint(true); // repaint with selected image + tqrepaint(true); // tqrepaint with selected image else - repaint(false); // repaint with default image (player-background) + tqrepaint(false); // tqrepaint with default image (player-background) } void KJButton::slotPlaylistShown(void) @@ -193,19 +193,19 @@ void KJButton::slotEqEnabled(bool on) void KJButton::mouseRelease(const TQPoint &, bool in) { - // repaint with default image (player-background) - repaint(false); + // tqrepaint with default image (player-background) + tqrepaint(false); if (!in) // only do something if users is still inside the button return; // now, find what widget I am and do the proper action if (mTitle=="closebutton") - KJWidget::parent()->close(); + KJWidget::tqparent()->close(); else if (mTitle=="minimizebutton") - KJWidget::parent()->minimize(); + KJWidget::tqparent()->minimize(); else if (mTitle=="aboutbutton") - KJWidget::parent()->helpMenu()->aboutApplication(); + KJWidget::tqparent()->helpMenu()->aboutApplication(); else if (mTitle=="stopbutton") napp->player()->stop(); else if (mTitle=="playbutton") @@ -214,7 +214,7 @@ void KJButton::mouseRelease(const TQPoint &, bool in) napp->player()->playpause(); else if (mTitle=="openfilebutton") { - KURL file(KFileDialog::getOpenURL(0, napp->mimeTypes(), KJWidget::parent(), i18n("Select File to Play"))); + KURL file(KFileDialog::getOpenURL(0, napp->mimeTypes(), KJWidget::tqparent(), i18n("Select File to Play"))); if (file.isValid()) napp->player()->openFile(file); } @@ -222,7 +222,7 @@ void KJButton::mouseRelease(const TQPoint &, bool in) napp->player()->toggleListView(); else if (mTitle=="repeatbutton") { - KPopupMenu *loopMenu = new KPopupMenu(KJWidget::parent(),"loopMenu"); + KPopupMenu *loopMenu = new KPopupMenu(KJWidget::tqparent(),"loopMenu"); int selectedItem = 0; loopMenu->setCheckable(true); @@ -291,11 +291,11 @@ void KJButton::mouseRelease(const TQPoint &, bool in) else if (mTitle=="rewindbutton") napp->player()->skipTo(napp->player()->getTime()-10000); else if (mTitle=="preferencesbutton") - napp->preferencesBox()->show(static_cast<CModule *>(KJWidget::parent()->prefs())); + napp->preferencesBox()->show(static_cast<CModule *>(KJWidget::tqparent()->prefs())); else if (mTitle=="dockmodebutton") - KJWidget::parent()->switchToDockmode(); + KJWidget::tqparent()->switchToDockmode(); else if (mTitle=="undockmodebutton") - KJWidget::parent()->returnFromDockmode(); + KJWidget::tqparent()->returnFromDockmode(); else kdDebug(66666) << "unknown buttontype: " << mTitle.latin1() << endl; } diff --git a/noatun/modules/kjofol-skin/kjbutton.h b/noatun/modules/kjofol-skin/kjbutton.h index e995c533..c0eba625 100644 --- a/noatun/modules/kjofol-skin/kjbutton.h +++ b/noatun/modules/kjofol-skin/kjbutton.h @@ -8,6 +8,7 @@ class KJLoader; class KJButton : public TQObject, public KJWidget { Q_OBJECT + TQ_OBJECT public: KJButton(const TQStringList&, KJLoader *); diff --git a/noatun/modules/kjofol-skin/kjequalizer.cpp b/noatun/modules/kjofol-skin/kjequalizer.cpp index 51d50e97..4b260f6f 100644 --- a/noatun/modules/kjofol-skin/kjequalizer.cpp +++ b/noatun/modules/kjofol-skin/kjequalizer.cpp @@ -34,7 +34,7 @@ KJEqualizer::KJEqualizer(const TQStringList &l, KJLoader *p) // needed to only blit onto screen ONCE and not for every band TQPixmap tmp = p->pixmap(p->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); // buffer for view mView = new TQPixmap ( xs, ys ); @@ -76,19 +76,19 @@ void KJEqualizer::paint(TQPainter *p, const TQRect &) { TQPixmap temp(rect().width(), rect().height()); // draw background into buffer - bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); + bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); // draw band sliders into buffer - bitBlt( &temp, 0, 0, mView, 0, 0, rect().width(), rect().height(), Qt::CopyROP); + bitBlt( &temp, 0, 0, mView, 0, 0, rect().width(), rect().height(), TQt::CopyROP); // and draw it on screen - bitBlt(p->device(), rect().topLeft(), &temp, TQRect(0,0,-1,-1), Qt::CopyROP); + bitBlt(p->device(), rect().topLeft(), &temp, TQRect(0,0,-1,-1), TQt::CopyROP); } void KJEqualizer::slotUpdateBuffer() { // kdDebug(66666) << "[KJEqualizer] slotUpdateBuffer() called." << endl; - TQBitmap regionMask( rect().width(), rect().height(), true); // fully transparent mask - TQPainter mask( ®ionMask ); + TQBitmap regionMask( rect().width(), rect().height(), true); // fully transparent tqmask + TQPainter tqmask( ®ionMask ); TQPoint destX = TQPoint(0, 0); @@ -102,15 +102,15 @@ void KJEqualizer::slotUpdateBuffer() // kdDebug(66666) << "[KJEqualizer] band=" << band << ", level=" << level << ", picNum=" << picNum << " @ xpos=" << xPos << "." << endl; - bitBlt(mView, destX, &mBars, TQRect(xPos,0,mBandWidth,rect().height()), Qt::CopyROP); - // make slider opaque in mask so you see something on screen - mask.fillRect ( destX.x(), 0, mBandWidth, rect().height(), Qt::color1 ); + bitBlt(mView, destX, &mBars, TQRect(xPos,0,mBandWidth,rect().height()), TQt::CopyROP); + // make slider opaque in tqmask so you see something on screen + tqmask.fillRect ( destX.x(), 0, mBandWidth, rect().height(), TQt::color1 ); destX += TQPoint(mXSpace,0); } // for() - // whole thingy has been drawn, now set the mask + // whole thingy has been drawn, now set the tqmask mView->setMask( regionMask ); - repaint(); + tqrepaint(); } void KJEqualizer::mouseMove(const TQPoint &p, bool in) diff --git a/noatun/modules/kjofol-skin/kjequalizer.h b/noatun/modules/kjofol-skin/kjequalizer.h index be5535eb..f2e85678 100644 --- a/noatun/modules/kjofol-skin/kjequalizer.h +++ b/noatun/modules/kjofol-skin/kjequalizer.h @@ -1,5 +1,5 @@ -#ifndef KJEQUALIZER_H -#define KJEQUALIZER_H +#ifndef KJETQUALIZER_H +#define KJETQUALIZER_H #include "kjwidget.h" //#include "kjloader.h" @@ -11,8 +11,9 @@ class VInterpolation; class KJEqualizer : public TQObject, public KJWidget { Q_OBJECT + TQ_OBJECT public: - KJEqualizer(const TQStringList &, KJLoader *parent); + KJEqualizer(const TQStringList &, KJLoader *tqparent); ~KJEqualizer(void); virtual void mouseMove(const TQPoint &pos, bool); @@ -31,7 +32,7 @@ private: int mBandWidth; int mBandHalfHeight; TQPixmap mBars; // holds all slider images - TQPixmap *mBack; // holds background of EQ for easy repaint + TQPixmap *mBack; // holds background of EQ for easy tqrepaint TQPixmap *mView; // holds prepared img of all sliders VInterpolation *mInterpEq; }; diff --git a/noatun/modules/kjofol-skin/kjfont.cpp b/noatun/modules/kjofol-skin/kjfont.cpp index c6b16b77..cf82fa43 100644 --- a/noatun/modules/kjofol-skin/kjfont.cpp +++ b/noatun/modules/kjofol-skin/kjfont.cpp @@ -23,9 +23,9 @@ * KJFont *******************************************/ -KJFont::KJFont(const TQString &prefix, KJLoader *parent) : mTextMask(0), mTransparentRGB(0) +KJFont::KJFont(const TQString &prefix, KJLoader *tqparent) : mTextMask(0), mTransparentRGB(0) { -// kdDebug(66666) << "KJFont::KJFont(const TQString &prefix, KJLoader *parent)" << prefix.latin1() << endl; +// kdDebug(66666) << "KJFont::KJFont(const TQString &prefix, KJLoader *tqparent)" << prefix.latin1() << endl; if (prefix=="timefont") { @@ -47,12 +47,12 @@ KJFont::KJFont(const TQString &prefix, KJLoader *parent) : mTextMask(0), mTransp mNullChar=' '; } - mText = parent->pixmap(parent->item(prefix+"image")[1]); + mText = tqparent->pixmap(tqparent->item(prefix+"image")[1]); - if ( parent->exist(prefix+"size") ) + if ( tqparent->exist(prefix+"size") ) { - mWidth = parent->item(prefix+"size")[1].toInt(); - mHeight = parent->item(prefix+"size")[2].toInt(); + mWidth = tqparent->item(prefix+"size")[1].toInt(); + mHeight = tqparent->item(prefix+"size")[2].toInt(); } else // try to load the font even we are missing important settings { // this still can cause crashes! @@ -73,13 +73,13 @@ KJFont::KJFont(const TQString &prefix, KJLoader *parent) : mTextMask(0), mTransp mHeight = mText.height(); // Stupid Skin authors tend to forget keys :/ - if ( parent->exist(prefix+"spacing") ) - mSpacing = parent->item(prefix+"spacing")[1].toInt(); + if ( tqparent->exist(prefix+"spacing") ) + mSpacing = tqparent->item(prefix+"spacing")[1].toInt(); else mSpacing = 0; // FIXME: What's default for this in kjöfol??? - if ( parent->exist(prefix+"transparent") ) - mTransparent = (bool)parent->item(prefix+"transparent")[1].toInt(); + if ( tqparent->exist(prefix+"transparent") ) + mTransparent = (bool)tqparent->item(prefix+"transparent")[1].toInt(); else mTransparent = true; // transparency seems to be default in kjöfol @@ -88,7 +88,7 @@ KJFont::KJFont(const TQString &prefix, KJLoader *parent) : mTextMask(0), mTransp { TQImage ibackground = mText.convertToImage(); mTransparentRGB = ibackground.pixel( ibackground.width()-1, ibackground.height()-1 ); -// kdDebug(66666) << "color (" << qRed(mTransparentRGB) << "," << qGreen(mTransparentRGB) << "," << qBlue(mTransparentRGB) << ") will be transparent for " << prefix.latin1() << endl; +// kdDebug(66666) << "color (" << tqRed(mTransparentRGB) << "," << tqGreen(mTransparentRGB) << "," << tqBlue(mTransparentRGB) << ") will be transparent for " << prefix.latin1() << endl; mTextMask = KJWidget::getMask(ibackground,mTransparentRGB); } @@ -153,8 +153,8 @@ TQPixmap KJFont::drawSysFont(const TQCString &s, int wide, const TQPoint &pos) c TQBitmap regionMask( (stringWidth > wide ? stringWidth : wide), - mHeight, true); // fully transparent mask - TQPainter mp(®ionMask); // mask painter + mHeight, true); // fully transparent tqmask + TQPainter mp(®ionMask); // tqmask painter // kdDebug(66666) << "region; w=" << region.width() << ", h=" << region.height() << endl; @@ -163,25 +163,25 @@ TQPixmap KJFont::drawSysFont(const TQCString &s, int wide, const TQPoint &pos) c if ( stringWidth < wide ) { freeSpace = wide - stringWidth; - mp.fillRect ( to.x(), 0, (freeSpace/2), mHeight, Qt::color0 ); + mp.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 ); to += TQPoint ( (freeSpace/2), 0 ); // kdDebug(66666) << "centering text, freeSpace=" << freeSpace << endl; } rp.setFont(sysFont); rp.setPen(sysFontColor); - rp.drawText(to.x(), to.y(), region.width()-freeSpace, mHeight, Qt::AlignLeft|Qt::AlignTop, string); + rp.drawText(to.x(), to.y(), region.width()-freeSpace, mHeight, TQt::AlignLeft|TQt::AlignTop, string); mp.setFont(sysFont); - mp.setPen(Qt::color1); - mp.drawText(to.x(), to.y(), region.width()-freeSpace, mHeight, Qt::AlignLeft|Qt::AlignTop, string); + mp.setPen(TQt::color1); + mp.drawText(to.x(), to.y(), region.width()-freeSpace, mHeight, TQt::AlignLeft|TQt::AlignTop, string); to += TQPoint(region.width()-freeSpace,0); // kdDebug(66666) << "text width=" << region.width()-freeSpace << endl; if (freeSpace > 0) { - mp.fillRect ( to.x(), 0, (freeSpace/2), mHeight, Qt::color0 ); + mp.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 ); to += TQPoint ( (freeSpace/2), 0 ); // kdDebug(66666) << "centering text, freeSpace=" << freeSpace << endl; } @@ -206,8 +206,8 @@ TQPixmap KJFont::drawPixmapFont(const TQCString &str, int wide, const TQPoint &p TQBitmap regionMask( (string.length()*mWidth+string.length()*mSpacing > (unsigned int)wide ? string.length()*mWidth+string.length()*mSpacing : wide), - mHeight, true); // fully transparent mask - TQPainter mask( ®ionMask ); + mHeight, true); // fully transparent tqmask + TQPainter tqmask( ®ionMask ); // kdDebug(66666) << "draw: {" << str << "}" << endl; @@ -216,7 +216,7 @@ TQPixmap KJFont::drawPixmapFont(const TQCString &str, int wide, const TQPoint &p if ( string.length()*mWidth+string.length()*mSpacing < (unsigned int)wide ) { freeSpace = wide - string.length()*mWidth+string.length()*mSpacing; - mask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, Qt::color0 ); + tqmask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 ); to += TQPoint ( (freeSpace/2), 0 ); } @@ -234,14 +234,14 @@ TQPixmap KJFont::drawPixmapFont(const TQCString &str, int wide, const TQPoint &p // draw according to "spacing" if ( (charPos < string.length()-1) && mSpacing > 0 ) { // make the spacing-area transparent - mask.fillRect ( to.x(), 0, mSpacing, mHeight, Qt::color0 ); + tqmask.fillRect ( to.x(), 0, mSpacing, mHeight, TQt::color0 ); to += TQPoint ( mSpacing, 0 ); } } if (freeSpace > 0) { - mask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, Qt::color0 ); + tqmask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 ); to += TQPoint ( (freeSpace/2), 0 ); } @@ -258,17 +258,17 @@ void KJFont::drawCharacter(TQPixmap *dev, TQBitmap *devMask, const TQPoint &to, int xs=mWidth; int ys=mHeight; - bitBlt(dev, to, &mText, TQRect(x,y,xs,ys), Qt::CopyROP); + bitBlt(dev, to, &mText, TQRect(x,y,xs,ys), TQt::CopyROP); - // bitBlt mask for transparency + // bitBlt tqmask for transparency if ( mTransparent ) { - bitBlt(devMask, to, &mTextMask, TQRect(x,y,xs,ys), Qt::OrROP); + bitBlt(devMask, to, &mTextMask, TQRect(x,y,xs,ys), TQt::OrROP); } - else // fill mask + else // fill tqmask { TQPainter tempPainter (devMask); - tempPainter.fillRect ( to.x(), 0, xs,ys, Qt::color1 ); + tempPainter.fillRect ( to.x(), 0, xs,ys, TQt::color1 ); } } diff --git a/noatun/modules/kjofol-skin/kjfont.h b/noatun/modules/kjofol-skin/kjfont.h index a40e7854..626ed027 100644 --- a/noatun/modules/kjofol-skin/kjfont.h +++ b/noatun/modules/kjofol-skin/kjfont.h @@ -11,7 +11,7 @@ class KJLoader; class KJFont { public: - KJFont(const TQString &prefix, KJLoader *parent); + KJFont(const TQString &prefix, KJLoader *tqparent); // draw the string str to dev at position pos, within rectangle limit in relation to pos TQPixmap draw(const TQCString &str, int wide, const TQPoint &pt=TQPoint(0,0)) const; TQPixmap draw(const TQString &str, int wide, const TQPoint &pt=TQPoint(0,0)) const @@ -35,7 +35,7 @@ protected: private: TQPixmap mText; TQBitmap mTextMask; - QRgb mTransparentRGB; // this color will be transparent + TQRgb mTransparentRGB; // this color will be transparent int mSpacing; int mWidth, mHeight; bool mTransparent; // indicates wether there's transparency diff --git a/noatun/modules/kjofol-skin/kjguisettingswidget.ui b/noatun/modules/kjofol-skin/kjguisettingswidget.ui index e2b4f784..ab787975 100644 --- a/noatun/modules/kjofol-skin/kjguisettingswidget.ui +++ b/noatun/modules/kjofol-skin/kjguisettingswidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KJGuiSettings</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KJGuiSettings</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -30,7 +30,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -47,7 +47,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>visScope</cstring> </property> @@ -55,7 +55,7 @@ <string>Oscillo&scope</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>visAnalyzer</cstring> </property> @@ -63,7 +63,7 @@ <string>&Analyzer</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>visNone</cstring> </property> @@ -71,7 +71,7 @@ <string>&None</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -85,7 +85,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> @@ -125,7 +125,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -142,7 +142,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -156,7 +156,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -194,7 +194,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -208,7 +208,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_2_2</cstring> </property> @@ -250,7 +250,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>displayTooltips</cstring> </property> @@ -258,7 +258,7 @@ <string>Display &tooltips</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>displaySplash</cstring> </property> @@ -276,14 +276,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>60</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -297,7 +297,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -308,7 +308,7 @@ <cstring>titleScrollSpeed</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -316,11 +316,11 @@ <string>Slow</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>titleScrollSpeed</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>80</width> <height>0</height> @@ -348,7 +348,7 @@ <number>1</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -358,7 +358,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="3" column="0"> + <widget class="TQGroupBox" row="3" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -381,7 +381,7 @@ </color> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>txtFontColor</cstring> </property> @@ -389,7 +389,7 @@ <string>Color:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>txtFont</cstring> </property> @@ -408,7 +408,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>useSysFont</cstring> </property> @@ -428,7 +428,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>140</width> <height>21</height> @@ -453,7 +453,7 @@ <tabstop>cmbSysFontColor</tabstop> <tabstop>titleScrollSpeed</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp index 7a9d70c4..fca8b6bb 100644 --- a/noatun/modules/kjofol-skin/kjloader.cpp +++ b/noatun/modules/kjofol-skin/kjloader.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - kjloader.cpp - The KJöfol-GUI itself + kjloader.cpp - The KJ�fol-GUI itself -------------------------------------- Maintainer: Stefan Gehn <sgehn@gmx.net> @@ -69,11 +69,11 @@ #include <kwin.h> #include <kiconloader.h> -class KJToolTip : public QToolTip +class KJToolTip : public TQToolTip { public: - KJToolTip(KJLoader *parent) - : TQToolTip(parent), mParent(parent) + KJToolTip(KJLoader *tqparent) + : TQToolTip(tqparent), mParent(tqparent) {} protected: @@ -131,7 +131,7 @@ KJLoader::KJLoader() subwidgets.setAutoDelete(true); - mPrefs = new KJPrefs(this); + mPrefs = new KJPrefs(TQT_TQOBJECT(this)); connect ( mPrefs, TQT_SIGNAL(configChanged()), this, TQT_SLOT(readConfig()) ); TQString skin = mPrefs->skin(); @@ -142,7 +142,7 @@ KJLoader::KJLoader() else { KNotifyClient::event(winId(), "warning", - i18n("There was trouble loading skin %1. Please select another skin file.").arg(skin)); + i18n("There was trouble loading skin %1. Please select another skin file.").tqarg(skin)); napp->preferences(); } @@ -163,7 +163,7 @@ TQPtrList<KJWidget> KJLoader::widgetsAt(const TQPoint &pt) const { TQPtrList<KJWidget> things; for ( TQPtrListIterator<KJWidget> i(subwidgets); i.current(); ++i ) - if ( (*i)->rect().contains(pt) ) + if ( (*i)->rect().tqcontains(pt) ) things.append((*i)); return things; @@ -173,7 +173,7 @@ void KJLoader::removeChild(KJWidget *c) { if ( mClickedIn == c ) mClickedIn = 0; - if (subwidgets.findRef(c) != -1) + if (subwidgets.tqfindRef(c) != -1) subwidgets.take(); } @@ -219,7 +219,7 @@ void KJLoader::loadSkin(const TQString &file) if ( exist("dockmodercfile") ) { // set path to dockmode rc-file (its not always skinname.dck) - mCurrentDockModeSkin = file.left(file.findRev("/")+1) + (item("dockmodercfile")[1]); + mCurrentDockModeSkin = file.left(file.tqfindRev("/")+1) + (item("dockmodercfile")[1]); mDockPosition = item("dockmodeposition")[1].toInt(); mDockPositionX = item("dockmodepositionxy")[1].toInt(); mDockPositionY = item("dockmodepositionxy")[2].toInt(); @@ -228,7 +228,7 @@ void KJLoader::loadSkin(const TQString &file) mCurrentDockModeSkin=""; if ( exist("winshademodercfile") ) - mCurrentWinshadeModeSkin = file.left(file.findRev("/")+1) + (item("winshademodercfile")[1]); + mCurrentWinshadeModeSkin = file.left(file.tqfindRev("/")+1) + (item("winshademodercfile")[1]); else // no WinshadeMode mCurrentWinshadeModeSkin=""; } @@ -377,7 +377,7 @@ void KJLoader::loadSkin(const TQString &file) for (TQDictIterator<TQStringList> i(*this); i.current(); ++i) { TQString d=i.currentKey(); - if(d.contains("button") && + if(d.tqcontains("button") && !d.startsWith("playlistwindow") && // don't add buttons that belong to the playlistwindow d != "pitchcontrolbutton" && // both already handled above as they aren't buttons but sliders d != "volumecontrolbutton" && @@ -392,7 +392,7 @@ void KJLoader::loadSkin(const TQString &file) show(); conserveMemory(); - repaint(); + tqrepaint(); // update displays if we are already playing // This happens while changing skins @@ -728,11 +728,11 @@ void KJLoader::mouseMoveEvent(TQMouseEvent *e) // TQWidget::mouseMoveEvent(e); // not on background but on a widget: pass event to subwidget - if ( !moving && mClickedIn && subwidgets.findRef(mClickedIn) != -1 ) + if ( !moving && mClickedIn && subwidgets.tqfindRef(mClickedIn) != -1 ) { mClickedIn->mouseMove ( e->pos()-mClickedIn->rect().topLeft(), - mClickedIn->rect().contains(mapFromGlobal(TQCursor::pos())) ); + mClickedIn->rect().tqcontains(mapFromGlobal(TQCursor::pos())) ); } } @@ -742,14 +742,14 @@ void KJLoader::mousePressEvent(TQMouseEvent *e) // TQWidget::mousePressEvent(e); - if ( e->button()==RightButton ) + if ( e->button()==Qt::RightButton ) NoatunStdAction::ContextMenu::showContextMenu(); else /* if ( e->button()==LeftButton ) */ { mMousePoint = mapFromGlobal(TQCursor::pos()); // try to find a KJWidget that is here for (KJWidget* i=subwidgets.first(); i!=0; i=subwidgets.next()) - if (i->rect().contains(mMousePoint)) + if (i->rect().tqcontains(mMousePoint)) { if (i->mousePress(mMousePoint-i->rect().topLeft())) { @@ -769,11 +769,11 @@ void KJLoader::mouseReleaseEvent(TQMouseEvent */*e*/) // TQWidget::mouseReleaseEvent(e); - if (!moving && mClickedIn && subwidgets.findRef(mClickedIn)!=-1) + if (!moving && mClickedIn && subwidgets.tqfindRef(mClickedIn)!=-1) { mClickedIn->mouseRelease(mapFromGlobal(TQCursor::pos())- mClickedIn->rect().topLeft(), - mClickedIn->rect().contains( + mClickedIn->rect().tqcontains( mapFromGlobal(TQCursor::pos()))); mClickedIn=0; } @@ -812,7 +812,7 @@ void KJLoader::showSplash() splashScreen->setBackgroundMode ( NoBackground ); splashScreen->setMask( KJWidget::getMask(image(item("splashscreen")[1])) ); - TQSize sh = splashScreen->sizeHint(); + TQSize sh = splashScreen->tqsizeHint(); TQRect desk = KGlobalSettings::splashScreenDesktopGeometry(); splashScreen->move (desk.x() + (desk.width() - sh.width())/2, diff --git a/noatun/modules/kjofol-skin/kjloader.h b/noatun/modules/kjofol-skin/kjloader.h index 6fec9f05..94ab729a 100644 --- a/noatun/modules/kjofol-skin/kjloader.h +++ b/noatun/modules/kjofol-skin/kjloader.h @@ -33,6 +33,7 @@ class KJPrefs; class KJLoader : public TQWidget, public UserInterface, public Parser { Q_OBJECT + TQ_OBJECT NOATUNPLUGIND friend class KJWidget; @@ -43,7 +44,7 @@ public: public: void minimize(); KHelpMenu *helpMenu() const { return mHelpMenu; } - TQStringList &item(const TQString &key) { return *Parser::find(key); } + TQStringList &item(const TQString &key) { return *Parser::tqfind(key); } // returns path to currently loaded configfile // can be either a newly loaded one or one of the three below diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp index 4231d0ff..b8e6e4bf 100644 --- a/noatun/modules/kjofol-skin/kjprefs.cpp +++ b/noatun/modules/kjofol-skin/kjprefs.cpp @@ -45,8 +45,8 @@ static TQString expand(TQString s); -KJPrefs::KJPrefs(TQObject* parent) - : CModule(i18n("K-Jöfol Skins"), i18n("Skin Selection For the K-Jöfol Plugin"), "style", parent) +KJPrefs::KJPrefs(TQObject* tqparent) + : CModule(i18n("K-Jöfol Skins"), i18n("Skin Selection For the K-Jöfol Plugin"), "style", tqparent) { cfg = KGlobal::config(); @@ -151,7 +151,7 @@ void KJPrefs::reopen() // reload config and set stuff in dialog skins.sort(); TQString loaded = cfg->readEntry("SkinResource", locate("data", "noatun/skins/kjofol/kjofol/kjofol.rc") ); - loaded = loaded.mid(loaded.findRev("/")+1); // remove path + loaded = loaded.mid(loaded.tqfindRev("/")+1); // remove path loaded = loaded.left( loaded.length() - 3 ); // remove ".rc" mSkinselectorWidget->mSkins->clear(); @@ -454,7 +454,7 @@ void KJPrefs::installNewSkin( void ) { // skindir is named like the archive without extension (FIXME: extension is not stripped from name) - int dotPos = srcFile.fileName().findRev('.'); + int dotPos = srcFile.fileName().tqfindRev('.'); if ( dotPos > 0 ) // found a dot -> (hopefully) strip the extension { dst.addPath( srcFile.fileName().left(dotPos) ); diff --git a/noatun/modules/kjofol-skin/kjprefs.h b/noatun/modules/kjofol-skin/kjprefs.h index a8f52e29..a0849d17 100644 --- a/noatun/modules/kjofol-skin/kjprefs.h +++ b/noatun/modules/kjofol-skin/kjprefs.h @@ -25,8 +25,9 @@ class KJLoader; class KJPrefs : public CModule { Q_OBJECT + TQ_OBJECT public: - KJPrefs(TQObject* parent); + KJPrefs(TQObject* tqparent); // Save which Skin is currently selected virtual void save(); diff --git a/noatun/modules/kjofol-skin/kjseeker.cpp b/noatun/modules/kjofol-skin/kjseeker.cpp index b9b441b1..0d30e506 100644 --- a/noatun/modules/kjofol-skin/kjseeker.cpp +++ b/noatun/modules/kjofol-skin/kjseeker.cpp @@ -22,62 +22,57 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0) { kdDebug(66666) << k_funcinfo << "No pressed background found for seeker," << " using default background!" << endl; - parent()->image(parser()["backgroundimage"][1]); + tqparent()->image(parser()["backgroundimage"][1]); } else - mActive = parent()->image(activeBg); + mActive = tqparent()->image(activeBg); - mScale = parent()->image(parser()["seekimage"][1]); - TQImage pixmapNoPress = parent()->image(parser()["backgroundimage"][1]); + mScale = tqparent()->image(parser()["seekimage"][1]); + TQImage pixmapNoPress = tqparent()->image(parser()["backgroundimage"][1]); - // generate transparent mask + // generate transparent tqmask int x, y, xs, ys; x=i[1].toInt(); y=i[2].toInt(); xs=i[3].toInt()-x; ys=i[4].toInt()-y; setRect(x,y,xs,ys); - TQImage transmask(xs, ys, 1, 2, TQImage::LittleEndian); -#if QT_VERSION < 0x030300 - transmask.setColor(0, qRgb(0,0,0)); - transmask.setColor(1, qRgb(255,255,255)); -#else - transmask.setColor(1, qRgb(0,0,0)); - transmask.setColor(0, qRgb(255,255,255)); -#endif + TQImage transtqmask(xs, ys, 1, 2, TQImage::LittleEndian); + transtqmask.setColor(1, tqRgb(0,0,0)); + transtqmask.setColor(0, tqRgb(255,255,255)); // clear the pointers memset(barmodeImages, 0, 256*sizeof(TQImage*)); memset(barmode, 0, 256*sizeof(TQPixmap*)); - // Now do the pixel føking + // Now do the pixel f�king // kdDebug(66666) << "creating Pixmaps for Seeker" << endl; for (int iy=y;iy<y+ys; iy++) { for (int ix=x;ix<x+xs; ix++) { - QRgb checkmScale = mScale.pixel(ix, iy); + TQRgb checkmScale = mScale.pixel(ix, iy); // am I transparent? if (!isGray(checkmScale)) { - setPixel1BPP(transmask, ix-x, iy-y, 0); + setPixel1BPP(transtqmask, ix-x, iy-y, 0); continue; } - setPixel1BPP(transmask, ix-x, iy-y, 1); + setPixel1BPP(transtqmask, ix-x, iy-y, 1); // what is the level int level=grayRgb(checkmScale)+1; if (level>255) level=255; // allocate the pixmap of the level proper // copy the color to the surface proper - QRgb activeColor=mActive.pixel(ix,iy); - QRgb inactiveColor=pixmapNoPress.pixel(ix,iy); + TQRgb activeColor=mActive.pixel(ix,iy); + TQRgb inactiveColor=pixmapNoPress.pixel(ix,iy); // set this pixel and everything before it for(int i=0; i<level; i++) { if (!barmodeImages[i]) barmodeImages[i]=new TQImage(xs,ys, 32); - QRgb *l=(QRgb*)barmodeImages[i]->scanLine(iy-y); + TQRgb *l=(TQRgb*)barmodeImages[i]->scanLine(iy-y); l[ix-x]=inactiveColor; } @@ -85,7 +80,7 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0) { if (!barmodeImages[level]) barmodeImages[level]=new TQImage(xs,ys, 32); - QRgb *l=(QRgb*)barmodeImages[level]->scanLine(iy-y); + TQRgb *l=(TQRgb*)barmodeImages[level]->scanLine(iy-y); l[ix-x]=activeColor; } while (level++<255); } @@ -94,10 +89,10 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0) // create the blank one barmode[0]=new TQPixmap(xs, ys); - TQPixmap px=parent()->pixmap(parser()["backgroundimage"][1]); - bitBlt(barmode[0], 0, 0, &px, x, y, xs, ys, Qt::CopyROP); - px.convertFromImage(transmask); - barModeMask=px; + TQPixmap px=tqparent()->pixmap(parser()["backgroundimage"][1]); + bitBlt(barmode[0], 0, 0, &px, x, y, xs, ys, TQt::CopyROP); + px.convertFromImage(transtqmask); + barModeMask=TQBitmap(px); // kdDebug(66666) << "END KJSeeker constructor" << endl; } @@ -135,7 +130,7 @@ void KJSeeker::paint(TQPainter *p, const TQRect &) TQPixmap *pixmap = toPixmap(g); pixmap->setMask(barModeMask); bitBlt(p->device(), rect().topLeft().x(), rect().topLeft().y(), - pixmap, 0, 0, rect().width(), rect().height(), Qt::CopyROP); + pixmap, 0, 0, rect().width(), rect().height(), TQt::CopyROP); } bool KJSeeker::mousePress(const TQPoint &pos) @@ -154,14 +149,14 @@ void KJSeeker::mouseRelease(const TQPoint &pos, bool in) if(!mScale.valid(x, y)) return; - QRgb color=mScale.pixel(x, y); + TQRgb color=mScale.pixel(x, y); // user released mousebutton outside of the seeker-area (which is gray) if ( (!isGray(color)) || (!in) ) return; g = grayRgb(color); - repaint(); + tqrepaint(); // kdDebug(66666) << "length : " << napp->player()->getLength() << endl; // kdDebug(66666) << "skip to: " << ((long long)g*(long long)napp->player()->getLength())/255 << endl; @@ -185,7 +180,7 @@ void KJSeeker::timeUpdate(int sec) g = sec * 255 / length; //kdDebug(66666) << "sec: " << sec << " len: " << length << " g: " << g << endl; - TQPainter p(parent()); + TQPainter p(tqparent()); paint(&p, rect()); } diff --git a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui index 1540ad5e..66f3462a 100644 --- a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui +++ b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KJSkinselector</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KJSkinselector</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>mSkins</cstring> </property> @@ -35,7 +35,7 @@ </sizepolicy> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>previewGroup</cstring> </property> @@ -70,7 +70,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -87,7 +87,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>21</height> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>41</height> @@ -121,21 +121,21 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>21</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="1" rowspan="2" colspan="1"> + <widget class="TQLabel" row="1" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>mPreview</cstring> </property> <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -145,7 +145,7 @@ </widget> </grid> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -153,7 +153,7 @@ <string>About skin:</string> </property> </widget> - <widget class="QTextBrowser"> + <widget class="TQTextBrowser"> <property name="name"> <cstring>mAboutText</cstring> </property> @@ -170,7 +170,7 @@ It can be several lines and usually does not contain anything interesting but still this will be shown.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -197,7 +197,7 @@ It can be several lines and usually does not contain anything interesting but st </sizepolicy> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>installButton</cstring> </property> @@ -205,7 +205,7 @@ It can be several lines and usually does not contain anything interesting but st <string>Install Skin</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>mRemoveButton</cstring> </property> @@ -219,7 +219,7 @@ It can be several lines and usually does not contain anything interesting but st </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/noatun/modules/kjofol-skin/kjsliders.cpp b/noatun/modules/kjofol-skin/kjsliders.cpp index 7b884853..b1e03b7a 100644 --- a/noatun/modules/kjofol-skin/kjsliders.cpp +++ b/noatun/modules/kjofol-skin/kjsliders.cpp @@ -44,8 +44,8 @@ KJVolumeBar::KJVolumeBar(const TQStringList &i, KJLoader *p) // kdDebug(66666) << "x: " << x << " y: " << y << " w: " << xs << " h: " << ys << endl; - mBack = parent()->pixmap(parser()["backgroundimage"][1]); - mSlider = parent()->pixmap(parser()["volumecontrolimage"][1]); + mBack = tqparent()->pixmap(parser()["backgroundimage"][1]); + mSlider = tqparent()->pixmap(parser()["volumecontrolimage"][1]); } TQString KJVolumeBar::tip() @@ -71,7 +71,7 @@ void KJVolumeBar::paint(TQPainter *p, const TQRect &) rect().y() /*- hotSpot.y()*/, rect().width() /*+ (2*hotSpot.x())*/, rect().height() /*+ (2*hotSpot.y())*/, - Qt::CopyROP); + TQt::CopyROP); // draw our slider bitBlt( @@ -83,17 +83,17 @@ void KJVolumeBar::paint(TQPainter *p, const TQRect &) 0, mSlider.width(), mSlider.height(), - Qt::CopyROP); + TQt::CopyROP); if (mText) - mText->repaint(); + mText->tqrepaint(); } bool KJVolumeBar::mousePress(const TQPoint &pos) { mVolume = (pos.x()*100) / rect().width(); // kdDebug(66666) << "volume: " << mVolume << endl; - repaint(); + tqrepaint(); napp->player()->setVolume(mVolume); return true; } @@ -112,7 +112,7 @@ void KJVolumeBar::mouseMove(const TQPoint &pos, bool in) void KJVolumeBar::timeUpdate(int) { mVolume = napp->player()->volume(); - repaint(); + tqrepaint(); } @@ -133,8 +133,8 @@ KJVolumeBMP::KJVolumeBMP(const TQStringList &i, KJLoader *p) mWidth = parser()["volumecontrolimagexsize"][1].toInt(); mCount = parser()["volumecontrolimagenb"][1].toInt()-1; - mImages = parent()->pixmap(parser()["volumecontrolimage"][1]); - mPos = parent()->image(parser()["volumecontrolimageposition"][1]); + mImages = tqparent()->pixmap(parser()["volumecontrolimage"][1]); + mPos = tqparent()->image(parser()["volumecontrolimageposition"][1]); timeUpdate(0); } @@ -146,14 +146,14 @@ TQString KJVolumeBMP::tip() void KJVolumeBMP::paint(TQPainter *p, const TQRect &) { TQRect from(mVolume*mCount/100*mWidth, 0, mWidth, mImages.height()); - bitBlt(p->device(), rect().topLeft(), &mImages, from, Qt::CopyROP); + bitBlt(p->device(), rect().topLeft(), &mImages, from, TQt::CopyROP); if (mText) - mText->repaint(); + mText->tqrepaint(); } bool KJVolumeBMP::mousePress(const TQPoint &pos) { - QRgb color = mPos.pixel ( rect().topLeft().x()+pos.x(), rect().topLeft().y()+pos.y() ); + TQRgb color = mPos.pixel ( rect().topLeft().x()+pos.x(), rect().topLeft().y()+pos.y() ); if (!isGray(color)) return false; @@ -162,7 +162,7 @@ bool KJVolumeBMP::mousePress(const TQPoint &pos) // kdDebug(66666) << "gray : " << grayRgb(color) << endl; // kdDebug(66666) << "volume: " << mVolume << endl; - repaint(); + tqrepaint(); napp->player()->setVolume(mVolume); @@ -187,7 +187,7 @@ void KJVolumeBMP::timeUpdate(int) mOldVolume = mVolume; - repaint(); + tqrepaint(); } @@ -208,12 +208,12 @@ KJPitchBMP::KJPitchBMP(const TQStringList &i, KJLoader *p) mWidth = parser()["pitchcontrolimagexsize"][1].toInt(); mCount = parser()["pitchcontrolimagenb"][1].toInt()-1; - mImages = parent()->pixmap(parser()["pitchcontrolimage"][1]); - mPos = parent()->image(parser()["pitchcontrolimageposition"][1]); + mImages = tqparent()->pixmap(parser()["pitchcontrolimage"][1]); + mPos = tqparent()->image(parser()["pitchcontrolimageposition"][1]); // makes all pixels with rgb(255,0,255) transparent TQImage ibackground; - ibackground = parent()->image(parser()["pitchcontrolimage"][1]); + ibackground = tqparent()->image(parser()["pitchcontrolimage"][1]); mImages.setMask( getMask(ibackground) ); Arts::PlayObject playobject = napp->player()->engine()->playObject(); @@ -236,7 +236,7 @@ KJPitchBMP::KJPitchBMP(const TQStringList &i, KJLoader *p) readConfig(); if (mText) - mText->repaint(); + mText->tqrepaint(); } TQString KJPitchBMP::tip() @@ -250,15 +250,15 @@ void KJPitchBMP::paint(TQPainter *p, const TQRect &) TQRect from( (int)xPos, 0, mWidth, mImages.height()); - bitBlt(p->device(), rect().topLeft(), &mImages, from, Qt::CopyROP); + bitBlt(p->device(), rect().topLeft(), &mImages, from, TQt::CopyROP); if (mText) - mText->repaint(); + mText->tqrepaint(); } bool KJPitchBMP::mousePress(const TQPoint &pos) { - QRgb color = mPos.pixel ( rect().topLeft().x()+pos.x(), rect().topLeft().y()+pos.y() ); + TQRgb color = mPos.pixel ( rect().topLeft().x()+pos.x(), rect().topLeft().y()+pos.y() ); if (!isGray(color)) return false; @@ -266,7 +266,7 @@ bool KJPitchBMP::mousePress(const TQPoint &pos) mCurrentPitch = mMinPitch + ( (grayRgb(color)*(mMaxPitch-mMinPitch)) / 255 ); // kdDebug(66666) << "[KJPitchBMP] mousePress() mCurrentPitch: " << mCurrentPitch << endl; - repaint(); + tqrepaint(); newFile(); // wrong naming, in fact it just sets pitch @@ -300,7 +300,7 @@ void KJPitchBMP::timeUpdate(int) mOldPitch = mCurrentPitch; - repaint(); + tqrepaint(); } void KJPitchBMP::newFile() diff --git a/noatun/modules/kjofol-skin/kjsliders.h b/noatun/modules/kjofol-skin/kjsliders.h index bd3c3324..131261c7 100644 --- a/noatun/modules/kjofol-skin/kjsliders.h +++ b/noatun/modules/kjofol-skin/kjsliders.h @@ -12,7 +12,7 @@ class KJVolumeText; class KJVolumeBMP : public KJWidget { public: - KJVolumeBMP(const TQStringList &, KJLoader *parent); + KJVolumeBMP(const TQStringList &, KJLoader *tqparent); virtual void paint(TQPainter *, const TQRect &rect); virtual bool mousePress(const TQPoint &pos); @@ -36,7 +36,7 @@ private: class KJVolumeBar : public KJWidget { public: - KJVolumeBar(const TQStringList &, KJLoader *parent); + KJVolumeBar(const TQStringList &, KJLoader *tqparent); virtual void paint(TQPainter *, const TQRect &rect); virtual bool mousePress(const TQPoint &pos); @@ -59,7 +59,7 @@ private: class KJPitchBMP : public KJWidget { public: - KJPitchBMP(const TQStringList &, KJLoader *parent); + KJPitchBMP(const TQStringList &, KJLoader *tqparent); virtual void paint(TQPainter *, const TQRect &rect); virtual bool mousePress(const TQPoint &pos); diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.cpp b/noatun/modules/kjofol-skin/kjtextdisplay.cpp index c1a17139..42d546a0 100644 --- a/noatun/modules/kjofol-skin/kjtextdisplay.cpp +++ b/noatun/modules/kjofol-skin/kjtextdisplay.cpp @@ -52,7 +52,7 @@ KJFilename::KJFilename(const TQStringList &l, KJLoader *p) // background under filename-scroller TQPixmap tmp = p->pixmap(p->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); setRect(x,y,xs,ys); @@ -77,12 +77,12 @@ void KJFilename::paint(TQPainter *p, const TQRect &) TQPixmap temp ( rect().width(), rect().height() ); // draw background into buffer - bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); + bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); // draw font into buffer - bitBlt( &temp, 0, 0, &mView, 0, 0, rect().width(), rect().height(), Qt::CopyROP); + bitBlt( &temp, 0, 0, &mView, 0, 0, rect().width(), rect().height(), TQt::CopyROP); // and draw it on screen bitBlt(p->device(), rect().topLeft(), &temp, - TQRect(0,0,-1,-1), Qt::CopyROP); + TQRect(0,0,-1,-1), TQt::CopyROP); } void KJFilename::timerEvent(TQTimerEvent *) @@ -90,25 +90,25 @@ void KJFilename::timerEvent(TQTimerEvent *) int height = mView.height(); int width = mView.width(); - TQBitmap cycleMask ( mDistance, height ); // temporary-space for moving parts of the mask + TQBitmap cycleMask ( mDistance, height ); // temporary-space for moving parts of the tqmask TQPixmap cycle ( mDistance, height ); // temporary-space for moving parts of the pixmap - TQBitmap newMask ( *mView.mask() ); // save old mask + TQBitmap newMask ( *mView.tqmask() ); // save old tqmask - // copy mask like the same way we're doing it with the pixmap - // a mask does not get copied on a bitblt automatically, we have to do + // copy tqmask like the same way we're doing it with the pixmap + // a tqmask does not get copied on a bitblt automatically, we have to do // it "by hand" - bitBlt(&cycleMask, 0,0, &newMask, 0,0, mDistance, height, Qt::CopyROP); - bitBlt(&newMask, 0,0, &newMask, mDistance, 0, width-mDistance, height, Qt::CopyROP); - bitBlt(&newMask, width-mDistance, 0, &cycleMask, 0,0, mDistance, height, Qt::CopyROP); + bitBlt(&cycleMask, 0,0, &newMask, 0,0, mDistance, height, TQt::CopyROP); + bitBlt(&newMask, 0,0, &newMask, mDistance, 0, width-mDistance, height, TQt::CopyROP); + bitBlt(&newMask, width-mDistance, 0, &cycleMask, 0,0, mDistance, height, TQt::CopyROP); - bitBlt(&cycle, 0,0, &mView, 0,0, mDistance, height, Qt::CopyROP); - bitBlt(&mView, 0,0, &mView, mDistance, 0, width-mDistance, height, Qt::CopyROP); - bitBlt(&mView, width-mDistance, 0, &cycle, 0,0, mDistance, height, Qt::CopyROP); + bitBlt(&cycle, 0,0, &mView, 0,0, mDistance, height, TQt::CopyROP); + bitBlt(&mView, 0,0, &mView, mDistance, 0, width-mDistance, height, TQt::CopyROP); + bitBlt(&mView, width-mDistance, 0, &cycle, 0,0, mDistance, height, TQt::CopyROP); - // apply the newly created mask + // apply the newly created tqmask mView.setMask(newMask); - repaint(); + tqrepaint(); } bool KJFilename::mousePress(const TQPoint &) @@ -142,7 +142,7 @@ void KJFilename::readConfig() mDistance = 1; mTimerUpdates = KJLoader::kjofol->prefs()->titleMovingUpdates(); textFont().recalcSysFont(); - mLastTitle=""; // invalidate title so it gets repainted on next timeUpdate() + mLastTitle=""; // tqinvalidate title so it gets tqrepainted on next timeUpdate() } void KJFilename::prepareString(const TQCString &str) @@ -167,7 +167,7 @@ void KJFilename::timeUpdate(int) mLastTitle = title; TQCString timestring = napp->player()->lengthString().local8Bit(); - timestring = timestring.mid(timestring.find('/')+1); + timestring = timestring.mid(timestring.tqfind('/')+1); prepareString ( title + " (" + timestring + ") "); } @@ -206,7 +206,7 @@ KJTime::KJTime(const TQStringList &l, KJLoader *p) // background under time-display TQPixmap tmp = p->pixmap(p->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); setRect(x,y,xs,ys); @@ -226,13 +226,13 @@ void KJTime::paint(TQPainter *p, const TQRect &) TQPixmap temp ( rect().width(), rect().height() ); // draw background into buffer - bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); - // draw time-display into buffer (that's a pixmap with a mask applied) - bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), Qt::CopyROP); + bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); + // draw time-display into buffer (that's a pixmap with a tqmask applied) + bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), TQt::CopyROP); // and draw it on screen bitBlt(p->device(), rect().topLeft(), &temp, - TQRect(0,0, rect().width(), rect().height()), Qt::CopyROP); + TQRect(0,0, rect().width(), rect().height()), TQt::CopyROP); } bool KJTime::mousePress(const TQPoint &) @@ -255,7 +255,7 @@ void KJTime::readConfig() // kdDebug(66666) << "KJTime::readConfig()" << endl; countDown = napp->displayRemaining(); timeFont().recalcSysFont(); - mLastTime=""; // invalidate time so it gets repainted on next timeUpdate() + mLastTime=""; // tqinvalidate time so it gets tqrepainted on next timeUpdate() } TQString KJTime::lengthString ( void ) @@ -325,7 +325,7 @@ void KJTime::prepareString(const TQCString &str) mLastTime = str; mTime = timeFont().draw(str, rect().width()); - repaint(); + tqrepaint(); // kdDebug(66666) << "END KJTime::prepareString(const TQCString &str)" << endl; } @@ -364,7 +364,7 @@ KJVolumeText::KJVolumeText(const TQStringList &l, KJLoader *p) // background under volumetext-display TQPixmap tmp = p->pixmap(p->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); setRect(x,y,xs,ys); @@ -381,13 +381,13 @@ void KJVolumeText::paint(TQPainter *p, const TQRect &) TQPixmap temp ( rect().width(), rect().height() ); // draw background into buffer - bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); + bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); // draw time-display into buffer - bitBlt( &temp, 0, 0, &mVolume, 0, 0, rect().width(), rect().height(), Qt::CopyROP); + bitBlt( &temp, 0, 0, &mVolume, 0, 0, rect().width(), rect().height(), TQt::CopyROP); // and draw it on screen bitBlt(p->device(), rect().topLeft(), &temp, - TQRect(0,0,-1,-1), Qt::CopyROP); + TQRect(0,0,-1,-1), TQt::CopyROP); } bool KJVolumeText::mousePress(const TQPoint &) @@ -398,7 +398,7 @@ bool KJVolumeText::mousePress(const TQPoint &) void KJVolumeText::readConfig() { volumeFont().recalcSysFont(); - mLastVolume=""; // invalidate value so it gets repainted on next timeUpdate() + mLastVolume=""; // tqinvalidate value so it gets tqrepainted on next timeUpdate() } void KJVolumeText::timeUpdate(int) @@ -421,7 +421,7 @@ void KJVolumeText::prepareString(const TQCString &str) mLastVolume = str; mVolume = volumeFont().draw(str, rect().width()); - repaint(); + tqrepaint(); } TQString KJVolumeText::tip() @@ -454,7 +454,7 @@ KJPitchText::KJPitchText(const TQStringList &l, KJLoader *p) // background under time-display TQPixmap tmp = p->pixmap(p->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); setRect(x,y,xs,ys); @@ -472,11 +472,11 @@ void KJPitchText::paint(TQPainter *p, const TQRect &) TQPixmap temp ( rect().width(), rect().height() ); // draw background into buffer - bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); + bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); // draw time-display into buffer - bitBlt( &temp, 0, 0, &mSpeed, 0, 0, rect().width(), rect().height(), Qt::CopyROP); + bitBlt( &temp, 0, 0, &mSpeed, 0, 0, rect().width(), rect().height(), TQt::CopyROP); // and draw it on screen - bitBlt(p->device(), rect().topLeft(), &temp, TQRect(0,0,-1,-1), Qt::CopyROP); + bitBlt(p->device(), rect().topLeft(), &temp, TQRect(0,0,-1,-1), TQt::CopyROP); } bool KJPitchText::mousePress(const TQPoint &) @@ -501,7 +501,7 @@ void KJPitchText::mouseRelease(const TQPoint &, bool in) void KJPitchText::readConfig() { pitchFont().recalcSysFont(); - mLastPitch=""; // invalidate value so it gets repainted on next timeUpdate() + mLastPitch=""; // tqinvalidate value so it gets tqrepainted on next timeUpdate() } void KJPitchText::timeUpdate(int) @@ -529,7 +529,7 @@ void KJPitchText::prepareString(const TQCString &str) mLastPitch = str; mSpeed = pitchFont().draw(str, rect().width()); - repaint(); + tqrepaint(); } TQString KJPitchText::tip() @@ -566,7 +566,7 @@ KJFileInfo::KJFileInfo(const TQStringList &l, KJLoader *p) // background under info-display TQPixmap tmp = p->pixmap(p->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); setRect(x,y,xs,ys); @@ -583,13 +583,13 @@ void KJFileInfo::paint(TQPainter *p, const TQRect &) TQPixmap temp ( rect().width(), rect().height() ); // draw background into buffer - bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); - // draw time-display into buffer (that's a pixmap with a mask applied) - bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), Qt::CopyROP); + bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); + // draw time-display into buffer (that's a pixmap with a tqmask applied) + bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), TQt::CopyROP); // and draw it on screen bitBlt(p->device(), rect().topLeft(), &temp, - TQRect(0,0, rect().width(), rect().height()), Qt::CopyROP); + TQRect(0,0, rect().width(), rect().height()), TQt::CopyROP); } bool KJFileInfo::mousePress(const TQPoint &) @@ -600,7 +600,7 @@ bool KJFileInfo::mousePress(const TQPoint &) void KJFileInfo::readConfig() { textFont().recalcSysFont(); - mLastTime=""; // invalidate value so it gets repainted on next timeUpdate() + mLastTime=""; // tqinvalidate value so it gets tqrepainted on next timeUpdate() } void KJFileInfo::timeUpdate(int) @@ -634,7 +634,7 @@ void KJFileInfo::prepareString(const TQCString &str) return; mLastTime = str; mTime = textFont().draw(str, rect().width()); - repaint(); + tqrepaint(); } TQString KJFileInfo::tip() diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.h b/noatun/modules/kjofol-skin/kjtextdisplay.h index 893efac0..0a5caa0a 100644 --- a/noatun/modules/kjofol-skin/kjtextdisplay.h +++ b/noatun/modules/kjofol-skin/kjtextdisplay.h @@ -12,8 +12,9 @@ class KPixmap; class KJFilename : public TQObject, public KJWidget { Q_OBJECT + TQ_OBJECT public: - KJFilename(const TQStringList &, KJLoader *parent); + KJFilename(const TQStringList &, KJLoader *tqparent); ~KJFilename(); virtual void paint(TQPainter *, const TQRect &rect); @@ -42,7 +43,7 @@ private: class KJTime : public KJWidget { public: - KJTime(const TQStringList &, KJLoader *parent); + KJTime(const TQStringList &, KJLoader *tqparent); ~KJTime(); virtual void paint(TQPainter *, const TQRect &rect); @@ -72,7 +73,7 @@ private: class KJVolumeText : public KJWidget { public: - KJVolumeText(const TQStringList &, KJLoader *parent); + KJVolumeText(const TQStringList &, KJLoader *tqparent); ~KJVolumeText(); virtual void paint(TQPainter *, const TQRect &rect); @@ -94,7 +95,7 @@ private: class KJPitchText : public KJWidget { public: - KJPitchText(const TQStringList &, KJLoader *parent); + KJPitchText(const TQStringList &, KJLoader *tqparent); ~KJPitchText(); virtual void paint(TQPainter *, const TQRect &rect); @@ -117,7 +118,7 @@ private: class KJFileInfo : public KJWidget { public: - KJFileInfo(const TQStringList &, KJLoader *parent); + KJFileInfo(const TQStringList &, KJLoader *tqparent); ~KJFileInfo(); virtual void paint(TQPainter *, const TQRect &rect); diff --git a/noatun/modules/kjofol-skin/kjvis.cpp b/noatun/modules/kjofol-skin/kjvis.cpp index 3bd40f00..8915e434 100644 --- a/noatun/modules/kjofol-skin/kjvis.cpp +++ b/noatun/modules/kjofol-skin/kjvis.cpp @@ -35,8 +35,8 @@ void KJVisScope::swapScope(Visuals newOne) { //kdDebug(66666) << k_funcinfo << endl; - TQStringList line = parent()->item("analyzerwindow"); - KJLoader *p=parent(); + TQStringList line = tqparent()->item("analyzerwindow"); + KJLoader *p=tqparent(); p->removeChild(this); delete this; @@ -66,8 +66,8 @@ void KJVisScope::swapScope(Visuals newOne) * KJNullScope *******************************************/ -KJNullScope::KJNullScope(const TQStringList &l, KJLoader *parent) - : KJVisScope(parent) +KJNullScope::KJNullScope(const TQStringList &l, KJLoader *tqparent) + : KJVisScope(tqparent) { int x = l[1].toInt(); int y = l[2].toInt(); @@ -75,17 +75,17 @@ KJNullScope::KJNullScope(const TQStringList &l, KJLoader *parent) int ys = l[4].toInt() - y; // background under vis - TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]); + TQPixmap tmp = tqparent->pixmap(tqparent->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); setRect ( x, y, xs, ys ); - repaint(); + tqrepaint(); } void KJNullScope::paint(TQPainter *p, const TQRect &) { // just redraw the background - bitBlt ( p->device(), rect().topLeft(), mBack, TQRect(0,0,-1,-1), Qt::CopyROP ); + bitBlt ( p->device(), rect().topLeft(), mBack, TQRect(0,0,-1,-1), TQt::CopyROP ); } bool KJNullScope::mousePress(const TQPoint &) @@ -98,7 +98,7 @@ void KJNullScope::mouseRelease(const TQPoint &, bool in) if (!in) // only do something if users is still inside the button return; - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); swapScope(FFT); } @@ -108,7 +108,7 @@ void KJNullScope::readConfig() Visuals v = (Visuals) KJLoader::kjofol->prefs()->visType(); if ( v != Null ) { - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); swapScope ( v ); } } @@ -118,8 +118,8 @@ void KJNullScope::readConfig() * KJFFT - Analyzer like visualization, mono *************************************************/ -KJFFT::KJFFT(const TQStringList &l, KJLoader *parent) - : KJVisScope(parent), MonoFFTScope(50), mGradient(0) +KJFFT::KJFFT(const TQStringList &l, KJLoader *tqparent) + : KJVisScope(tqparent), MonoFFTScope(50), mGradient(0) { int x = l[1].toInt(); int y = l[2].toInt(); @@ -129,7 +129,7 @@ KJFFT::KJFFT(const TQStringList &l, KJLoader *parent) // each bar will be 1px wide mMultiples=1; - if ( parent->exist("analyzercolor") ) + if ( tqparent->exist("analyzercolor") ) { TQStringList &col = parser()["analyzercolor"]; mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() ); @@ -140,12 +140,12 @@ KJFFT::KJFFT(const TQStringList &l, KJLoader *parent) } // background under vis - TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]); + TQPixmap tmp = tqparent->pixmap(tqparent->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); mAnalyzer = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mAnalyzer, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mAnalyzer, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); // create a gradient for the bars going from 30% lighter to 30% darker than mColor mGradient = new KPixmap ( TQSize(xs,ys) ); @@ -163,7 +163,7 @@ void KJFFT::scopeEvent(float *d, int size) if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped) { if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); return; } @@ -171,12 +171,12 @@ void KJFFT::scopeEvent(float *d, int size) int h = rect().height(); TQBitmap mGradientMask ( rect().width(), h, true ); - TQPainter mask( &mGradientMask ); + TQPainter tqmask( &mGradientMask ); float *start = d ; float *end = d + size /*- 1*/; - // loop creating the mask for vis-gradient + // loop creating the tqmask for vis-gradient for ( ; start < end; ++start ) { // 5 has been 8 before and I have no idea how this scaling works :/ @@ -191,26 +191,26 @@ void KJFFT::scopeEvent(float *d, int size) else if ( amp > h ) amp = h; // make a part of the analyzer-gradient visible - mask.fillRect ( x, (h-amp), mMultiples, amp, Qt::color1 ); + tqmask.fillRect ( x, (h-amp), mMultiples, amp, TQt::color1 ); x += mMultiples; } - // done creating our mask + // done creating our tqmask // draw background of vis into it - bitBlt ( mAnalyzer, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); + bitBlt ( mAnalyzer, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); // draw the analyzer mGradient->setMask(mGradientMask); - bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, Qt::CopyROP ); + bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, TQt::CopyROP ); - repaint(); + tqrepaint(); } void KJFFT::paint(TQPainter *p, const TQRect &) { // put that thing on screen if ( !napp->player()->isStopped() ) - bitBlt ( p->device(), rect().topLeft(), mAnalyzer, TQRect(0,0,-1,-1), Qt::CopyROP ); + bitBlt ( p->device(), rect().topLeft(), mAnalyzer, TQRect(0,0,-1,-1), TQt::CopyROP ); } @@ -225,7 +225,7 @@ void KJFFT::mouseRelease(const TQPoint &, bool in) return; stop(); - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); swapScope(Mono); } @@ -236,7 +236,7 @@ void KJFFT::readConfig() if ( v != FFT ) { stop(); - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); swapScope ( v ); return; } @@ -250,8 +250,8 @@ void KJFFT::readConfig() * KJStereoFFT - Analyzer like visualization, stereo *************************************************/ -KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *parent) - : KJVisScope(parent), StereoFFTScope(50), mGradient(0) +KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *tqparent) + : KJVisScope(tqparent), StereoFFTScope(50), mGradient(0) { //kdDebug(66666) << k_funcinfo << endl; @@ -263,7 +263,7 @@ KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *parent) // each bar will be 1px wide mMultiples=1; - if ( parent->exist("analyzercolor") ) + if ( tqparent->exist("analyzercolor") ) { TQStringList &col = parser()["analyzercolor"]; mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() ); @@ -274,12 +274,12 @@ KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *parent) } // background under vis - TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]); + TQPixmap tmp = tqparent->pixmap(tqparent->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); mAnalyzer = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mAnalyzer, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mAnalyzer, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); // create a gradient for the bars going from 30% lighter to 30% darker than mColor mGradient = new KPixmap ( TQSize(xs,ys) ); @@ -297,7 +297,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len) if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped) { if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); return; } @@ -305,7 +305,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len) int hh = (int)(rect().height()/2); TQBitmap mGradientMask ( rect().width(), h, true ); - TQPainter mask( &mGradientMask ); + TQPainter tqmask( &mGradientMask ); float *start = left; float *end = left + len; @@ -313,7 +313,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len) int amp = 0; int x = 0; - // loop creating the mask for vis-gradient + // loop creating the tqmask for vis-gradient for ( ; start < end; ++start ) { n = log((*start)+1) * (float)hh * 5; @@ -324,16 +324,16 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len) else if ( amp > hh ) amp = hh; // make a part of the analyzer-gradient visible - mask.fillRect ( x, (h-amp), mMultiples, amp, Qt::color1 ); + tqmask.fillRect ( x, (h-amp), mMultiples, amp, TQt::color1 ); x += mMultiples; } - // done creating our mask + // done creating our tqmask start = right; end = right + len; x = 0; - // loop creating the mask for vis-gradient + // loop creating the tqmask for vis-gradient for ( ; start < end; ++start ) { n = log((*start)+1) * (float)hh * 5; @@ -344,26 +344,26 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len) else if ( amp > hh ) amp = hh; // make a part of the analyzer-gradient visible - mask.fillRect ( x, 0, mMultiples, amp, Qt::color1 ); + tqmask.fillRect ( x, 0, mMultiples, amp, TQt::color1 ); x += mMultiples; } // draw background of vis into it - bitBlt ( mAnalyzer, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); + bitBlt ( mAnalyzer, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); // draw the analyzer mGradient->setMask(mGradientMask); - bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, Qt::CopyROP ); + bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, TQt::CopyROP ); - repaint(); + tqrepaint(); } void KJStereoFFT::paint(TQPainter *p, const TQRect &) { // put that thing on screen if ( !napp->player()->isStopped() ) - bitBlt ( p->device(), rect().topLeft(), mAnalyzer, TQRect(0,0,-1,-1), Qt::CopyROP ); + bitBlt ( p->device(), rect().topLeft(), mAnalyzer, TQRect(0,0,-1,-1), TQt::CopyROP ); } bool KJStereoFFT::mousePress(const TQPoint &) @@ -376,7 +376,7 @@ void KJStereoFFT::mouseRelease(const TQPoint &, bool in) if (!in) // only do something if users is still inside the button return; stop(); - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); swapScope(Null); } @@ -387,7 +387,7 @@ void KJStereoFFT::readConfig() if ( v != StereoFFT ) { stop(); - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); swapScope ( v ); return; } @@ -399,8 +399,8 @@ void KJStereoFFT::readConfig() * KJScope - oscilloscope like visualization *************************************************/ -KJScope::KJScope(const TQStringList &l, KJLoader *parent) - : KJVisScope(parent), MonoScope(50)/*, blurnum(0), mOsci(0)*/ +KJScope::KJScope(const TQStringList &l, KJLoader *tqparent) + : KJVisScope(tqparent), MonoScope(50)/*, blurnum(0), mOsci(0)*/ { int x=l[1].toInt(); int y=l[2].toInt(); @@ -411,7 +411,7 @@ KJScope::KJScope(const TQStringList &l, KJLoader *parent) // kdDebug(66666) << "Analyzer Window " << x << "," << y << " " << mWidth << "," << mHeight << endl; - if ( parent->exist("analyzercolor") ) + if ( tqparent->exist("analyzercolor") ) { TQStringList &col = parser()["analyzercolor"]; mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() ); @@ -420,12 +420,12 @@ KJScope::KJScope(const TQStringList &l, KJLoader *parent) mColor.setRgb ( 255, 255, 255 ); // background under vis - TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]); + TQPixmap tmp = tqparent->pixmap(tqparent->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); mOsci = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mOsci, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mOsci, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); // create a gradient mGradient = new KPixmap ( TQSize(xs,ys) ); @@ -447,8 +447,8 @@ void KJScope::scopeEvent(float *d, int size) { if ( napp->player()->isStopped() ) { - bitBlt ( mOsci, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); - repaint(); + bitBlt ( mOsci, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); + tqrepaint(); } return; } @@ -463,7 +463,7 @@ void KJScope::scopeEvent(float *d, int size) if ( blurnum == 3 ) { // clear whole Vis - bitBlt ( mOsci, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); + bitBlt ( mOsci, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); tempP.setPen( mColor.light(110) ); // 10% lighter than mColor blurnum=0; } @@ -487,23 +487,23 @@ void KJScope::scopeEvent(float *d, int size) // tempP.drawLine(x, heightHalf, x, heightHalf+amp); if ( amp > 0 ) { - bitBlt ( tempP.device(), TQPoint(x,heightHalf), mGradient, TQRect(x,heightHalf,1,amp), Qt::CopyROP ); + bitBlt ( tempP.device(), TQPoint(x,heightHalf), mGradient, TQRect(x,heightHalf,1,amp), TQt::CopyROP ); } else { amp = -amp; - bitBlt ( tempP.device(), TQPoint(x,heightHalf-amp), mGradient, TQRect(x,(heightHalf-amp),1,amp), Qt::CopyROP ); + bitBlt ( tempP.device(), TQPoint(x,heightHalf-amp), mGradient, TQRect(x,(heightHalf-amp),1,amp), TQt::CopyROP ); } x++; } - repaint(); + tqrepaint(); } void KJScope::paint(TQPainter *p, const TQRect &) { // put that thing on screen - bitBlt ( p->device(), rect().topLeft(), mOsci, TQRect(0,0,-1,-1), Qt::CopyROP ); + bitBlt ( p->device(), rect().topLeft(), mOsci, TQRect(0,0,-1,-1), TQt::CopyROP ); } bool KJScope::mousePress(const TQPoint &) @@ -517,7 +517,7 @@ void KJScope::mouseRelease(const TQPoint &, bool in) return; stop(); - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); swapScope(/*Null*/ StereoFFT); } @@ -528,7 +528,7 @@ void KJScope::readConfig() if ( v != Mono ) { stop(); - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); swapScope ( v ); return; } diff --git a/noatun/modules/kjofol-skin/kjvis.h b/noatun/modules/kjofol-skin/kjvis.h index a05103d8..9f8bec4d 100644 --- a/noatun/modules/kjofol-skin/kjvis.h +++ b/noatun/modules/kjofol-skin/kjvis.h @@ -8,7 +8,7 @@ class KPixmap; class KJVisScope : public KJWidget { public: - KJVisScope(KJLoader *parent) : KJWidget(parent) {}; + KJVisScope(KJLoader *tqparent) : KJWidget(tqparent) {}; enum Visuals { Null=0, FFT, Mono, StereoFFT }; void swapScope(Visuals newOne); // virtual void readConfig(); @@ -19,7 +19,7 @@ public: class KJNullScope : public KJVisScope { public: - KJNullScope(const TQStringList &, KJLoader *parent); + KJNullScope(const TQStringList &, KJLoader *tqparent); virtual void paint(TQPainter *p, const TQRect &); virtual bool mousePress(const TQPoint&); virtual void mouseRelease(const TQPoint &, bool in); @@ -35,7 +35,7 @@ private: class KJFFT : public KJVisScope, public MonoFFTScope { public: - KJFFT(const TQStringList &, KJLoader *parent); + KJFFT(const TQStringList &, KJLoader *tqparent); virtual void paint(TQPainter *p, const TQRect &); virtual void scopeEvent(float *d, int size); @@ -57,7 +57,7 @@ private: class KJStereoFFT : public KJVisScope, public StereoFFTScope { public: - KJStereoFFT(const TQStringList &, KJLoader *parent); + KJStereoFFT(const TQStringList &, KJLoader *tqparent); virtual void paint(TQPainter *p, const TQRect &); virtual void scopeEvent(float *left, float *right, int len); @@ -79,7 +79,7 @@ private: class KJScope : public KJVisScope, public MonoScope { public: - KJScope ( const TQStringList &, KJLoader *parent); + KJScope ( const TQStringList &, KJLoader *tqparent); virtual void paint(TQPainter *p, const TQRect &); virtual void scopeEvent(float *d, int size); diff --git a/noatun/modules/kjofol-skin/kjwidget.cpp b/noatun/modules/kjofol-skin/kjwidget.cpp index b46fb651..d292637a 100644 --- a/noatun/modules/kjofol-skin/kjwidget.cpp +++ b/noatun/modules/kjofol-skin/kjwidget.cpp @@ -18,16 +18,11 @@ KJWidget::KJWidget(KJLoader *p) : mParent(p) { } -TQBitmap KJWidget::getMask(const TQImage &_rect, register QRgb transparent) +TQBitmap KJWidget::getMask(const TQImage &_rect, register TQRgb transparent) { TQImage result(_rect.width(), _rect.height(), 1,2, TQImage::LittleEndian); -#if QT_VERSION < 0x030300 - result.setColor(0, qRgb(0,0,0)); //TODO: maybe use Qt::color0 and Qt::color1 - result.setColor(1, qRgb(255,255,255)); -#else - result.setColor(1, qRgb(0,0,0)); - result.setColor(0, qRgb(255,255,255)); -#endif + result.setColor(1, tqRgb(0,0,0)); + result.setColor(0, tqRgb(255,255,255)); for(int height=0;height<_rect.height(); height++) { @@ -39,21 +34,21 @@ TQBitmap KJWidget::getMask(const TQImage &_rect, register QRgb transparent) return bm; } -void KJWidget::repaint(bool me, const TQRect &r, bool clear) +void KJWidget::tqrepaint(bool me, const TQRect &r, bool clear) { - TQPainter p(parent()); + TQPainter p(tqparent()); if (me) paint(&p, r.isValid() ? r : rect()); else - parent()->repaint(r.isValid() ? r : rect(), clear); + tqparent()->tqrepaint(r.isValid() ? r : rect(), clear); } const TQString &KJWidget::backgroundPressed(const TQString &bmp) const { if(bmp.isEmpty()) // play safe { -// kdDebug(66666) << k_funcinfo << "empty argument 'bmp', returning TQString::null!" << endl; - return TQString::null; +// kdDebug(66666) << k_funcinfo << "empty argument 'bmp', returning TQString()!" << endl; + return TQString(); } // kdDebug(66666) << k_funcinfo << "Returning pressed pixmap for '" << bmp.latin1() << "'" << endl; @@ -63,7 +58,7 @@ const TQString &KJWidget::backgroundPressed(const TQString &bmp) const if(item.count() < 2) { // kdDebug(66666) << k_funcinfo << "backgroundimagepressed doesn't have enough keys in its line!" << endl; - return TQString::null; + return TQString(); } else return item[1]; diff --git a/noatun/modules/kjofol-skin/kjwidget.h b/noatun/modules/kjofol-skin/kjwidget.h index 3f63671b..693d4eaa 100644 --- a/noatun/modules/kjofol-skin/kjwidget.h +++ b/noatun/modules/kjofol-skin/kjwidget.h @@ -25,17 +25,17 @@ public: virtual void readConfig() {} // called when the mouse is moved while clicked in this widget - // repaint myself - virtual void repaint(bool me=true, const TQRect &rect=TQRect(), bool clear=false); + // tqrepaint myself + virtual void tqrepaint(bool me=true, const TQRect &rect=TQRect(), bool clear=false); virtual TQString tip() { return 0; } public: - static TQBitmap getMask(const TQImage &color, register QRgb=qRgb(255,0,255)); + static TQBitmap getMask(const TQImage &color, register TQRgb=tqRgb(255,0,255)); protected: const TQString &backgroundPressed(const TQString &bmp) const; - KJLoader *parent() const {return mParent;} + KJLoader *tqparent() const {return mParent;} KJLoader &parser() const {return *mParent;} KJFont &textFont() const {return *mParent->mText;} diff --git a/noatun/modules/kjofol-skin/parser.cpp b/noatun/modules/kjofol-skin/parser.cpp index aae5b12e..7b6be03a 100644 --- a/noatun/modules/kjofol-skin/parser.cpp +++ b/noatun/modules/kjofol-skin/parser.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - parser.cpp - Reads *.rc files in kjöfol-config-format into a QDict + parser.cpp - Reads *.rc files in kjöfol-config-format into a TQDict -------------------------------------- Maintainer: Stefan Gehn <sgehn@gmx.net> @@ -82,7 +82,7 @@ Parser::ImagePixmap* Parser::getPair(const TQString &filenameOld) const // is it in there? ImagePixmap *pair; { - pair=mImageCache.find(filenameOld); + pair=mImageCache.tqfind(filenameOld); if (pair) return pair; } @@ -128,5 +128,5 @@ Parser::ImagePixmap* Parser::getPair(const TQString &filenameOld) const bool Parser::exist(const TQString &i) const { - return (bool)find(i); + return (bool)tqfind(i); } diff --git a/noatun/modules/kjofol-skin/parser.h b/noatun/modules/kjofol-skin/parser.h index 3f691253..5c838726 100644 --- a/noatun/modules/kjofol-skin/parser.h +++ b/noatun/modules/kjofol-skin/parser.h @@ -36,7 +36,7 @@ class Parser : public TQDict<TQStringList> bool exist(const TQString &i) const; public: - TQStringList& operator[](const TQString &l) { return *find(l);} + TQStringList& operator[](const TQString &l) { return *tqfind(l);} private: ImagePixmap *getPair(const TQString &i) const; diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp index 15a298c3..0a55e8c8 100644 --- a/noatun/modules/marquis/marquis.cpp +++ b/noatun/modules/marquis/marquis.cpp @@ -37,7 +37,7 @@ #include <noatun/engine.h> #include <kaction.h> -static int getPlayStatus( Player *player ) +static int getPlaytqStatus( Player *player ) { if ( player->isPlaying() ) return 1; @@ -46,7 +46,7 @@ static int getPlayStatus( Player *player ) return 0; } -static void setPlayStatus( Player *player, int status ) +static void setPlaytqStatus( Player *player, int status ) { switch( status ) { @@ -107,14 +107,14 @@ void Marquis::saveSessionConfig(KConfig *c) if ( !player->current().isNull() ) { KURL songURL = player->current().url(); - songURL.setPass( TQString::null ); // don't save passwords + songURL.setPass( TQString() ); // don't save passwords c->writePathEntry("Current Song", songURL.url()); } else - c->writePathEntry("Current Song", TQString::null); + c->writePathEntry("Current Song", TQString()); c->writeEntry("Current Position", player->getTime()); - c->writeEntry("PlayStatus", getPlayStatus( player )); + c->writeEntry("PlaytqStatus", getPlaytqStatus( player )); // borrowed from Plugin config dialog TQStringList specList; @@ -122,7 +122,7 @@ void Marquis::saveSessionConfig(KConfig *c) TQValueList<NoatunLibraryInfo> loaded = napp->libraryLoader()->loaded(); for( TQValueList<NoatunLibraryInfo>::Iterator i = loaded.begin(); i != loaded.end(); ++i) { - if(!specList.contains((*i).specfile) + if(!specList.tqcontains((*i).specfile) && napp->libraryLoader()->isLoaded((*i).specfile) && (*i).specfile != "marquis.plugin") { @@ -139,7 +139,7 @@ void Marquis::readSessionConfig(KConfig *c) { Player *player = napp->player(); - c->setGroup(TQString::null); + c->setGroup(TQString()); // First set volume, then load modules, some module could start // playback and that would be with 100% volume! diff --git a/noatun/modules/marquis/marquis.h b/noatun/modules/marquis/marquis.h index 5b166d57..e1d91f7d 100644 --- a/noatun/modules/marquis/marquis.h +++ b/noatun/modules/marquis/marquis.h @@ -23,8 +23,8 @@ // used in advertising or otherwise to promote the sale, use or other dealings // in this Software without prior written authorization from the author(s). -#ifndef MARQUIS_H -#define MARQUIS_H +#ifndef MARTQUIS_H +#define MARTQUIS_H #include <noatun/plugin.h> #include <noatun/app.h> @@ -35,6 +35,7 @@ class Player; class Marquis : public KMainWindow, public SessionManagement { Q_OBJECT + TQ_OBJECT NOATUNPLUGIND public: Marquis(); diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp index 83c53c1f..dd4390db 100644 --- a/noatun/modules/metatag/edit.cpp +++ b/noatun/modules/metatag/edit.cpp @@ -37,9 +37,9 @@ Editor::Editor() TQHBox *heading = new TQHBox(mMainWidget, "Editor::heading"); heading->setSpacing(4); mFileIcon = new TQLabel(heading); - mFileIcon->setAlignment(AlignVCenter | AlignLeft); + mFileIcon->tqsetAlignment(AlignVCenter | AlignLeft); mFile = new TQLabel(heading); - mFile->setAlignment(AlignVCenter | AlignLeft); + mFile->tqsetAlignment(AlignVCenter | AlignLeft); heading->setStretchFactor(mFile, 2); mGrid->addMultiCellWidget(heading, 0, 0, 0, 2); @@ -53,7 +53,7 @@ Editor::Editor() connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(save())); enableButtonSeparator(true); - setFixedHeight(sizeHint().height()); + setFixedHeight(tqsizeHint().height()); } void Editor::open(const PlaylistItem & file) @@ -158,7 +158,7 @@ void Editor::saveControl(KFileMetaInfo& meta_info, const MetaWidget &meta_widget kdWarning() << "Cannot save " << meta_widget.key << " as required type." << endl; } -MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *parent) { +MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *tqparent) { TQLabel *tmp_label = 0L; KFileMetaInfoItem info_item = meta_info.item(key); TQVariant::Type type; @@ -182,7 +182,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe // Get the correct validator if ( info && !groupName.isNull() ) - validator = info->createValidator( groupName, key, parent ); + validator = info->createValidator( groupName, key, TQT_TQOBJECT(tqparent) ); // meta_widget is used for book-keeping internally meta_widget = new MetaWidget; @@ -190,7 +190,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe if ((type == TQVariant::Int) || (type == TQVariant::UInt)) { // We're an int, make a spin box - TQSpinBox *box = new TQSpinBox(parent); + TQSpinBox *box = new TQSpinBox(tqparent); // Well, normally metatag doesn't care that much about suffixes // and prefixes, but this is just too easy. @@ -226,7 +226,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe combo_box = validator->isA("KStringListValidator"); if (combo_box) { - TQComboBox *combo = new TQComboBox(parent); + TQComboBox *combo = new TQComboBox(tqparent); combo->clear(); combo->insertStringList(static_cast< @@ -241,7 +241,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe else { KLineEdit *edit; - edit = new KLineEdit(parent); + edit = new KLineEdit(tqparent); edit->setText(info_item.value().toString()); edit->setValidator(validator); connect(edit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(modified())); @@ -258,7 +258,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe mGrid->addMultiCellWidget(meta_widget->widget, mNextRow, mNextRow, 1, 2); // Add our label. This is the easy part - tmp_label = new TQLabel(meta_widget->widget, label + ":", parent); + tmp_label = new TQLabel(meta_widget->widget, label + ":", tqparent); mGrid->addWidget(tmp_label, mNextRow, 0); @@ -277,7 +277,7 @@ TQString Editor::keyGroup(const KFileMetaInfo& i, TQString key) { } } - return TQString::null; + return TQString(); } bool Editor::keyAddable(const KFileMetaInfo &i, TQString key) { diff --git a/noatun/modules/metatag/edit.h b/noatun/modules/metatag/edit.h index e2d53f89..f0e94778 100644 --- a/noatun/modules/metatag/edit.h +++ b/noatun/modules/metatag/edit.h @@ -17,6 +17,7 @@ struct MetaWidget { class Editor:public KDialogBase { Q_OBJECT + TQ_OBJECT public: Editor(); @@ -35,7 +36,7 @@ class Editor:public KDialogBase { TQString keyGroup(const KFileMetaInfo &, TQString); void saveControl(KFileMetaInfo& meta_info, const MetaWidget&); - MetaWidget *createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *parent); + MetaWidget *createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *tqparent); TQPtrList<MetaWidget> mControls; diff --git a/noatun/modules/metatag/metatag.h b/noatun/modules/metatag/metatag.h index 4559edaf..05dbd5b5 100644 --- a/noatun/modules/metatag/metatag.h +++ b/noatun/modules/metatag/metatag.h @@ -13,6 +13,7 @@ class KAction; class MetaTagLoader:public TQObject, public Tags, public Plugin { Q_OBJECT + TQ_OBJECT public: MetaTagLoader(); ~MetaTagLoader(); diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp index 758d3950..1fa07fdd 100644 --- a/noatun/modules/monoscope/monoscope.cpp +++ b/noatun/modules/monoscope/monoscope.cpp @@ -20,14 +20,14 @@ Monoscope::Monoscope() : TQWidget(0,0,WRepaintNoErase), MonoScope(30), Plugin() NOATUNPLUGINC(Monoscope); mAction=0L; - mLowColor=qRgb(0,0,0); - mHighColor=qRgb(238,238,238); + mLowColor=tqRgb(0,0,0); + mHighColor=tqRgb(238,238,238); resize(320, 240); MonoScope::start(); setCaption(i18n("Monoscope")); show(); resizeEvent(0); - repaint(0,0, TQWidget::width(), height(), false); + tqrepaint(0,0, TQWidget::width(), height(), false); resizeEvent(0); setBackgroundColor(mLowColor); } @@ -41,7 +41,7 @@ Monoscope::~Monoscope() void Monoscope::init() { mAction = new KToggleAction(i18n("Toggle Monoscope"), 0, 0, - this, TQT_SLOT(toggle()), this, "togglemonoscope"); + TQT_TQOBJECT(this), TQT_SLOT(toggle()), TQT_TQOBJECT(this), "togglemonoscope"); mAction->setChecked(!isHidden()); napp->pluginActionMenu()->insert(mAction); } @@ -83,7 +83,7 @@ void Monoscope::scopeEvent(float *d, int size) buffer.fill(mLowColor); TQPainter p(&buffer); p.setPen(mHighColor); - repaint(rect()); + tqrepaint(rect()); if (line) p.moveTo(0, y); @@ -105,7 +105,7 @@ void Monoscope::scopeEvent(float *d, int size) } if (line) p.drawLine(0, y, size, y); - bitBlt(this, 0, 0, &buffer, 0, 0, viewWidth, viewHeight, Qt::CopyROP); + bitBlt(this, 0, 0, &buffer, 0, 0, viewWidth, viewHeight, TQt::CopyROP); } #include "monoscope.moc" diff --git a/noatun/modules/monoscope/monoscope.h b/noatun/modules/monoscope/monoscope.h index 0f9ddcff..59ae7500 100644 --- a/noatun/modules/monoscope/monoscope.h +++ b/noatun/modules/monoscope/monoscope.h @@ -8,6 +8,7 @@ class KToggleAction; class Monoscope : public TQWidget, public MonoScope, public Plugin { Q_OBJECT + TQ_OBJECT NOATUNPLUGIND public: @@ -26,7 +27,7 @@ protected: virtual void resizeEvent(TQResizeEvent *); private: - QRgb mHighColor, mLowColor; + TQRgb mHighColor, mLowColor; KToggleAction *mAction; }; diff --git a/noatun/modules/net/net.h b/noatun/modules/net/net.h index 41c07438..5e6c509d 100644 --- a/noatun/modules/net/net.h +++ b/noatun/modules/net/net.h @@ -10,6 +10,7 @@ class Net : public TQServerSocket, public Plugin { Q_OBJECT + TQ_OBJECT public: Net(); diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp index 0302efe6..3afd3698 100644 --- a/noatun/modules/noatunui/userinterface.cpp +++ b/noatun/modules/noatunui/userinterface.cpp @@ -80,9 +80,9 @@ MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface() } - mVolume=new L33tSlider(0,100,10,0, Horizontal, this); + mVolume=new L33tSlider(0,100,10,0,Qt::Horizontal, this); mVolume->setValue(napp->player()->volume()); - mSeeker=new L33tSlider(0,1000,10,0, Horizontal, this); + mSeeker=new L33tSlider(0,1000,10,0,Qt::Horizontal, this); mStatusBar=new KStatusBar(this); @@ -92,7 +92,7 @@ MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface() l->addWidget(mStop,0,1); l->addWidget(mPlay,0,2); l->addWidget(mForward,0,3); - l->addWidget(mPlaylist,0,4, Qt::AlignLeft); + l->addWidget(mPlaylist,0,4, TQt::AlignLeft); l->addWidget(mLoop,0,5); l->addWidget(mPopup,0,6); l->addColSpacing(4, buttonSize+8); @@ -132,7 +132,7 @@ MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface() connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden())); // Event Filter for the RMB - for (TQPtrListIterator<TQObject> i(*children()); i.current(); ++i) + for (TQPtrListIterator<TQObject> i(childrenListObject()); i.current(); ++i) (*i)->installEventFilter(this); setCaption("Noatun"); @@ -140,7 +140,7 @@ MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface() show(); // What it is now, stay, stay.. roll over, good boy! - setFixedSize(minimumSize()); + setFixedSize(tqminimumSize()); } MilkChocolate::~MilkChocolate() @@ -179,7 +179,7 @@ void MilkChocolate::dropEvent(TQDropEvent *event) void MilkChocolate::mouseReleaseEvent(TQMouseEvent *e) { TQWidget::mouseReleaseEvent(e); - if (e->button()!=RightButton) return; + if (e->button()!=Qt::RightButton) return; NoatunStdAction::ContextMenu::showContextMenu(); } @@ -199,13 +199,13 @@ void MilkChocolate::changeCaption(const TQString& text) void MilkChocolate::popup() { NoatunStdAction::ContextMenu::showContextMenu( - mapToGlobal(mPopup->geometry().bottomLeft()) + mapToGlobal(mPopup->tqgeometry().bottomLeft()) ); } void MilkChocolate::slotPlaying() { -// connect(kwinmodule, TQT_SIGNAL(windowAdded(WId)), view, TQT_SLOT(attemptReparent(WId))); +// connect(kwinmodule, TQT_SIGNAL(windowAdded(WId)), view, TQT_SLOT(attemptRetqparent(WId))); changeStatusbar(napp->player()->current().title(), napp->player()->lengthString()); mPlay->setOn(true); mStop->setEnabled(true); @@ -281,15 +281,15 @@ void MilkChocolate::changeLoopType(int t) bool MilkChocolate::eventFilter(TQObject *o, TQEvent *e) { if ((e->type() == TQEvent::MouseButtonRelease) - && ((static_cast<TQMouseEvent*>(e))->button()==RightButton)) + && ((TQT_TQMOUSEEVENT(e))->button()==Qt::RightButton)) { - mouseReleaseEvent(static_cast<TQMouseEvent*>(e)); + mouseReleaseEvent(TQT_TQMOUSEEVENT(e)); return true; } if (e->type() == TQEvent::Wheel) { - wheelEvent(static_cast<TQWheelEvent*>(e)); + wheelEvent(TQT_TQWHEELEVENT(e)); return true; } return TQWidget::eventFilter(o, e); diff --git a/noatun/modules/noatunui/userinterface.h b/noatun/modules/noatunui/userinterface.h index d20b2536..77bf2222 100644 --- a/noatun/modules/noatunui/userinterface.h +++ b/noatun/modules/noatunui/userinterface.h @@ -24,6 +24,7 @@ class KStatusBar; class MilkChocolate : public TQWidget, public UserInterface { Q_OBJECT + TQ_OBJECT public: MilkChocolate(); virtual ~MilkChocolate(); diff --git a/noatun/modules/simple/propertiesdialog.ui b/noatun/modules/simple/propertiesdialog.ui index 08f4f71c..875baa10 100644 --- a/noatun/modules/simple/propertiesdialog.ui +++ b/noatun/modules/simple/propertiesdialog.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>PropertiesDialog</class> <author>Ewald Snel</author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>PropertiesDialog</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -26,11 +26,11 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>TabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>details</cstring> </property> @@ -47,11 +47,11 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit" row="0" column="2"> + <widget class="TQLineEdit" row="0" column="2"> <property name="name"> <cstring>nameField</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>180</width> <height>0</height> @@ -78,15 +78,15 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>iconLabel</cstring> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>typeLabel</cstring> </property> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -130,7 +130,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel7_2</cstring> </property> @@ -138,24 +138,24 @@ <string>Type:</string> </property> </widget> - <widget class="QLabel" row="2" column="1" rowspan="4" colspan="1"> + <widget class="TQLabel" row="2" column="1" rowspan="4" colspan="1"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>25</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>25</width> <height>32767</height> </size> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -163,7 +163,7 @@ <string>Length:</string> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>lengthLabel</cstring> </property> @@ -176,7 +176,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -184,7 +184,7 @@ <string>Audio:</string> </property> </widget> - <widget class="QLabel" row="4" column="2"> + <widget class="TQLabel" row="4" column="2"> <property name="name"> <cstring>audioLabel</cstring> </property> @@ -197,7 +197,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>TextLabel7</cstring> </property> @@ -205,7 +205,7 @@ <string>Video:</string> </property> </widget> - <widget class="QLabel" row="5" column="2"> + <widget class="TQLabel" row="5" column="2"> <property name="name"> <cstring>videoLabel</cstring> </property> @@ -220,7 +220,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>playobject</cstring> </property> @@ -237,17 +237,17 @@ <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>TextLabel2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>80</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>80</width> <height>32767</height> @@ -257,12 +257,12 @@ <string>Description:</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>descriptionLabel</cstring> </property> </widget> - <widget class="QListView" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQListView" row="1" column="0" rowspan="1" colspan="2"> <column> <property name="text"> <string>Capabilities</string> @@ -281,7 +281,7 @@ </grid> </widget> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>buttonLayout</cstring> </property> @@ -305,14 +305,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>okButton</cstring> </property> @@ -341,8 +341,8 @@ <include location="global" impldecl="in declaration">kmimetype.h</include> <include location="local" impldecl="in implementation">propertiesdialog.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot specifier="non virtual">setPlayObject( PlaylistItem pi, Arts::PlayObject po )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/noatun/modules/simple/propertiesdialog.ui.h b/noatun/modules/simple/propertiesdialog.ui.h index ef6f14f9..bf106f24 100644 --- a/noatun/modules/simple/propertiesdialog.ui.h +++ b/noatun/modules/simple/propertiesdialog.ui.h @@ -21,14 +21,14 @@ void PropertiesDialog::setPlayObject( PlaylistItem pi, Arts::PlayObject po ) descriptionLabel->setText( po.description().c_str() ); // Determine capabilities - if (!(item = (TQCheckListItem *)capsList->findItem( "capSeek", 0 ))) + if (!(item = (TQCheckListItem *)capsList->tqfindItem( "capSeek", 0 ))) { item = new TQCheckListItem( capsList, "capSeek", TQCheckListItem::CheckBox ); } item->setOn( (ncaps & Arts::capSeek) ); - if (!(item = (TQCheckListItem *)capsList->findItem( "capPause", 0 ))) + if (!(item = (TQCheckListItem *)capsList->tqfindItem( "capPause", 0 ))) { item = new TQCheckListItem( capsList, "capPause", TQCheckListItem::CheckBox ); @@ -46,7 +46,7 @@ void PropertiesDialog::setPlayObject( PlaylistItem pi, Arts::PlayObject po ) // PlaylistItem properties (name and mimetype) if (!pi.isNull()) { - setCaption( i18n("Properties for %1").arg(pi.url().fileName()) ); + setCaption( i18n("Properties for %1").tqarg(pi.url().fileName()) ); KSharedPtr<KMimeType> mime = KMimeType::mimeType( pi.mimetype() ); iconLabel->setPixmap( mime->pixmap( KIcon::Desktop, KIcon::SizeMedium ) ); diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp index 685b2467..591335f9 100644 --- a/noatun/modules/simple/userinterface.cpp +++ b/noatun/modules/simple/userinterface.cpp @@ -74,7 +74,7 @@ SimpleUI::SimpleUI() napp->player()->handleButtons(); - resize( minimumSize() ); + resize( tqminimumSize() ); // Show UI and calculate video widget frame show(); @@ -126,10 +126,10 @@ SimpleUI::~SimpleUI() void SimpleUI::setupActions() { - KStdAction::open( napp, TQT_SLOT(fileOpen()), actionCollection(), "_file_open" ); - new KAction( i18n("&Properties"), 0, propertiesDialog, TQT_SLOT(show()), + KStdAction::open( TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection(), "_file_open" ); + new KAction( i18n("&Properties"), 0, TQT_TQOBJECT(propertiesDialog), TQT_SLOT(show()), actionCollection(), "_file_properties" ); - KStdAction::quit( napp, TQT_SLOT(quit()), actionCollection(), "_file_quit"); + KStdAction::quit( TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection(), "_file_quit"); NoatunStdAction::playlist( actionCollection(), "view_playlist" ); actionCollection()->insert(video->action( "half_size" )); @@ -139,14 +139,14 @@ void SimpleUI::setupActions() actionCollection()->insert(napp->pluginActionMenu()); - menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), + menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()), actionCollection()); - statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(showStatusbar()), + statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(showStatusbar()), actionCollection()); NoatunStdAction::effects( actionCollection(), "effects" ); NoatunStdAction::equalizer( actionCollection(), "equalizer" ); NoatunStdAction::loop( actionCollection(), "loop_style" ); - KStdAction::preferences( napp, TQT_SLOT(preferences()), actionCollection() ); + KStdAction::preferences( TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection() ); } void SimpleUI::showMenubar() @@ -173,7 +173,7 @@ void SimpleUI::setupCentralWidget() npWidget->setSpacing( 0 ); positionLabel = new TQLabel( statusBar() ); - positionLabel->setAlignment( AlignVCenter | AlignCenter ); + positionLabel->tqsetAlignment( AlignVCenter | AlignCenter ); positionLabel->setFixedSize( fontMetrics().size( 0, " 00:00/00:00 " ) ); statusBar()->addWidget( positionLabel, 0, true ); @@ -214,7 +214,7 @@ void SimpleUI::setupCentralWidget() TQToolTip::add( forwButton, i18n("Forward") ); connect( forwButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()) ); - slider = new L33tSlider( 0, 1000, 10, 0, L33tSlider::Horizontal, ctlFrame ); + slider = new L33tSlider( 0, 1000, 10, 0, Qt::Horizontal, ctlFrame ); slider->setFixedHeight( 24 ); slider->setMinimumWidth( 100 ); slider->setTickmarks( TQSlider::NoMarks ); @@ -238,15 +238,15 @@ void SimpleUI::setupCentralWidget() volumeLabel = new TQLabel( volumeFrame ); volumeLabel->setText( "100%" ); - volumeLabel->setAlignment( AlignCenter ); - volumeLabel->setFixedSize( volumeLabel->sizeHint() ); + volumeLabel->tqsetAlignment( AlignCenter ); + volumeLabel->setFixedSize( volumeLabel->tqsizeHint() ); TQHBox *volumeSubFrame = new TQHBox( volumeFrame ); - volumeSlider = new L33tSlider( 0, 100, 10, 0, Vertical, volumeSubFrame ); + volumeSlider = new L33tSlider( 0, 100, 10, 0,Qt::Vertical, volumeSubFrame ); volumeSlider->setValue( 100 - napp->player()->volume() ); - volumeSlider->setFixedSize( volumeSlider->sizeHint() ); + volumeSlider->setFixedSize( volumeSlider->tqsizeHint() ); - volumeFrame->resize( volumeFrame->sizeHint() ); + volumeFrame->resize( volumeFrame->tqsizeHint() ); connect( volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(slotVolumeSliderMoved(int)) ); connect( volumeSlider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotVolumeSliderMoved(int)) ); @@ -254,7 +254,7 @@ void SimpleUI::setupCentralWidget() setCentralWidget( npWidget ); - video->setMinimumSize( minimumSizeHint().width(), 1 ); + video->setMinimumSize( tqminimumSizeHint().width(), 1 ); // Create properties dialog propertiesDialog = new PropertiesDialog( this ); diff --git a/noatun/modules/simple/userinterface.h b/noatun/modules/simple/userinterface.h index e3a84f84..251471ee 100644 --- a/noatun/modules/simple/userinterface.h +++ b/noatun/modules/simple/userinterface.h @@ -28,6 +28,7 @@ class SimpleUI : public KMainWindow, public UserInterface { Q_OBJECT + TQ_OBJECT public: SimpleUI(); diff --git a/noatun/modules/splitplaylist/find.cpp b/noatun/modules/splitplaylist/find.cpp index 5d378a79..99eaa8ed 100644 --- a/noatun/modules/splitplaylist/find.cpp +++ b/noatun/modules/splitplaylist/find.cpp @@ -5,14 +5,14 @@ #include <tqcheckbox.h> #include <klocale.h> -Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), Close | User1, User1, false, KGuiItem(i18n("&Find"),"find")) +Finder::Finder(TQWidget *tqparent) : KDialogBase(tqparent, 0, false, i18n("Find"), Close | User1, User1, false, KGuiItem(i18n("&Find"),"tqfind")) { TQWidget *mainWidget = new TQWidget(this); mainWidget->setMinimumWidth(320); setMainWidget(mainWidget); - TQGridLayout *layout=new TQGridLayout(mainWidget); - layout->setSpacing(KDialog::spacingHint()); + TQGridLayout *tqlayout=new TQGridLayout(mainWidget); + tqlayout->setSpacing(KDialog::spacingHint()); mText=new KHistoryCombo(mainWidget); mText->setMaxCount(10); @@ -22,9 +22,9 @@ Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), C mRegexp=new TQCheckBox(i18n("&Regular expression"), mainWidget); mBackwards=new TQCheckBox(i18n("Find &backwards"), mainWidget); - layout->addMultiCellWidget(mText, 0, 0, 0, 1); - layout->addWidget(mRegexp, 1, 0); - layout->addWidget(mBackwards, 1, 1); + tqlayout->addMultiCellWidget(mText, 0, 0, 0, 1); + tqlayout->addWidget(mRegexp, 1, 0); + tqlayout->addWidget(mBackwards, 1, 1); connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(clicked())); diff --git a/noatun/modules/splitplaylist/find.h b/noatun/modules/splitplaylist/find.h index 8c0d461e..47a53f99 100644 --- a/noatun/modules/splitplaylist/find.h +++ b/noatun/modules/splitplaylist/find.h @@ -10,8 +10,9 @@ class TQPushButton; class Finder : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - Finder(TQWidget *parent); + Finder(TQWidget *tqparent); bool regexp() const; bool isForward() const; diff --git a/noatun/modules/splitplaylist/playlist.cpp b/noatun/modules/splitplaylist/playlist.cpp index d0ded140..d7ddd1bf 100644 --- a/noatun/modules/splitplaylist/playlist.cpp +++ b/noatun/modules/splitplaylist/playlist.cpp @@ -217,14 +217,14 @@ void SplitPlaylist::setCurrent(const PlaylistItem &i, bool emitC) if (now) now->setPixmap(0, TQPixmap()); - TQRect rect(view->listView()->itemRect(static_cast<SafeListViewItem*>(current().data()))); + TQRect rect(view->listView()->tqitemRect(static_cast<SafeListViewItem*>(current().data()))); rect.setWidth(view->listView()->viewport()->width()); currentItem=i; - view->listView()->viewport()->repaint(rect,true); + view->listView()->viewport()->tqrepaint(rect,true); view->listView()->ensureItemVisible(static_cast<SafeListViewItem*>(current().data())); - TQRect currentRect= view->listView()->itemRect(static_cast<SafeListViewItem*>(current().data())); - view->listView()->viewport()->repaint(currentRect); + TQRect currentRect= view->listView()->tqitemRect(static_cast<SafeListViewItem*>(current().data())); + view->listView()->viewport()->tqrepaint(currentRect); now=static_cast<SafeListViewItem*>(current().data()); if(now) diff --git a/noatun/modules/splitplaylist/playlist.h b/noatun/modules/splitplaylist/playlist.h index 6f9b5ae6..13a309bf 100644 --- a/noatun/modules/splitplaylist/playlist.h +++ b/noatun/modules/splitplaylist/playlist.h @@ -28,6 +28,7 @@ class TQListViewItem; class SplitPlaylist : public Playlist, public Plugin { Q_OBJECT + TQ_OBJECT friend class SafeListViewItem; friend class List; public: diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp index 8df38afd..f1874f3a 100644 --- a/noatun/modules/splitplaylist/view.cpp +++ b/noatun/modules/splitplaylist/view.cpp @@ -43,13 +43,13 @@ #define SPL SplitPlaylist::SPL() -SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, const KURL &text) - : TQCheckListItem(parent,0, TQCheckListItem::CheckBox), PlaylistItemData(), removed(false) +SafeListViewItem::SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const KURL &text) + : TQCheckListItem(tqparent,0, TQCheckListItem::CheckBox), PlaylistItemData(), removed(false) { addRef(); setUrl(text); - static_cast<KListView*>(parent)->moveItem(this, 0, after); + static_cast<KListView*>(TQT_TQWIDGET(tqparent))->moveItem(this, 0, after); setOn(true); // is this really needed, it makes the listview too wide for me :( @@ -65,8 +65,8 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co PlaylistItemData::added(); } -SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, const TQMap<TQString,TQString> &props) - : TQCheckListItem(parent, 0, TQCheckListItem::CheckBox), removed(false) +SafeListViewItem::SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const TQMap<TQString,TQString> &props) + : TQCheckListItem(tqparent, 0, TQCheckListItem::CheckBox), removed(false) { addRef(); @@ -91,7 +91,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co } } - static_cast<KListView*>(parent)->moveItem(this, 0, after); + static_cast<KListView*>(TQT_TQWIDGET(tqparent))->moveItem(this, 0, after); modified(); if (!streamable() && enqueue(url())) @@ -288,7 +288,7 @@ void SafeListViewItem::stateChange(bool s) TQPtrList<TQListViewItem> list=SPL->view->listView()->selectedItems(); // but not if I'm not selected - if (list.containsRef(this)) + if (list.tqcontainsRef(this)) for (TQListViewItem *i=list.first(); i != 0; i=list.next()) static_cast<TQCheckListItem*>(i)->setOn(s); else @@ -344,8 +344,8 @@ void SafeListViewItem::remove() PlaylistItemData::removed(); } -List::List(View *parent) - : KListView(parent), recursiveAddAfter(0), listJob(0) +List::List(View *tqparent) + : KListView(tqparent), recursiveAddAfter(0), listJob(0) { addColumn(i18n("File")); addColumn(i18n("Time")); @@ -355,10 +355,10 @@ List::List(View *parent) setDragEnabled(true); setItemsMovable(true); setSelectionMode(TQListView::Extended); - connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*))); - connect(this, TQT_SIGNAL(moved()), TQT_SLOT(move())); - connect(this, TQT_SIGNAL(aboutToMove()), parent, TQT_SLOT(setNoSorting())); - connect(this, TQT_SIGNAL(deleteCurrentItem()), parent, TQT_SLOT(deleteSelected())); + connect(TQT_TQOBJECT(this), TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*))); + connect(TQT_TQOBJECT(this), TQT_SIGNAL(moved()), TQT_SLOT(move())); + connect(TQT_TQOBJECT(this), TQT_SIGNAL(aboutToMove()), tqparent, TQT_SLOT(setNoSorting())); + connect(TQT_TQOBJECT(this), TQT_SIGNAL(deleteCurrentItem()), tqparent, TQT_SLOT(deleteSelected())); } List::~List() @@ -377,7 +377,7 @@ bool List::acceptDrag(TQDropEvent *event) const void List::dropEvent(TQDropEvent *event, TQListViewItem *after) { - static_cast<View*>(parent())->setNoSorting(); + static_cast<View*>(TQT_TQWIDGET(tqparent()))->setNoSorting(); KURL::List textlist; if (!KURLDrag::decode(event, textlist)) return; event->acceptAction(); @@ -467,7 +467,7 @@ bool View::saveToURL(const KURL &url) } else { - KMessageBox::error( this, i18n("Could not write to %1.").arg(url.prettyURL()) ); + KMessageBox::error( this, i18n("Could not write to %1.").tqarg(url.prettyURL()) ); return false; } } @@ -638,25 +638,25 @@ View::View(SplitPlaylist *) { list=new List(this); setCentralWidget(list); - connect(list, TQT_SIGNAL(modified(void)), this, TQT_SLOT(setModified(void)) ); + connect(list, TQT_SIGNAL(modified(void)), TQT_TQOBJECT(this), TQT_SLOT(setModified(void)) ); // connect the click on the header with sorting connect(list->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(headerClicked(int)) ); - mOpen=new KAction(i18n("Add &Files..."), "queue", 0, this, TQT_SLOT(addFiles()), actionCollection(), "add_files"); - (void) new KAction(i18n("Add Fol&ders..."), "folder", 0, this, TQT_SLOT(addDirectory()), actionCollection(), "add_dir"); - mDelete=new KAction(i18n("Delete"), "editdelete", Key_Delete, this, TQT_SLOT(deleteSelected()), actionCollection(), "delete"); + mOpen=new KAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files"); + (void) new KAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir"); + mDelete=new KAction(i18n("Delete"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteSelected()), actionCollection(), "delete"); - mClose=KStdAction::close(this, TQT_SLOT(close()), actionCollection()); - mFind=KStdAction::find(this, TQT_SLOT(find()), actionCollection()); + mClose=KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + mFind=KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(tqfind()), actionCollection()); - (void) KStdAction::configureToolbars(this, TQT_SLOT(configureToolBars()), actionCollection()); - mOpenNew=KStdAction::openNew(this, TQT_SLOT(openNew()), actionCollection()); - mOpenpl=KStdAction::open(this, TQT_SLOT(open()), actionCollection()); - mSave=KStdAction::save(this, TQT_SLOT(save()), actionCollection()); - mSaveAs=KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection()); + (void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection()); + mOpenNew=KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection()); + mOpenpl=KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection()); + mSave=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); + mSaveAs=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection()); - (void) new KAction(i18n("Shuffle"), "misc", 0, SPL, TQT_SLOT( randomize() ), actionCollection(), "shuffle"); - (void) new KAction(i18n("Clear"), "editclear", 0, list, TQT_SLOT( clear() ), actionCollection(), "clear"); + (void) new KAction(i18n("Shuffle"), "misc", 0, TQT_TQOBJECT(SPL), TQT_SLOT( randomize() ), actionCollection(), "shuffle"); + (void) new KAction(i18n("Clear"), "editclear", 0, TQT_TQOBJECT(list), TQT_SLOT( clear() ), actionCollection(), "clear"); createGUI("splui.rc"); @@ -666,7 +666,7 @@ View::View(SplitPlaylist *) list->setFocus(); } -void View::find() +void View::tqfind() { mFinder->show(); connect(mFinder, TQT_SIGNAL(search(Finder*)), TQT_SLOT(findIt(Finder*))); @@ -675,15 +675,15 @@ void View::find() static bool testWord(TQListViewItem *i, const TQString &finder) { PlaylistItemData *item=static_cast<SafeListViewItem*>(i); - if (item->title().find(finder, 0, false) >=0) + if (item->title().tqfind(finder, 0, false) >=0) return true; - if (item->file().find(finder, 0, false) >=0) + if (item->file().tqfind(finder, 0, false) >=0) return true; - if (item->url().path().find(finder.local8Bit(), 0, false) >=0) + if (item->url().path().tqfind(finder.local8Bit().data(), 0, false) >=0) return true; - if (item->lengthString().find(finder, 0, false) >=0) + if (item->lengthString().tqfind(finder, 0, false) >=0) return true; - if (item->mimetype().find(finder.local8Bit(), 0, false) >=0) + if (item->mimetype().tqfind(finder.local8Bit().data(), 0, false) >=0) return true; return false; } @@ -691,15 +691,15 @@ static bool testWord(TQListViewItem *i, const TQString &finder) static bool testWord(TQListViewItem *i, const TQRegExp &finder) { PlaylistItemData *item=static_cast<SafeListViewItem*>(i); - if (item->title().find(finder) >=0) + if (item->title().tqfind(finder) >=0) return true; - if (item->file().find(finder) >=0) + if (item->file().tqfind(finder) >=0) return true; - if (item->url().path().find(finder) >=0) + if (item->url().path().tqfind(finder) >=0) return true; - if (item->lengthString().find(finder) >=0) + if (item->lengthString().tqfind(finder) >=0) return true; - if (item->mimetype().find(finder) >=0) + if (item->mimetype().tqfind(finder) >=0) return true; return false; } @@ -746,12 +746,12 @@ void View::findIt(Finder *f) { if (f->isForward()) { - if (KMessageBox::questionYesNo(this, i18n("End of playlist reached. Continue searching from beginning?"),TQString::null,KStdGuiItem::cont(),KStdGuiItem::cancel()) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(this, i18n("End of playlist reached. Continue searching from beginning?"),TQString(),KStdGuiItem::cont(),KStdGuiItem::cancel()) == KMessageBox::Yes) search=list->firstChild(); } else { - if (KMessageBox::questionYesNo(this, i18n("Beginning of playlist reached. Continue searching from end?"),TQString::null,KStdGuiItem::cont(),KStdGuiItem::cancel()) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(this, i18n("Beginning of playlist reached. Continue searching from end?"),TQString(),KStdGuiItem::cont(),KStdGuiItem::cancel()) == KMessageBox::Yes) search=list->lastChild(); } } diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h index 785608fd..293276ca 100644 --- a/noatun/modules/splitplaylist/view.h +++ b/noatun/modules/splitplaylist/view.h @@ -16,13 +16,13 @@ namespace KIO { class ListJob; } class SafeListViewItem - : public QCheckListItem + : public TQCheckListItem , public PlaylistItemData , public DownloadItem { public: - SafeListViewItem(TQListView *parent, TQListViewItem *after, const KURL &text); - SafeListViewItem(TQListView *parent, TQListViewItem *after, const TQMap<TQString,TQString> &properties); + SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const KURL &text); + SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const TQMap<TQString,TQString> &properties); virtual ~SafeListViewItem(); virtual TQString property(const TQString &, const TQString & = 0) const; @@ -58,9 +58,10 @@ private: class List : public KListView { Q_OBJECT + TQ_OBJECT friend class View; public: - List(View *parent); + List(View *tqparent); virtual ~List(); TQListViewItem *openGlobal(const KURL&, TQListViewItem * =0); TQListViewItem *importGlobal(const KURL&, TQListViewItem * =0); @@ -105,6 +106,7 @@ class KToolBar; class View : public KMainWindow { Q_OBJECT + TQ_OBJECT public: View(SplitPlaylist *mother); // load the SM playlist @@ -125,7 +127,7 @@ public slots: void openNew(); void setSorting(bool on, int column = 0); void setNoSorting() { setSorting(false); } - void headerClicked(int column);void find(); + void headerClicked(int column);void tqfind(); void findIt(Finder *); diff --git a/noatun/modules/systray/cmodule.h b/noatun/modules/systray/cmodule.h index fd9cae2c..ddf52ada 100644 --- a/noatun/modules/systray/cmodule.h +++ b/noatun/modules/systray/cmodule.h @@ -34,6 +34,7 @@ class YHConfigWidget; class YHModule : public CModule { Q_OBJECT + TQ_OBJECT public: YHModule(TQObject *_parent); virtual void save(); diff --git a/noatun/modules/systray/kitsystemtray.cpp b/noatun/modules/systray/kitsystemtray.cpp index 8e42a3ed..61c0f035 100644 --- a/noatun/modules/systray/kitsystemtray.cpp +++ b/noatun/modules/systray/kitsystemtray.cpp @@ -44,12 +44,12 @@ #include <fixx11h.h> -KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name) - : KSystemTray(parent, name) +KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *tqparent, const char *name) + : KSystemTray(tqparent, name) { - setAlignment(AlignHCenter | AlignVCenter); - menu = (KPopupMenu *)parent->guiFactory()->container(contextMenu, parent); - menu->insertTitle(SmallIcon("noatun"), TQString::null, 0, 0); + tqsetAlignment(AlignHCenter | AlignVCenter); + menu = (KPopupMenu *)tqparent->guiFactory()->container(contextMenu, tqparent); + menu->insertTitle(SmallIcon("noatun"), TQString(), 0, 0); setAcceptDrops(true); } @@ -67,10 +67,10 @@ void KitSystemTray::mousePressEvent(TQMouseEvent *event) { switch(event->button()) { - case LeftButton: + case Qt::LeftButton: napp->toggleInterfaces(); break; - case MidButton: + case Qt::MidButton: if (YHConfig::self()->middleMouseAction() == YHConfig::HideShowPlaylist) napp->playlist()->toggleList(); else // play or pause @@ -103,11 +103,11 @@ void KitSystemTray::wheelEvent(TQWheelEvent *event) YHConfig *c = YHConfig::self(); int action = 0; - if (event->state() & Qt::ShiftButton) + if (event->state() & TQt::ShiftButton) action = c->mouseWheelAction(YHConfig::Shift); - else if (event->state() & Qt::ControlButton) + else if (event->state() & TQt::ControlButton) action = c->mouseWheelAction(YHConfig::Ctrl); - else if (event->state() & Qt::AltButton) + else if (event->state() & TQt::AltButton) action = c->mouseWheelAction(YHConfig::Alt); else action = c->mouseWheelAction(YHConfig::None); diff --git a/noatun/modules/systray/kitsystemtray.h b/noatun/modules/systray/kitsystemtray.h index 6d5a2908..d933a19e 100644 --- a/noatun/modules/systray/kitsystemtray.h +++ b/noatun/modules/systray/kitsystemtray.h @@ -37,9 +37,10 @@ class TQPixmap; class KitSystemTray : public KSystemTray { Q_OBJECT + TQ_OBJECT public: - KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name = 0); + KitSystemTray(const TQString &contextMenu, KMainWindow *tqparent, const char *name = 0); void changeTitle(const TQPixmap &, const TQString &); protected: virtual void showEvent(TQShowEvent *); diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp index 2493bdbc..57ce2105 100644 --- a/noatun/modules/systray/systray.cpp +++ b/noatun/modules/systray/systray.cpp @@ -72,7 +72,7 @@ const int COVER_MAXH = 128; class PassivePopup : public KPassivePopup { public: - PassivePopup(TQWidget *parent = 0, const char *name = 0) : KPassivePopup(parent, name) {} + PassivePopup(TQWidget *tqparent = 0, const char *name = 0) : KPassivePopup(tqparent, name) {} protected: virtual void enterEvent(TQEvent *) @@ -91,7 +91,7 @@ protected: NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(), - mTray(0), trayStatus(0), trayBase(0), mPassivePopup(0L) + mTray(0), traytqStatus(0), trayBase(0), mPassivePopup(0L) { //self = this; hide(); @@ -100,9 +100,9 @@ NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(), removeCover(); // make sure any old temp cover is gone - KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection()); - KStdAction::open(napp, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::preferences(napp, TQT_SLOT(preferences()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection()); + KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection()); NoatunStdAction::back(actionCollection(), "back"); NoatunStdAction::stop(actionCollection(), "stop"); NoatunStdAction::playpause(actionCollection(), "play"); @@ -117,11 +117,11 @@ NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(), mTray = new KitSystemTray("tray", this); mTray->show(); - trayBase = renderIcon(BASEICON, TQString::null); - trayStatus = renderIcon(BASEICON, "player_stop"); + trayBase = renderIcon(BASEICON, TQString()); + traytqStatus = renderIcon(BASEICON, "player_stop"); mTray->changeTitle(*trayBase, i18n("Noatun")); - showingTrayStatus = false; + showingTraytqStatus = false; mBlinkTimer = new TQTimer(this); connect(mBlinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBlinkTimer())); @@ -138,14 +138,14 @@ NoatunSystray::~NoatunSystray() //kdDebug(66666) << k_funcinfo << "Called." << endl; removeCover(); delete trayBase; - delete trayStatus; + delete traytqStatus; napp->showInterfaces(); } void NoatunSystray::init() { - YHModule *cmod = new YHModule(this); + YHModule *cmod = new YHModule(TQT_TQOBJECT(this)); connect(cmod, TQT_SIGNAL(saved()), this, TQT_SLOT(slotLoadSettings())); slotLoadSettings(); } @@ -213,21 +213,21 @@ void NoatunSystray::slotPlayPause() if(!item.isProperty("title")) { // No metadata - s = TQString("<nobr>%1</nobr>").arg(item.title()); + s = TQString("<nobr>%1</nobr>").tqarg(item.title()); } else { - s = TQString("<h2><nobr>%1</nobr></h2>").arg(item.property("title")); + s = TQString("<h2><nobr>%1</nobr></h2>").tqarg(item.property("title")); if(item.isProperty("author")) - s += TQString("<nobr>%1</nobr><br>").arg(item.property("author")); + s += TQString("<nobr>%1</nobr><br>").tqarg(item.property("author")); if(item.isProperty("album")) { if(item.isProperty("date")) - s += TQString("<nobr>%1 (%2)</nobr><br>").arg(item.property("album")).arg(item.property("date")); + s += TQString("<nobr>%1 (%2)</nobr><br>").tqarg(item.property("album")).tqarg(item.property("date")); else - s += TQString("<nobr>%1</nobr><br>").arg(item.property("album")); + s += TQString("<nobr>%1</nobr><br>").tqarg(item.property("album")); } } @@ -242,11 +242,11 @@ void NoatunSystray::slotPlayPause() setTipText(TQString("<qt><br><table cellspacing=0 cellpadding=0><tr>" \ "<td align=center valign=center><h4><nobr>%1</nobr></h4>%2</td>" \ "<td valign=center><img src='%3'></td>" \ - "</qt></tr></table>").arg(status).arg(s).arg(tmpCoverPath)); + "</qt></tr></table>").tqarg(status).tqarg(s).tqarg(tmpCoverPath)); } else { - setTipText(TQString("<qt><center><h4><nobr>%1</nobr></h4>%2</center></qt>").arg(status).arg(s)); + setTipText(TQString("<qt><center><h4><nobr>%1</nobr></h4>%2</center></qt>").tqarg(status).tqarg(s)); } } @@ -256,16 +256,16 @@ void NoatunSystray::slotStopped() if(!napp->player()->current()) return; changeTray("player_stop"); - setTipText(TQString("<qt><nobr><h4>%1</h4></nobr></qt>").arg(i18n("Noatun - Stopped"))); + setTipText(TQString("<qt><nobr><h4>%1</h4></nobr></qt>").tqarg(i18n("Noatun - Stopped"))); } void NoatunSystray::changeTray(const TQString &pm) { - delete trayStatus; - trayStatus = renderIcon(BASEICON, pm); - if(showingTrayStatus) + delete traytqStatus; + traytqStatus = renderIcon(BASEICON, pm); + if(showingTraytqStatus) slotBlinkTimer(); } @@ -275,18 +275,18 @@ void NoatunSystray::slotBlinkTimer() switch(YHConfig::self()->stateIconDisplay()) { case (YHConfig::FlashingIcon): - showingTrayStatus ^= true; + showingTraytqStatus ^= true; break; case (YHConfig::StaticIcon): - showingTrayStatus = true; + showingTraytqStatus = true; break; case (YHConfig::NoIcon): - showingTrayStatus = false; + showingTraytqStatus = false; break; } - if(showingTrayStatus) - mTray->setPixmap(*trayStatus); + if(showingTraytqStatus) + mTray->setPixmap(*traytqStatus); else mTray->setPixmap(*trayBase); } @@ -334,7 +334,7 @@ void NoatunSystray::updateCover() if(src.load(cover)) { if(src.width() >= COVER_MAXW || src.height() >= COVER_MAXH) - tmpimg = src.scale(COVER_MAXW, COVER_MAXH, TQImage::ScaleMin); + tmpimg = src.scale(COVER_MAXW, COVER_MAXH, TQ_ScaleMin); else tmpimg = src; @@ -383,7 +383,7 @@ void NoatunSystray::showPassivePopup() if (YHConfig::self()->passivePopupButtons() && !napp->player()->isStopped()) { - TQVBox *widget = mPassivePopup->standardView(TQString::null, tipText, TQPixmap()); + TQVBox *widget = mPassivePopup->standardView(TQString(), tipText, TQPixmap()); TQHBox *box = new TQHBox(mPassivePopup, "popupbox"); box->setSpacing(8); @@ -439,7 +439,7 @@ void NoatunSystray::showPassivePopup() } else { - mPassivePopup->setView(TQString::null, tipText); + mPassivePopup->setView(TQString(), tipText); } mPassivePopup->setTimeout(YHConfig::self()->passivePopupTimeout()*1000); diff --git a/noatun/modules/systray/systray.h b/noatun/modules/systray/systray.h index 1865479b..11743a22 100644 --- a/noatun/modules/systray/systray.h +++ b/noatun/modules/systray/systray.h @@ -41,6 +41,7 @@ class PassivePopup; class NoatunSystray : public KMainWindow, public Plugin { Q_OBJECT + TQ_OBJECT public: NoatunSystray(); virtual ~NoatunSystray(); @@ -68,11 +69,11 @@ private: private: KitSystemTray *mTray; TQTimer *mBlinkTimer; - TQPixmap *trayStatus; + TQPixmap *traytqStatus; TQPixmap *trayBase; PassivePopup *mPassivePopup; - bool showingTrayStatus; + bool showingTraytqStatus; TQString tipText; TQString tmpCoverPath; }; diff --git a/noatun/modules/systray/yhconfigwidget.ui b/noatun/modules/systray/yhconfigwidget.ui index 48267c28..5556c2c1 100644 --- a/noatun/modules/systray/yhconfigwidget.ui +++ b/noatun/modules/systray/yhconfigwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>YHConfigWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>YHConfigWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,11 +19,11 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chkUseTooltip</cstring> </property> @@ -42,7 +42,7 @@ <string>Show a &tooltip for the current track</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chkUseCovers</cstring> </property> @@ -50,7 +50,7 @@ <string>Show &covers in popup window and tooltip</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -61,7 +61,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblPopupTimeout</cstring> </property> @@ -72,7 +72,7 @@ <cstring>spinPopupTimeout</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>chkPopupButtons</cstring> </property> @@ -80,7 +80,7 @@ <string>Show &buttons in popup window</string> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>spinPopupTimeout</cstring> </property> @@ -98,7 +98,7 @@ <number>5</number> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>chkUsePopup</cstring> </property> @@ -108,7 +108,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -119,7 +119,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>rbStateAnim</cstring> </property> @@ -130,7 +130,7 @@ <string>&Animated</string> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>rbStateFlashing</cstring> </property> @@ -138,7 +138,7 @@ <string>&Flashing</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>rbStateStatic</cstring> </property> @@ -149,7 +149,7 @@ <bool>false</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="1"> + <widget class="TQRadioButton" row="1" column="1"> <property name="name"> <cstring>rbStateNone</cstring> </property> @@ -169,7 +169,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>81</height> @@ -178,7 +178,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -189,7 +189,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>grpMiddleMouse</cstring> </property> @@ -200,7 +200,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbHideShowPlaylist</cstring> </property> @@ -208,7 +208,7 @@ <string>Hide / Show play&list</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbPlayPause</cstring> </property> @@ -218,7 +218,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>grpMwheel</cstring> </property> @@ -229,15 +229,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblModifier</cstring> </property> @@ -248,14 +248,14 @@ <cstring>cmbModifier</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>cmbModifier</cstring> </property> </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblAction</cstring> </property> @@ -263,7 +263,7 @@ <string>Action:</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbActNothing</cstring> </property> @@ -271,7 +271,7 @@ <string>&Nothing</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbActVolume</cstring> </property> @@ -279,7 +279,7 @@ <string>Change v&olume</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbActTrack</cstring> </property> @@ -299,7 +299,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -329,5 +329,5 @@ <tabstop>rbActVolume</tabstop> <tabstop>rbActTrack</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/noatun/modules/voiceprint/prefs.cpp b/noatun/modules/voiceprint/prefs.cpp index 230c542f..a50db7ff 100644 --- a/noatun/modules/voiceprint/prefs.cpp +++ b/noatun/modules/voiceprint/prefs.cpp @@ -8,10 +8,10 @@ #include <kcolorbutton.h> #include <kconfig.h> -Prefs::Prefs(TQObject* parent) - : CModule(i18n("Voiceprint"), i18n("Options for the Voiceprint Visualization"), "xapp", parent) +Prefs::Prefs(TQObject* tqparent) + : CModule(i18n("Voiceprint"), i18n("Options for the Voiceprint Visualization"), "xapp", tqparent) { - QVBoxLayout *king=new TQVBoxLayout(this); + TQVBoxLayout *king=new TQVBoxLayout(this); TQHBoxLayout *minor; TQLabel *label; diff --git a/noatun/modules/voiceprint/prefs.h b/noatun/modules/voiceprint/prefs.h index 65f4cf3d..1803fe9b 100644 --- a/noatun/modules/voiceprint/prefs.h +++ b/noatun/modules/voiceprint/prefs.h @@ -9,8 +9,9 @@ class KColorButton; class Prefs : public CModule { Q_OBJECT + TQ_OBJECT public: - Prefs(TQObject* parent); + Prefs(TQObject* tqparent); virtual void save(); virtual void reopen(); diff --git a/noatun/modules/voiceprint/voiceprint.cpp b/noatun/modules/voiceprint/voiceprint.cpp index 0a82a1ab..234aafd0 100644 --- a/noatun/modules/voiceprint/voiceprint.cpp +++ b/noatun/modules/voiceprint/voiceprint.cpp @@ -35,7 +35,7 @@ VoicePrint::~VoicePrint() void VoicePrint::init() { - Prefs *p=new Prefs(this); + Prefs *p=new Prefs(TQT_TQOBJECT(this)); p->reopen(); p->save(); resizeEvent(0); @@ -66,13 +66,13 @@ void VoicePrint::resizeEvent(TQResizeEvent *) #define COLOR(color, bgcolor, fgcolor, foctet) \ (int)( color(bgcolor) + (foctet) * (color(fgcolor) - color(bgcolor)) ) -inline static QRgb averageByIntensity(QRgb bgcolor, QRgb fgcolor, int octet) +inline static TQRgb averageByIntensity(TQRgb bgcolor, TQRgb fgcolor, int octet) { float foctet = octet / 255.0; - return qRgb(COLOR(qRed, bgcolor, fgcolor, foctet), - COLOR(qGreen, bgcolor, fgcolor, foctet), - COLOR(qBlue, bgcolor, fgcolor, foctet) + return tqRgb(COLOR(tqRed, bgcolor, fgcolor, foctet), + COLOR(tqGreen, bgcolor, fgcolor, foctet), + COLOR(tqBlue, bgcolor, fgcolor, foctet) ); } @@ -80,7 +80,7 @@ inline static QRgb averageByIntensity(QRgb bgcolor, QRgb fgcolor, int octet) void VoicePrint::paintEvent(TQPaintEvent *e) { - bitBlt(this, e->rect().topLeft(), &mBuffer, e->rect(), Qt::CopyROP); + bitBlt(this, e->rect().topLeft(), &mBuffer, e->rect(), TQt::CopyROP); } void VoicePrint::scopeEvent(float *data, int bands) @@ -113,12 +113,12 @@ void VoicePrint::scopeEvent(float *data, int bands) // redraw changes with the minimum amount of work if(newOffset != 0) { - repaint(mOffset,0,mSegmentWidth*2,height(),false); + tqrepaint(mOffset,0,mSegmentWidth*2,height(),false); } else { - repaint(mOffset,0,mSegmentWidth,height(),false); - repaint(newOffset,0,mSegmentWidth,height(),false); + tqrepaint(mOffset,0,mSegmentWidth,height(),false); + tqrepaint(newOffset,0,mSegmentWidth,height(),false); } mOffset = newOffset; } diff --git a/noatun/modules/voiceprint/voiceprint.h b/noatun/modules/voiceprint/voiceprint.h index 4d78909a..1d02bae6 100644 --- a/noatun/modules/voiceprint/voiceprint.h +++ b/noatun/modules/voiceprint/voiceprint.h @@ -6,6 +6,7 @@ class VoicePrint : public TQWidget, public MonoFFTScope, public Plugin { Q_OBJECT + TQ_OBJECT public: VoicePrint(); @@ -26,7 +27,7 @@ public: private: TQColor mProgress; TQPixmap mBuffer; - QRgb mLowColor, mHighColor; + TQRgb mLowColor, mHighColor; int mOffset, mSegmentWidth; }; #endif diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp index 583266e0..cab5be35 100644 --- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp +++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp @@ -72,13 +72,13 @@ GuiSpectrumAnalyser::~GuiSpectrumAnalyser() void GuiSpectrumAnalyser::mousePressEvent ( TQMouseEvent *e ) { - if (e->button() == LeftButton) { + if (e->button() == Qt::LeftButton) { if (visualization_mode == MODE_DISABLED) setVisualizationMode(MODE_ANALYSER); else setVisualizationMode(MODE_DISABLED); } - else if (e->button() == RightButton) { + else if (e->button() == Qt::RightButton) { contextMenu->popup(mapToGlobal(TQPoint(e->x(), e->y()))); } } @@ -138,7 +138,7 @@ void GuiSpectrumAnalyser::setVisualizationMode(int mode) { if (!winSkinVis) { - winSkinVis=new WinSkinVis(this,"WinSkinVis"); + winSkinVis=new WinSkinVis(TQT_TQOBJECT(this),"WinSkinVis"); connect(winSkinVis,TQT_SIGNAL(doRepaint()),this,TQT_SLOT(updatePeaks())); } } diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.h b/noatun/modules/winskin/guiSpectrumAnalyser.h index e2dd3431..8cffa3d6 100644 --- a/noatun/modules/winskin/guiSpectrumAnalyser.h +++ b/noatun/modules/winskin/guiSpectrumAnalyser.h @@ -29,6 +29,7 @@ enum analyserMode {MODE_NORMAL = 0, MODE_FIRE = 1, MODE_VERTICAL_LINES = 2}; class GuiSpectrumAnalyser : public WaWidget { Q_OBJECT + TQ_OBJECT public: GuiSpectrumAnalyser(); diff --git a/noatun/modules/winskin/vis/realFFT.cpp b/noatun/modules/winskin/vis/realFFT.cpp index 330280ea..383831b7 100644 --- a/noatun/modules/winskin/vis/realFFT.cpp +++ b/noatun/modules/winskin/vis/realFFT.cpp @@ -20,7 +20,7 @@ RealFFT::RealFFT(int fftlen) { int i; int temp; - int mask; + int tqmask; /* * FFT size is only half the number of data points @@ -43,8 +43,8 @@ RealFFT::RealFFT(int fftlen) { for(i=0;i<Points/2;i++) { temp=0; - for(mask=Points/4;mask>0;mask >>= 1) - temp=(temp >> 1) + (i&mask ? Points/2 : 0); + for(tqmask=Points/4;tqmask>0;tqmask >>= 1) + temp=(temp >> 1) + (i&tqmask ? Points/2 : 0); BitReversed[i]=temp; } diff --git a/noatun/modules/winskin/vis/visQueue.h b/noatun/modules/winskin/vis/visQueue.h index 2f737fd1..9360805a 100644 --- a/noatun/modules/winskin/vis/visQueue.h +++ b/noatun/modules/winskin/vis/visQueue.h @@ -11,8 +11,8 @@ */ -#ifndef __VISQUEUE_H -#define __VISQUEUE_H +#ifndef __VISTQUEUE_H +#define __VISTQUEUE_H #include <vector> diff --git a/noatun/modules/winskin/waBalanceSlider.h b/noatun/modules/winskin/waBalanceSlider.h index d120bcc7..cd10aa96 100644 --- a/noatun/modules/winskin/waBalanceSlider.h +++ b/noatun/modules/winskin/waBalanceSlider.h @@ -20,7 +20,8 @@ #include "waWidget.h" class WaBalanceSlider : public WaWidget { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: WaBalanceSlider(); diff --git a/noatun/modules/winskin/waButton.cpp b/noatun/modules/winskin/waButton.cpp index da113c87..4946d548 100644 --- a/noatun/modules/winskin/waButton.cpp +++ b/noatun/modules/winskin/waButton.cpp @@ -50,7 +50,7 @@ void WaButton::paintEvent(TQPaintEvent *) { void WaButton::mousePressEvent(TQMouseEvent* e) { - if (e->button() != LeftButton) { + if (e->button() != Qt::LeftButton) { // We can't deal with it, but maybe the widget can do something clever WaWidget::mousePressEvent(e); } @@ -68,7 +68,7 @@ void WaButton::mouseReleaseEvent(TQMouseEvent* e) { else { pressed = false; - if (this->rect().contains(e->pos())){ + if (TQT_TQRECT_OBJECT(this->rect()).tqcontains(e->pos())){ if (_togglable) { _toggled = !_toggled; emit(toggleEvent(_toggled)); diff --git a/noatun/modules/winskin/waButton.h b/noatun/modules/winskin/waButton.h index bfaf43ff..a6e67548 100644 --- a/noatun/modules/winskin/waButton.h +++ b/noatun/modules/winskin/waButton.h @@ -21,6 +21,7 @@ class WaButton : public WaWidget { Q_OBJECT + TQ_OBJECT public: WaButton(int mapId); ~WaButton(); diff --git a/noatun/modules/winskin/waClutterbar.h b/noatun/modules/winskin/waClutterbar.h index 5a96993a..b7560039 100644 --- a/noatun/modules/winskin/waClutterbar.h +++ b/noatun/modules/winskin/waClutterbar.h @@ -6,6 +6,7 @@ class WaClutterbar : public WaWidget { Q_OBJECT + TQ_OBJECT public: WaClutterbar(); diff --git a/noatun/modules/winskin/waDigit.cpp b/noatun/modules/winskin/waDigit.cpp index 15a3ae46..b81a0da2 100644 --- a/noatun/modules/winskin/waDigit.cpp +++ b/noatun/modules/winskin/waDigit.cpp @@ -57,28 +57,28 @@ void WaDigit::paintEvent(TQPaintEvent *) // continue parsing mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_MINUS); if (len == 6) { - waSkinModel->getDigit('-', this, mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit('-', TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); time++; } else { - waSkinModel->getDigit(' ', this, mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(' ', TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); } mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_1); - waSkinModel->getDigit(time[0], this, mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(time[0], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_2); - waSkinModel->getDigit(time[1], this, mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(time[1], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_3); - waSkinModel->getDigit(time[3], this, mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(time[3], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_4); - waSkinModel->getDigit(time[4], this, mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(time[4], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); } void WaDigit::mousePressEvent(TQMouseEvent* e) { - if (e->button() == LeftButton) { + if (e->button() == Qt::LeftButton) { reverse_time = !reverse_time; emit digitsClicked(); } diff --git a/noatun/modules/winskin/waDigit.h b/noatun/modules/winskin/waDigit.h index cee5da1d..905431bd 100644 --- a/noatun/modules/winskin/waDigit.h +++ b/noatun/modules/winskin/waDigit.h @@ -22,6 +22,7 @@ class WaDigit : public WaWidget { Q_OBJECT + TQ_OBJECT public: WaDigit(); diff --git a/noatun/modules/winskin/waIndicator.h b/noatun/modules/winskin/waIndicator.h index b4d37482..1c26da6b 100644 --- a/noatun/modules/winskin/waIndicator.h +++ b/noatun/modules/winskin/waIndicator.h @@ -22,6 +22,7 @@ class WaIndicator : public WaWidget { Q_OBJECT + TQ_OBJECT public: WaIndicator(int widget_mapping, int enabled_mapping, int disabled_mapping); diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp index d64191da..fb923994 100644 --- a/noatun/modules/winskin/waInfo.cpp +++ b/noatun/modules/winskin/waInfo.cpp @@ -30,7 +30,7 @@ WaInfo::WaInfo() : WaWidget(_WA_MAPPING_INFO) completePixmap = new TQPixmap(); - TQSize size = sizeHint(); + TQSize size = tqsizeHint(); completePixmap->resize(size.width(), size.height()); xGrabbedPos = -1; @@ -55,7 +55,7 @@ void WaInfo::timeEvent() } if (isVisible()) - repaint(false); + tqrepaint(false); } } @@ -65,7 +65,7 @@ void WaInfo::scrollerSetup() xScrollPos = 0; xScrollDirection = 0; timer->stop(); - TQSize size = sizeHint(); + TQSize size = tqsizeHint(); if (completePixmap->width() > size.width()) { xScrollDirection = 1; @@ -79,7 +79,7 @@ void WaInfo::scrollerSetup() void WaInfo::paintEvent(TQPaintEvent *) { - TQSize size = sizeHint(); + TQSize size = tqsizeHint(); if (completePixmap->width() <= size.width()) { bitBlt(this, 0, 0, completePixmap); @@ -127,12 +127,12 @@ void WaInfo::pixmapChange() int x = 0; int n=infoString ? strlen(infoString) : 0; - TQSize size = sizeHint(); + TQSize size = tqsizeHint(); - completePixmap->resize(QMAX(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT); + completePixmap->resize(TQMAX(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT); for (i = 0; i < n; i++) { - WaSkinModel::instance()->getText(infoString[i], completePixmap, x, 0); + WaSkinModel::instance()->getText(infoString[i], TQT_TQPAINTDEVICE(completePixmap), x, 0); x += _WA_TEXT_WIDTH; } @@ -140,7 +140,7 @@ void WaInfo::pixmapChange() // fill the pixmap with spaces if (x < size.width()) { while (x < size.width()) { - WaSkinModel::instance()->getText(' ', completePixmap, x, 0); + WaSkinModel::instance()->getText(' ', TQT_TQPAINTDEVICE(completePixmap), x, 0); x += _WA_TEXT_WIDTH; } } @@ -150,7 +150,7 @@ void WaInfo::pixmapChange() } void WaInfo::mousePressEvent (TQMouseEvent *e) { - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) xGrabbedPos = (e->x() + xScrollPos) % completePixmap->width(); } diff --git a/noatun/modules/winskin/waInfo.h b/noatun/modules/winskin/waInfo.h index 32d310e4..3a6dfe29 100644 --- a/noatun/modules/winskin/waInfo.h +++ b/noatun/modules/winskin/waInfo.h @@ -23,6 +23,7 @@ class WaInfo : public WaWidget { Q_OBJECT + TQ_OBJECT public: WaInfo(); diff --git a/noatun/modules/winskin/waJumpSlider.h b/noatun/modules/winskin/waJumpSlider.h index e8a48b1f..56d37d05 100644 --- a/noatun/modules/winskin/waJumpSlider.h +++ b/noatun/modules/winskin/waJumpSlider.h @@ -20,6 +20,7 @@ class WaJumpSlider : public WaWidget { Q_OBJECT + TQ_OBJECT public: WaJumpSlider(); diff --git a/noatun/modules/winskin/waLabel.cpp b/noatun/modules/winskin/waLabel.cpp index 54b7513b..bb16d118 100644 --- a/noatun/modules/winskin/waLabel.cpp +++ b/noatun/modules/winskin/waLabel.cpp @@ -24,7 +24,7 @@ WaLabel::WaLabel(int mapping) : WaWidget(mapping) completePixmap = new TQPixmap(); - TQSize size = sizeHint(); + TQSize size = tqsizeHint(); completePixmap->resize(size.width(), size.height()); } @@ -58,7 +58,7 @@ void WaLabel::pixmapChange() int n = label_text ? strlen(label_text) : 0; for (int i = 0; i < n; i++) - WaSkinModel::instance()->getText(label_text[i], completePixmap, + WaSkinModel::instance()->getText(label_text[i], TQT_TQPAINTDEVICE(completePixmap), i * _WA_TEXT_WIDTH, 0); } diff --git a/noatun/modules/winskin/waLabel.h b/noatun/modules/winskin/waLabel.h index ce7ad771..7303e4a0 100644 --- a/noatun/modules/winskin/waLabel.h +++ b/noatun/modules/winskin/waLabel.h @@ -17,7 +17,8 @@ #include "waWidget.h" class WaLabel : public WaWidget { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: WaLabel(int mapping); diff --git a/noatun/modules/winskin/waMain.h b/noatun/modules/winskin/waMain.h index fbc47a64..94ae5e83 100644 --- a/noatun/modules/winskin/waMain.h +++ b/noatun/modules/winskin/waMain.h @@ -5,6 +5,7 @@ class WaMain : WaWidget { Q_OBJECT + TQ_OBJECT public: WaMain(); ~WaMain(); diff --git a/noatun/modules/winskin/waRegion.cpp b/noatun/modules/winskin/waRegion.cpp index 06f6851e..5f968b00 100644 --- a/noatun/modules/winskin/waRegion.cpp +++ b/noatun/modules/winskin/waRegion.cpp @@ -31,14 +31,14 @@ WaRegion::WaRegion(TQString filename) { KSimpleConfig regionFile(filename, true); // Clear our variables by default - window_mask = 0; - shade_mask = 0; + window_tqmask = 0; + shade_tqmask = 0; // Make the new bitmaps, default window size - window_mask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_MAIN).size(), true); - shade_mask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_TITLE).size(), true); + window_tqmask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_MAIN).size(), true); + shade_tqmask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_TITLE).size(), true); - // Load the normal window mask data + // Load the normal window tqmask data regionFile.setGroup("Normal"); TQValueList<int> num_points; @@ -53,27 +53,27 @@ WaRegion::WaRegion(TQString filename) { point_list = parseList(regionFile.readEntry(pointListNames[x])); } - // Now build the mask - buildPixmap(num_points, point_list, window_mask); + // Now build the tqmask + buildPixmap(num_points, point_list, window_tqmask); - // Load the windowshade mask data + // Load the windowshade tqmask data regionFile.setGroup("WindowShade"); num_points = parseList(regionFile.readEntry("NumPoints")); point_list = parseList(regionFile.readEntry("PointList")); - // Now build the mask - buildPixmap(num_points, point_list, shade_mask); + // Now build the tqmask + buildPixmap(num_points, point_list, shade_tqmask); } WaRegion::~WaRegion() { - delete window_mask; - delete shade_mask; + delete window_tqmask; + delete shade_tqmask; } void WaRegion::buildPixmap(const TQValueList<int> &num_points_list, const TQValueList<int> &points_list, TQBitmap *dest) { if (!num_points_list.count()) { - dest->fill(Qt::color1); + dest->fill(TQt::color1); return; } @@ -85,8 +85,8 @@ void WaRegion::buildPixmap(const TQValueList<int> &num_points_list, const TQValu TQBitmap bm(dest->width()+1,dest->height()+1,true); TQPainter bmp(&bm); - bmp.setBrush(Qt::color1); - bmp.setPen(Qt::NoPen); // The polygon border itself should not be part of the visible window + bmp.setBrush(TQt::color1); + bmp.setPen(TQt::NoPen); // The polygon border itself should not be part of the visible window // Go over each "region" in the file for (TQValueList<int>::const_iterator num_points = num_points_list.begin();num_points != num_points_list.end();num_points++) { @@ -101,7 +101,7 @@ void WaRegion::buildPixmap(const TQValueList<int> &num_points_list, const TQValu point_array.setPoint(i, x, y); } - // Now draw it as a filled polygon on the mask + // Now draw it as a filled polygon on the tqmask bmp.drawPolygon(point_array); } diff --git a/noatun/modules/winskin/waRegion.h b/noatun/modules/winskin/waRegion.h index 66c7c811..737ebdb9 100644 --- a/noatun/modules/winskin/waRegion.h +++ b/noatun/modules/winskin/waRegion.h @@ -9,15 +9,15 @@ public: WaRegion(TQString filename); ~WaRegion(); - const TQBitmap *mainWindowMask() const { return window_mask; } - const TQBitmap *mainWindowShadeMask() const { return shade_mask; } + const TQBitmap *mainWindowMask() const { return window_tqmask; } + const TQBitmap *mainWindowShadeMask() const { return shade_tqmask; } private: TQValueList<int> parseList(const TQString &list) const; void buildPixmap(const TQValueList<int> &num_points, const TQValueList<int> &point_list, TQBitmap *dest); - TQBitmap *window_mask; - TQBitmap *shade_mask; + TQBitmap *window_tqmask; + TQBitmap *shade_tqmask; }; extern WaRegion *windowRegion; diff --git a/noatun/modules/winskin/waShadeMapping.h b/noatun/modules/winskin/waShadeMapping.h index d28d4ca8..a20fcf6d 100644 --- a/noatun/modules/winskin/waShadeMapping.h +++ b/noatun/modules/winskin/waShadeMapping.h @@ -107,10 +107,10 @@ static const SkinDesc shadeMapFromFile[] = { {_WA_FILE_SHUFREP, 69, 61, 23, 12}, // _WA_SKIN_SHUFREP_PLAYLIST_NOT_SET_PRES {_WA_FILE_SHUFREP, 23, 73, 23, 12}, // _WA_SKIN_SHUFREP_PLAYLIST_SET_NORM {_WA_FILE_SHUFREP, 73, 23, 12}, // _WA_SKIN_SHUFREP_PLAYLIST_SET_PRES - {_WA_FILE_SHUFREP, 0, 61, 23, 12}, // _WA_SKIN_SHUFREP_EQ_NOT_SET_NORM - {_WA_FILE_SHUFREP, 46, 61, 23, 12}, // _WA_SKIN_SHUFREP_EQ_NOT_SET_PRES - {_WA_FILE_SHUFREP, 0, 73, 23, 12}, // _WA_SKIN_SHUFREP_EQ_SET_NORM - {_WA_FILE_SHUFREP, 46, 73, 23, 12}, // _WA_SKIN_SHUFREP_EQ_SET_PRES + {_WA_FILE_SHUFREP, 0, 61, 23, 12}, // _WA_SKIN_SHUFREP_ETQ_NOT_SET_NORM + {_WA_FILE_SHUFREP, 46, 61, 23, 12}, // _WA_SKIN_SHUFREP_ETQ_NOT_SET_PRES + {_WA_FILE_SHUFREP, 0, 73, 23, 12}, // _WA_SKIN_SHUFREP_ETQ_SET_NORM + {_WA_FILE_SHUFREP, 46, 73, 23, 12}, // _WA_SKIN_SHUFREP_ETQ_SET_PRES {_WA_FILE_TEXT, 0, 0, 155, 18}, // _WA_SKIN_TEXT {_WA_FILE_VOLUME, 0, 0, 68, 421}, // _WA_SKIN_VOLUME_BAR_ALL_BARS {_WA_FILE_VOLUME, 0, 0, 68, 13}, // _WA_SKIN_VOLUME_BAR diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp index d7b443ee..aae49bf9 100644 --- a/noatun/modules/winskin/waSkin.cpp +++ b/noatun/modules/winskin/waSkin.cpp @@ -72,8 +72,8 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface() createHighLevelElements(); createButtons(); - setMinimumSize(sizeHint()); - setMaximumSize(sizeHint()); + setMinimumSize(tqsizeHint()); + setMaximumSize(tqsizeHint()); KWin::setType(this->winId(), NET::Override); setBackgroundMode(NoBackground); @@ -126,7 +126,7 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface() newSong(); // HACK: We won't get focus events otherwise - setFocusPolicy(TQWidget::ClickFocus); + setFocusPolicy(TQ_ClickFocus); show(); } @@ -142,7 +142,7 @@ void WaSkin::loadSkin(TQString newSkinDir) { waSkinManager->loadSkin(newSkinDir); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); if (title_shaded) { // waSkinModel::load() resets our skin model :( @@ -154,7 +154,7 @@ void WaSkin::loadSkin(TQString newSkinDir) } } -TQSize WaSkin::sizeHint() const +TQSize WaSkin::tqsizeHint() const { TQRect temp_rect; @@ -254,8 +254,8 @@ void WaSkin::createButtons() repeat->setPixmapDownSelected(_WA_SKIN_SHUFREP_REPEAT_SET_PRES); - eq->setPixmapUp(_WA_SKIN_SHUFREP_EQ_NOT_SET_NORM); - eq->setPixmapDown(_WA_SKIN_SHUFREP_EQ_NOT_SET_PRES); + eq->setPixmapUp(_WA_SKIN_SHUFREP_ETQ_NOT_SET_NORM); + eq->setPixmapDown(_WA_SKIN_SHUFREP_ETQ_NOT_SET_PRES); playlist->setPixmapUp(_WA_SKIN_SHUFREP_PLAYLIST_NOT_SET_NORM); playlist->setPixmapDown( _WA_SKIN_SHUFREP_PLAYLIST_NOT_SET_PRES); @@ -305,7 +305,7 @@ void WaSkin::createHighLevelElements() waInfo = new WaInfo(); - waStatus = new WaStatus(); + watqStatus = new WatqStatus(); waStereo = new WaIndicator(_WA_MAPPING_MONOSTER_STEREO, _WA_SKIN_MONOSTER_STEREO_TRUE, _WA_SKIN_MONOSTER_STEREO_FALSE); waMono = new WaIndicator(_WA_MAPPING_MONOSTER_MONO, _WA_SKIN_MONOSTER_MONO_TRUE, _WA_SKIN_MONOSTER_MONO_FALSE); @@ -337,7 +337,7 @@ void WaSkin::setChannels(int val) void WaSkin::shade() { waSkinModel->setSkinModel(WA_MODEL_WINDOWSHADE); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); setMask(*windowRegion->mainWindowShadeMask()); title_shaded = true; @@ -346,7 +346,7 @@ void WaSkin::shade() { void WaSkin::unshade() { waSkinModel->setSkinModel(WA_MODEL_NORMAL); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); setMask(*windowRegion->mainWindowMask()); title_shaded = false; @@ -558,9 +558,9 @@ void WaSkin::balanceSetValue(int val) waInfo->setText(i18n("Balance: Center")); } else if (val < 0) { - waInfo->setText(i18n("Balance: %1% Left").arg(-val)); + waInfo->setText(i18n("Balance: %1% Left").tqarg(-val)); } else { - waInfo->setText(i18n("Balance: %1% Right").arg(val)); + waInfo->setText(i18n("Balance: %1% Right").tqarg(val)); } } @@ -672,14 +672,14 @@ void WaSkin::volumeSliderReleased() void WaSkin::volumeSetValue(int val) { if (mVolumePressed) - waInfo->setText(i18n("Volume: %1%").arg(val)); + waInfo->setText(i18n("Volume: %1%").tqarg(val)); napp->player()->setVolume(val); } void WaSkin::slotPlaying() { - waStatus->setStatus(STATUS_PLAYING); + watqStatus->settqStatus(STATUS_PLAYING); if (!napp->playlist()->current()) { return; @@ -710,7 +710,7 @@ void WaSkin::slotPlaying() void WaSkin::slotStopped() { - waStatus->setStatus(STATUS_STOPPED); + watqStatus->settqStatus(STATUS_STOPPED); waDigit->setTime(""); @@ -733,7 +733,7 @@ void WaSkin::slotStopped() void WaSkin::slotPaused() { - waStatus->setStatus(STATUS_PAUSED); + watqStatus->settqStatus(STATUS_PAUSED); } void WaSkin::keyPressEvent(TQKeyEvent *e) { diff --git a/noatun/modules/winskin/waSkin.h b/noatun/modules/winskin/waSkin.h index 947ce81e..5c363428 100644 --- a/noatun/modules/winskin/waSkin.h +++ b/noatun/modules/winskin/waSkin.h @@ -33,7 +33,7 @@ class WaMain; class WaIndicator; class WaTitleBar; class WaClutterbar; -class WaStatus; +class WatqStatus; class WaJumpSlider; class WaVolumeSlider; @@ -45,7 +45,8 @@ class WaSkin; extern WaSkin *_waskin_instance; class WaSkin : public TQWidget, public UserInterface { - Q_OBJECT + Q_OBJECT + TQ_OBJECT NOATUNPLUGIND WaSkinModel *waSkinModel; WaSkinManager *waSkinManager; @@ -59,7 +60,7 @@ class WaSkin : public TQWidget, public UserInterface { void loadSkin(TQString skinDir); void setChannels(int val); - TQSize sizeHint() const; + TQSize tqsizeHint() const; static TQString defaultSkin(); static WaSkin *instance() { return _waskin_instance; } @@ -158,7 +159,7 @@ class WaSkin : public TQWidget, public UserInterface { WaLabel *waFreq; WaInfo *waInfo; - WaStatus *waStatus; + WatqStatus *watqStatus; WaIndicator *waStereo; WaIndicator *waMono; diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp index cb5b0e2a..de7a4d0f 100644 --- a/noatun/modules/winskin/waSkinManager.cpp +++ b/noatun/modules/winskin/waSkinManager.cpp @@ -25,20 +25,20 @@ TQStringList WaSkinManager::availableSkins() { // This loop adds them all to our skin list for(unsigned int x = 0;x < skinDirs.count();x++) { - TQDir skinQDir(skinDirs[x]); + TQDir skinTQDir(skinDirs[x]); // We only want directories, although there shouldn't be anything else - skinQDir.setFilter( TQDir::Dirs ); + skinTQDir.setFilter( TQDir::Dirs ); // I guess name is as good as any - skinQDir.setSorting( TQDir::Name ); + skinTQDir.setSorting( TQDir::Name ); - for (unsigned int y = 0;y < skinQDir.count();y++) { - TQStringList skins = skinQDir.entryList(TQDir::Dirs, TQDir::Name); + for (unsigned int y = 0;y < skinTQDir.count();y++) { + TQStringList skins = skinTQDir.entryList(TQDir::Dirs, TQDir::Name); // We really don't care for '.' and '..' - if (skinQDir[y][0] != (char)'.') { + if (skinTQDir[y][0] != (char)'.') { // Add ourselves to the list, using our directory name - skin_list += skinQDir[y]; + skin_list += skinTQDir[y]; } } } @@ -82,7 +82,7 @@ bool WaSkinManager::installSkin(TQString _url) { return false; TQString base_path; - base_path = location + "/" + TQFileInfo(url.path()).baseName().replace(TQRegExp("_"), " "); + base_path = location + "/" + TQFileInfo(url.path()).baseName().tqreplace(TQRegExp("_"), " "); KIO::Job *job = KIO::copy("zip:" + url.path(), base_path); connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList())); diff --git a/noatun/modules/winskin/waSkinManager.h b/noatun/modules/winskin/waSkinManager.h index 360826b1..bc04d89c 100644 --- a/noatun/modules/winskin/waSkinManager.h +++ b/noatun/modules/winskin/waSkinManager.h @@ -9,6 +9,7 @@ class WaSkinManager : public TQObject, public DCOPObject { Q_OBJECT +//TQ_OBJECT K_DCOP public: diff --git a/noatun/modules/winskin/waSkinMapping.h b/noatun/modules/winskin/waSkinMapping.h index a3dfc9c5..37d56c08 100644 --- a/noatun/modules/winskin/waSkinMapping.h +++ b/noatun/modules/winskin/waSkinMapping.h @@ -107,10 +107,10 @@ static const SkinDesc normalMapFromFile[] = { {_WA_FILE_SHUFREP, 69, 61, 23, 12}, // _WA_SKIN_SHUFREP_PLAYLIST_NOT_SET_PRES {_WA_FILE_SHUFREP, 23, 73, 23, 12}, // _WA_SKIN_SHUFREP_PLAYLIST_SET_NORM {_WA_FILE_SHUFREP, 73, 23, 12}, // _WA_SKIN_SHUFREP_PLAYLIST_SET_PRES - {_WA_FILE_SHUFREP, 0, 61, 23, 12}, // _WA_SKIN_SHUFREP_EQ_NOT_SET_NORM - {_WA_FILE_SHUFREP, 46, 61, 23, 12}, // _WA_SKIN_SHUFREP_EQ_NOT_SET_PRES - {_WA_FILE_SHUFREP, 0, 73, 23, 12}, // _WA_SKIN_SHUFREP_EQ_SET_NORM - {_WA_FILE_SHUFREP, 46, 73, 23, 12}, // _WA_SKIN_SHUFREP_EQ_SET_PRES + {_WA_FILE_SHUFREP, 0, 61, 23, 12}, // _WA_SKIN_SHUFREP_ETQ_NOT_SET_NORM + {_WA_FILE_SHUFREP, 46, 61, 23, 12}, // _WA_SKIN_SHUFREP_ETQ_NOT_SET_PRES + {_WA_FILE_SHUFREP, 0, 73, 23, 12}, // _WA_SKIN_SHUFREP_ETQ_SET_NORM + {_WA_FILE_SHUFREP, 46, 73, 23, 12}, // _WA_SKIN_SHUFREP_ETQ_SET_PRES {_WA_FILE_TEXT, 0, 0, 155, 18}, // _WA_SKIN_TEXT {_WA_FILE_VOLUME, 0, 0, 68, 421}, // _WA_SKIN_VOLUME_BAR_ALL_BARS {_WA_FILE_VOLUME, 0, 0, 68, 13}, // _WA_SKIN_VOLUME_BAR diff --git a/noatun/modules/winskin/waSkinModel.cpp b/noatun/modules/winskin/waSkinModel.cpp index e7562c04..b2cdb0c2 100644 --- a/noatun/modules/winskin/waSkinModel.cpp +++ b/noatun/modules/winskin/waSkinModel.cpp @@ -419,37 +419,37 @@ void WaSkinModel::resetSkinModel() { TQChar WaSkinModel::deaccent(TQChar input) { - if (TQString("Á").contains(input)) + if (TQString("Á").tqcontains(input)) return 'A'; - if (TQString("ÉË").contains(input)) + if (TQString("ÉË").tqcontains(input)) return 'E'; - if (TQString("ÍÎ").contains(input)) + if (TQString("ÍÎ").tqcontains(input)) return 'I'; - if (TQString("ÔÓ").contains(input)) + if (TQString("ÔÓ").tqcontains(input)) return 'O'; - if (TQString("ÚÜ").contains(input)) + if (TQString("ÚÜ").tqcontains(input)) return 'U'; if (input == 'Ý') return 'Y'; - if (TQString("áâ").contains(input)) + if (TQString("áâ").tqcontains(input)) return 'a'; - if (TQString("éë").contains(input)) + if (TQString("éë").tqcontains(input)) return 'e'; - if (TQString("îí").contains(input)) + if (TQString("îí").tqcontains(input)) return 'i'; - if (TQString("ôó").contains(input)) + if (TQString("ôó").tqcontains(input)) return 'o'; - if (TQString("úü").contains(input)) + if (TQString("úü").tqcontains(input)) return 'u'; return input; diff --git a/noatun/modules/winskin/waSkinModel.h b/noatun/modules/winskin/waSkinModel.h index f200bf83..75f485d5 100644 --- a/noatun/modules/winskin/waSkinModel.h +++ b/noatun/modules/winskin/waSkinModel.h @@ -26,7 +26,8 @@ class WaSkinModel; extern WaSkinModel *_waskinmodel_instance; class WaSkinModel : public TQObject { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: WaSkinModel(); diff --git a/noatun/modules/winskin/waSkins.h b/noatun/modules/winskin/waSkins.h index f8d5f623..8e778525 100644 --- a/noatun/modules/winskin/waSkins.h +++ b/noatun/modules/winskin/waSkins.h @@ -58,10 +58,10 @@ #define _WA_SKIN_SHUFREP_PLAYLIST_NOT_SET_PRES 29 #define _WA_SKIN_SHUFREP_PLAYLIST_SET_NORM 30 #define _WA_SKIN_SHUFREP_PLAYLIST_SET_PRES 31 -#define _WA_SKIN_SHUFREP_EQ_NOT_SET_NORM 32 -#define _WA_SKIN_SHUFREP_EQ_NOT_SET_PRES 33 -#define _WA_SKIN_SHUFREP_EQ_SET_NORM 34 -#define _WA_SKIN_SHUFREP_EQ_SET_PRES 35 +#define _WA_SKIN_SHUFREP_ETQ_NOT_SET_NORM 32 +#define _WA_SKIN_SHUFREP_ETQ_NOT_SET_PRES 33 +#define _WA_SKIN_SHUFREP_ETQ_SET_NORM 34 +#define _WA_SKIN_SHUFREP_ETQ_SET_PRES 35 #define _WA_SKIN_TEXT 36 diff --git a/noatun/modules/winskin/waSlider.cpp b/noatun/modules/winskin/waSlider.cpp index 99e52402..3323e7ee 100644 --- a/noatun/modules/winskin/waSlider.cpp +++ b/noatun/modules/winskin/waSlider.cpp @@ -70,7 +70,7 @@ void WaSlider::mouseMoveEvent(TQMouseEvent * e) if (newX < 0) newX = 0; - TQSize size = sizeHint(); + TQSize size = tqsizeHint(); int maxX = size.width() - slider_width; @@ -102,7 +102,7 @@ void WaSlider::updateSliderPos(int value) } void WaSlider::mousePressEvent(TQMouseEvent *e) { - if (e->button() != LeftButton && e->button() != MidButton) { + if (e->button() != Qt::LeftButton && e->button() != Qt::MidButton) { WaWidget::mousePressEvent(e); return; } @@ -143,7 +143,7 @@ void WaSlider::mouseReleaseEvent(TQMouseEvent *e) int WaSlider::pixel2Value(int xpos) { - TQSize size = sizeHint(); + TQSize size = tqsizeHint(); int min = abs(minValue); int max = abs(maxValue); @@ -158,7 +158,7 @@ int WaSlider::pixel2Value(int xpos) int WaSlider::value2Pixel(int value) { - TQSize size = sizeHint(); + TQSize size = tqsizeHint(); float min = (float) minValue; float max = (float) maxValue; float fmin = min; diff --git a/noatun/modules/winskin/waSlider.h b/noatun/modules/winskin/waSlider.h index 47630a6c..0515a3c7 100644 --- a/noatun/modules/winskin/waSlider.h +++ b/noatun/modules/winskin/waSlider.h @@ -23,6 +23,7 @@ class WaSlider : public WaWidget { Q_OBJECT + TQ_OBJECT public: WaSlider(int sliderBarMapId, int sliderId, bool is_volume = false); diff --git a/noatun/modules/winskin/waStatus.cpp b/noatun/modules/winskin/waStatus.cpp index 861e8677..20f95d92 100644 --- a/noatun/modules/winskin/waStatus.cpp +++ b/noatun/modules/winskin/waStatus.cpp @@ -14,16 +14,16 @@ #include "waStatus.h" #include "waSkinModel.h" -WaStatus::WaStatus() : WaWidget(_WA_MAPPING_PLAYPAUS) +WatqStatus::WatqStatus() : WaWidget(_WA_MAPPING_PLAYPAUS) { _status = STATUS_STOPPED; } -WaStatus::~WaStatus() +WatqStatus::~WatqStatus() { } -void WaStatus::paintEvent(TQPaintEvent *) +void WatqStatus::paintEvent(TQPaintEvent *) { if (_status == STATUS_PLAYING) { paintPixmap(_WA_SKIN_PLAYPAUS_WORK_INDICATOR); diff --git a/noatun/modules/winskin/waStatus.h b/noatun/modules/winskin/waStatus.h index e67054df..e028f318 100644 --- a/noatun/modules/winskin/waStatus.h +++ b/noatun/modules/winskin/waStatus.h @@ -22,14 +22,15 @@ enum status_enum {STATUS_PLAYING, STATUS_STOPPED, STATUS_PAUSED}; -class WaStatus : public WaWidget { +class WatqStatus : public WaWidget { Q_OBJECT + TQ_OBJECT public: - WaStatus(); - ~WaStatus(); + WatqStatus(); + ~WatqStatus(); - void setStatus(status_enum status) { _status = status; update(); } + void settqStatus(status_enum status) { _status = status; update(); } status_enum status() const { return _status; } private: diff --git a/noatun/modules/winskin/waTitleBar.cpp b/noatun/modules/winskin/waTitleBar.cpp index bba7386e..b3b4917c 100644 --- a/noatun/modules/winskin/waTitleBar.cpp +++ b/noatun/modules/winskin/waTitleBar.cpp @@ -25,7 +25,7 @@ WaTitleBar::WaTitleBar() : WaIndicator(_WA_MAPPING_TITLE, _WA_SKIN_TITLE_ACTIVE, _WA_SKIN_TITLE_INACTIVE) { moving = false; - setState(parentWidget()->isActiveWindow()); + setState(tqparentWidget()->isActiveWindow()); } WaTitleBar::~WaTitleBar() @@ -34,7 +34,7 @@ WaTitleBar::~WaTitleBar() void WaTitleBar::mousePressEvent(TQMouseEvent * e) { - if (e->button() != RightButton) { + if (e->button() != Qt::RightButton) { if (!moving) { moving = true; mDragStart = e->pos(); @@ -55,7 +55,7 @@ void WaTitleBar::mouseDoubleClickEvent(TQMouseEvent *) { void WaTitleBar::mouseReleaseEvent(TQMouseEvent * e) { - if (e->button() != RightButton) { + if (e->button() != Qt::RightButton) { moving = false; update(); return; @@ -73,7 +73,7 @@ void WaTitleBar::mouseMoveEvent(TQMouseEvent * e) } if (moving) - parentWidget()->move(e->globalPos() - mDragStart); + tqparentWidget()->move(e->globalPos() - mDragStart); } #include <waTitleBar.moc> diff --git a/noatun/modules/winskin/waTitleBar.h b/noatun/modules/winskin/waTitleBar.h index 30bfe29a..ad181389 100644 --- a/noatun/modules/winskin/waTitleBar.h +++ b/noatun/modules/winskin/waTitleBar.h @@ -29,6 +29,7 @@ class WaTitleBar : public WaIndicator { Q_OBJECT + TQ_OBJECT public: WaTitleBar(); diff --git a/noatun/modules/winskin/waVolumeSlider.h b/noatun/modules/winskin/waVolumeSlider.h index 29030c65..0f4d6ebf 100644 --- a/noatun/modules/winskin/waVolumeSlider.h +++ b/noatun/modules/winskin/waVolumeSlider.h @@ -19,7 +19,8 @@ #include "waWidget.h" class WaVolumeSlider:public WaWidget { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: WaVolumeSlider(); diff --git a/noatun/modules/winskin/waWidget.cpp b/noatun/modules/winskin/waWidget.cpp index a93537b9..0b792c7c 100644 --- a/noatun/modules/winskin/waWidget.cpp +++ b/noatun/modules/winskin/waWidget.cpp @@ -14,39 +14,39 @@ WaWidget::~WaWidget() { void WaWidget::paintPixmap(int pixmap_mapping) { if (pixmap_mapping != -1) - WaSkinModel::instance()->bltTo(pixmap_mapping, this, 0, 0); + WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), 0, 0); else - WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0); + WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0); } void WaWidget::paintPixmap(int pixmap_mapping, int x, int y) { if (pixmap_mapping != -1) - WaSkinModel::instance()->bltTo(pixmap_mapping, this, x, y); + WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), x, y); else - WaSkinModel::instance()->paintBackgroundTo(mapping, this, x, y); + WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), x, y); } void WaWidget::paintPixmap(int pixmap_mapping, int argument) { if (pixmap_mapping != -1) - WaSkinModel::instance()->bltTo(pixmap_mapping, this, 0, 0, argument); + WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), 0, 0, argument); else - WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0); + WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0); } void WaWidget::paintPixmap(int pixmap_mapping, int argument, int x, int y) { if (pixmap_mapping != -1) - WaSkinModel::instance()->bltTo(pixmap_mapping, this, x, y, argument); + WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), x, y, argument); else - WaSkinModel::instance()->paintBackgroundTo(mapping, this, x, y); + WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), x, y); } -TQSize WaWidget::sizeHint() { +TQSize WaWidget::tqsizeHint() { return WaSkinModel::instance()->getMapGeometry(mapping).size(); } void WaWidget::mousePressEvent(TQMouseEvent *e) { - if (e->button() == RightButton) + if (e->button() == Qt::RightButton) NoatunStdAction::ContextMenu::showContextMenu(); } diff --git a/noatun/modules/winskin/waWidget.h b/noatun/modules/winskin/waWidget.h index 076d0a5c..d1fb1d9c 100644 --- a/noatun/modules/winskin/waWidget.h +++ b/noatun/modules/winskin/waWidget.h @@ -6,11 +6,12 @@ class WaWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: WaWidget(int mapping); virtual ~WaWidget(); - TQSize sizeHint(); + TQSize tqsizeHint(); void paintPixmap(int wa_mapping); void paintPixmap(int wa_mapping, int number); @@ -18,7 +19,7 @@ public: void paintPixmap(int wa_mapping, int x, int y); void paintPixmap(int wa_mapping, int number, int x, int y); - void paintBackground() { WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0); } + void paintBackground() { WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0); } protected: void mousePressEvent(TQMouseEvent *); diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp index 07352c7b..0f2067de 100644 --- a/noatun/modules/winskin/winSkinConfig.cpp +++ b/noatun/modules/winskin/winSkinConfig.cpp @@ -23,13 +23,13 @@ #include "waSkinManager.h" #include "winSkinConfig.h" -WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) : +WinSkinConfig::WinSkinConfig(TQWidget * tqparent, WaSkinManager *waSkinManager) : CModule(i18n("Winskin"), i18n("Skin Selection for the Winskin Plugin"), "style", - parent) + TQT_TQOBJECT(tqparent)) { - // Make a token horizontal layout box + // Make a token horizontal tqlayout box vbox = new TQVBoxLayout(this); vbox->setSpacing( 6 ); vbox->setMargin( 0 ); @@ -55,7 +55,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) : mWaSkinManager = waSkinManager; - TQGroupBox *settingsBox = new TQGroupBox( 1, Vertical, i18n("Settings"), this ); + TQGroupBox *settingsBox = new TQGroupBox( 1,Qt::Vertical, i18n("Settings"), this ); vbox->addWidget(settingsBox); TQHBox *box = new TQHBox(settingsBox); @@ -68,7 +68,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) : scrollSpeed->setMinValue( 0 ); scrollSpeed->setMaxValue( 50 ); scrollSpeed->setPageStep( 1 ); - scrollSpeed->setOrientation( TQSlider::Horizontal ); + scrollSpeed->setOrientation( Qt::Horizontal ); scrollSpeed->setTickmarks( TQSlider::NoMarks ); label = new TQLabel(i18n("Fast"), box); @@ -111,7 +111,7 @@ void WinSkinConfig::reopen() { TQString orig_skin = mWaSkinManager->currentSkin(); // Where is that skin in our big-list-o-skins? - TQListBoxItem *item = skin_list->findItem(orig_skin); + TQListBoxItem *item = skin_list->tqfindItem(orig_skin); if (item) { // Aha, found it... make it the currently selected skin @@ -138,7 +138,7 @@ void WinSkinConfig::install() TQString url; // Ask the user for directory containing a skin - KURLRequesterDlg* udlg = new KURLRequesterDlg( TQString::null, this, "udlg", true ); + KURLRequesterDlg* udlg = new KURLRequesterDlg( TQString(), this, "udlg", true ); udlg->urlRequester()->setFilter(mWaSkinManager->skinMimeTypes().join(" ")); udlg->urlRequester()->setMode( KFile::File | KFile::Directory | KFile::ExistingOnly ); @@ -163,7 +163,7 @@ void WinSkinConfig::remove() // Ask the user first if( KMessageBox::warningContinueCancel( this, - i18n("<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>").arg( skin_list->currentText() ), TQString::null, KStdGuiItem::del() ) + i18n("<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>").tqarg( skin_list->currentText() ), TQString(), KStdGuiItem::del() ) == KMessageBox::Continue ) { mWaSkinManager->removeSkin( skin_list->currentText() ); diff --git a/noatun/modules/winskin/winSkinConfig.h b/noatun/modules/winskin/winSkinConfig.h index 3ba04cad..047f0805 100644 --- a/noatun/modules/winskin/winSkinConfig.h +++ b/noatun/modules/winskin/winSkinConfig.h @@ -10,8 +10,9 @@ class TQSlider; class WinSkinConfig:public CModule { Q_OBJECT + TQ_OBJECT public: - WinSkinConfig(TQWidget * parent, WaSkinManager *waManager); + WinSkinConfig(TQWidget * tqparent, WaSkinManager *waManager); void save(); diff --git a/noatun/modules/winskin/winSkinVis.cpp b/noatun/modules/winskin/winSkinVis.cpp index 8ec025d2..f760fac3 100644 --- a/noatun/modules/winskin/winSkinVis.cpp +++ b/noatun/modules/winskin/winSkinVis.cpp @@ -17,8 +17,8 @@ #define __BANDS 75 #define __SPAHEIGHT 15 -WinSkinVis::WinSkinVis(TQObject *parent, const char *name): - TQObject(parent,name),Visualization(50) { +WinSkinVis::WinSkinVis(TQObject *tqparent, const char *name): + TQObject(tqparent,name),Visualization(50) { m_currentPeaks=new float[__BANDS]; diff --git a/noatun/modules/winskin/winSkinVis.h b/noatun/modules/winskin/winSkinVis.h index 51c33205..3f941c6f 100644 --- a/noatun/modules/winskin/winSkinVis.h +++ b/noatun/modules/winskin/winSkinVis.h @@ -25,9 +25,10 @@ class WinSkinVis : public TQObject, public Visualization { Q_OBJECT + TQ_OBJECT public: - WinSkinVis(TQObject* parent,const char* name); + WinSkinVis(TQObject* tqparent,const char* name); ~WinSkinVis(); /** diff --git a/noatun/noatun.api b/noatun/noatun.api index abf3bf87..2e0b8806 100644 --- a/noatun/noatun.api +++ b/noatun/noatun.api @@ -59,8 +59,8 @@ WARN_LOGFILE = INPUT = library/noatun FILE_PATTERNS = *.h RECURSIVE = NO -EXCLUDE_PATTERNS = *.moc.* \ - moc* \ +EXCLUDE_PATTERNS = *.tqmoc.* \ + tqmoc* \ *.all_cpp.* \ *unload.* \ EXAMPLE_PATH = diff --git a/noatun/noatun20update.cpp b/noatun/noatun20update.cpp index 8ab0bbdb..dbf21f3d 100644 --- a/noatun/noatun20update.cpp +++ b/noatun/noatun20update.cpp @@ -21,19 +21,19 @@ int main(int, char **) TQString text = qin.readAll(); // tag loaders - bool tagloaders = text.contains("id3tag.plugin") || - text.contains("oggtag.plugin") || - text.contains("luckytag.plugin"); + bool tagloaders = text.tqcontains("id3tag.plugin") || + text.tqcontains("oggtag.plugin") || + text.tqcontains("luckytag.plugin"); - text.replace(TQRegExp("id3tag\\.plugin"), ""); - text.replace(TQRegExp("oggtag\\.plugin"), ""); - text.replace(TQRegExp("luckytag\\.plugin"), ""); + text.tqreplace(TQRegExp("id3tag\\.plugin"), ""); + text.tqreplace(TQRegExp("oggtag\\.plugin"), ""); + text.tqreplace(TQRegExp("luckytag\\.plugin"), ""); - if(tagloaders) text.replace(TQRegExp("Modules="), "Modules=metatag.plugin,"); + if(tagloaders) text.tqreplace(TQRegExp("Modules="), "Modules=metatag.plugin,"); // playlists - text.replace(TQRegExp("tron\\.plugin"), "splitplaylist.plugin"); - text.replace(TQRegExp("liszt\\.plugin"), "splitplaylist.plugin"); + text.tqreplace(TQRegExp("tron\\.plugin"), "splitplaylist.plugin"); + text.tqreplace(TQRegExp("liszt\\.plugin"), "splitplaylist.plugin"); qout.writeBlock(text.local8Bit()); diff --git a/xine_artsplugin/tools/thumbnail/videocreator.h b/xine_artsplugin/tools/thumbnail/videocreator.h index 3af6d515..691d1ba3 100644 --- a/xine_artsplugin/tools/thumbnail/videocreator.h +++ b/xine_artsplugin/tools/thumbnail/videocreator.h @@ -25,6 +25,7 @@ class VideoCreator : public TQObject, public ThumbCreator { Q_OBJECT + TQ_OBJECT public: VideoCreator(); virtual ~VideoCreator(); diff --git a/xine_artsplugin/xinePlayObject_impl.cpp b/xine_artsplugin/xinePlayObject_impl.cpp index 21e3dff5..9b5cef18 100644 --- a/xine_artsplugin/xinePlayObject_impl.cpp +++ b/xine_artsplugin/xinePlayObject_impl.cpp @@ -739,7 +739,7 @@ void xineVideoPlayObject_impl::x11WindowId( long window ) { XLockDisplay( display ); - // Change window and set event mask of new window + // Change window and set event tqmask of new window visual.d = window; XSelectInput( display, window, ExposureMask ); |