diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | kdevdesigner/designer/actioneditorimpl.h | 2 | ||||
| -rw-r--r-- | kdevdesigner/designer/outputwindow.cpp | 2 | ||||
| -rw-r--r-- | kdevdesigner/designer/propertyeditor.cpp | 8 | ||||
| -rw-r--r-- | languages/cpp/cppnewclassdlgbase.ui | 12 | ||||
| -rw-r--r-- | languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui | 3 | ||||
| -rw-r--r-- | languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui | 3 | ||||
| -rw-r--r-- | languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui | 3 | ||||
| m--------- | parts/appwizard/common/admin | 0 | ||||
| -rw-r--r-- | parts/distpart/distpart_ui.ui | 3 | ||||
| -rw-r--r-- | parts/documentation/find_documentationbase.ui | 6 | ||||
| -rw-r--r-- | parts/quickopen/quickopenbase.ui | 3 | ||||
| -rw-r--r-- | src/profileengine/editor/profileeditorbase.ui | 4 |
13 files changed, 38 insertions, 14 deletions
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 <tqlistview.h> + #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</string> </connection> <connection> <sender>access_view</sender> - <signal>mouseButtonPressed(int,TQListViewItem*,const QPoint&,int)</signal> + <signal>mouseButtonPressed(int,TQListViewItem*,const TQPoint&,int)</signal> <receiver>CppNewClassDlgBase</receiver> - <slot>access_view_mouseButtonPressed(int,TQListViewItem*,const QPoint&,int)</slot> + <slot>access_view_mouseButtonPressed(int,TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>methods_view</sender> - <signal>mouseButtonPressed(int,TQListViewItem*,const QPoint&,int)</signal> + <signal>mouseButtonPressed(int,TQListViewItem*,const TQPoint&,int)</signal> <receiver>CppNewClassDlgBase</receiver> - <slot>methods_view_mouseButtonPressed(int,TQListViewItem*,const QPoint&,int)</slot> + <slot>methods_view_mouseButtonPressed(int,TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>clear_selection_button</sender> @@ -1241,7 +1241,7 @@ Namespace1::Namespace2::...::NamespaceN</string> </includes> <Q_SLOTS> <slot access="protected">updateClassStore()</slot> - <slot access="protected">access_view_mouseButtonPressed( int button, TQListViewItem * item, const QPoint & p, int c )</slot> + <slot access="protected">access_view_mouseButtonPressed( int button, TQListViewItem * item, const TQPoint & p, int c )</slot> <slot access="protected">classNameChanged( const QString & text )</slot> <slot access="protected">headerChanged()</slot> <slot access="protected">implementationChanged()</slot> @@ -1261,7 +1261,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <slot access="protected">changeToProtected()</slot> <slot access="protected">changeToPublic()</slot> <slot access="protected">changeToInherited()</slot> - <slot access="protected">methods_view_mouseButtonPressed( int, TQListViewItem *, const QPoint &, int )</slot> + <slot access="protected">methods_view_mouseButtonPressed( int, TQListViewItem *, const TQPoint &, int )</slot> <slot access="protected">newTabSelected( QWidget * w )</slot> <slot access="protected">extendFunctionality()</slot> <slot access="protected">replaceFunctionality()</slot> 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</string> <slot>slotSelectionChanged(TQListBoxItem*)</slot> </connection> </connections> +<forwards> + <forward>class TQListBoxItem;</forward> +</forwards> <Q_SIGNALS> <signal>enabled(int)</signal> </Q_SIGNALS> 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</string> <slot>slotSelectionChanged(TQListBoxItem*)</slot> </connection> </connections> +<forwards> + <forward>class TQListBoxItem;</forward> +</forwards> <Q_SIGNALS> <signal>enabled(int)</signal> </Q_SIGNALS> 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</string> <slot>slotSelectionChanged(TQListBoxItem*)</slot> </connection> </connections> +<forwards> + <forward>class TQListBoxItem;</forward> +</forwards> <Q_SIGNALS> <signal>enabled(int)</signal> </Q_SIGNALS> diff --git a/parts/appwizard/common/admin b/parts/appwizard/common/admin new file mode 160000 +Subproject 21cb4a9d2a0e083b10dee6d22958c4f58de6c5b 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</string> <pixmapfunction>DesktopIcon</pixmapfunction> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<forwards> + <forward>class TQListBoxItem;</forward> +</forwards> <includehints> <includehint>klistbox.h</includehint> <includehint>klineedit.h</includehint> 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 @@ </connection> <connection> <sender>result_list</sender> - <signal>mouseButtonPressed(int,TQListViewItem*,const QPoint&,int)</signal> + <signal>mouseButtonPressed(int,TQListViewItem*,const TQPoint&,int)</signal> <receiver>FindDocumentationBase</receiver> - <slot>buttonPressedOnItem(int,TQListViewItem*,const QPoint&,int)</slot> + <slot>buttonPressedOnItem(int,TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>search_term</sender> @@ -157,7 +157,7 @@ <slot>procManReadFromStdout()</slot> <slot>procInfoReadFromStdout()</slot> <slot>clickOnItem( TQListViewItem * item )</slot> - <slot>buttonPressedOnItem( int button, TQListViewItem * item, const QPoint & pos, int c )</slot> + <slot>buttonPressedOnItem( int button, TQListViewItem * item, const TQPoint & pos, int c )</slot> </Q_SLOTS> <layoutdefaults spacing="1" margin="1"/> <includehints> 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 @@ <slot>slotReturnPressed()</slot> </connection> </connections> +<forwards> + <forward>class TQListBoxItem;</forward> +</forwards> <tabstops> <tabstop>nameEdit</tabstop> <tabstop>itemList</tabstop> 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 @@ <slot>delDisabled()</slot> </connection> </connections> +<forwards> + <forward>class TQListViewItem;</forward> + <forward>class TQListBoxItem;</forward> +</forwards> <tabstops> <tabstop>profilesList</tabstop> <tabstop>addProfileButton</tabstop> |