summaryrefslogtreecommitdiffstats
path: root/src/newui
diff options
context:
space:
mode:
Diffstat (limited to 'src/newui')
-rw-r--r--src/newui/CMakeLists.txt4
-rw-r--r--src/newui/button.cpp8
-rw-r--r--src/newui/button.h2
-rw-r--r--src/newui/buttonbar.h2
-rw-r--r--src/newui/ddockwindow.cpp12
-rw-r--r--src/newui/ddockwindow.h2
-rw-r--r--src/newui/dmainwindow.cpp16
-rw-r--r--src/newui/dmainwindow.h2
-rw-r--r--src/newui/docksplitter.cpp22
-rw-r--r--src/newui/docksplitter.h6
-rw-r--r--src/newui/dtabwidget.cpp6
-rw-r--r--src/newui/dtabwidget.h2
12 files changed, 43 insertions, 41 deletions
diff --git a/src/newui/CMakeLists.txt b/src/newui/CMakeLists.txt
index b1f89a56..e6f6b124 100644
--- a/src/newui/CMakeLists.txt
+++ b/src/newui/CMakeLists.txt
@@ -15,6 +15,10 @@ include_directories(
${TQT_INCLUDE_DIRS}
)
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+)
+
##### d (shared) ################################
diff --git a/src/newui/button.cpp b/src/newui/button.cpp
index 930ce733..fc8bf826 100644
--- a/src/newui/button.cpp
+++ b/src/newui/button.cpp
@@ -47,7 +47,7 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
hide();
setFlat(true);
setToggleButton(true);
- setFocusPolicy(TQ_NoFocus);
+ setFocusPolicy(TQWidget::NoFocus);
setDescription(m_description);
setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
resize(sizeHint());
@@ -56,9 +56,9 @@ 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();
config->setGroup("UI");
@@ -229,7 +229,7 @@ TQSize Button::sizeHint(const TQString &text) const
h = TQMAX(h, sz.height());
}
- return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
+ return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
expandedTo(TQApplication::globalStrut()));
}
diff --git a/src/newui/button.h b/src/newui/button.h
index 63d0da59..68028fa9 100644
--- a/src/newui/button.h
+++ b/src/newui/button.h
@@ -38,7 +38,7 @@ A TQPushButton derivative with a size of a TQToolBar. Button can be rotated
(placed onto different places in ideal mode).
*/
class Button : public TQPushButton {
- Q_OBJECT
+ TQ_OBJECT
public:
Button(ButtonBar *parent, const TQString text, const TQIconSet &icon = TQIconSet(),
diff --git a/src/newui/buttonbar.h b/src/newui/buttonbar.h
index f0ae292b..f698fdb0 100644
--- a/src/newui/buttonbar.h
+++ b/src/newui/buttonbar.h
@@ -52,7 +52,7 @@ Looks like a toolbar but has another behaviour. It is suitable for
placing on the left(right, bottom, top) corners of a window as a bar with slider.
*/
class ButtonBar : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
ButtonBar(Place place, ButtonMode mode = IconsAndText,
diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp
index 88f25d18..60292252 100644
--- a/src/newui/ddockwindow.cpp
+++ b/src/newui/ddockwindow.cpp
@@ -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);
@@ -192,8 +192,8 @@ 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)
{
@@ -375,7 +375,7 @@ void DDockWindow::selectPrevWidget()
void DDockWindow::contextMenu(TQPopupMenu * menu)
{
- m_lastContextMenuButton = static_cast<Ideal::Button*>( TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>( sender() )) );
+ m_lastContextMenuButton = static_cast<Ideal::Button*>( const_cast<TQObject*>( sender() ) );
menu->insertSeparator();
diff --git a/src/newui/ddockwindow.h b/src/newui/ddockwindow.h
index 4190958a..29421914 100644
--- a/src/newui/ddockwindow.h
+++ b/src/newui/ddockwindow.h
@@ -39,7 +39,7 @@ namespace Ideal {
}
class DDockWindow : public TQDockWindow {
- Q_OBJECT
+ TQ_OBJECT
public:
enum Position { Bottom, Left, Right };
diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp
index 3517ab6c..d3c70d4e 100644
--- a/src/newui/dmainwindow.cpp
+++ b/src/newui/dmainwindow.cpp
@@ -34,7 +34,7 @@ DMainWindow::DMainWindow(TQWidget *parent, const char *name)
{
loadSettings();
createToolWindows();
- m_central = new Ideal::DockSplitter(Qt::Horizontal, this);
+ m_central = new Ideal::DockSplitter(TQt::Horizontal, this);
m_activeTabWidget = createTab();
m_central->addDock(0, 0, m_activeTabWidget);
setCentralWidget(m_central);
@@ -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<TQT_BASE_OBJECT_NAME*>(sender()));
+ TQWidget *w = static_cast<TQWidget*>(const_cast<TQObject*>(sender()));
if (m_docks.contains(w))
{
@@ -305,5 +305,3 @@ void DMainWindow::widgetDestroyed()
}
#include "dmainwindow.moc"
-
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
diff --git a/src/newui/dmainwindow.h b/src/newui/dmainwindow.h
index 7ccb51f6..8745c454 100644
--- a/src/newui/dmainwindow.h
+++ b/src/newui/dmainwindow.h
@@ -32,7 +32,7 @@ namespace Ideal {
/**Main window which provides simplified IDEA mode.*/
class DMainWindow: public KParts::MainWindow {
- Q_OBJECT
+ TQ_OBJECT
public:
DMainWindow(TQWidget *parent = 0, const char *name = 0);
diff --git a/src/newui/docksplitter.cpp b/src/newui/docksplitter.cpp
index 6cfa9445..3b447b80 100644
--- a/src/newui/docksplitter.cpp
+++ b/src/newui/docksplitter.cpp
@@ -23,16 +23,16 @@
namespace Ideal {
-DockSplitter::DockSplitter(Qt::Orientation orientation, TQWidget *parent, const char *name)
+DockSplitter::DockSplitter(TQt::Orientation orientation, TQWidget *parent, const char *name)
:TQSplitter(parent, name), m_orientation(orientation)
{
switch (m_orientation)
{
- case Qt::Horizontal:
- setOrientation(Qt::Vertical);
+ case TQt::Horizontal:
+ setOrientation(TQt::Vertical);
break;
- case Qt::Vertical:
- setOrientation(Qt::Horizontal);
+ case TQt::Vertical:
+ setOrientation(TQt::Horizontal);
break;
}
setOpaqueResize(true);
@@ -73,11 +73,11 @@ void DockSplitter::appendSplitter()
{
switch (m_orientation)
{
- case Qt::Horizontal:
- m_splitters.append(new TQSplitter(Qt::Horizontal, this));
+ case TQt::Horizontal:
+ m_splitters.append(new TQSplitter(TQt::Horizontal, this));
break;
- case Qt::Vertical:
- m_splitters.append(new TQSplitter(Qt::Vertical, this));
+ case TQt::Vertical:
+ m_splitters.append(new TQSplitter(TQt::Vertical, this));
break;
}
m_splitters[m_splitters.size()-1]->setOpaqueResize(true);
@@ -166,8 +166,8 @@ TQPair<uint, uint> DockSplitter::indexOf(TQWidget *dock)
for (uint i = 0; i < m_docks.count(); ++i)
for (uint j = 0; j < m_docks[i].count(); ++j)
if (dock == m_docks[i][j])
- return tqMakePair(i, j);
- return tqMakePair(0u, 0u);
+ return qMakePair(i, j);
+ return qMakePair(0u, 0u);
}
}
diff --git a/src/newui/docksplitter.h b/src/newui/docksplitter.h
index c61f6c91..1d2a2d56 100644
--- a/src/newui/docksplitter.h
+++ b/src/newui/docksplitter.h
@@ -31,10 +31,10 @@ class DockWidget;
@short Splitter for docks
*/
class DockSplitter: public TQSplitter {
- Q_OBJECT
+ TQ_OBJECT
public:
- DockSplitter(Qt::Orientation orientation, TQWidget *parent = 0, const char *name = 0);
+ DockSplitter(TQt::Orientation orientation, TQWidget *parent = 0, const char *name = 0);
~DockSplitter();
void addDock(uint row, uint col, TQWidget *dock);
@@ -53,7 +53,7 @@ protected:
bool isRowEmpty(int row);
private:
- Qt::Orientation m_orientation;
+ TQt::Orientation m_orientation;
TQValueList<TQSplitter*> m_splitters;
TQValueList<TQValueList<TQWidget*> > m_docks;
};
diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp
index 1480785a..f96f3ca0 100644
--- a/src/newui/dtabwidget.cpp
+++ b/src/newui/dtabwidget.cpp
@@ -29,7 +29,7 @@
DTabWidget::DTabWidget(TQWidget *parent, const char *name)
:KTabWidget(parent, name), m_closeButton(0)
{
- setFocusPolicy(TQ_NoFocus);
+ setFocusPolicy(TQWidget::NoFocus);
setMargin(0);
loadSettings();
@@ -49,8 +49,8 @@ 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()
diff --git a/src/newui/dtabwidget.h b/src/newui/dtabwidget.h
index 4d7b6f7f..c1b2fca1 100644
--- a/src/newui/dtabwidget.h
+++ b/src/newui/dtabwidget.h
@@ -25,7 +25,7 @@
class TQToolButton;
class DTabWidget: public KTabWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
DTabWidget(TQWidget *parent=0, const char *name=0);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 19:32:07 +0000