summaryrefslogtreecommitdiffstats
path: root/arts/builder
diff options
context:
space:
mode:
Diffstat (limited to 'arts/builder')
-rw-r--r--arts/builder/CMakeLists.txt2
-rw-r--r--arts/builder/TODO2
-rw-r--r--arts/builder/createtool.cpp2
-rw-r--r--arts/builder/dirmanager.cpp2
-rw-r--r--arts/builder/execdlg.cpp18
-rw-r--r--arts/builder/execdlg.h2
-rw-r--r--arts/builder/interfacedlg.cpp14
-rw-r--r--arts/builder/interfacedlg.h2
-rw-r--r--arts/builder/main.cpp102
-rw-r--r--arts/builder/main.h4
-rw-r--r--arts/builder/menumaker.cpp4
-rw-r--r--arts/builder/menumaker.h4
-rw-r--r--arts/builder/module.cpp2
-rw-r--r--arts/builder/module.h2
-rw-r--r--arts/builder/mwidget.cpp10
-rw-r--r--arts/builder/mwidget.h2
-rw-r--r--arts/builder/portposdlg.cpp16
-rw-r--r--arts/builder/portposdlg.h2
-rw-r--r--arts/builder/propertypanel.cpp34
-rw-r--r--arts/builder/propertypanel.h2
-rw-r--r--arts/builder/propertypanelbase.ui4
-rw-r--r--arts/builder/qttableview.cpp164
-rw-r--r--arts/builder/qttableview.h20
-rw-r--r--arts/builder/retrievedlg.cpp10
-rw-r--r--arts/builder/retrievedlg.h2
25 files changed, 213 insertions, 215 deletions
diff --git a/arts/builder/CMakeLists.txt b/arts/builder/CMakeLists.txt
index a8611e27..62e2c0c3 100644
--- a/arts/builder/CMakeLists.txt
+++ b/arts/builder/CMakeLists.txt
@@ -39,7 +39,7 @@ tde_add_executable( artsbuilder AUTOMOC
execdlg.cpp qttableview.cpp interfacedlg.cpp
LINK
tdecore-shared tdeui-shared tdeio-shared artsbuilder-shared artskde-shared
- mcop qtmcop artsflow_idl soundserver_idl pthread
+ mcop qtmcop artsflow_idl soundserver_idl ${CMAKE_THREAD_LIBS_INIT}
DEPENDENCIES
arts_builder_headers
DESTINATION ${BIN_INSTALL_DIR}
diff --git a/arts/builder/TODO b/arts/builder/TODO
index 8b962aa5..139f22b2 100644
--- a/arts/builder/TODO
+++ b/arts/builder/TODO
@@ -41,7 +41,7 @@ Wishlist for the artsbuilder app:
this should be very useful in editing objects with lots of properties
(widgets)
-- make _changed Q_SIGNALS visible so you can connect the value_changed of a
+- make _changed 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
diff --git a/arts/builder/createtool.cpp b/arts/builder/createtool.cpp
index 2913fdd3..95026884 100644
--- a/arts/builder/createtool.cpp
+++ b/arts/builder/createtool.cpp
@@ -67,7 +67,7 @@ void CreateTool::mousePressEvent(TQMouseEvent *e)
if(x < 0 || y < 0) return;
- if( e->button() == Qt::LeftButton )
+ if( e->button() == TQt::LeftButton )
performCreate(x, y);
// well, perhaps make this an option
diff --git a/arts/builder/dirmanager.cpp b/arts/builder/dirmanager.cpp
index f3907142..f83ab7d3 100644
--- a/arts/builder/dirmanager.cpp
+++ b/arts/builder/dirmanager.cpp
@@ -25,7 +25,7 @@
#include <tqfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <tdelocale.h>
diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp
index fcdce6b8..9b673f38 100644
--- a/arts/builder/execdlg.cpp
+++ b/arts/builder/execdlg.cpp
@@ -47,7 +47,7 @@ static void min_size(TQWidget *w) {
ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
:TQDialog(parent,"X")
-/*, TRUE)*/
+/*, true)*/
{
this->structure = structure;
@@ -71,10 +71,10 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
cpuusagelabel->setText(i18n("CPU usage: unknown"));
cpuusagetimer = new TQTimer( this );
- connect( cpuusagetimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(updateCpuUsage()) );
- connect( cpuusagetimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(guiServerTick()) );
+ connect( cpuusagetimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(updateCpuUsage()) );
+ connect( cpuusagetimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(guiServerTick()) );
cpuusagetimer->start( 2000, false );
min_size(cpuusagelabel);
@@ -115,15 +115,15 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
buttonlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
bbox->addStretch(1);
TQButton *savebutton = bbox->addButton(KStdGuiItem::saveAs());
- connect( savebutton, TQT_SIGNAL( clicked() ), TQT_SLOT(saveSession() ) );
+ connect( savebutton, TQ_SIGNAL( clicked() ), TQ_SLOT(saveSession() ) );
TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
- connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+ connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
bbox->layout();
//min_size(bbox);
@@ -196,6 +196,6 @@ void ExecDlg::saveSession()
void ExecDlg::help()
{
- TDEApplication::kApplication()->invokeHelp("", "karts");
+ tdeApp->invokeHelp("", "karts");
}
#include "execdlg.moc"
diff --git a/arts/builder/execdlg.h b/arts/builder/execdlg.h
index a4c235be..6a85656d 100644
--- a/arts/builder/execdlg.h
+++ b/arts/builder/execdlg.h
@@ -30,7 +30,7 @@
#include <tqlayout.h>
class ExecDlg :public TQDialog {
- Q_OBJECT
+ TQ_OBJECT
public:
TQTimer *cpuusagetimer;
diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp
index 99b8072e..cb090644 100644
--- a/arts/builder/interfacedlg.cpp
+++ b/arts/builder/interfacedlg.cpp
@@ -41,7 +41,7 @@
using namespace std;
-InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
+InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", true)
{
setCaption(i18n("aRts: Structureport View"));
@@ -94,8 +94,8 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
listbox->setMinimumSize(340,400);
mainlayout->addWidget(listbox);
- connect( listbox, TQT_SIGNAL( doubleClicked ( TQListBoxItem *)), this,
- TQT_SLOT(accept()));
+ connect( listbox, TQ_SIGNAL( doubleClicked ( TQListBoxItem *)), this,
+ TQ_SLOT(accept()));
// hruler
mainlayout->addSpacing(5);
@@ -112,14 +112,14 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
buttonlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
bbox->addStretch(1);
TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
- connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+ connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel());
- connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
+ connect( cancelbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(reject() ) );
bbox->layout();
//min_size(bbox);
@@ -172,7 +172,7 @@ void InterfaceDlg::update()
void InterfaceDlg::help()
{
- TDEApplication::kApplication()->invokeHelp("", "karts");
+ tdeApp->invokeHelp("", "karts");
}
#include "interfacedlg.moc"
diff --git a/arts/builder/interfacedlg.h b/arts/builder/interfacedlg.h
index c2ee3341..efb8a9de 100644
--- a/arts/builder/interfacedlg.h
+++ b/arts/builder/interfacedlg.h
@@ -31,7 +31,7 @@
#include <vector>
class InterfaceDlg :public TQDialog {
- Q_OBJECT
+ TQ_OBJECT
protected:
TQListBox *listbox;
diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp
index 1d7bbce9..d8cf6224 100644
--- a/arts/builder/main.cpp
+++ b/arts/builder/main.cpp
@@ -52,7 +52,7 @@
#include <ksavefile.h>
#include <tdemessagebox.h>
#include <tdeaboutdata.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kartsserver.h>
#include <tqfile.h>
#include <tqpopupmenu.h>
@@ -146,7 +146,7 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
arts_debug("PORT: modulewidget");
modulewidget = new ModuleWidget(structure, mainDock, "mwidget");
mainDock->setWidget(modulewidget);
- connect(modulewidget, TQT_SIGNAL(modified(bool)), TQT_SLOT(setModified(bool)));
+ connect(modulewidget, TQ_SIGNAL(modified(bool)), TQ_SLOT(setModified(bool)));
arts_debug("PORT: modulewidget ok");
// allow others to dock to the 4 sides
@@ -167,20 +167,20 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
80); // relation target/this (in percent)
// selection
- connect(modulewidget, TQT_SIGNAL(portSelected(ModulePort *)),
- propertyPanel, TQT_SLOT (setSelectedPort(ModulePort *)));
- connect(propertyPanel, TQT_SIGNAL(portSelected(ModulePort *)),
- modulewidget, TQT_SLOT (selectPort(ModulePort *)));
- connect(modulewidget, TQT_SIGNAL(componentSelected(StructureComponent *)),
- propertyPanel, TQT_SLOT (setSelectedComponent(StructureComponent *)));
+ connect(modulewidget, TQ_SIGNAL(portSelected(ModulePort *)),
+ propertyPanel, TQ_SLOT (setSelectedPort(ModulePort *)));
+ connect(propertyPanel, TQ_SIGNAL(portSelected(ModulePort *)),
+ modulewidget, TQ_SLOT (selectPort(ModulePort *)));
+ connect(modulewidget, TQ_SIGNAL(componentSelected(StructureComponent *)),
+ propertyPanel, TQ_SLOT (setSelectedComponent(StructureComponent *)));
// connection
- connect(propertyPanel, TQT_SIGNAL(startConnection(ModulePort *)),
- modulewidget, TQT_SLOT (startConnection(ModulePort *)));
+ connect(propertyPanel, TQ_SIGNAL(startConnection(ModulePort *)),
+ modulewidget, TQ_SLOT (startConnection(ModulePort *)));
// port properties changed
- connect(propertyPanel, TQT_SIGNAL(portPropertiesChanged(ModulePort *)),
- modulewidget, TQT_SLOT (portPropertiesChanged(ModulePort *)));
+ connect(propertyPanel, TQ_SIGNAL(portPropertiesChanged(ModulePort *)),
+ modulewidget, TQ_SLOT (portPropertiesChanged(ModulePort *)));
arts_debug("PORT: setcanvas");
structure->setCanvas(modulewidget);
@@ -251,25 +251,25 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
*/
#if 000
- 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)), TQT_TQOBJECT(this), TQT_SLOT(addPort(int)));
- connect(m_file_new, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(fileNew(int)));
+ connect(menubar, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(activateMenu(int)));
+ connect(m_view, TQ_SIGNAL(activated(int)), modulewidget, TQ_SLOT(setZoom(int)));
+ connect(m_ports, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addPort(int)));
+ connect(m_file_new, TQ_SIGNAL(activated(int)), this, TQ_SLOT(fileNew(int)));
- //connect(m_modules, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
+ //connect(m_modules, TQ_SIGNAL(activated(int)), this, TQ_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(m_modules_synth, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int)));
+ connect(m_modules_gui, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int)));
+ connect(m_modules_instruments, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int)));
+ connect(m_modules_other, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int)));
*/
- connect(kapp, TQT_SIGNAL(lastWindowClosed()), this , TQT_SLOT(quit()));
+ connect(tdeApp, TQ_SIGNAL(lastWindowClosed()), this , TQ_SLOT(quit()));
// update the modules menu once for the start
#endif
arts_debug("PORT: activatemenu");
- connect(menumaker, TQT_SIGNAL(activated(const char *)), TQT_TQOBJECT(this), TQT_SLOT(addModule(const char *)));
+ connect(menumaker, TQ_SIGNAL(activated(const char *)), this, TQ_SLOT(addModule(const char *)));
fillModuleMenu();
arts_debug("PORT: activatemenu ok");
setupActions();
@@ -279,7 +279,7 @@ 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()), TQT_TQOBJECT(this), TQT_SLOT(viewMenuAboutToShow()));
+ connect(viewmenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(viewMenuAboutToShow()));
else
arts_debug("view menu not found!");
@@ -292,55 +292,55 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
void ArtsBuilderWindow::setupActions()
{
// File menu
- KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection());
+ KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection());
- (void)new TDEAction(i18n("Open Session..."), 0, TQT_TQOBJECT(this), TQT_SLOT(openSession()),
+ (void)new TDEAction(i18n("Open Session..."), 0, this, TQ_SLOT(openSession()),
actionCollection(), "file_open_session");
- KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection());
- (void)new TDEAction(i18n("Open E&xample..."), TQt::CTRL + TQt::Key_X, TQT_TQOBJECT(this), TQT_SLOT(openExample()),
+ KStdAction::open(this, TQ_SLOT(open()), actionCollection());
+ (void)new TDEAction(i18n("Open E&xample..."), TQt::CTRL + TQt::Key_X, this, TQ_SLOT(openExample()),
actionCollection(), "file_open_example");
- KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection());
- KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection());
- (void)new TDEAction(i18n("&Retrieve From Server..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(retrieve()),
+ KStdAction::save(this, TQ_SLOT(save()), actionCollection());
+ KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection());
+ (void)new TDEAction(i18n("&Retrieve From Server..."), TQt::CTRL + TQt::Key_R, this, TQ_SLOT(retrieve()),
actionCollection(), "file_retrieve_from_server");
- (void)new TDEAction(i18n("&Execute Structure"), "artsbuilderexecute", TQt::CTRL + TQt::Key_E, TQT_TQOBJECT(this), TQT_SLOT(execute()),
+ (void)new TDEAction(i18n("&Execute Structure"), "artsbuilderexecute", TQt::CTRL + TQt::Key_E, this, TQ_SLOT(execute()),
actionCollection(), "file_execute_structure");
- (void)new TDEAction(i18n("&Rename Structure..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(rename()),
+ (void)new TDEAction(i18n("&Rename Structure..."), TQt::CTRL + TQt::Key_R, this, TQ_SLOT(rename()),
actionCollection(), "file_rename_structure");
- (void)new TDEAction(i18n("&Publish Structure"), TQt::CTRL + TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT(publish()),
+ (void)new TDEAction(i18n("&Publish Structure"), TQt::CTRL + TQt::Key_P, this, TQ_SLOT(publish()),
actionCollection(), "file_publish_structure");
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+ KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
// Edit menu
- (void)new TDEAction(i18n("&Delete"), TQt::Key_Delete, TQT_TQOBJECT(modulewidget), TQT_SLOT(delModule()),
+ (void)new TDEAction(i18n("&Delete"), TQt::Key_Delete, modulewidget, TQ_SLOT(delModule()),
actionCollection(), "edit_delete");
- KStdAction::selectAll(TQT_TQOBJECT(modulewidget), TQT_SLOT(selectAll()), actionCollection());
+ KStdAction::selectAll(modulewidget, TQ_SLOT(selectAll()), actionCollection());
// View menu
viewPropertiesAction= new TDEToggleAction(i18n("&Property Panel"), 0,
- TQT_TQOBJECT(propertyDock), TQT_SLOT(changeHideShowState()),
+ propertyDock, TQ_SLOT(changeHideShowState()),
actionCollection(), "view_properties");
- (void)new TDEAction(i18n("200%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt200()),
+ (void)new TDEAction(i18n("200%"), 0, this, TQ_SLOT(viewAt200()),
actionCollection(), "view_200");
- (void)new TDEAction(i18n("150%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt150()),
+ (void)new TDEAction(i18n("150%"), 0, this, TQ_SLOT(viewAt150()),
actionCollection(), "view_150");
- (void)new TDEAction(i18n("100%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt100()),
+ (void)new TDEAction(i18n("100%"), 0, this, TQ_SLOT(viewAt100()),
actionCollection(), "view_100");
- (void)new TDEAction(i18n("50%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt50()),
+ (void)new TDEAction(i18n("50%"), 0, this, TQ_SLOT(viewAt50()),
actionCollection(), "view_50");
// Ports menu
- (void)new TDEAction(i18n("Create IN Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioSignal()),
+ (void)new TDEAction(i18n("Create IN Audio Signal"), 0, this, TQ_SLOT(createInAudioSignal()),
actionCollection(), "ports_create_in_audio_signal");
- (void)new TDEAction(i18n("Create OUT Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createOutAudioSignal()),
+ (void)new TDEAction(i18n("Create OUT Audio Signal"), 0, this, TQ_SLOT(createOutAudioSignal()),
actionCollection(), "ports_create_out_audio_signal");
- (void)new TDEAction(i18n("Create IN String Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInStringProperty()),
+ (void)new TDEAction(i18n("Create IN String Property"), 0, this, TQ_SLOT(createInStringProperty()),
actionCollection(), "ports_create_in_string_property");
- (void)new TDEAction(i18n("Create IN Audio Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioProperty()),
+ (void)new TDEAction(i18n("Create IN Audio Property"), 0, this, TQ_SLOT(createInAudioProperty()),
actionCollection(), "ports_create_in_audio_property");
- (void)new TDEAction(i18n("Implement Interface..."), 0, TQT_TQOBJECT(this), TQT_SLOT(addInterface()),
+ (void)new TDEAction(i18n("Implement Interface..."), 0, this, TQ_SLOT(addInterface()),
actionCollection(), "ports_implement_interface");
- (void)new TDEAction(i18n("Change Positions/Names..."), 0, TQT_TQOBJECT(this), TQT_SLOT(changePortPositions()),
+ (void)new TDEAction(i18n("Change Positions/Names..."), 0, this, TQ_SLOT(changePortPositions()),
actionCollection(), "ports_change_positions");
}
@@ -422,7 +422,7 @@ void ArtsBuilderWindow::quit()
{
if(execDlg) return;
arts_debug(">> ArtsBuilderWindow::quit() called");
- kapp->quit();
+ tdeApp->quit();
arts_debug("<< leaving ArtsBuilderWindow::quit()");
}
@@ -532,7 +532,7 @@ void ArtsBuilderWindow::openSession()
execDlg->start();
execDlg->show();
- connect(execDlg, TQT_SIGNAL(ready()), TQT_TQOBJECT(this), TQT_SLOT(endexecute()));
+ connect(execDlg, TQ_SIGNAL(ready()), this, TQ_SLOT(endexecute()));
hide();
// m_filename = filename; FIXME: DOESN'T THIS BELONG HERE?
@@ -674,7 +674,7 @@ void ArtsBuilderWindow::execute()
execDlg->start();
execDlg->show();
- connect(execDlg, TQT_SIGNAL(ready()), TQT_TQOBJECT(this), TQT_SLOT(endexecute()));
+ connect(execDlg, TQ_SIGNAL(ready()), this, TQ_SLOT(endexecute()));
hide();
}
diff --git a/arts/builder/main.h b/arts/builder/main.h
index 74408022..5fd9b8bf 100644
--- a/arts/builder/main.h
+++ b/arts/builder/main.h
@@ -27,7 +27,7 @@
#include <kdockwidget.h>
#include <tdeapplication.h>
#include <tdefiledialog.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <list>
@@ -39,7 +39,7 @@ class TDEToggleAction;
class ArtsBuilderWindow: public KDockMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
protected:
diff --git a/arts/builder/menumaker.cpp b/arts/builder/menumaker.cpp
index 8045091b..33784652 100644
--- a/arts/builder/menumaker.cpp
+++ b/arts/builder/menumaker.cpp
@@ -10,7 +10,7 @@ MenuEntry::MenuEntry(MenuMaker *menumaker, TDEActionMenu *parent, const char *te
{
action = new TDEAction(TQString::fromLocal8Bit(text));
parent->insert(action);
- connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(activated()));
+ connect(action, TQ_SIGNAL(activated()), this, TQ_SLOT(activated()));
}
void MenuEntry::activated()
@@ -93,7 +93,7 @@ void MenuMaker::addCategory(const TQString& name, const char *prefix)
TDEActionMenu *newMenu = new TDEActionMenu(catname(name));
pc->menu()->insert(newMenu);
/* 000 */
- /*connect(newMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(menuactivated(int)));
+ /*connect(newMenu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(menuactivated(int)));
pc->menu()->insertItem(catname(name).c_str(), newMenu, CAT_MAGIC_ID);*/
arts_debug("inserting a menu called '%s' in the parent menu '%s'",
catname(name).local8Bit().data(),pc->name().local8Bit().data());
diff --git a/arts/builder/menumaker.h b/arts/builder/menumaker.h
index fa3c0c20..655a0764 100644
--- a/arts/builder/menumaker.h
+++ b/arts/builder/menumaker.h
@@ -10,7 +10,7 @@ class MenuMaker;
class MenuEntry : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
protected:
@@ -46,7 +46,7 @@ public:
class MenuMaker :public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
std::list<MenuCategory *> categories;
diff --git a/arts/builder/module.cpp b/arts/builder/module.cpp
index e11da759..7d5aa58d 100644
--- a/arts/builder/module.cpp
+++ b/arts/builder/module.cpp
@@ -435,5 +435,3 @@ TQString Module::name()
{
return _name;
}
-
-// vim: sw=4 ts=4 noet
diff --git a/arts/builder/module.h b/arts/builder/module.h
index 44466bc0..1d323b82 100644
--- a/arts/builder/module.h
+++ b/arts/builder/module.h
@@ -27,7 +27,7 @@
#include <tqpixmap.h>
#include <tqstring.h>
#include <tqrect.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include "artsbuilder.h"
#include "scomponent.h"
diff --git a/arts/builder/mwidget.cpp b/arts/builder/mwidget.cpp
index 38a362e7..7bfd506e 100644
--- a/arts/builder/mwidget.cpp
+++ b/arts/builder/mwidget.cpp
@@ -133,7 +133,7 @@ void ModuleWidget::mousePressEvent( TQMouseEvent *e )
return;
}
- if( e->button() == Qt::LeftButton )
+ if( e->button() == TQt::LeftButton )
{
StructureComponent *component;
ModulePort *port;
@@ -627,7 +627,7 @@ ModuleWidget::ModuleWidget(Structure *structure, TQWidget *parent, const char *n
setTableFlags(Tbl_autoScrollBars);
setZoom(100);
- setFocusPolicy( TQ_NoFocus );
+ setFocusPolicy( TQWidget::NoFocus );
arts_debug("PORT: mw; bgmode");
setBackgroundMode(NoBackground);
@@ -637,11 +637,11 @@ ModuleWidget::ModuleWidget(Structure *structure, TQWidget *parent, const char *n
arts_debug("PORT: mw; new ar ok - qtimer");
TQTimer *timer = new TQTimer( this );
- connect( timer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(autoRedrawRouter()) );
+ connect( timer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(autoRedrawRouter()) );
arts_debug("PORT: mw; tstart");
- timer->start( 100, FALSE ); // 100 ms reoccurring check
+ timer->start( 100, false ); // 100 ms reoccurring check
}
ModuleWidget::~ModuleWidget()
diff --git a/arts/builder/mwidget.h b/arts/builder/mwidget.h
index 38d6999d..11fe76c0 100644
--- a/arts/builder/mwidget.h
+++ b/arts/builder/mwidget.h
@@ -33,7 +33,7 @@ class MWidgetTool;
class ModuleWidget :public QtTableView, public StructureCanvas
{
- Q_OBJECT
+ TQ_OBJECT
friend class MWidgetTool;
friend class CreateTool;
diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp
index 2bf9dbe4..36fa7e93 100644
--- a/arts/builder/portposdlg.cpp
+++ b/arts/builder/portposdlg.cpp
@@ -40,7 +40,7 @@
using namespace std;
-PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,"Props", TRUE)
+PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,"Props", true)
{
this->structure = structure;
@@ -111,27 +111,27 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,
buttonlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
bbox->addStretch(1);
TDEIconLoader iconloader;
TQButton *raise = bbox->addButton(i18n("&Raise"));
raise->setPixmap(iconloader.loadIcon("go-up", TDEIcon::Small));
- connect( raise, TQT_SIGNAL( clicked() ), TQT_SLOT( raise() ));
+ connect( raise, TQ_SIGNAL( clicked() ), TQ_SLOT( raise() ));
TQButton *lower = bbox->addButton(i18n("&Lower"));
lower->setPixmap(iconloader.loadIcon("go-down", TDEIcon::Small));
- connect( lower, TQT_SIGNAL( clicked() ), TQT_SLOT( lower() ));
+ connect( lower, TQ_SIGNAL( clicked() ), TQ_SLOT( lower() ));
TQButton *rename = bbox->addButton(i18n("R&ename..."));
- connect( rename, TQT_SIGNAL( clicked() ), TQT_SLOT( rename() ));
+ connect( rename, TQ_SIGNAL( clicked() ), TQ_SLOT( rename() ));
TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
- connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+ connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
/*
TQButton *cancelbutton = bbox->addButton(i18n("Cancel"));
- connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
+ connect( cancelbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(reject() ) );
*/
bbox->layout();
//min_size(bbox);
@@ -252,7 +252,7 @@ void PortPosDlg::update()
void PortPosDlg::help()
{
- TDEApplication::kApplication()->invokeHelp("", "karts");
+ tdeApp->invokeHelp("", "karts");
}
#include "portposdlg.moc"
diff --git a/arts/builder/portposdlg.h b/arts/builder/portposdlg.h
index b8714538..ba5ba8f9 100644
--- a/arts/builder/portposdlg.h
+++ b/arts/builder/portposdlg.h
@@ -31,7 +31,7 @@
#include <vector>
class PortPosDlg :public TQDialog {
- Q_OBJECT
+ TQ_OBJECT
protected:
Structure *structure;
diff --git a/arts/builder/propertypanel.cpp b/arts/builder/propertypanel.cpp
index 25809100..46615711 100644
--- a/arts/builder/propertypanel.cpp
+++ b/arts/builder/propertypanel.cpp
@@ -43,20 +43,20 @@ PropertyPanel::PropertyPanel( TQWidget* parent, const char* name, WFlags fl )
{
setTitleFont();
setTitleColors();
- connect( kapp, TQT_SIGNAL( tdedisplayFontChanged() ),
- this, TQT_SLOT( setTitleFont() ));
- connect( kapp, TQT_SIGNAL( tdedisplayPaletteChanged() ),
- this, TQT_SLOT( setTitleColors() ));
- connect( portValueGroup, TQT_SIGNAL( clicked(int) ),
- this, TQT_SLOT( pvModeChanged(int) ));
- connect( constantValueEdit, TQT_SIGNAL( returnPressed() ),
- this, TQT_SLOT( writePortProperties() ));
- connect( constantValueComboBox, TQT_SIGNAL( activated(int) ),
- this, TQT_SLOT( writePortProperties() ));
- connect( portCombo, TQT_SIGNAL( activated(int) ),
- this, TQT_SLOT( comboPortSelected(int) ));
- connect( connectButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( connectButtonClicked() ));
+ connect( tdeApp, TQ_SIGNAL( tdedisplayFontChanged() ),
+ this, TQ_SLOT( setTitleFont() ));
+ connect( tdeApp, TQ_SIGNAL( tdedisplayPaletteChanged() ),
+ this, TQ_SLOT( setTitleColors() ));
+ connect( portValueGroup, TQ_SIGNAL( clicked(int) ),
+ this, TQ_SLOT( pvModeChanged(int) ));
+ connect( constantValueEdit, TQ_SIGNAL( returnPressed() ),
+ this, TQ_SLOT( writePortProperties() ));
+ connect( constantValueComboBox, TQ_SIGNAL( activated(int) ),
+ this, TQ_SLOT( writePortProperties() ));
+ connect( portCombo, TQ_SIGNAL( activated(int) ),
+ this, TQ_SLOT( comboPortSelected(int) ));
+ connect( connectButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( connectButtonClicked() ));
constantValueComboBox->hide();
setEnabled( false );
@@ -341,7 +341,7 @@ bool PropertyPanel::eventFilter( TQObject *o, TQEvent *e )
{
if( port && !constantValueEdit->hasFocus() && (e->type() == TQEvent::KeyPress) ) {
// kdDebug() << TQString(" ..is KeyPress") << endl;
- TQString entered = TQT_TQKEYEVENT(e)->text();
+ TQString entered = static_cast<TQKeyEvent*>(e)->text();
bool goodString = entered.length() > 0;
// kdDebug() << TQString("pressed '%1'").arg(entered) << endl;
@@ -355,12 +355,12 @@ bool PropertyPanel::eventFilter( TQObject *o, TQEvent *e )
constantValueEdit->setText( entered );
constantValueEdit->setFocus();
// kdDebug() << "keyPress used in propPanel" << endl;
- return TRUE; // eat event
+ return true; // eat event
}
}
// else
// kdDebug() << "event type = " << e->type() << " != " << TQEvent::KeyPress << endl;
- return FALSE; // PropertyPanelBase::eventFilter( o, e );
+ return false; // PropertyPanelBase::eventFilter( o, e );
}
bool PropertyPanel::isEnum(const std::string& type)
diff --git a/arts/builder/propertypanel.h b/arts/builder/propertypanel.h
index 9b74b275..af156fda 100644
--- a/arts/builder/propertypanel.h
+++ b/arts/builder/propertypanel.h
@@ -32,7 +32,7 @@ class ModulePort;
class PropertyPanel: public PropertyPanelBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/arts/builder/propertypanelbase.ui b/arts/builder/propertypanelbase.ui
index 0ff20382..875f6813 100644
--- a/arts/builder/propertypanelbase.ui
+++ b/arts/builder/propertypanelbase.ui
@@ -355,8 +355,8 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot access="protected">setTitleFont()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/arts/builder/qttableview.cpp b/arts/builder/qttableview.cpp
index c8f8d9d3..827b96d2 100644
--- a/arts/builder/qttableview.cpp
+++ b/arts/builder/qttableview.cpp
@@ -108,7 +108,7 @@ void TQCornerSquare::paintEvent( TQPaintEvent * )
\warning the functions setNumRows(), setNumCols(), setCellHeight(),
setCellWidth(), setTableFlags() and clearTableFlags() may cause
virtual functions such as cellWidth() and cellHeight() to be called,
- even if autoUpdate() is FALSE. This may cause errors if relevant
+ even if autoUpdate() is false. This may cause errors if relevant
state variables are not initialized.
\warning Experience has shown that use of this widget tends to cause
@@ -215,7 +215,7 @@ void QtTableView::show()
Repaints the table view directly by calling paintEvent() directly
unless updates are disabled.
- Erases the view area \a (x,y,w,h) if \a erase is TRUE. Parameters \a
+ Erases the view area \a (x,y,w,h) if \a erase is true. Parameters \a
(x,y) are in \e widget coordinates.
If \a w is negative, it is replaced with <code>width() - x</code>.
@@ -250,7 +250,7 @@ void QtTableView::repaint( int x, int y, int w, int h, bool erase )
/*!
\overload void QtTableView::repaint( const TQRect &r, bool erase )
- Replaints rectangle \a r. If \a erase is TRUE draws the background
+ Repaints rectangle \a r. If \a erase is true draws the background
using the palette's background.
*/
@@ -464,7 +464,7 @@ void QtTableView::setYOffset( int y )
in the view. Parameters \a (x,y) are in \e table coordinates.
The interaction with \link setTableFlags() Tbl_snapTo*Grid \endlink
- is tricky. If \a updateScrBars is TRUE, the scroll bars are
+ is tricky. If \a updateScrBars is true, the scroll bars are
updated.
\sa xOffset(), yOffset(), setXOffset(), setYOffset(), setTopLeftCell()
@@ -707,8 +707,8 @@ int QtTableView::totalHeight()
/*!
\fn bool QtTableView::testTableFlags( uint f ) const
- Returns TRUE if any of the table flags in \a f are currently set,
- otherwise FALSE.
+ Returns true if any of the table flags in \a f are currently set,
+ otherwise false.
\sa setTableFlags(), clearTableFlags(), tableFlags()
*/
@@ -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.
+ repainted 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:
@@ -784,15 +784,15 @@ void QtTableView::setTableFlags( uint f )
tFlags |= f;
bool updateOn = autoUpdate();
- setAutoUpdate( FALSE );
+ setAutoUpdate( false );
uint repaintMask = Tbl_cutCellsV | Tbl_cutCellsH;
if ( f & Tbl_vScrollBar ) {
- setVerScrollBar( TRUE );
+ setVerScrollBar( true );
}
if ( f & Tbl_hScrollBar ) {
- setHorScrollBar( TRUE );
+ setHorScrollBar( true );
}
if ( f & Tbl_autoVScrollBar ) {
updateScrollBars( verRange );
@@ -822,7 +822,7 @@ void QtTableView::setTableFlags( uint f )
}
if ( updateOn ) {
- setAutoUpdate( TRUE );
+ setAutoUpdate( true );
updateScrollBars();
if ( isVisible() && (f & repaintMask) )
repaint();
@@ -850,15 +850,15 @@ void QtTableView::clearTableFlags( uint f )
tFlags &= ~f;
bool updateOn = autoUpdate();
- setAutoUpdate( FALSE );
+ setAutoUpdate( false );
uint repaintMask = Tbl_cutCellsV | Tbl_cutCellsH;
if ( f & Tbl_vScrollBar ) {
- setVerScrollBar( FALSE );
+ setVerScrollBar( false );
}
if ( f & Tbl_hScrollBar ) {
- setHorScrollBar( FALSE );
+ setHorScrollBar( false );
}
if ( f & Tbl_scrollLastHCell ) {
int maxX = maxXOffset();
@@ -891,7 +891,7 @@ void QtTableView::clearTableFlags( uint f )
updateScrollBars( verRange );
}
if ( updateOn ) {
- setAutoUpdate( TRUE );
+ setAutoUpdate( true );
updateScrollBars(); // returns immediately if nothing to do
if ( isVisible() && (f & repaintMask) )
repaint();
@@ -903,7 +903,7 @@ void QtTableView::clearTableFlags( uint f )
/*!
\fn bool QtTableView::autoUpdate() const
- Returns TRUE if the view updates itself automatically whenever it
+ Returns true if the view updates itself automatically whenever it
is changed in some way.
\sa setAutoUpdate()
@@ -912,11 +912,11 @@ void QtTableView::clearTableFlags( uint f )
/*!
Sets the auto-update option of the table view to \a enable.
- If \a enable is TRUE (this is the default), the view updates itself
+ If \a enable is true (this is the default), the view updates itself
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 repaint 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
@@ -926,7 +926,7 @@ void QtTableView::clearTableFlags( uint f )
(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
+ Setting auto-update to true does not repaint the view; you must call
repaint() to do this.
\sa autoUpdate(), repaint()
@@ -947,7 +947,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
+ If \a erase is true, the relevant part of the view is cleared to the
background color/pixmap before the contents are repainted.
\sa isVisible()
@@ -1043,7 +1043,7 @@ int QtTableView::lastColVisible() const
}
/*!
- Returns TRUE if \a row is at least partially visible.
+ Returns true if \a row is at least partially visible.
\sa colIsVisible()
*/
@@ -1053,7 +1053,7 @@ bool QtTableView::rowIsVisible( int row ) const
}
/*!
- Returns TRUE if \a col is at least partially visible.
+ Returns true if \a col is at least partially visible.
\sa rowIsVisible()
*/
@@ -1093,10 +1093,10 @@ void QtTableView::coverCornerSquare( bool enable )
\internal
Scroll the view to a position such that:
- If \a horizontal is TRUE, the leftmost column shown fits snugly
+ If \a horizontal is true, the leftmost column shown fits snugly
with the left edge of the view.
- If \a vertical is TRUE, the top row shown fits snugly with the top
+ If \a vertical is true, the top row shown fits snugly with the top
of the view.
You can achieve the same effect automatically by setting any of the
@@ -1142,7 +1142,7 @@ void QtTableView::horSbValue( int val )
tFlags |= Tbl_snapToHGrid;
}
}
- setOffset( val, yOffs, FALSE );
+ setOffset( val, yOffs, false );
}
/*!
@@ -1158,10 +1158,10 @@ void QtTableView::horSbSliding( int val )
if ( testTableFlags(Tbl_snapToHGrid) &&
testTableFlags(Tbl_smoothHScrolling) ) {
tFlags &= ~Tbl_snapToHGrid; // turn off snapping while sliding
- setOffset( val, yOffs, FALSE );
+ setOffset( val, yOffs, false );
tFlags |= Tbl_snapToHGrid; // turn on snapping again
} else {
- setOffset( val, yOffs, FALSE );
+ setOffset( val, yOffs, false );
}
}
@@ -1175,7 +1175,7 @@ void QtTableView::horSbSlidingDone( )
{
if ( testTableFlags(Tbl_snapToHGrid) &&
testTableFlags(Tbl_smoothHScrolling) )
- snapToGrid( TRUE, FALSE );
+ snapToGrid( true, false );
}
/*!
@@ -1196,7 +1196,7 @@ void QtTableView::verSbValue( int val )
tFlags |= Tbl_snapToVGrid;
}
}
- setOffset( xOffs, val, FALSE );
+ setOffset( xOffs, val, false );
}
/*!
@@ -1212,10 +1212,10 @@ void QtTableView::verSbSliding( int val )
if ( testTableFlags(Tbl_snapToVGrid) &&
testTableFlags(Tbl_smoothVScrolling) ) {
tFlags &= ~Tbl_snapToVGrid; // turn off snapping while sliding
- setOffset( xOffs, val, FALSE );
+ setOffset( xOffs, val, false );
tFlags |= Tbl_snapToVGrid; // turn on snapping again
} else {
- setOffset( xOffs, val, FALSE );
+ setOffset( xOffs, val, false );
}
}
@@ -1229,7 +1229,7 @@ void QtTableView::verSbSlidingDone( )
{
if ( testTableFlags(Tbl_snapToVGrid) &&
testTableFlags(Tbl_smoothVScrolling) )
- snapToGrid( FALSE, TRUE );
+ snapToGrid( false, true );
}
@@ -1280,7 +1280,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
TQPainter paint( this );
- if ( !contentsRect().contains( updateR, TRUE ) ) {// update frame ?
+ if ( !contentsRect().contains( updateR, true ) ) {// update frame ?
drawFrame( &paint );
if ( updateR.left() < frameWidth() ) //###
updateR.setLeft( frameWidth() );
@@ -1346,7 +1346,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt
paint.setClipRect( cellUR );
paintCell( &paint, row, col );
- paint.setClipping( FALSE );
+ paint.setClipping( false );
} else {
paintCell( &paint, row, col );
}
@@ -1358,7 +1358,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt
paint.setClipRect( cellUR );
paintCell( &paint, row, col );
- paint.setClipping( FALSE );
+ paint.setClipping( false );
} else {
paintCell( &paint, row, col );
}
@@ -1379,7 +1379,7 @@ 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 repaint(false).
// The subclass, however, cannot draw all pixels, just those
// inside the cells. So QtTableView is reponsible for all pixels
// outside the cells.
@@ -1391,7 +1391,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
TQRect r = viewR;
r.setLeft( xPos );
r.setBottom( yPos<maxY?yPos:maxY );
- if ( inherits( TQMULTILINEEDIT_OBJECT_NAME_STRING ) )
+ if ( inherits( "TQMultiLineEdit" ) )
paint.fillRect( r.intersect( updateR ), g.base() );
else
paint.eraseRect( r.intersect( updateR ) );
@@ -1399,7 +1399,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
if ( yPos <= maxY ) {
TQRect r = viewR;
r.setTop( yPos );
- if ( inherits( TQMULTILINEEDIT_OBJECT_NAME_STRING ) )
+ if ( inherits( "TQMultiLineEdit" ) )
paint.fillRect( r.intersect( updateR ), g.base() );
else
paint.eraseRect( r.intersect( updateR ) );
@@ -1439,20 +1439,20 @@ TQScrollBar *QtTableView::verticalScrollBar() const
{
QtTableView *that = (QtTableView*)this; // semantic const
if ( !vScrollBar ) {
- TQScrollBar *sb = new TQScrollBar( Qt::Vertical, that );
+ TQScrollBar *sb = new TQScrollBar( TQt::Vertical, that );
#ifndef TQT_NO_CURSOR
sb->setCursor( arrowCursor );
#endif
sb->resize( sb->sizeHint() ); // height is irrelevant
TQ_CHECK_PTR(sb);
- sb->setTracking( FALSE );
- sb->setFocusPolicy( TQ_NoFocus );
- connect( sb, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(verSbValue(int)));
- connect( sb, TQT_SIGNAL(sliderMoved(int)),
- TQT_SLOT(verSbSliding(int)));
- connect( sb, TQT_SIGNAL(sliderReleased()),
- TQT_SLOT(verSbSlidingDone()));
+ sb->setTracking( false );
+ sb->setFocusPolicy( TQWidget::NoFocus );
+ connect( sb, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(verSbValue(int)));
+ connect( sb, TQ_SIGNAL(sliderMoved(int)),
+ TQ_SLOT(verSbSliding(int)));
+ connect( sb, TQ_SIGNAL(sliderReleased()),
+ TQ_SLOT(verSbSlidingDone()));
sb->hide();
that->vScrollBar = sb;
return sb;
@@ -1470,20 +1470,20 @@ TQScrollBar *QtTableView::horizontalScrollBar() const
{
QtTableView *that = (QtTableView*)this; // semantic const
if ( !hScrollBar ) {
- TQScrollBar *sb = new TQScrollBar( Qt::Horizontal, that );
+ TQScrollBar *sb = new TQScrollBar( TQt::Horizontal, that );
#ifndef TQT_NO_CURSOR
sb->setCursor( arrowCursor );
#endif
sb->resize( sb->sizeHint() ); // width is irrelevant
- sb->setFocusPolicy( TQ_NoFocus );
+ sb->setFocusPolicy( TQWidget::NoFocus );
TQ_CHECK_PTR(sb);
- sb->setTracking( FALSE );
- connect( sb, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(horSbValue(int)));
- connect( sb, TQT_SIGNAL(sliderMoved(int)),
- TQT_SLOT(horSbSliding(int)));
- connect( sb, TQT_SIGNAL(sliderReleased()),
- TQT_SLOT(horSbSlidingDone()));
+ sb->setTracking( false );
+ connect( sb, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(horSbValue(int)));
+ connect( sb, TQ_SIGNAL(sliderMoved(int)),
+ TQ_SLOT(horSbSliding(int)));
+ connect( sb, TQ_SIGNAL(sliderReleased()),
+ TQ_SLOT(horSbSlidingDone()));
sb->hide();
that->hScrollBar = sb;
return sb;
@@ -1506,14 +1506,14 @@ void QtTableView::setHorScrollBar( bool on, bool update )
else
sbDirty = sbDirty | (horMask | verMask);
if ( testTableFlags( Tbl_vScrollBar ) )
- coverCornerSquare( TRUE );
+ coverCornerSquare( true );
if ( autoUpdate() )
sbDirty = sbDirty | horMask;
} else {
tFlags &= ~Tbl_hScrollBar;
if ( !hScrollBar )
return;
- coverCornerSquare( FALSE );
+ coverCornerSquare( false );
bool hideScrollBar = autoUpdate() && hScrollBar->isVisible();
if ( hideScrollBar )
hScrollBar->hide();
@@ -1545,14 +1545,14 @@ void QtTableView::setVerScrollBar( bool on, bool update )
else
sbDirty = sbDirty | (horMask | verMask);
if ( testTableFlags( Tbl_hScrollBar ) )
- coverCornerSquare( TRUE );
+ coverCornerSquare( true );
if ( autoUpdate() )
sbDirty = sbDirty | verMask;
} else {
tFlags &= ~Tbl_vScrollBar;
if ( !vScrollBar )
return;
- coverCornerSquare( FALSE );
+ coverCornerSquare( false );
bool hideScrollBar = autoUpdate() && vScrollBar->isVisible();
if ( hideScrollBar )
vScrollBar->hide();
@@ -1707,8 +1707,8 @@ int QtTableView::findCol( int xPos ) const
/*!
Computes the position in the widget of row \a row.
- Returns TRUE and stores the result in \a *yPos (in \e widget
- coordinates) if the row is visible. Returns FALSE and does not modify
+ Returns true and stores the result in \a *yPos (in \e widget
+ coordinates) if the row is visible. Returns false and does not modify
\a *yPos if \a row is invisible or invalid.
\sa colXPos(), findRow()
@@ -1721,7 +1721,7 @@ bool QtTableView::rowYPos( int row, int *yPos ) const
if ( cellH ) {
int lastVisible = lastRowVisible();
if ( row > lastVisible || lastVisible == -1 )
- return FALSE;
+ return false;
y = (row - yCellOffs)*cellH + minViewY() - yCellDelta;
} else {
//##arnt3
@@ -1732,23 +1732,23 @@ bool QtTableView::rowYPos( int row, int *yPos ) const
while ( r < row && y <= maxY )
y += tw->cellHeight( r++ );
if ( y > maxY )
- return FALSE;
+ return false;
}
} else {
- return FALSE;
+ return false;
}
if ( yPos )
*yPos = y;
- return TRUE;
+ return true;
}
/*!
Computes the position in the widget of column \a col.
- Returns TRUE and stores the result in \a *xPos (in \e widget
- coordinates) if the column is visible. Returns FALSE and does not
+ Returns true and stores the result in \a *xPos (in \e widget
+ coordinates) if the column is visible. Returns false and does not
modify \a *xPos if \a col is invisible or invalid.
\sa rowYPos(), findCol()
@@ -1761,7 +1761,7 @@ bool QtTableView::colXPos( int col, int *xPos ) const
if ( cellW ) {
int lastVisible = lastColVisible();
if ( col > lastVisible || lastVisible == -1 )
- return FALSE;
+ return false;
x = (col - xCellOffs)*cellW + minViewX() - xCellDelta;
} else {
//##arnt3
@@ -1772,14 +1772,14 @@ bool QtTableView::colXPos( int col, int *xPos ) const
while ( c < col && x <= maxX )
x += tw->cellWidth( c++ );
if ( x > maxX )
- return FALSE;
+ return false;
}
} else {
- return FALSE;
+ return false;
}
if ( xPos )
*xPos = x;
- return TRUE;
+ return true;
}
@@ -1908,9 +1908,9 @@ void QtTableView::doAutoScrollBars()
w += cellWidth( i++ );
}
if ( w > viewW )
- hScrollOn = TRUE;
+ hScrollOn = true;
else
- hScrollOn = FALSE;
+ hScrollOn = false;
}
if ( testTableFlags(Tbl_autoVScrollBar) ) {
@@ -1923,21 +1923,21 @@ void QtTableView::doAutoScrollBars()
}
if ( h > viewH )
- vScrollOn = TRUE;
+ vScrollOn = true;
else
- vScrollOn = FALSE;
+ vScrollOn = false;
}
if ( testTableFlags(Tbl_autoHScrollBar) && vScrollOn && !hScrollOn )
if ( w > viewW - VSBEXT )
- hScrollOn = TRUE;
+ hScrollOn = true;
if ( testTableFlags(Tbl_autoVScrollBar) && hScrollOn && !vScrollOn )
if ( h > viewH - HSBEXT )
- vScrollOn = TRUE;
+ vScrollOn = true;
- setHorScrollBar( hScrollOn, FALSE );
- setVerScrollBar( vScrollOn, FALSE );
+ setHorScrollBar( hScrollOn, false );
+ setVerScrollBar( vScrollOn, false );
updateFrameSize();
}
@@ -2259,10 +2259,10 @@ void QtTableView::showOrHideScrollBars()
void QtTableView::updateTableSize()
{
bool updateOn = autoUpdate();
- setAutoUpdate( FALSE );
+ setAutoUpdate( false );
int xofs = xOffset();
xOffs++; //so that setOffset will not return immediately
- setOffset(xofs,yOffset(),FALSE); //to calculate internal state correctly
+ setOffset(xofs,yOffset(),false); //to calculate internal state correctly
setAutoUpdate(updateOn);
updateScrollBars( horSteps | horRange |
diff --git a/arts/builder/qttableview.h b/arts/builder/qttableview.h
index 8a8cbe3d..39f5d757 100644
--- a/arts/builder/qttableview.h
+++ b/arts/builder/qttableview.h
@@ -25,16 +25,16 @@ class TQCornerSquare;
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 repaint( bool erase=true );
+ void repaint( int x, int y, int w, int h, bool erase=true );
+ void repaint( const TQRect &, bool erase=true );
protected:
QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 );
@@ -55,7 +55,7 @@ protected:
virtual void setXOffset( int );
int yOffset() const;
virtual void setYOffset( int );
- virtual void setOffset( int x, int y, bool updateScrBars = TRUE );
+ virtual void setOffset( int x, int y, bool updateScrBars = true );
virtual int cellWidth( int col );
virtual int cellHeight( int row );
@@ -75,7 +75,7 @@ protected:
bool autoUpdate() const;
virtual void setAutoUpdate( bool );
- void updateCell( int row, int column, bool erase=TRUE );
+ void updateCell( int row, int column, bool erase=true );
TQRect cellUpdateRect() const;
TQRect viewRect() const;
@@ -129,13 +129,13 @@ protected:
private:
void coverCornerSquare( bool );
void snapToGrid( bool horizontal, bool vertical );
- virtual void setHorScrollBar( bool on, bool update = TRUE );
- virtual void setVerScrollBar( bool on, bool update = TRUE );
+ virtual void setHorScrollBar( bool on, bool update = true );
+ virtual void setVerScrollBar( bool on, bool update = true );
void updateView();
int findRawRow( int yPos, int *cellMaxY, int *cellMinY = 0,
- bool goOutsideView = FALSE ) const;
+ bool goOutsideView = false ) const;
int findRawCol( int xPos, int *cellMaxX, int *cellMinX = 0,
- bool goOutsideView = FALSE ) const;
+ bool goOutsideView = false ) const;
int maxColsVisible() const;
void updateScrollBars( uint );
diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp
index c95d40ad..f6da1294 100644
--- a/arts/builder/retrievedlg.cpp
+++ b/arts/builder/retrievedlg.cpp
@@ -40,7 +40,7 @@ static void min_size(TQWidget *w) {
w->setMinimumSize(w->sizeHint());
}
-RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE)
+RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", true)
{
setCaption(i18n("Retrieve Structure From Server"));
@@ -104,14 +104,14 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE)
buttonlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
bbox->addStretch(1);
TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel());
- connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
+ connect( cancelbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(reject() ) );
TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
- connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+ connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
bbox->layout();
@@ -132,6 +132,6 @@ TQString RetrieveDlg::result()
void RetrieveDlg::help()
{
- TDEApplication::kApplication()->invokeHelp("", "karts");
+ tdeApp->invokeHelp("", "karts");
}
#include "retrievedlg.moc"
diff --git a/arts/builder/retrievedlg.h b/arts/builder/retrievedlg.h
index 485298f0..065efe93 100644
--- a/arts/builder/retrievedlg.h
+++ b/arts/builder/retrievedlg.h
@@ -34,7 +34,7 @@
#include <string>
class RetrieveDlg :public TQDialog {
- Q_OBJECT
+ TQ_OBJECT
TQListBox *listbox;
public:
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-14 04:00:27 +0000