From eb699de2dcba3cc748848d3dfa5cff8a4037062a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 21 Nov 2011 18:14:06 -0600 Subject: [PATCH] Fix FTBFS (cherry picked from commit d0f4f1bc5d4feb8ad340798b13fcd8b62661d2fa) --- filters/kspread/kexi/kspread_kexiimportdialog.h | 2 ++ kexi/widget/utils/kexiflowlayout.cpp | 4 ++-- kexi/widget/utils/kexiflowlayout.h | 2 +- kivio/kiviopart/ui/kivio_layer_panel_base.ui | 6 +++--- kplato/kptdurationwidget.ui | 2 +- lib/kofficecore/KoOpenPane.h | 2 ++ lib/kross/main/wdgscriptsmanager.h | 2 ++ 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/filters/kspread/kexi/kspread_kexiimportdialog.h b/filters/kspread/kexi/kspread_kexiimportdialog.h index 1476a25e6..ec8951b91 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialog.h +++ b/filters/kspread/kexi/kspread_kexiimportdialog.h @@ -29,6 +29,8 @@ #ifndef KSPREAD_KEXIIMPORTDIALOG_H #define KSPREAD_KEXIIMPORTDIALOG_H +#include + #include "kspread_kexiimportdialogbase.h" #include diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp index a637b2fba..e2397ede8 100644 --- a/kexi/widget/utils/kexiflowlayout.cpp +++ b/kexi/widget/utils/kexiflowlayout.cpp @@ -96,7 +96,7 @@ KexiFlowLayout::~KexiFlowLayout() } void -KexiFlowLayout::addItem(QLayoutItem *item) +KexiFlowLayout::addItem(TQLayoutItem *item) { m_list.append(TQT_TQLAYOUTITEM(item)); } @@ -484,4 +484,4 @@ TQLayoutItem* KexiFlowLayout::takeAt(int index) { invalidate(); return item; } -#endif // USE_QT4 \ No newline at end of file +#endif // USE_QT4 diff --git a/kexi/widget/utils/kexiflowlayout.h b/kexi/widget/utils/kexiflowlayout.h index 025b9305b..c23398e02 100644 --- a/kexi/widget/utils/kexiflowlayout.h +++ b/kexi/widget/utils/kexiflowlayout.h @@ -46,7 +46,7 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout void setJustified(bool justify) { m_justify = justify; } bool isJustified() const { return m_justify; } - virtual void addItem(QLayoutItem *item); + virtual void addItem(TQLayoutItem *item); virtual void addSpacing(int size); virtual TQLayoutIterator iterator(); virtual void invalidate(); diff --git a/kivio/kiviopart/ui/kivio_layer_panel_base.ui b/kivio/kiviopart/ui/kivio_layer_panel_base.ui index 0438d2611..904196c2e 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel_base.ui +++ b/kivio/kiviopart/ui/kivio_layer_panel_base.ui @@ -82,14 +82,14 @@ list - clicked(TQListViewItem*,const QPoint&,int) + clicked(TQListViewItem*,const TQPoint&,int) KivioLayerPanelBase - itemClicked(TQListViewItem*,const QPoint&,int) + itemClicked(TQListViewItem*,const TQPoint&,int) itemActivated(TQListViewItem*) - itemClicked(TQListViewItem*,const QPoint&,int) + itemClicked(TQListViewItem*,const TQPoint&,int) updateButtons(TQListViewItem*) diff --git a/kplato/kptdurationwidget.ui b/kplato/kptdurationwidget.ui index 103fc4d17..74018692a 100644 --- a/kplato/kptdurationwidget.ui +++ b/kplato/kptdurationwidget.ui @@ -378,7 +378,7 @@ kptdurationwidget.ui.h - class QRegExpValidator + class TQRegExpValidator enum { Days = 0x1, Hours = 0x2, Minutes = 0x4, Seconds = 0x8, Milliseconds = 0x10 } Fields; diff --git a/lib/kofficecore/KoOpenPane.h b/lib/kofficecore/KoOpenPane.h index 64f799d82..2d450cda7 100644 --- a/lib/kofficecore/KoOpenPane.h +++ b/lib/kofficecore/KoOpenPane.h @@ -19,6 +19,8 @@ #ifndef KOOPENPANE_H #define KOOPENPANE_H +#include + #include class KoCustomDocumentCreator; diff --git a/lib/kross/main/wdgscriptsmanager.h b/lib/kross/main/wdgscriptsmanager.h index 596017ce6..5423777bd 100644 --- a/lib/kross/main/wdgscriptsmanager.h +++ b/lib/kross/main/wdgscriptsmanager.h @@ -19,6 +19,8 @@ #ifndef WDGSCRIPTSMANAGER_H #define WDGSCRIPTSMANAGER_H +#include + #include "main/scriptaction.h" #include "main/wdgscriptsmanagerbase.h"