summaryrefslogtreecommitdiffstats
path: root/src/newui
diff options
context:
space:
mode:
Diffstat (limited to 'src/newui')
-rw-r--r--src/newui/button.cpp8
-rw-r--r--src/newui/ddockwindow.cpp20
-rw-r--r--src/newui/dmainwindow.cpp14
-rw-r--r--src/newui/dtabwidget.cpp6
4 files changed, 24 insertions, 24 deletions
diff --git a/src/newui/button.cpp b/src/newui/button.cpp
index ea63ea51..3220533e 100644
--- a/src/newui/button.cpp
+++ b/src/newui/button.cpp
@@ -56,11 +56,11 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
TQToolTip::add(this, m_realText);
m_assignAccelAction = new TDEAction(i18n("Assign Accelerator..."), 0,
- TQT_TQOBJECT(this), TQT_SLOT(assignAccel()), TQT_TQOBJECT(this));
+ this, TQ_SLOT(assignAccel()), this);
m_clearAccelAction = new TDEAction(i18n("Clear Accelerator"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(clearAccel()), TQT_TQOBJECT(this));
+ this, TQ_SLOT(clearAccel()), this);
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("UI");
TQString accel = config->readEntry(TQString("button_%1").arg(text), "");
if (!accel.isEmpty())
@@ -70,7 +70,7 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
Button::~Button()
{
// m_buttonBar->removeButton(this);
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("UI");
TQRegExp r("^&([0-9])\\s.*");
diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp
index 164ecae7..0cf3cbdc 100644
--- a/src/newui/ddockwindow.cpp
+++ b/src/newui/ddockwindow.cpp
@@ -68,7 +68,7 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position)
break;
}
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("UI");
int mode = config->readNumEntry("MDIStyle", 3);
Ideal::ButtonMode buttonMode = Ideal::Text;
@@ -85,9 +85,9 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position)
m_widgetStack = new TQWidgetStack(this);
m_internalLayout->addWidget(m_widgetStack);
- m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) );
- m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) );
- m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) );
+ m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, this, TQ_SLOT(moveToDockLeft()), this );
+ m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, this, TQ_SLOT(moveToDockRight()), this );
+ m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, this, TQ_SLOT(moveToDockBottom()), this );
setVisible(m_visible);
@@ -103,7 +103,7 @@ DDockWindow::~DDockWindow()
void DDockWindow::setVisible(bool v)
{
//write dock width to the config file
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
TQString group = TQString("%1").arg(m_name);
config->setGroup(group);
@@ -147,7 +147,7 @@ void DDockWindow::loadSettings()
void DDockWindow::saveSettings()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
TQString group = TQString("%1").arg(m_name);
int invisibleWidth = 0;
config->setGroup(group);
@@ -192,14 +192,14 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc
m_bar->addButton(button);
m_widgetStack->addWidget(widget);
- connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectWidget()));
- connect(button, TQT_SIGNAL(contextMenu(TQPopupMenu*)), this, TQT_SLOT(contextMenu(TQPopupMenu*)) );
+ connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectWidget()));
+ connect(button, TQ_SIGNAL(contextMenu(TQPopupMenu*)), this, TQ_SLOT(contextMenu(TQPopupMenu*)) );
if (!skipActivation)
{
//if the widget was selected last time the dock is deleted
//we need to show it
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
TQString group = TQString("%1").arg(m_name);
config->setGroup(group);
if (config->readEntry("ViewLastWidget") == title)
@@ -375,7 +375,7 @@ void DDockWindow::selectPrevWidget()
void DDockWindow::contextMenu(TQPopupMenu * menu)
{
- m_lastContextMenuButton = static_cast<Ideal::Button*>( TQT_TQWIDGET(const_cast<TQObject*>( sender() )) );
+ m_lastContextMenuButton = static_cast<Ideal::Button*>( const_cast<TQObject*>( sender() ) );
menu->insertSeparator();
diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp
index bc50b6f4..b2488901 100644
--- a/src/newui/dmainwindow.cpp
+++ b/src/newui/dmainwindow.cpp
@@ -42,7 +42,7 @@ DMainWindow::DMainWindow(TQWidget *parent, const char *name)
void DMainWindow::loadSettings()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("UI");
m_openTabAfterCurrent = config->readBoolEntry("OpenNewTabAfterCurrent", true);
m_showIconsOnTabs = config->readBoolEntry("ShowTabIcons", false);
@@ -208,10 +208,10 @@ DTabWidget *DMainWindow::createTab()
DTabWidget *tab = new DTabWidget(m_central);
m_tabs.append(tab);
if (tab->closeButton())
- connect(tab->closeButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(closeTab()));
- connect(tab, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(closeTab(TQWidget*)));
- connect(tab, TQT_SIGNAL(contextMenu(TQWidget*,const TQPoint &)),
- this, TQT_SLOT(tabContext(TQWidget*,const TQPoint &)));
+ connect(tab->closeButton(), TQ_SIGNAL(clicked()), this, TQ_SLOT(closeTab()));
+ connect(tab, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(closeTab(TQWidget*)));
+ connect(tab, TQ_SIGNAL(contextMenu(TQWidget*,const TQPoint &)),
+ this, TQ_SLOT(tabContext(TQWidget*,const TQPoint &)));
return tab;
}
@@ -274,7 +274,7 @@ void DMainWindow::addDockWidget(DDockWindow::Position position, TQWidget *view,
{
toolWindow(position)->addWidget(title, view);
m_docks[view] = position;
- connect(view, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDestroyed()));
+ connect(view, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDestroyed()));
}
void DMainWindow::removeDockWidget(TQWidget *view)
@@ -295,7 +295,7 @@ DDockWindow::Position DMainWindow::dockWidgetPosition(TQWidget *view)
void DMainWindow::widgetDestroyed()
{
- TQWidget *w = TQT_TQWIDGET(const_cast<TQObject*>(sender()));
+ TQWidget *w = static_cast<TQWidget*>(const_cast<TQObject*>(sender()));
if (m_docks.contains(w))
{
diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp
index becfb12c..e0a27982 100644
--- a/src/newui/dtabwidget.cpp
+++ b/src/newui/dtabwidget.cpp
@@ -49,13 +49,13 @@ DTabWidget::DTabWidget(TQWidget *parent, const char *name)
setTabReorderingEnabled(true);
}
- connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(setFocus(TQWidget*)));
-// connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(updateHistory(TQWidget*)));
+ connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(setFocus(TQWidget*)));
+// connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(updateHistory(TQWidget*)));
}
void DTabWidget::loadSettings()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("UI");
// m_tabBarShown = config->readBoolEntry("TabBarShown", true);
m_tabBarShown = ! config->readNumEntry("TabWidgetVisibility", 0);
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-25 17:27:11 +0000