diff options
Diffstat (limited to 'src/kvilib/tal/kvi_tal_toolbardocktype.h')
| -rw-r--r-- | src/kvilib/tal/kvi_tal_toolbardocktype.h | 61 |
1 files changed, 25 insertions, 36 deletions
diff --git a/src/kvilib/tal/kvi_tal_toolbardocktype.h b/src/kvilib/tal/kvi_tal_toolbardocktype.h index a7c9697a..0295f7d4 100644 --- a/src/kvilib/tal/kvi_tal_toolbardocktype.h +++ b/src/kvilib/tal/kvi_tal_toolbardocktype.h @@ -26,46 +26,35 @@ //#define COMPILE_USE_QT4 #ifdef COMPILE_USE_QT4 /* - #define QT_TOOLBARDOCK_TYPE Qt::Dock - #define QT_DOCK_TOP Qt::DockTop - #define QT_DOCK_LEFT Qt::DockLeft - #define QT_DOCK_RIGHT Qt::DockRight - #define QT_DOCK_BOTTOM Qt::DockBottom - #define QT_DOCK_MINIMIZED Qt::DockMinimized - #define QT_DOCK_TORNOFF Qt::DockTornOff - #define QT_DOCK_UNMANAGED Qt::DockUnmanaged + #define TQT_TOOLBARDOCK_TYPE TQt::Dock + #define TQT_DOCK_TOP TQt::DockTop + #define TQT_DOCK_LEFT TQt::DockLeft + #define TQT_DOCK_RIGHT TQt::DockRight + #define TQT_DOCK_BOTTOM TQt::DockBottom + #define TQT_DOCK_MINIMIZED TQt::DockMinimized + #define TQT_DOCK_TORNOFF TQt::DockTornOff + #define TQT_DOCK_UNMANAGED TQt::DockUnmanaged */ - // We will need these when we'll use the real QToolBar in Qt 4.x - #define QT_TOOLBARDOCK_TYPE Qt::ToolBarArea - #define QT_DOCK_TOP Qt::TopToolBarArea - #define QT_DOCK_LEFT Qt::LeftToolBarArea - #define QT_DOCK_RIGHT Qt::RightToolBarArea - #define QT_DOCK_BOTTOM Qt::BottomToolBarArea + // We will need these when we'll use the real TQToolBar in TQt 4.x + #define TQT_TOOLBARDOCK_TYPE TQt::ToolBarArea + #define TQT_DOCK_TOP TQt::TopToolBarArea + #define TQT_DOCK_LEFT TQt::LeftToolBarArea + #define TQT_DOCK_RIGHT TQt::RightToolBarArea + #define TQT_DOCK_BOTTOM TQt::BottomToolBarArea // THESE ARE UNSUPPORTED UNDER QT4! - #define QT_DOCK_MINIMIZED Qt::TopToolBarArea - #define QT_DOCK_TORNOFF Qt::TopToolBarArea - #define QT_DOCK_UNMANAGED Qt::TopToolBarArea + #define TQT_DOCK_MINIMIZED TQt::TopToolBarArea + #define TQT_DOCK_TORNOFF TQt::TopToolBarArea + #define TQT_DOCK_UNMANAGED TQt::TopToolBarArea #else - #if QT_VERSION >= 300 - #define QT_TOOLBARDOCK_TYPE Qt::Dock - #define QT_DOCK_TOP Qt::DockTop - #define QT_DOCK_LEFT Qt::DockLeft - #define QT_DOCK_RIGHT Qt::DockRight - #define QT_DOCK_BOTTOM Qt::DockBottom - #define QT_DOCK_MINIMIZED Qt::DockMinimized - #define QT_DOCK_TORNOFF Qt::DockTornOff - #define QT_DOCK_UNMANAGED Qt::DockUnmanaged - #else - #define QT_TOOLBARDOCK_TYPE QMainWindow::ToolBarDock - #define QT_DOCK_TOP QMainWindow::Top - #define QT_DOCK_LEFT QMainWindow::Left - #define QT_DOCK_RIGHT QMainWindow::Right - #define QT_DOCK_BOTTOM QMainWindow::Bottom - #define QT_DOCK_MINIMIZED QMainWindow::Minimized - #define QT_DOCK_TORNOFF QMainWindow::TornOff - #define QT_DOCK_UNMANAGED QMainWindow::Unmanaged - #endif + #define TQT_TOOLBARDOCK_TYPE TQt::Dock + #define TQT_DOCK_TOP TQt::DockTop + #define TQT_DOCK_LEFT TQt::DockLeft + #define TQT_DOCK_RIGHT TQt::DockRight + #define TQT_DOCK_BOTTOM TQt::DockBottom + #define TQT_DOCK_MINIMIZED TQt::DockMinimized + #define TQT_DOCK_TORNOFF TQt::DockTornOff + #define TQT_DOCK_UNMANAGED TQt::DockUnmanaged #endif #endif //_KVI_TAL_TOOLBARDOCKTYPE_H_ |