From c6fee889e9a4a644560804c7226c5fd6eb475e48 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 21 Nov 2011 16:28:25 -0600 Subject: [PATCH] Fix FTBFS --- .gitmodules | 3 +++ kdevdesigner/designer/actioneditorimpl.h | 2 ++ kdevdesigner/designer/outputwindow.cpp | 2 +- kdevdesigner/designer/propertyeditor.cpp | 8 ++++---- languages/cpp/cppnewclassdlgbase.ui | 12 ++++++------ .../pcsimporter/qt4importer/settingsdialogbase.ui | 3 +++ .../cpp/pcsimporter/qtimporter/settingsdialogbase.ui | 3 +++ .../tdelibsimporter/settingsdialogbase.ui | 3 +++ parts/appwizard/common/admin | 1 + parts/distpart/distpart_ui.ui | 3 +++ parts/documentation/find_documentationbase.ui | 6 +++--- parts/quickopen/quickopenbase.ui | 3 +++ src/profileengine/editor/profileeditorbase.ui | 4 ++++ 13 files changed, 39 insertions(+), 14 deletions(-) create mode 160000 parts/appwizard/common/admin diff --git a/.gitmodules b/.gitmodules index 4fce771e..c9983902 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "cmake"] path = cmake url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake +[submodule "parts/appwizard/common/admin"] + path = parts/appwizard/common/admin + url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin diff --git a/kdevdesigner/designer/actioneditorimpl.h b/kdevdesigner/designer/actioneditorimpl.h index 248c9e24..a3c804bf 100644 --- a/kdevdesigner/designer/actioneditorimpl.h +++ b/kdevdesigner/designer/actioneditorimpl.h @@ -27,6 +27,8 @@ #ifndef ACTIONEDITORIMPL_H #define ACTIONEDITORIMPL_H +#include + #include "actioneditor.h" class TQAction; diff --git a/kdevdesigner/designer/outputwindow.cpp b/kdevdesigner/designer/outputwindow.cpp index ad1cab22..33113ef5 100644 --- a/kdevdesigner/designer/outputwindow.cpp +++ b/kdevdesigner/designer/outputwindow.cpp @@ -97,7 +97,7 @@ static void debugMessageOutput( TQtMsgType type, const char *msg ) TQString s( msg ); s += "\n"; - if ( type != QtFatalMsg ) { + if ( type != TQtFatalMsg ) { if ( debugoutput && debugoutput->isVisible() ) debugoutput->append( s ); else if ( OutputWindow::oldMsgHandler && OutputWindow::oldMsgHandler != debugMessageOutput ) diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp index 402c1117..01a2bb9f 100644 --- a/kdevdesigner/designer/propertyeditor.cpp +++ b/kdevdesigner/designer/propertyeditor.cpp @@ -2982,9 +2982,9 @@ static TQVariant::Type type_to_variant( const TQString &s ) if ( s == "Palette" ) return TQVariant::Palette; if ( s == "ColorGroup" ) - return (QVariant::Type)TQVariant::ColorGroup; + return TQVariant::ColorGroup; if ( s == "IconSet" ) - return (QVariant::Type)TQVariant::IconSet; + return TQVariant::IconSet; if ( s == "Point" ) return TQVariant::Point; if ( s == "Image" ) @@ -2998,9 +2998,9 @@ static TQVariant::Type type_to_variant( const TQString &s ) if ( s == "Double" ) return TQVariant::Double; if ( s == "CString" ) - return (QVariant::Type)TQVariant::CString; + return TQVariant::CString; if ( s == "PointArray" ) - return (QVariant::Type)TQVariant::PointArray; + return TQVariant::PointArray; if ( s == "Region" ) return TQVariant::Region; if ( s == "Bitmap" ) diff --git a/languages/cpp/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui index c4d68a70..a5405690 100644 --- a/languages/cpp/cppnewclassdlgbase.ui +++ b/languages/cpp/cppnewclassdlgbase.ui @@ -1134,15 +1134,15 @@ Namespace1::Namespace2::...::NamespaceN access_view - mouseButtonPressed(int,TQListViewItem*,const QPoint&,int) + mouseButtonPressed(int,TQListViewItem*,const TQPoint&,int) CppNewClassDlgBase - access_view_mouseButtonPressed(int,TQListViewItem*,const QPoint&,int) + access_view_mouseButtonPressed(int,TQListViewItem*,const TQPoint&,int) methods_view - mouseButtonPressed(int,TQListViewItem*,const QPoint&,int) + mouseButtonPressed(int,TQListViewItem*,const TQPoint&,int) CppNewClassDlgBase - methods_view_mouseButtonPressed(int,TQListViewItem*,const QPoint&,int) + methods_view_mouseButtonPressed(int,TQListViewItem*,const TQPoint&,int) clear_selection_button @@ -1241,7 +1241,7 @@ Namespace1::Namespace2::...::NamespaceN updateClassStore() - access_view_mouseButtonPressed( int button, TQListViewItem * item, const QPoint & p, int c ) + access_view_mouseButtonPressed( int button, TQListViewItem * item, const TQPoint & p, int c ) classNameChanged( const QString & text ) headerChanged() implementationChanged() @@ -1261,7 +1261,7 @@ Namespace1::Namespace2::...::NamespaceN changeToProtected() changeToPublic() changeToInherited() - methods_view_mouseButtonPressed( int, TQListViewItem *, const QPoint &, int ) + methods_view_mouseButtonPressed( int, TQListViewItem *, const TQPoint &, int ) newTabSelected( QWidget * w ) extendFunctionality() replaceFunctionality() diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui index 67178a73..3658c0ac 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui @@ -63,6 +63,9 @@ Only the selected entry will be used slotSelectionChanged(TQListBoxItem*) + + class TQListBoxItem; + enabled(int) diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui index 222c7e71..3e085845 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui @@ -122,6 +122,9 @@ Only the selected entry will be used slotSelectionChanged(TQListBoxItem*) + + class TQListBoxItem; + enabled(int) diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui index a7ba1365..1f967edc 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui @@ -115,6 +115,9 @@ Only the selected entry will be used slotSelectionChanged(TQListBoxItem*) + + class TQListBoxItem; + enabled(int) diff --git a/parts/appwizard/common/admin b/parts/appwizard/common/admin new file mode 160000 index 00000000..21cb4a9d --- /dev/null +++ b/parts/appwizard/common/admin @@ -0,0 +1 @@ +Subproject commit 21cb4a9d2a0e083b10dee6d22958c4f58de6c5b2 diff --git a/parts/distpart/distpart_ui.ui b/parts/distpart/distpart_ui.ui index cbe1e172..7cb665ce 100644 --- a/parts/distpart/distpart_ui.ui +++ b/parts/distpart/distpart_ui.ui @@ -1212,6 +1212,9 @@ Build Files DesktopIcon + + class TQListBoxItem; + klistbox.h klineedit.h diff --git a/parts/documentation/find_documentationbase.ui b/parts/documentation/find_documentationbase.ui index 0fa52676..cd0507d1 100644 --- a/parts/documentation/find_documentationbase.ui +++ b/parts/documentation/find_documentationbase.ui @@ -122,9 +122,9 @@ result_list - mouseButtonPressed(int,TQListViewItem*,const QPoint&,int) + mouseButtonPressed(int,TQListViewItem*,const TQPoint&,int) FindDocumentationBase - buttonPressedOnItem(int,TQListViewItem*,const QPoint&,int) + buttonPressedOnItem(int,TQListViewItem*,const TQPoint&,int) search_term @@ -157,7 +157,7 @@ procManReadFromStdout() procInfoReadFromStdout() clickOnItem( TQListViewItem * item ) - buttonPressedOnItem( int button, TQListViewItem * item, const QPoint & pos, int c ) + buttonPressedOnItem( int button, TQListViewItem * item, const TQPoint & pos, int c ) diff --git a/parts/quickopen/quickopenbase.ui b/parts/quickopen/quickopenbase.ui index 17b3a1df..f4281564 100644 --- a/parts/quickopen/quickopenbase.ui +++ b/parts/quickopen/quickopenbase.ui @@ -158,6 +158,9 @@ slotReturnPressed() + + class TQListBoxItem; + nameEdit itemList diff --git a/src/profileengine/editor/profileeditorbase.ui b/src/profileengine/editor/profileeditorbase.ui index d8ad68d3..d66c4e31 100644 --- a/src/profileengine/editor/profileeditorbase.ui +++ b/src/profileengine/editor/profileeditorbase.ui @@ -631,6 +631,10 @@ delDisabled() + + class TQListViewItem; + class TQListBoxItem; + profilesList addProfileButton