Now compiles kdelibs/dcop folder properly...

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1158880 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 180 insertions, 5 deletions

diff --git a/qtinterface/tqt.h b/qtinterface/tqt.h
index b11ebf4..8db5e27 100644
--- a/qtinterface/tqt.h
+++ b/qtinterface/tqt.h
@@ -50,6 +50,32 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT3
 #define tqchildren children
 #define tqaccess access
+#define tqcolorTable colorTable
+#define TQSO_Default Default
+#define tqqt_cast ::qt_cast
+
+#define TQAlignCenter AlignCenter
+#define TQNoBrush NoBrush
+
+#define tqred red
+#define tqgreen green
+#define tqblue blue
+#define tqcyan cyan
+#define tqmagenta magenta
+#define tqyellow yellow
+#define tqdarkRed darkRed
+#define tqdarkGreen darkGreen
+#define tqdarkBlue darkBlue
+#define tqdarkCyan darkCyan
+#define tqdarkMagenta darkMagenta
+#define tqdarkYellow darkYellow
+#define tqwhite white
+#define tqlightGray lightGray
+#define tqgray gray
+#define tqdarkGray darkGray
+#define tqblack black
+#define tqcolor0 color0
+#define tqcolor1 color1
 
 #define TQAccel QAccel
 #define TQAccessible QAccessible
@@ -531,21 +557,170 @@ Boston, MA 02110-1301, USA.
 #endif
 
 #ifdef USE_QT4
+
+//#define TQT_QT_STRING_LIST_TYPE QStringList
+#define TQT_QT_STRING_LIST_TYPE Q3StrList
+
+#ifdef __cplusplus
+class TQT_QT_STRING_LIST_TYPE;
+class QUObject;
+
 #include <tqt4/Qt/qobjectdefs.h>
 #include <tqt4/Qt/qlist.h>
 #include <tqt4/Qt/qbytearray.h>
 #include <tqt4/Qt/qobject.h>
+#include <tqucomextra_p.h>
+#include <tqt4/Qt/qmetaobject.h>
 #include <tqeventloop.h>
+#include <tqt4/Qt/qimage.h>
+#include <tqt4/Qt/qpixmap.h>
+#include <tqt4/Qt/qwidget.h>
 #include <tqt4/Qt/qapplication.h>
 #include <tqt4/Qt/q3cstring.h>
+#include <tqt4/Qt/q3pointarray.h>
+
+#include <Qt/q3strlist.h>
+
+#include <Qt/q3popupmenu.h>
 
 #include <tqlistiterator.h>
+#endif // __cplusplus
 
 #define tqchildren ptrchildren
 #define tqaccess access()
+#define tqcolorTable ptrColorTable
+#define TQSO_Default SO_Default
+#define tqqt_cast qobject_cast
+
+#define TQAlignCenter Qt::AlignCenter
+#define TQNoBrush Qt::NoBrush
 
 #define QMetaData QMetaMethod
 
+#define ColorOnly Qt::ColorOnly
+#define MonoOnly Qt::MonoOnly
+#define ColorMode_Mask Qt::ColorMode_Mask
+
+#define tqred Qt::red
+#define tqgreen Qt::green
+#define tqblue Qt::blue
+#define tqcyan Qt::cyan
+#define tqmagenta Qt::magenta
+#define tqyellow Qt::yellow
+#define tqdarkRed Qt::darkRed
+#define tqdarkGreen Qt::darkGreen
+#define tqdarkBlue Qt::darkBlue
+#define tqdarkCyan Qt::darkCyan
+#define tqdarkMagenta Qt::darkMagenta
+#define tqdarkYellow Qt::darkYellow
+#define tqwhite Qt::white
+#define tqlightGray Qt::lightGray
+#define tqgray Qt::gray
+#define tqdarkGray Qt::darkGray
+#define tqblack Qt::black
+#define tqcolor0 Qt::color0
+#define tqcolor1 Qt::color1
+
+#define SubRect			SubElement
+#define SR_PushButtonContents	SE_PushButtonContents
+#define SR_PushButtonFocusRect	SE_PushButtonFocusRect
+#define SR_CheckBoxIndicator	SE_CheckBoxIndicator
+#define SR_CheckBoxContents	SE_CheckBoxContents
+#define SR_CheckBoxFocusRect	SE_CheckBoxFocusRect
+#define SR_RadioButtonIndicator	SE_RadioButtonIndicator
+#define SR_RadioButtonContents	SE_RadioButtonContents
+#define SR_RadioButtonFocusRect	SE_RadioButtonFocusRect
+#define SR_ComboBoxFocusRect	SE_ComboBoxFocusRect
+#define SR_SliderFocusRect	SE_SliderFocusRect
+#define SR_DockWindowHandleRect	SE_DockWindowHandleRect
+#define SR_ProgressBarGroove	SE_ProgressBarGroove
+#define SR_ProgressBarContents	SE_ProgressBarContents
+#define SR_ProgressBarLabel	SE_ProgressBarLabel
+#define SR_ToolButtonContents	SE_ToolButtonContents
+#define SR_DialogButtonAccept	SE_DialogButtonAccept
+#define SR_DialogButtonReject	SE_DialogButtonReject
+#define SR_DialogButtonApply	SE_DialogButtonApply
+#define SR_DialogButtonHelp	SE_DialogButtonHelp
+#define SR_DialogButtonAll	SE_DialogButtonAll
+#define SR_DialogButtonAbort	SE_DialogButtonAbort
+#define SR_DialogButtonIgnore	SE_DialogButtonIgnore
+#define SR_DialogButtonRetry	SE_DialogButtonRetry
+#define SR_DialogButtonCustom	SE_DialogButtonCustom
+#define SR_ToolBoxTabContents	SE_ToolBoxTabContents
+#define SR_CustomBase		SE_CustomBase
+
+#define StylePixmap			StandardPixmap
+// #define SP_TitleBarMinButton		SC_TitleBarMinButton
+// #define SP_TitleBarMaxButton		SC_TitleBarMaxButton
+// #define SP_TitleBarCloseButton		SC_TitleBarCloseButton
+// #define SP_TitleBarNormalButton		SC_TitleBarNormalButton
+// #define SP_TitleBarShadeButton		SC_TitleBarShadeButton
+// #define SP_TitleBarUnshadeButton	SC_TitleBarUnshadeButton
+// #define SP_DockWindowCloseButton	SC_DockWindowCloseButton
+// #define SP_MessageBoxInformation	SC_MessageBoxInformation
+// #define SP_MessageBoxWarning		SC_MessageBoxWarning
+// #define SP_MessageBoxCritical		SC_MessageBoxCritical
+// #define SP_MessageBoxQuestion		SC_MessageBoxQuestion
+// #define SP_CustomBase			SC_CustomBase
+
+#define StyleFlags		StateFlags
+#define Style_Default		QStyle::State_Default
+#define Style_Enabled		QStyle::State_Enabled
+#define Style_Raised		QStyle::State_Raised
+#define Style_Sunken		QStyle::State_Sunken
+#define Style_Off		QStyle::State_Off
+#define Style_NoChange		QStyle::State_NoChange
+#define Style_On		QStyle::State_On
+#define Style_Down		QStyle::State_DownArrow
+#define Style_Horizontal	QStyle::State_Horizontal
+#define Style_HasFocus		QStyle::State_HasFocus
+#define Style_To		QStyle::State_To
+#define Style_Bottom		QStyle::State_Bottom
+#define Style_FocusAtBorder	QStyle::State_FocusAtBorder
+#define Style_AutoRaise		QStyle::State_AutoRaise
+#define Style_MouseOver		QStyle::State_MouseOver
+#define Style_Up		QStyle::State_UpArrow
+#define Style_Selected		QStyle::State_Selected
+#define Style_Active		QStyle::State_Active
+#define Style_ButtonDefault	QStyle::State_ButtonDefault
+
+#define PE_ArrowDown		PE_IndicatorArrowDown
+#define PE_ArrowUp		PE_IndicatorArrowUp
+#define PE_ButtonTool		PE_PanelButtonTool
+#define	PE_DockWindowHandle	PE_IndicatorToolBarHandle
+#define PE_DockWindowSeparator	PE_Q3DockWindowSeparator
+// Verify this one -------------v
+#define PE_FocusRect		PE_FrameFocusRect
+#define PE_Panel		PE_Frame
+#define PE_RubberBand		CE_RubberBand
+#define PE_ScrollBarAddLine	CE_ScrollBarAddLine
+#define PE_ScrollBarAddPage	CE_ScrollBarAddPage
+#define PE_ScrollBarFirst	CE_ScrollBarFirst
+#define PE_ScrollBarLast	CE_ScrollBarLast
+#define PE_ScrollBarSlider	CE_ScrollBarSlider
+#define PE_ScrollBarSubLine	CE_ScrollBarSubLine
+#define PE_ScrollBarSubPage	CE_ScrollBarSubPage
+
+#define SC_ListView		SC_Q3ListView
+#define SC_ListViewBranch	SC_Q3ListViewBranch
+#define SC_ListViewExpand	SC_Q3ListViewExpand
+
+#define WState			Qt::WidgetAttribute
+#define	WState_Polished		Qt::WA_WState_Polished
+
+#define SH_PopupMenu_Scrollable			SH_Menu_Scrollable
+#define SH_PopupMenu_SloppySubMenus		SH_Menu_SloppySubMenus
+#define SH_PopupMenu_SubMenuPopupDelay		SH_Menu_SubMenuPopupDelay
+#define SH_PopupMenu_AllowActiveAndDisabled	SH_Menu_AllowActiveAndDisabled
+#define SH_PopupMenu_MouseTracking		SH_Menu_MouseTracking
+
+#define	CE_PopupMenuScroller			CE_MenuScroller
+
+#define PM_DockWindowHandleExtent		PM_DockWidgetHandleExtent
+#define PM_MenuBarFrameWidth			PM_ToolBarFrameWidth
+#define PM_DockWindowFrameWidth			PM_DockWidgetFrameWidth
+#define PM_PopupMenuScrollerHeight		PM_MenuScrollerHeight
+
 #define TQAccel Q3Accel
 #define TQAccessible QAccessible
 #define TQAccessibleObject QAccessibleObject
@@ -599,9 +774,9 @@ Boston, MA 02110-1301, USA.
 #define TQCanvasText Q3CanvasText
 #define TQCDEStyle QCDEStyle
 #define TQCheckBox QCheckBox
-#define TQCleanupHandler QCleanupHandler
-#define TQSingleCleanupHandler QSingleCleanupHandler
-#define TQSharedCleanupHandler QSharedCleanupHandler
+// #define TQCleanupHandler QCleanupHandler
+// #define TQSingleCleanupHandler QSingleCleanupHandler
+// #define TQSharedCleanupHandler QSharedCleanupHandler
 #define TQShared Q3Shared
 #define TQColor QColor
 #define TQColorDialog QColorDialog
@@ -760,7 +935,7 @@ Boston, MA 02110-1301, USA.
 #define TQImageFormatPlugin QImageFormatPlugin
 #define TQImageTextKeyLang QImageTextKeyLang
 #define TQImage QImage
-#define TQImageIO QImageIO
+//#define TQImageIO QImageIO
 #define TQInputContextFactory QInputContextFactory
 #define TQInputContext QInputContext
 #define TQIntCache Q3IntCache
@@ -932,7 +1107,7 @@ Boston, MA 02110-1301, USA.
 #define TQStrIVec QStrIVec
 #define TQStyleFactory QStyleFactory
 #define TQStyleOption QStyleOption
-#define TQStyle QStyle
+//#define TQStyle QStyle
 #define TQStyleHintReturn QStyleHintReturn
 #define TQStylePlugin QStylePlugin
 #define TQStyleSheetItem Q3StyleSheetItem