diff options
188 files changed, 599 insertions, 599 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 8be8c96..5929915 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1040,7 +1040,7 @@ elif test "$kde_use_qt_emb" = "yes"; then x_includes="" x_libraries="" elif test "$kde_use_qt_mac" = "yes"; then - dnl We're using TQt/Mac (I use QT_MAC so that ntqglobal.h doesn't *have* to + dnl We're using TQt/Mac (I use QT_MAC so that tqglobal.h doesn't *have* to dnl be included to get the information) --Sam CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp" CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp" @@ -1072,13 +1072,13 @@ AC_DEFUN([KDE_PRINT_QT_PROGRAM], AC_REQUIRE([KDE_USE_TQT]) cat > conftest.$ac_ext <<EOF #include "confdefs.h" -#include <ntqglobal.h> -#include <ntqapplication.h> +#include <tqglobal.h> +#include <tqapplication.h> EOF if test "$kde_qtver" = "3"; then cat >> conftest.$ac_ext <<EOF -#include <ntqcursor.h> -#include <ntqstylefactory.h> +#include <tqcursor.h> +#include <tqstylefactory.h> #include <private/qucomextra_p.h> EOF fi @@ -1345,7 +1345,7 @@ if test ! "$ac_tqt_includes" = "NO"; then qt_incdirs="$ac_tqt_includes $qt_incdirs" fi -kde_qt_header=ntqstyle.h +kde_qt_header=tqstyle.h AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) ac_tqt_includes="$qt_incdir" @@ -1922,7 +1922,7 @@ AC_CACHE_VAL(kde_cv_have_kdetqtaddon, LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ - #include <ntqdom.h> + #include <tqdom.h> ], [ QDomDocument doc; @@ -2458,7 +2458,7 @@ LIBS=`echo $LIBS | sed "s/$LIBJPEG//"` ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" AC_TRY_LINK( -[#include <ntqapplication.h>], +[#include <tqapplication.h>], [ int argc; char** argv; @@ -3274,7 +3274,7 @@ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY], AC_TRY_COMPILE( [ -#include <ntqglobal.h> +#include <tqglobal.h> #if Q_EXPORT - 0 != 0 /* if this compiles, then Q_EXPORT is undefined */ /* if Q_EXPORT is nonempty, this will break compilation */ @@ -4522,7 +4522,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" AC_TRY_RUN(dnl [ #include <qimageio.h> -#include <ntqstring.h> +#include <tqstring.h> int main() { TQString t = "hallo"; t.fill('t'); @@ -5366,7 +5366,7 @@ if test "${with_qt_dir+set}" = set; then kde_qtdir="$with_qt_dir" fi -AC_FIND_FILE(ntqsql.html, [ $kde_qtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/tqt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/tqt/html ], TQTDOCDIR) +AC_FIND_FILE(tqsql.html, [ $kde_qtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/tqt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/tqt/html ], TQTDOCDIR) AC_MSG_RESULT($TQTDOCDIR) AC_SUBST(TQTDOCDIR) @@ -5387,7 +5387,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME) AC_SUBST(DOXYGEN_PROJECT_NUMBER) KDE_HAS_DOXYGEN=no -if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/ntqsql.html; then +if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/tqsql.html; then KDE_HAS_DOXYGEN=yes fi AC_SUBST(KDE_HAS_DOXYGEN) diff --git a/krecipes/src/backends/PostgreSQL/psqlrecipedb.cpp b/krecipes/src/backends/PostgreSQL/psqlrecipedb.cpp index 44b1d3a..c5e2129 100644 --- a/krecipes/src/backends/PostgreSQL/psqlrecipedb.cpp +++ b/krecipes/src/backends/PostgreSQL/psqlrecipedb.cpp @@ -20,7 +20,7 @@ #include <tdelocale.h> #include <tdeconfig.h> -#include <ntqvariant.h> +#include <tqvariant.h> //Note: PostgreSQL's database names are always lowercase PSqlRecipeDB::PSqlRecipeDB( const TQString& host, const TQString& user, const TQString& pass, const TQString& DBname, int port ) : TQSqlRecipeDB( host, user, pass, DBname.lower(), port ) diff --git a/krecipes/src/backends/SQLite/literecipedb.cpp b/krecipes/src/backends/SQLite/literecipedb.cpp index defd2c2..9531791 100644 --- a/krecipes/src/backends/SQLite/literecipedb.cpp +++ b/krecipes/src/backends/SQLite/literecipedb.cpp @@ -14,7 +14,7 @@ #include "literecipedb.h" -#include <ntqbuffer.h> +#include <tqbuffer.h> #include <kdebug.h> #include <tdeconfig.h> diff --git a/krecipes/src/backends/SQLite/literecipedb.h b/krecipes/src/backends/SQLite/literecipedb.h index 2973872..f108599 100644 --- a/krecipes/src/backends/SQLite/literecipedb.h +++ b/krecipes/src/backends/SQLite/literecipedb.h @@ -15,7 +15,7 @@ #include "backends/qsqlrecipedb.h" -#include <ntqstring.h> +#include <tqstring.h> #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/krecipes/src/backends/progressinterface.cpp b/krecipes/src/backends/progressinterface.cpp index cf37ff0..ea5ce08 100644 --- a/krecipes/src/backends/progressinterface.cpp +++ b/krecipes/src/backends/progressinterface.cpp @@ -10,7 +10,7 @@ #include "progressinterface.h" -#include <ntqapplication.h> +#include <tqapplication.h> #include <kprogress.h> diff --git a/krecipes/src/backends/progressinterface.h b/krecipes/src/backends/progressinterface.h index 8e38a86..de9fd28 100644 --- a/krecipes/src/backends/progressinterface.h +++ b/krecipes/src/backends/progressinterface.h @@ -11,8 +11,8 @@ #ifndef PROGRESSINTERFACE_H #define PROGRESSINTERFACE_H -#include <ntqobject.h> -#include <ntqwidget.h> +#include <tqobject.h> +#include <tqwidget.h> class KProgressDialog; diff --git a/krecipes/src/backends/qsqlrecipedb.cpp b/krecipes/src/backends/qsqlrecipedb.cpp index 334a39f..7d36a31 100644 --- a/krecipes/src/backends/qsqlrecipedb.cpp +++ b/krecipes/src/backends/qsqlrecipedb.cpp @@ -21,9 +21,9 @@ #include "propertycalculator.h" -#include <ntqbuffer.h> -#include <ntqtextcodec.h> -#include <ntqvariant.h> +#include <tqbuffer.h> +#include <tqtextcodec.h> +#include <tqvariant.h> #include <tdeapplication.h> #include <kdebug.h> diff --git a/krecipes/src/backends/qsqlrecipedb.h b/krecipes/src/backends/qsqlrecipedb.h index d9d4a58..b9211d7 100644 --- a/krecipes/src/backends/qsqlrecipedb.h +++ b/krecipes/src/backends/qsqlrecipedb.h @@ -18,13 +18,13 @@ #include "backends/recipedb.h" -#include <ntqglobal.h> -#include <ntqobject.h> -#include <ntqsqldatabase.h> -#include <ntqimage.h> -#include <ntqfileinfo.h> -#include <ntqregexp.h> -#include <ntqstring.h> +#include <tqglobal.h> +#include <tqobject.h> +#include <tqsqldatabase.h> +#include <tqimage.h> +#include <tqfileinfo.h> +#include <tqregexp.h> +#include <tqstring.h> #include "datablocks/recipe.h" #include "datablocks/elementlist.h" diff --git a/krecipes/src/backends/recipedb.cpp b/krecipes/src/backends/recipedb.cpp index 1967b0f..fbc0ff4 100644 --- a/krecipes/src/backends/recipedb.cpp +++ b/krecipes/src/backends/recipedb.cpp @@ -30,9 +30,9 @@ #include <kfilterdev.h> #include <tdemessagebox.h> -#include <ntqfile.h> -#include <ntqstringlist.h> -#include <ntqtextstream.h> +#include <tqfile.h> +#include <tqstringlist.h> +#include <tqtextstream.h> #include <map> diff --git a/krecipes/src/backends/recipedb.h b/krecipes/src/backends/recipedb.h index 01b2ad6..cf43127 100644 --- a/krecipes/src/backends/recipedb.h +++ b/krecipes/src/backends/recipedb.h @@ -14,9 +14,9 @@ #ifndef RECIPEDB_H #define RECIPEDB_H -#include <ntqobject.h> -#include <ntqstring.h> -#include <ntqvaluelist.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqvaluelist.h> #include <dcopclient.h> diff --git a/krecipes/src/backends/searchparameters.h b/krecipes/src/backends/searchparameters.h index 06fd972..643cb29 100644 --- a/krecipes/src/backends/searchparameters.h +++ b/krecipes/src/backends/searchparameters.h @@ -11,9 +11,9 @@ #ifndef SEARCHPARAMETERS_H #define SEARCHPARAMETERS_H -#include <ntqstring.h> -#include <ntqstringlist.h> -#include <ntqdatetime.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqdatetime.h> class RecipeSearchParameters { diff --git a/krecipes/src/backends/usda_unit_data.h b/krecipes/src/backends/usda_unit_data.h index b879ffa..d509004 100644 --- a/krecipes/src/backends/usda_unit_data.h +++ b/krecipes/src/backends/usda_unit_data.h @@ -14,7 +14,7 @@ #include <tdelocale.h> -#include <ntqstring.h> +#include <tqstring.h> struct unit_data { const char *name; diff --git a/krecipes/src/convert_sqlite3.cpp b/krecipes/src/convert_sqlite3.cpp index fae9401..ddb144e 100644 --- a/krecipes/src/convert_sqlite3.cpp +++ b/krecipes/src/convert_sqlite3.cpp @@ -10,8 +10,8 @@ #include "convert_sqlite3.h" -#include <ntqapplication.h> -#include <ntqfile.h> +#include <tqapplication.h> +#include <tqfile.h> #include <kdebug.h> #include <tdeglobal.h> diff --git a/krecipes/src/convert_sqlite3.h b/krecipes/src/convert_sqlite3.h index 0313e7f..4f23bf5 100644 --- a/krecipes/src/convert_sqlite3.h +++ b/krecipes/src/convert_sqlite3.h @@ -11,7 +11,7 @@ #ifndef CONVERT_SQLITE3_H #define CONVERT_SQLITE3_H -#include <ntqobject.h> +#include <tqobject.h> class KProcIO; diff --git a/krecipes/src/datablocks/constraintlist.h b/krecipes/src/datablocks/constraintlist.h index 46c7056..2a75470 100644 --- a/krecipes/src/datablocks/constraintlist.h +++ b/krecipes/src/datablocks/constraintlist.h @@ -10,7 +10,7 @@ #ifndef CONSTRAINTLIST_H #define CONSTRAINTLIST_H -#include <ntqstring.h> +#include <tqstring.h> #include "unit.h" diff --git a/krecipes/src/datablocks/element.h b/krecipes/src/datablocks/element.h index a940953..6324719 100644 --- a/krecipes/src/datablocks/element.h +++ b/krecipes/src/datablocks/element.h @@ -12,7 +12,7 @@ #ifndef ELEMENT_H #define ELEMENT_H -#include <ntqstring.h> +#include <tqstring.h> /** @author Unai Garro */ diff --git a/krecipes/src/datablocks/elementlist.h b/krecipes/src/datablocks/elementlist.h index 85a7dd1..58d5bca 100644 --- a/krecipes/src/datablocks/elementlist.h +++ b/krecipes/src/datablocks/elementlist.h @@ -11,8 +11,8 @@ #ifndef ELEMENTLIST_H #define ELEMENTLIST_H -#include <ntqvaluelist.h> -#include <ntqregexp.h> +#include <tqvaluelist.h> +#include <tqregexp.h> #include "element.h" diff --git a/krecipes/src/datablocks/ingredient.cpp b/krecipes/src/datablocks/ingredient.cpp index 19d66e6..a17beda 100644 --- a/krecipes/src/datablocks/ingredient.cpp +++ b/krecipes/src/datablocks/ingredient.cpp @@ -12,7 +12,7 @@ #include "datablocks/ingredient.h" -#include <ntqstringlist.h> +#include <tqstringlist.h> #include "mixednumber.h" diff --git a/krecipes/src/datablocks/ingredient.h b/krecipes/src/datablocks/ingredient.h index 98ca9d4..bdc20d4 100644 --- a/krecipes/src/datablocks/ingredient.h +++ b/krecipes/src/datablocks/ingredient.h @@ -12,8 +12,8 @@ #ifndef INGREDIENT_H #define INGREDIENT_H -#include <ntqstring.h> -#include <ntqvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> #include "datablocks/unit.h" #include "datablocks/elementlist.h" diff --git a/krecipes/src/datablocks/ingredientlist.h b/krecipes/src/datablocks/ingredientlist.h index 08fd153..bfd07db 100644 --- a/krecipes/src/datablocks/ingredientlist.h +++ b/krecipes/src/datablocks/ingredientlist.h @@ -13,8 +13,8 @@ #ifndef INGREDIENTLIST_H #define INGREDIENTLIST_H -#include <ntqvaluelist.h> -#include <ntqregexp.h> +#include <tqvaluelist.h> +#include <tqregexp.h> #include "datablocks/ingredient.h" diff --git a/krecipes/src/datablocks/ingredientproperty.h b/krecipes/src/datablocks/ingredientproperty.h index ecc28cf..5b5fd55 100644 --- a/krecipes/src/datablocks/ingredientproperty.h +++ b/krecipes/src/datablocks/ingredientproperty.h @@ -10,7 +10,7 @@ #ifndef INGREDIENTPROPERTY_H #define INGREDIENTPROPERTY_H -#include <ntqstring.h> +#include <tqstring.h> #include "unit.h" diff --git a/krecipes/src/datablocks/ingredientpropertylist.h b/krecipes/src/datablocks/ingredientpropertylist.h index 041c920..5a8811d 100644 --- a/krecipes/src/datablocks/ingredientpropertylist.h +++ b/krecipes/src/datablocks/ingredientpropertylist.h @@ -10,7 +10,7 @@ #ifndef INGREDIENTPROPERTYLIST_H #define INGREDIENTPROPERTYLIST_H -#include <ntqvaluelist.h> +#include <tqvaluelist.h> #include "datablocks/ingredientproperty.h" diff --git a/krecipes/src/datablocks/kreborder.h b/krecipes/src/datablocks/kreborder.h index 48d0390..0e535b6 100644 --- a/krecipes/src/datablocks/kreborder.h +++ b/krecipes/src/datablocks/kreborder.h @@ -11,8 +11,8 @@ #ifndef KREBORDER_H #define KREBORDER_H -#include <ntqcolor.h> -#include <ntqstring.h> +#include <tqcolor.h> +#include <tqstring.h> //typedef enum KreBorderStyle { None = 0, Dotted, Dashed, Solid, Double, Groove, Ridge, Inset, Outset }; diff --git a/krecipes/src/datablocks/mixednumber.cpp b/krecipes/src/datablocks/mixednumber.cpp index 2de9e57..17a9047 100644 --- a/krecipes/src/datablocks/mixednumber.cpp +++ b/krecipes/src/datablocks/mixednumber.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "mixednumber.h" -#include <ntqregexp.h> +#include <tqregexp.h> #include <tdeglobal.h> #include <tdelocale.h> diff --git a/krecipes/src/datablocks/mixednumber.h b/krecipes/src/datablocks/mixednumber.h index 15d9054..34a0f8b 100644 --- a/krecipes/src/datablocks/mixednumber.h +++ b/krecipes/src/datablocks/mixednumber.h @@ -11,7 +11,7 @@ #ifndef MIXEDNUMBER_H #define MIXEDNUMBER_H -#include <ntqstring.h> +#include <tqstring.h> /** remove any extra zeros on the end of the string and the decimal if a whole number */ TQString beautify( const TQString &num ); diff --git a/krecipes/src/datablocks/rating.cpp b/krecipes/src/datablocks/rating.cpp index af78344..83f0d9b 100644 --- a/krecipes/src/datablocks/rating.cpp +++ b/krecipes/src/datablocks/rating.cpp @@ -10,8 +10,8 @@ #include "rating.h" -#include <ntqpainter.h> -#include <ntqbitmap.h> +#include <tqpainter.h> +#include <tqbitmap.h> #include <kiconloader.h> diff --git a/krecipes/src/datablocks/rating.h b/krecipes/src/datablocks/rating.h index 54379a5..60e7693 100644 --- a/krecipes/src/datablocks/rating.h +++ b/krecipes/src/datablocks/rating.h @@ -11,10 +11,10 @@ #ifndef RATING_H #define RATING_H -#include <ntqvaluelist.h> -#include <ntqstring.h> +#include <tqvaluelist.h> +#include <tqstring.h> -#include <ntqpixmap.h> +#include <tqpixmap.h> class RatingCriteria { diff --git a/krecipes/src/datablocks/recipe.h b/krecipes/src/datablocks/recipe.h index 1ff7f8b..c1c8aab 100644 --- a/krecipes/src/datablocks/recipe.h +++ b/krecipes/src/datablocks/recipe.h @@ -11,9 +11,9 @@ #ifndef RECIPE_H #define RECIPE_H -#include <ntqstring.h> -#include <ntqpixmap.h> -#include <ntqdatetime.h> +#include <tqstring.h> +#include <tqpixmap.h> +#include <tqdatetime.h> #include "ingredientlist.h" #include "datablocks/rating.h" diff --git a/krecipes/src/datablocks/recipelist.h b/krecipes/src/datablocks/recipelist.h index 2aaf180..ac8cc99 100644 --- a/krecipes/src/datablocks/recipelist.h +++ b/krecipes/src/datablocks/recipelist.h @@ -13,7 +13,7 @@ #include "datablocks/recipe.h" -#include <ntqvaluelist.h> +#include <tqvaluelist.h> /** @author Unai Garro diff --git a/krecipes/src/datablocks/unit.h b/krecipes/src/datablocks/unit.h index ff565d1..f948cf8 100644 --- a/krecipes/src/datablocks/unit.h +++ b/krecipes/src/datablocks/unit.h @@ -11,8 +11,8 @@ #ifndef UNIT_H #define UNIT_H -#include <ntqstring.h> -#include <ntqvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> class Unit { diff --git a/krecipes/src/datablocks/unitratiolist.h b/krecipes/src/datablocks/unitratiolist.h index 86193ad..9b74e0a 100644 --- a/krecipes/src/datablocks/unitratiolist.h +++ b/krecipes/src/datablocks/unitratiolist.h @@ -9,7 +9,7 @@ ***************************************************************************/ #ifndef UNITRATIOLIST_H #define UNITRATIOLIST_H -#include <ntqvaluelist.h> +#include <tqvaluelist.h> #include "unitratio.h" diff --git a/krecipes/src/datablocks/weight.h b/krecipes/src/datablocks/weight.h index 881d359..c5042bd 100644 --- a/krecipes/src/datablocks/weight.h +++ b/krecipes/src/datablocks/weight.h @@ -10,8 +10,8 @@ #ifndef WEIGHT_H #define WEIGHT_H -#include <ntqstring.h> -#include <ntqvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> #include "datablocks/elementlist.h" diff --git a/krecipes/src/dialogs/advancedsearchdialog.cpp b/krecipes/src/dialogs/advancedsearchdialog.cpp index 95898a4..9f4864d 100644 --- a/krecipes/src/dialogs/advancedsearchdialog.cpp +++ b/krecipes/src/dialogs/advancedsearchdialog.cpp @@ -10,28 +10,28 @@ #include "advancedsearchdialog.h" -#include <ntqvariant.h> -#include <ntqpushbutton.h> -#include <ntqtabwidget.h> -#include <ntqwidget.h> -#include <ntqcheckbox.h> -#include <ntqframe.h> -#include <ntqcombobox.h> -#include <ntqheader.h> -#include <ntqlistview.h> -#include <ntqgroupbox.h> -#include <ntqspinbox.h> -#include <ntqdatetimeedit.h> +#include <tqvariant.h> +#include <tqpushbutton.h> +#include <tqtabwidget.h> +#include <tqwidget.h> +#include <tqcheckbox.h> +#include <tqframe.h> +#include <tqcombobox.h> +#include <tqheader.h> +#include <tqlistview.h> +#include <tqgroupbox.h> +#include <tqspinbox.h> +#include <tqdatetimeedit.h> #include <kpushbutton.h> -#include <ntqlayout.h> -#include <ntqtooltip.h> -#include <ntqwhatsthis.h> -#include <ntqlabel.h> -#include <ntqlineedit.h> -#include <ntqscrollview.h> -#include <ntqhbox.h> -#include <ntqradiobutton.h> -#include <ntqbuttongroup.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqscrollview.h> +#include <tqhbox.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> #include <tdeapplication.h> #include <kcursor.h> diff --git a/krecipes/src/dialogs/advancedsearchdialog.h b/krecipes/src/dialogs/advancedsearchdialog.h index 214c6c4..65eb171 100644 --- a/krecipes/src/dialogs/advancedsearchdialog.h +++ b/krecipes/src/dialogs/advancedsearchdialog.h @@ -11,7 +11,7 @@ #ifndef ADVANCEDSEARCHDIALOG_H #define ADVANCEDSEARCHDIALOG_H -#include <ntqwidget.h> +#include <tqwidget.h> class TQVBoxLayout; class TQHBoxLayout; diff --git a/krecipes/src/dialogs/authorsdialog.h b/krecipes/src/dialogs/authorsdialog.h index aa8f398..3678ae3 100644 --- a/krecipes/src/dialogs/authorsdialog.h +++ b/krecipes/src/dialogs/authorsdialog.h @@ -13,10 +13,10 @@ #ifndef AUTHORSDIALOG_H #define AUTHORSDIALOG_H -#include <ntqwidget.h> -#include <ntqpushbutton.h> -#include <ntqhbox.h> -#include <ntqlayout.h> +#include <tqwidget.h> +#include <tqpushbutton.h> +#include <tqhbox.h> +#include <tqlayout.h> #include <kiconloader.h> #include <tdelistview.h> diff --git a/krecipes/src/dialogs/borderdialog.cpp b/krecipes/src/dialogs/borderdialog.cpp index 39c088d..13a8459 100644 --- a/krecipes/src/dialogs/borderdialog.cpp +++ b/krecipes/src/dialogs/borderdialog.cpp @@ -10,14 +10,14 @@ #include "borderdialog.h" -#include <ntqpushbutton.h> -#include <ntqgroupbox.h> -#include <ntqvbox.h> -#include <ntqlabel.h> -#include <ntqspinbox.h> -#include <ntqlayout.h> -#include <ntqtooltip.h> -#include <ntqwhatsthis.h> +#include <tqpushbutton.h> +#include <tqgroupbox.h> +#include <tqvbox.h> +#include <tqlabel.h> +#include <tqspinbox.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> #include <kdebug.h> #include <tdehtml_part.h> diff --git a/krecipes/src/dialogs/categorieseditordialog.h b/krecipes/src/dialogs/categorieseditordialog.h index 2f5e2fc..9b2e56d 100644 --- a/krecipes/src/dialogs/categorieseditordialog.h +++ b/krecipes/src/dialogs/categorieseditordialog.h @@ -13,10 +13,10 @@ #ifndef CATEGORIESEDITORDIALOG_H #define CATEGORIESEDITORDIALOG_H -#include <ntqwidget.h> -#include <ntqpushbutton.h> -#include <ntqhbox.h> -#include <ntqlayout.h> +#include <tqwidget.h> +#include <tqpushbutton.h> +#include <tqhbox.h> +#include <tqlayout.h> #include <kiconloader.h> #include <tdelistview.h> diff --git a/krecipes/src/dialogs/conversiondialog.cpp b/krecipes/src/dialogs/conversiondialog.cpp index c64645b..c9e3f51 100644 --- a/krecipes/src/dialogs/conversiondialog.cpp +++ b/krecipes/src/dialogs/conversiondialog.cpp @@ -10,15 +10,15 @@ #include "conversiondialog.h" -#include <ntqvariant.h> -#include <ntqpushbutton.h> +#include <tqvariant.h> +#include <tqpushbutton.h> #include <kcombobox.h> -#include <ntqlabel.h> +#include <tqlabel.h> #include <klineedit.h> -#include <ntqlayout.h> -#include <ntqtooltip.h> -#include <ntqwhatsthis.h> -#include <ntqvbox.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqvbox.h> #include <kcombobox.h> #include <klineedit.h> diff --git a/krecipes/src/dialogs/createcategorydialog.cpp b/krecipes/src/dialogs/createcategorydialog.cpp index e55180f..f0cbc21 100644 --- a/krecipes/src/dialogs/createcategorydialog.cpp +++ b/krecipes/src/dialogs/createcategorydialog.cpp @@ -12,11 +12,11 @@ #include "createcategorydialog.h" -#include <ntqpushbutton.h> -#include <ntqgroupbox.h> -#include <ntqlayout.h> -#include <ntqlabel.h> -#include <ntqvbox.h> +#include <tqpushbutton.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqvbox.h> #include <kcombobox.h> #include <klineedit.h> diff --git a/krecipes/src/dialogs/createcategorydialog.h b/krecipes/src/dialogs/createcategorydialog.h index a820996..2211006 100644 --- a/krecipes/src/dialogs/createcategorydialog.h +++ b/krecipes/src/dialogs/createcategorydialog.h @@ -13,7 +13,7 @@ #ifndef CREATECATEGORYDIALOG_H #define CREATECATEGORYDIALOG_H -#include <ntqmap.h> +#include <tqmap.h> #include <kdialogbase.h> diff --git a/krecipes/src/dialogs/createelementdialog.h b/krecipes/src/dialogs/createelementdialog.h index 14b137e..775647a 100644 --- a/krecipes/src/dialogs/createelementdialog.h +++ b/krecipes/src/dialogs/createelementdialog.h @@ -13,10 +13,10 @@ #ifndef CREATEELEMENTDIALOG_H #define CREATEELEMENTDIALOG_H -#include <ntqpushbutton.h> -#include <ntqgroupbox.h> -#include <ntqlayout.h> -#include <ntqvbox.h> +#include <tqpushbutton.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqvbox.h> #include <klineedit.h> #include <kdialogbase.h> diff --git a/krecipes/src/dialogs/createingredientweightdialog.cpp b/krecipes/src/dialogs/createingredientweightdialog.cpp index 4bc52d1..45bf158 100644 --- a/krecipes/src/dialogs/createingredientweightdialog.cpp +++ b/krecipes/src/dialogs/createingredientweightdialog.cpp @@ -10,13 +10,13 @@ #include "createingredientweightdialog.h" -#include <ntqgroupbox.h> -#include <ntqlabel.h> -#include <ntqpushbutton.h> -#include <ntqlayout.h> -#include <ntqtooltip.h> -#include <ntqwhatsthis.h> -#include <ntqvbox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqvbox.h> #include <tdemessagebox.h> #include <tdelocale.h> diff --git a/krecipes/src/dialogs/createpropertydialog.h b/krecipes/src/dialogs/createpropertydialog.h index ab99013..1714e9e 100644 --- a/krecipes/src/dialogs/createpropertydialog.h +++ b/krecipes/src/dialogs/createpropertydialog.h @@ -17,12 +17,12 @@ #ifndef CREATEPROPERTYDIALOG_H #define CREATEPROPERTYDIALOG_H -#include <ntqcombobox.h> -#include <ntqlayout.h> -#include <ntqpushbutton.h> -#include <ntqgroupbox.h> -#include <ntqvbox.h> -#include <ntqlabel.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqgroupbox.h> +#include <tqvbox.h> +#include <tqlabel.h> #include <klineedit.h> #include <kdialogbase.h> diff --git a/krecipes/src/dialogs/createunitdialog.cpp b/krecipes/src/dialogs/createunitdialog.cpp index 82fd22e..4929bb6 100644 --- a/krecipes/src/dialogs/createunitdialog.cpp +++ b/krecipes/src/dialogs/createunitdialog.cpp @@ -12,7 +12,7 @@ #include "createunitdialog.h" -#include <ntqlabel.h> +#include <tqlabel.h> #include <tdelocale.h> #include <klineedit.h> diff --git a/krecipes/src/dialogs/createunitdialog.h b/krecipes/src/dialogs/createunitdialog.h index 416c86f..a2e1777 100644 --- a/krecipes/src/dialogs/createunitdialog.h +++ b/krecipes/src/dialogs/createunitdialog.h @@ -14,10 +14,10 @@ #define CREATEUNITDIALOG_H #include <kdialogbase.h> -#include <ntqpushbutton.h> -#include <ntqgroupbox.h> -#include <ntqlayout.h> -#include <ntqvbox.h> +#include <tqpushbutton.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqvbox.h> #include "datablocks/unit.h" diff --git a/krecipes/src/dialogs/dbimportdialog.cpp b/krecipes/src/dialogs/dbimportdialog.cpp index 6face8a..7d5d68b 100644 --- a/krecipes/src/dialogs/dbimportdialog.cpp +++ b/krecipes/src/dialogs/dbimportdialog.cpp @@ -17,17 +17,17 @@ #include "config.h" #endif -#include <ntqpushbutton.h> -#include <ntqbuttongroup.h> -#include <ntqradiobutton.h> -#include <ntqwidgetstack.h> -#include <ntqwidget.h> -#include <ntqlineedit.h> -#include <ntqlabel.h> -#include <ntqlayout.h> -#include <ntqtooltip.h> -#include <ntqwhatsthis.h> -#include <ntqhbox.h> +#include <tqpushbutton.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqwidgetstack.h> +#include <tqwidget.h> +#include <tqlineedit.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqhbox.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/krecipes/src/dialogs/dependanciesdialog.cpp b/krecipes/src/dialogs/dependanciesdialog.cpp index d582e49..ac7d095 100644 --- a/krecipes/src/dialogs/dependanciesdialog.cpp +++ b/krecipes/src/dialogs/dependanciesdialog.cpp @@ -15,7 +15,7 @@ #include "dependanciesdialog.h" #include "datablocks/elementlist.h" -#include <ntqvbox.h> +#include <tqvbox.h> #include <tdelocale.h> #include <tdeglobal.h> diff --git a/krecipes/src/dialogs/dependanciesdialog.h b/krecipes/src/dialogs/dependanciesdialog.h index 84721ea..076bd04 100644 --- a/krecipes/src/dialogs/dependanciesdialog.h +++ b/krecipes/src/dialogs/dependanciesdialog.h @@ -15,8 +15,8 @@ #ifndef DEPENDANCIESDIALOG_H #define DEPENDANCIESDIALOG_H -#include <ntqgroupbox.h> -#include <ntqlabel.h> +#include <tqgroupbox.h> +#include <tqlabel.h> #include <tdelistview.h> #include <kdialogbase.h> diff --git a/krecipes/src/dialogs/dietviewdialog.h b/krecipes/src/dialogs/dietviewdialog.h index 30a1c95..aff4992 100644 --- a/krecipes/src/dialogs/dietviewdialog.h +++ b/krecipes/src/dialogs/dietviewdialog.h @@ -11,10 +11,10 @@ #ifndef DIETVIEWDIALOG_H #define DIETVIEWDIALOG_H -#include <ntqpushbutton.h> -#include <ntqlayout.h> -#include <ntqvbox.h> -#include <ntqwidget.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqvbox.h> +#include <tqwidget.h> #include <tdehtml_part.h> #include <tdehtmlview.h> diff --git a/krecipes/src/dialogs/dietwizarddialog.cpp b/krecipes/src/dialogs/dietwizarddialog.cpp index 15b9e18..30414cf 100644 --- a/krecipes/src/dialogs/dietwizarddialog.cpp +++ b/krecipes/src/dialogs/dietwizarddialog.cpp @@ -14,11 +14,11 @@ #include "backends/recipedb.h" #include "dietviewdialog.h" -#include <ntqbitmap.h> -#include <ntqheader.h> -#include <ntqlayout.h> -#include <ntqpainter.h> -#include <ntqwmatrix.h> +#include <tqbitmap.h> +#include <tqheader.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqwmatrix.h> #include <tdeapplication.h> #include <kcursor.h> diff --git a/krecipes/src/dialogs/dietwizarddialog.h b/krecipes/src/dialogs/dietwizarddialog.h index fb867a1..c848664 100644 --- a/krecipes/src/dialogs/dietwizarddialog.h +++ b/krecipes/src/dialogs/dietwizarddialog.h @@ -15,20 +15,20 @@ #include <stdlib.h> // For RAND_MAX -#include <ntqcheckbox.h> -#include <ntqhbox.h> -#include <ntqhgroupbox.h> -#include <ntqlabel.h> -#include <ntqptrlist.h> -#include <ntqpushbutton.h> -#include <ntqslider.h> -#include <ntqspinbox.h> -#include <ntqtabwidget.h> -#include <ntqtoolbutton.h> -#include <ntqvaluelist.h> -#include <ntqvbox.h> -#include <ntqvgroupbox.h> -#include <ntqwidgetstack.h> +#include <tqcheckbox.h> +#include <tqhbox.h> +#include <tqhgroupbox.h> +#include <tqlabel.h> +#include <tqptrlist.h> +#include <tqpushbutton.h> +#include <tqslider.h> +#include <tqspinbox.h> +#include <tqtabwidget.h> +#include <tqtoolbutton.h> +#include <tqvaluelist.h> +#include <tqvbox.h> +#include <tqvgroupbox.h> +#include <tqwidgetstack.h> #include <tdelistview.h> diff --git a/krecipes/src/dialogs/editratingdialog.cpp b/krecipes/src/dialogs/editratingdialog.cpp index 5a48bb9..bab6e1b 100644 --- a/krecipes/src/dialogs/editratingdialog.cpp +++ b/krecipes/src/dialogs/editratingdialog.cpp @@ -12,20 +12,20 @@ #include <tdelocale.h> -#include <ntqvariant.h> -#include <ntqpushbutton.h> -#include <ntqlabel.h> -#include <ntqcombobox.h> +#include <tqvariant.h> +#include <tqpushbutton.h> +#include <tqlabel.h> +#include <tqcombobox.h> #include <knuminput.h> -#include <ntqheader.h> +#include <tqheader.h> #include <tdelistview.h> -#include <ntqtextedit.h> -#include <ntqlineedit.h> -#include <ntqlayout.h> -#include <ntqtooltip.h> -#include <ntqwhatsthis.h> -#include <ntqpainter.h> -#include <ntqvbox.h> +#include <tqtextedit.h> +#include <tqlineedit.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqpainter.h> +#include <tqvbox.h> #include <tdepopupmenu.h> #include <tdelocale.h> diff --git a/krecipes/src/dialogs/ingredientgroupsdialog.cpp b/krecipes/src/dialogs/ingredientgroupsdialog.cpp index 22f55ba..dcfae3d 100644 --- a/krecipes/src/dialogs/ingredientgroupsdialog.cpp +++ b/krecipes/src/dialogs/ingredientgroupsdialog.cpp @@ -10,9 +10,9 @@ #include "ingredientgroupsdialog.h" -#include <ntqpushbutton.h> -#include <ntqlayout.h> -#include <ntqvbox.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqvbox.h> #include <tdelocale.h> #include <kdialog.h> diff --git a/krecipes/src/dialogs/ingredientgroupsdialog.h b/krecipes/src/dialogs/ingredientgroupsdialog.h index 4ab722f..2b8f585 100644 --- a/krecipes/src/dialogs/ingredientgroupsdialog.h +++ b/krecipes/src/dialogs/ingredientgroupsdialog.h @@ -11,7 +11,7 @@ #ifndef INGREDIENTGROUPSDIALOG_H #define INGREDIENTGROUPSDIALOG_H -#include <ntqwidget.h> +#include <tqwidget.h> #include "widgets/dblistviewbase.h" diff --git a/krecipes/src/dialogs/ingredientmatcherdialog.cpp b/krecipes/src/dialogs/ingredientmatcherdialog.cpp index 5662d21..b994ec8 100644 --- a/krecipes/src/dialogs/ingredientmatcherdialog.cpp +++ b/krecipes/src/dialogs/ingredientmatcherdialog.cpp @@ -21,11 +21,11 @@ #include "datablocks/mixednumber.h" #include "recipeactionshandler.h" -#include <ntqheader.h> -#include <ntqpainter.h> -#include <ntqstringlist.h> -#include <ntqlayout.h> -#include <ntqgroupbox.h> +#include <tqheader.h> +#include <tqpainter.h> +#include <tqstringlist.h> +#include <tqlayout.h> +#include <tqgroupbox.h> #include <tdeapplication.h> #include <kcursor.h> diff --git a/krecipes/src/dialogs/ingredientmatcherdialog.h b/krecipes/src/dialogs/ingredientmatcherdialog.h index b94049e..2bd54b3 100644 --- a/krecipes/src/dialogs/ingredientmatcherdialog.h +++ b/krecipes/src/dialogs/ingredientmatcherdialog.h @@ -19,12 +19,12 @@ #include "widgets/recipelistview.h" #include "widgets/dblistviewbase.h" -#include <ntqfontmetrics.h> -#include <ntqlabel.h> -#include <ntqlistview.h> -#include <ntqpushbutton.h> -#include <ntqhbox.h> -#include <ntqvbox.h> +#include <tqfontmetrics.h> +#include <tqlabel.h> +#include <tqlistview.h> +#include <tqpushbutton.h> +#include <tqhbox.h> +#include <tqvbox.h> #include <kstringhandler.h> #include <tdelocale.h> diff --git a/krecipes/src/dialogs/ingredientparserdialog.cpp b/krecipes/src/dialogs/ingredientparserdialog.cpp index a979b55..0081bcf 100644 --- a/krecipes/src/dialogs/ingredientparserdialog.cpp +++ b/krecipes/src/dialogs/ingredientparserdialog.cpp @@ -10,17 +10,17 @@ #include "ingredientparserdialog.h" -#include <ntqpushbutton.h> -#include <ntqtextedit.h> -#include <ntqlabel.h> -#include <ntqlineedit.h> -#include <ntqlayout.h> -#include <ntqtooltip.h> -#include <ntqwhatsthis.h> -#include <ntqheader.h> -#include <ntqapplication.h> -#include <ntqclipboard.h> -#include <ntqvbox.h> +#include <tqpushbutton.h> +#include <tqtextedit.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqheader.h> +#include <tqapplication.h> +#include <tqclipboard.h> +#include <tqvbox.h> #include <tdelocale.h> #include <kdebug.h> diff --git a/krecipes/src/dialogs/ingredientsdialog.cpp b/krecipes/src/dialogs/ingredientsdialog.cpp index 86dce62..358e01f 100644 --- a/krecipes/src/dialogs/ingredientsdialog.cpp +++ b/krecipes/src/dialogs/ingredientsdialog.cpp @@ -34,9 +34,9 @@ #include <tdeglobal.h> #include <tdeconfig.h> -#include <ntqheader.h> -#include <ntqmessagebox.h> -#include <ntqtabwidget.h> +#include <tqheader.h> +#include <tqmessagebox.h> +#include <tqtabwidget.h> class WeightListItem : public TQListViewItem { diff --git a/krecipes/src/dialogs/ingredientsdialog.h b/krecipes/src/dialogs/ingredientsdialog.h index dc17b8a..32af993 100644 --- a/krecipes/src/dialogs/ingredientsdialog.h +++ b/krecipes/src/dialogs/ingredientsdialog.h @@ -13,10 +13,10 @@ #ifndef INGREDIENTSDIALOG_H #define INGREDIENTSDIALOG_H -#include <ntqpushbutton.h> -#include <ntqvbox.h> -#include <ntqlayout.h> -#include <ntqwidget.h> +#include <tqpushbutton.h> +#include <tqvbox.h> +#include <tqlayout.h> +#include <tqwidget.h> #include <knuminput.h> #include "widgets/krelistview.h" diff --git a/krecipes/src/dialogs/pagesetupdialog.cpp b/krecipes/src/dialogs/pagesetupdialog.cpp index 7957147..08e3fda 100644 --- a/krecipes/src/dialogs/pagesetupdialog.cpp +++ b/krecipes/src/dialogs/pagesetupdialog.cpp @@ -10,15 +10,15 @@ #include "pagesetupdialog.h" -#include <ntqdir.h> -#include <ntqlayout.h> -#include <ntqhbox.h> -#include <ntqfileinfo.h> -#include <ntqpushbutton.h> -#include <ntqpopupmenu.h> -#include <ntqtooltip.h> -#include <ntqtabwidget.h> -#include <ntqlabel.h> +#include <tqdir.h> +#include <tqlayout.h> +#include <tqhbox.h> +#include <tqfileinfo.h> +#include <tqpushbutton.h> +#include <tqpopupmenu.h> +#include <tqtooltip.h> +#include <tqtabwidget.h> +#include <tqlabel.h> #include <tdehtmlview.h> #include <tdeapplication.h> diff --git a/krecipes/src/dialogs/pagesetupdialog.h b/krecipes/src/dialogs/pagesetupdialog.h index 328eb3b..70c2b4d 100644 --- a/krecipes/src/dialogs/pagesetupdialog.h +++ b/krecipes/src/dialogs/pagesetupdialog.h @@ -11,7 +11,7 @@ #ifndef PAGESETUPDIALOG_H #define PAGESETUPDIALOG_H -#include <ntqmap.h> +#include <tqmap.h> #include <kdialog.h> diff --git a/krecipes/src/dialogs/prepmethodsdialog.h b/krecipes/src/dialogs/prepmethodsdialog.h index 2e867bc..5dbb01c 100644 --- a/krecipes/src/dialogs/prepmethodsdialog.h +++ b/krecipes/src/dialogs/prepmethodsdialog.h @@ -13,10 +13,10 @@ #ifndef PREPMETHODSDIALOG_H #define PREPMETHODSDIALOG_H -#include <ntqwidget.h> -#include <ntqpushbutton.h> -#include <ntqhbox.h> -#include <ntqlayout.h> +#include <tqwidget.h> +#include <tqpushbutton.h> +#include <tqhbox.h> +#include <tqlayout.h> #include <kiconloader.h> #include <tdelistview.h> diff --git a/krecipes/src/dialogs/propertiesdialog.h b/krecipes/src/dialogs/propertiesdialog.h index 9dcc696..d6ae406 100644 --- a/krecipes/src/dialogs/propertiesdialog.h +++ b/krecipes/src/dialogs/propertiesdialog.h @@ -13,9 +13,9 @@ #ifndef PROPERTIESDIALOG_H #define PROPERTIESDIALOG_H -#include <ntqlayout.h> -#include <ntqpushbutton.h> -#include <ntqvbox.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqvbox.h> #include <tdelistview.h> class RecipeDB; diff --git a/krecipes/src/dialogs/recipeimportdialog.cpp b/krecipes/src/dialogs/recipeimportdialog.cpp index 1b9671d..cbc3dcf 100644 --- a/krecipes/src/dialogs/recipeimportdialog.cpp +++ b/krecipes/src/dialogs/recipeimportdialog.cpp @@ -17,11 +17,11 @@ #include <tdelistview.h> #include <kdebug.h> -#include <ntqvbox.h> -#include <ntqlayout.h> -#include <ntqheader.h> -#include <ntqvariant.h> -#include <ntqdict.h> +#include <tqvbox.h> +#include <tqlayout.h> +#include <tqheader.h> +#include <tqvariant.h> +#include <tqdict.h> #include "datablocks/recipe.h" diff --git a/krecipes/src/dialogs/recipeimportdialog.h b/krecipes/src/dialogs/recipeimportdialog.h index 98768ea..5dfdf2c 100644 --- a/krecipes/src/dialogs/recipeimportdialog.h +++ b/krecipes/src/dialogs/recipeimportdialog.h @@ -13,9 +13,9 @@ #ifndef RECIPEIMPORTDIALOG_H #define RECIPEIMPORTDIALOG_H -#include <ntqvaluelist.h> -#include <ntqmap.h> -#include <ntqlistview.h> +#include <tqvaluelist.h> +#include <tqmap.h> +#include <tqlistview.h> #include <kdialogbase.h> diff --git a/krecipes/src/dialogs/recipeinputdialog.cpp b/krecipes/src/dialogs/recipeinputdialog.cpp index 8e5df0a..31ee38e 100644 --- a/krecipes/src/dialogs/recipeinputdialog.cpp +++ b/krecipes/src/dialogs/recipeinputdialog.cpp @@ -14,19 +14,19 @@ #include "recipeinputdialog.h" -#include <ntqstring.h> -#include <ntqlayout.h> -#include <ntqhbox.h> -#include <ntqvbox.h> -#include <ntqimage.h> -#include <ntqmessagebox.h> -#include <ntqtooltip.h> -#include <ntqdatetimeedit.h> -#include <ntqdragobject.h> -#include <ntqbuttongroup.h> -#include <ntqradiobutton.h> -#include <ntqwidgetstack.h> -#include <ntqpainter.h> +#include <tqstring.h> +#include <tqlayout.h> +#include <tqhbox.h> +#include <tqvbox.h> +#include <tqimage.h> +#include <tqmessagebox.h> +#include <tqtooltip.h> +#include <tqdatetimeedit.h> +#include <tqdragobject.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqwidgetstack.h> +#include <tqpainter.h> #include <tdeapplication.h> #include <tdecompletionbox.h> diff --git a/krecipes/src/dialogs/recipeinputdialog.h b/krecipes/src/dialogs/recipeinputdialog.h index c0b35a3..dd9a623 100644 --- a/krecipes/src/dialogs/recipeinputdialog.h +++ b/krecipes/src/dialogs/recipeinputdialog.h @@ -23,13 +23,13 @@ #include <kiconloader.h> #include <kled.h> -#include <ntqlabel.h> -#include <ntqgroupbox.h> -#include <ntqmap.h> -#include <ntqobject.h> -#include <ntqtabwidget.h> -#include <ntqtoolbutton.h> -#include <ntqvbox.h> +#include <tqlabel.h> +#include <tqgroupbox.h> +#include <tqmap.h> +#include <tqobject.h> +#include <tqtabwidget.h> +#include <tqtoolbutton.h> +#include <tqvbox.h> #include "datablocks/elementlist.h" diff --git a/krecipes/src/dialogs/recipeprintpreview.cpp b/krecipes/src/dialogs/recipeprintpreview.cpp index c2019e3..7350d11 100644 --- a/krecipes/src/dialogs/recipeprintpreview.cpp +++ b/krecipes/src/dialogs/recipeprintpreview.cpp @@ -10,7 +10,7 @@ #include "recipeprintpreview.h" -#include <ntqvbox.h> +#include <tqvbox.h> #include <kdebug.h> #include <tdelocale.h> diff --git a/krecipes/src/dialogs/recipeprintpreview.h b/krecipes/src/dialogs/recipeprintpreview.h index f1161d7..f4c7b65 100644 --- a/krecipes/src/dialogs/recipeprintpreview.h +++ b/krecipes/src/dialogs/recipeprintpreview.h @@ -11,8 +11,8 @@ #ifndef RECIPEPRINTPREVIEW_H #define RECIPEPRINTPREVIEW_H -#include <ntqstring.h> -#include <ntqvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> #include <kdialogbase.h> diff --git a/krecipes/src/dialogs/recipeviewdialog.cpp b/krecipes/src/dialogs/recipeviewdialog.cpp index f68816f..133aece 100644 --- a/krecipes/src/dialogs/recipeviewdialog.cpp +++ b/krecipes/src/dialogs/recipeviewdialog.cpp @@ -12,9 +12,9 @@ #include "recipeviewdialog.h" -#include <ntqlayout.h> -#include <ntqstyle.h> -#include <ntqfile.h> +#include <tqlayout.h> +#include <tqstyle.h> +#include <tqfile.h> #include <tdeapplication.h> #include <kcursor.h> diff --git a/krecipes/src/dialogs/recipeviewdialog.h b/krecipes/src/dialogs/recipeviewdialog.h index 5384441..2b7c884 100644 --- a/krecipes/src/dialogs/recipeviewdialog.h +++ b/krecipes/src/dialogs/recipeviewdialog.h @@ -13,8 +13,8 @@ #ifndef RECIPEVIEWDIALOG_H #define RECIPEVIEWDIALOG_H -#include <ntqvbox.h> -#include <ntqstring.h> +#include <tqvbox.h> +#include <tqstring.h> class RecipeDB; class Recipe; diff --git a/krecipes/src/dialogs/refineshoppinglistdialog.cpp b/krecipes/src/dialogs/refineshoppinglistdialog.cpp index 624840a..adbe5bb 100644 --- a/krecipes/src/dialogs/refineshoppinglistdialog.cpp +++ b/krecipes/src/dialogs/refineshoppinglistdialog.cpp @@ -10,13 +10,13 @@ #include "refineshoppinglistdialog.h" -#include <ntqvariant.h> -#include <ntqpushbutton.h> -#include <ntqlabel.h> -#include <ntqheader.h> -#include <ntqlayout.h> -#include <ntqtooltip.h> -#include <ntqwhatsthis.h> +#include <tqvariant.h> +#include <tqpushbutton.h> +#include <tqlabel.h> +#include <tqheader.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> #include <tdelocale.h> #include <kiconloader.h> diff --git a/krecipes/src/dialogs/refineshoppinglistdialog.h b/krecipes/src/dialogs/refineshoppinglistdialog.h index 38f2822..5952a9b 100644 --- a/krecipes/src/dialogs/refineshoppinglistdialog.h +++ b/krecipes/src/dialogs/refineshoppinglistdialog.h @@ -11,8 +11,8 @@ #ifndef REFINESHOPPINGLISTDIALOG_H #define REFINESHOPPINGLISTDIALOG_H -#include <ntqvariant.h> -#include <ntqmap.h> +#include <tqvariant.h> +#include <tqmap.h> #include <kdialogbase.h> diff --git a/krecipes/src/dialogs/resizerecipedialog.cpp b/krecipes/src/dialogs/resizerecipedialog.cpp index 252b90f..958fadb 100644 --- a/krecipes/src/dialogs/resizerecipedialog.cpp +++ b/krecipes/src/dialogs/resizerecipedialog.cpp @@ -14,19 +14,19 @@ #include <cmath> -#include <ntqvbox.h> -#include <ntqvariant.h> -#include <ntqbuttongroup.h> -#include <ntqframe.h> -#include <ntqlabel.h> +#include <tqvbox.h> +#include <tqvariant.h> +#include <tqbuttongroup.h> +#include <tqframe.h> +#include <tqlabel.h> #include <knuminput.h> #include <klineedit.h> -#include <ntqradiobutton.h> -#include <ntqlayout.h> -#include <ntqtooltip.h> -#include <ntqwhatsthis.h> -#include <ntqimage.h> -#include <ntqpixmap.h> +#include <tqradiobutton.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqimage.h> +#include <tqpixmap.h> #include <tdelocale.h> #include <tdemessagebox.h> diff --git a/krecipes/src/dialogs/selectauthorsdialog.cpp b/krecipes/src/dialogs/selectauthorsdialog.cpp index 53ea2da..d7583d3 100644 --- a/krecipes/src/dialogs/selectauthorsdialog.cpp +++ b/krecipes/src/dialogs/selectauthorsdialog.cpp @@ -12,8 +12,8 @@ #include "selectauthorsdialog.h" -#include <ntqmessagebox.h> -#include <ntqvbox.h> +#include <tqmessagebox.h> +#include <tqvbox.h> #include <tdeconfig.h> #include <kdialog.h> diff --git a/krecipes/src/dialogs/selectauthorsdialog.h b/krecipes/src/dialogs/selectauthorsdialog.h index 7f6a808..6304e08 100644 --- a/krecipes/src/dialogs/selectauthorsdialog.h +++ b/krecipes/src/dialogs/selectauthorsdialog.h @@ -13,8 +13,8 @@ #ifndef SELECTAUTHORSDIALOG_H #define SELECTAUTHORSDIALOG_H -#include <ntqlayout.h> -#include <ntqpushbutton.h> +#include <tqlayout.h> +#include <tqpushbutton.h> #include <kdialogbase.h> #include <kiconloader.h> diff --git a/krecipes/src/dialogs/selectcategoriesdialog.cpp b/krecipes/src/dialogs/selectcategoriesdialog.cpp index d861803..fe75bd3 100644 --- a/krecipes/src/dialogs/selectcategoriesdialog.cpp +++ b/krecipes/src/dialogs/selectcategoriesdialog.cpp @@ -13,7 +13,7 @@ #include "selectcategoriesdialog.h" #include "createcategorydialog.h" -#include <ntqvbox.h> +#include <tqvbox.h> #include <tdelocale.h> #include <kdebug.h> diff --git a/krecipes/src/dialogs/selectcategoriesdialog.h b/krecipes/src/dialogs/selectcategoriesdialog.h index 781fdd5..d73bb2b 100644 --- a/krecipes/src/dialogs/selectcategoriesdialog.h +++ b/krecipes/src/dialogs/selectcategoriesdialog.h @@ -13,8 +13,8 @@ #ifndef SELECTCATEGORIESDIALOG_H #define SELECTCATEGORIESDIALOG_H -#include <ntqlayout.h> -#include <ntqpushbutton.h> +#include <tqlayout.h> +#include <tqpushbutton.h> #include <tdelistview.h> #include <kdialogbase.h> diff --git a/krecipes/src/dialogs/selectpropertydialog.h b/krecipes/src/dialogs/selectpropertydialog.h index ff8aa4f..94d7c3b 100644 --- a/krecipes/src/dialogs/selectpropertydialog.h +++ b/krecipes/src/dialogs/selectpropertydialog.h @@ -13,12 +13,12 @@ #ifndef SELECTPROPERTYDIALOG_H #define SELECTPROPERTYDIALOG_H -#include <ntqwidget.h> -#include <ntqlayout.h> -#include <ntqgroupbox.h> -#include <ntqlabel.h> -#include <ntqpushbutton.h> -#include <ntqvbox.h> +#include <tqwidget.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqvbox.h> #include <tdelistview.h> #include <kcombobox.h> diff --git a/krecipes/src/dialogs/selectrecipedialog.cpp b/krecipes/src/dialogs/selectrecipedialog.cpp index afadf23..a8a6ca6 100644 --- a/krecipes/src/dialogs/selectrecipedialog.cpp +++ b/krecipes/src/dialogs/selectrecipedialog.cpp @@ -12,9 +12,9 @@ #include "selectrecipedialog.h" -#include <ntqsignalmapper.h> -#include <ntqtabwidget.h> -#include <ntqtooltip.h> +#include <tqsignalmapper.h> +#include <tqtabwidget.h> +#include <tqtooltip.h> #include <tdelocale.h> #include <kdebug.h> diff --git a/krecipes/src/dialogs/selectrecipedialog.h b/krecipes/src/dialogs/selectrecipedialog.h index fcdb6a4..d296259 100644 --- a/krecipes/src/dialogs/selectrecipedialog.h +++ b/krecipes/src/dialogs/selectrecipedialog.h @@ -14,12 +14,12 @@ #define SELECTRECIPEDIALOG_H -#include <ntqwidget.h> -#include <ntqpushbutton.h> -#include <ntqlabel.h> -#include <ntqlayout.h> -#include <ntqcursor.h> -#include <ntqintdict.h> +#include <tqwidget.h> +#include <tqpushbutton.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqcursor.h> +#include <tqintdict.h> #include <kcombobox.h> #include <klineedit.h> diff --git a/krecipes/src/dialogs/selectunitdialog.h b/krecipes/src/dialogs/selectunitdialog.h index 22d07be..f2d8af0 100644 --- a/krecipes/src/dialogs/selectunitdialog.h +++ b/krecipes/src/dialogs/selectunitdialog.h @@ -13,11 +13,11 @@ #ifndef SELECTUNITDIALOG_H #define SELECTUNITDIALOG_H -#include <ntqwidget.h> -#include <ntqlayout.h> -#include <ntqpushbutton.h> -#include <ntqgroupbox.h> -#include <ntqvbox.h> +#include <tqwidget.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqgroupbox.h> +#include <tqvbox.h> #include <tdelistview.h> #include <kdialogbase.h> diff --git a/krecipes/src/dialogs/setupdisplay.cpp b/krecipes/src/dialogs/setupdisplay.cpp index 4eae8c5..6efa42f 100644 --- a/krecipes/src/dialogs/setupdisplay.cpp +++ b/krecipes/src/dialogs/setupdisplay.cpp @@ -25,16 +25,16 @@ #include <dom/dom_doc.h> #include <dom/css_rule.h> -#include <ntqinputdialog.h> -#include <ntqaction.h> -#include <ntqlabel.h> -#include <ntqfile.h> -#include <ntqregexp.h> -#include <ntqtextedit.h> -#include <ntqtooltip.h> -#include <ntqobjectlist.h> -#include <ntqvaluelist.h> -#include <ntqlayout.h> +#include <tqinputdialog.h> +#include <tqaction.h> +#include <tqlabel.h> +#include <tqfile.h> +#include <tqregexp.h> +#include <tqtextedit.h> +#include <tqtooltip.h> +#include <tqobjectlist.h> +#include <tqvaluelist.h> +#include <tqlayout.h> #include "datablocks/mixednumber.h" #include "dialogs/borderdialog.h" diff --git a/krecipes/src/dialogs/setupdisplay.h b/krecipes/src/dialogs/setupdisplay.h index 2e0e14f..3edd092 100644 --- a/krecipes/src/dialogs/setupdisplay.h +++ b/krecipes/src/dialogs/setupdisplay.h @@ -15,9 +15,9 @@ #include <dom/html_element.h> #include <dom/css_stylesheet.h> -#include <ntqdom.h> -#include <ntqwidget.h> -#include <ntqmap.h> +#include <tqdom.h> +#include <tqwidget.h> +#include <tqmap.h> #include "datablocks/recipe.h" #include "datablocks/kreborder.h" diff --git a/krecipes/src/dialogs/shoppinglistdialog.h b/krecipes/src/dialogs/shoppinglistdialog.h index d43e216..cc8dc43 100644 --- a/krecipes/src/dialogs/shoppinglistdialog.h +++ b/krecipes/src/dialogs/shoppinglistdialog.h @@ -13,8 +13,8 @@ #ifndef SHOPPINGLISTDIALOG_H #define SHOPPINGLISTDIALOG_H -#include <ntqhbox.h> -#include <ntqlayout.h> +#include <tqhbox.h> +#include <tqlayout.h> #include <kpushbutton.h> #include <kiconloader.h> diff --git a/krecipes/src/dialogs/shoppinglistviewdialog.cpp b/krecipes/src/dialogs/shoppinglistviewdialog.cpp index 33381e0..9099aa1 100644 --- a/krecipes/src/dialogs/shoppinglistviewdialog.cpp +++ b/krecipes/src/dialogs/shoppinglistviewdialog.cpp @@ -14,7 +14,7 @@ #include "datablocks/ingredientlist.h" #include "datablocks/mixednumber.h" -#include <ntqpushbutton.h> +#include <tqpushbutton.h> #include <tdelocale.h> #include <tdeapplication.h> diff --git a/krecipes/src/dialogs/shoppinglistviewdialog.h b/krecipes/src/dialogs/shoppinglistviewdialog.h index dbb99a6..e080808 100644 --- a/krecipes/src/dialogs/shoppinglistviewdialog.h +++ b/krecipes/src/dialogs/shoppinglistviewdialog.h @@ -13,9 +13,9 @@ #ifndef SHOPPINGLISTVIEWDIALOG_H #define SHOPPINGLISTVIEWDIALOG_H -#include <ntqlayout.h> -#include <ntqvbox.h> -#include <ntqwidget.h> +#include <tqlayout.h> +#include <tqvbox.h> +#include <tqwidget.h> #include <tdehtml_part.h> #include <tdehtmlview.h> diff --git a/krecipes/src/dialogs/similarcategoriesdialog.cpp b/krecipes/src/dialogs/similarcategoriesdialog.cpp index e292967..75d9721 100644 --- a/krecipes/src/dialogs/similarcategoriesdialog.cpp +++ b/krecipes/src/dialogs/similarcategoriesdialog.cpp @@ -9,15 +9,15 @@ #include "similarcategoriesdialog.h" -#include <ntqvariant.h> -#include <ntqpushbutton.h> -#include <ntqcombobox.h> -#include <ntqslider.h> -#include <ntqlabel.h> -#include <ntqheader.h> -#include <ntqlayout.h> -#include <ntqtooltip.h> -#include <ntqwhatsthis.h> +#include <tqvariant.h> +#include <tqpushbutton.h> +#include <tqcombobox.h> +#include <tqslider.h> +#include <tqlabel.h> +#include <tqheader.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> #include <tdelistview.h> #include <tdelocale.h> diff --git a/krecipes/src/dialogs/similarcategoriesdialog.h b/krecipes/src/dialogs/similarcategoriesdialog.h index c1c0909..67d6d03 100644 --- a/krecipes/src/dialogs/similarcategoriesdialog.h +++ b/krecipes/src/dialogs/similarcategoriesdialog.h @@ -10,9 +10,9 @@ #ifndef SIMILARCATEGORIESDIALOG_H #define SIMILARCATEGORIESDIALOG_H -#include <ntqvariant.h> -#include <ntqdialog.h> -#include <ntqvaluevector.h> +#include <tqvariant.h> +#include <tqdialog.h> +#include <tqvaluevector.h> #include "datablocks/elementlist.h" diff --git a/krecipes/src/dialogs/unitsdialog.cpp b/krecipes/src/dialogs/unitsdialog.cpp index c00d9d4..d52328a 100644 --- a/krecipes/src/dialogs/unitsdialog.cpp +++ b/krecipes/src/dialogs/unitsdialog.cpp @@ -10,8 +10,8 @@ * (at your option) any later version. * ***************************************************************************/ -#include <ntqlayout.h> -#include <ntqtabwidget.h> +#include <tqlayout.h> +#include <tqtabwidget.h> #include "unitsdialog.h" #include "createelementdialog.h" diff --git a/krecipes/src/dialogs/unitsdialog.h b/krecipes/src/dialogs/unitsdialog.h index df959b5..0810656 100644 --- a/krecipes/src/dialogs/unitsdialog.h +++ b/krecipes/src/dialogs/unitsdialog.h @@ -12,9 +12,9 @@ #ifndef UNITSDIALOG_H #define UNITSDIALOG_H -#include <ntqwidget.h> +#include <tqwidget.h> #include <tdelistview.h> -#include <ntqpushbutton.h> +#include <tqpushbutton.h> #include "datablocks/unitratiolist.h" #include "datablocks/unit.h" diff --git a/krecipes/src/dialogs/usdadatadialog.cpp b/krecipes/src/dialogs/usdadatadialog.cpp index e03ca11..fd771c6 100644 --- a/krecipes/src/dialogs/usdadatadialog.cpp +++ b/krecipes/src/dialogs/usdadatadialog.cpp @@ -17,12 +17,12 @@ #include <tdelocale.h> #include <tdemessagebox.h> -#include <ntqfile.h> -#include <ntqlabel.h> -#include <ntqlayout.h> -#include <ntqpushbutton.h> -#include <ntqtextstream.h> -#include <ntqvbox.h> +#include <tqfile.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqtextstream.h> +#include <tqvbox.h> #include "backends/recipedb.h" #include "backends/usda_property_data.h" diff --git a/krecipes/src/dialogs/usdadatadialog.h b/krecipes/src/dialogs/usdadatadialog.h index ffc7d13..b96d9de 100644 --- a/krecipes/src/dialogs/usdadatadialog.h +++ b/krecipes/src/dialogs/usdadatadialog.h @@ -13,8 +13,8 @@ #include <kdialogbase.h> -#include <ntqstringlist.h> -#include <ntqvaluelist.h> +#include <tqstringlist.h> +#include <tqvaluelist.h> #include "datablocks/element.h" diff --git a/krecipes/src/exporters/baseexporter.cpp b/krecipes/src/exporters/baseexporter.cpp index 8dcd09a..60dc5a1 100644 --- a/krecipes/src/exporters/baseexporter.cpp +++ b/krecipes/src/exporters/baseexporter.cpp @@ -11,8 +11,8 @@ #include "baseexporter.h" -#include <ntqfile.h> -#include <ntqfileinfo.h> +#include <tqfile.h> +#include <tqfileinfo.h> #include <tdeaboutdata.h> #include <kdebug.h> diff --git a/krecipes/src/exporters/baseexporter.h b/krecipes/src/exporters/baseexporter.h index c9df070..d814fb4 100644 --- a/krecipes/src/exporters/baseexporter.h +++ b/krecipes/src/exporters/baseexporter.h @@ -12,7 +12,7 @@ #ifndef BASEEXPORTER_H #define BASEEXPORTER_H -#include <ntqstringlist.h> +#include <tqstringlist.h> #include <tdeapplication.h> #include <kprogress.h> diff --git a/krecipes/src/exporters/cookmlexporter.cpp b/krecipes/src/exporters/cookmlexporter.cpp index 1d9bd16..f8f9d40 100644 --- a/krecipes/src/exporters/cookmlexporter.cpp +++ b/krecipes/src/exporters/cookmlexporter.cpp @@ -10,11 +10,11 @@ #include "cookmlexporter.h" -#include <ntqbuffer.h> -#include <ntqdom.h> -#include <ntqimage.h> -#include <ntqpixmap.h> -#include <ntqfile.h> +#include <tqbuffer.h> +#include <tqdom.h> +#include <tqimage.h> +#include <tqpixmap.h> +#include <tqfile.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/krecipes/src/exporters/htmlbookexporter.cpp b/krecipes/src/exporters/htmlbookexporter.cpp index 72f09c3..93440a5 100644 --- a/krecipes/src/exporters/htmlbookexporter.cpp +++ b/krecipes/src/exporters/htmlbookexporter.cpp @@ -10,8 +10,8 @@ #include "htmlbookexporter.h" -#include <ntqfile.h> -#include <ntqstylesheet.h> +#include <tqfile.h> +#include <tqstylesheet.h> #include <kdebug.h> diff --git a/krecipes/src/exporters/htmlbookexporter.h b/krecipes/src/exporters/htmlbookexporter.h index 1766c0e..d8b5884 100644 --- a/krecipes/src/exporters/htmlbookexporter.h +++ b/krecipes/src/exporters/htmlbookexporter.h @@ -11,8 +11,8 @@ #ifndef HTMLBOOKEXPORTER_H #define HTMLBOOKEXPORTER_H -#include <ntqmap.h> -#include <ntqvaluelist.h> +#include <tqmap.h> +#include <tqvaluelist.h> #include "baseexporter.h" #include "htmlexporter.h" diff --git a/krecipes/src/exporters/htmlexporter.cpp b/krecipes/src/exporters/htmlexporter.cpp index f501acd..b4c44f4 100644 --- a/krecipes/src/exporters/htmlexporter.cpp +++ b/krecipes/src/exporters/htmlexporter.cpp @@ -14,14 +14,14 @@ #include "htmlexporter.h" -#include <ntqptrdict.h> -#include <ntqimage.h> -#include <ntqfileinfo.h> -#include <ntqdir.h> -#include <ntqstylesheet.h> //for TQStyleSheet::escape() to escape for HTML +#include <tqptrdict.h> +#include <tqimage.h> +#include <tqfileinfo.h> +#include <tqdir.h> +#include <tqstylesheet.h> //for TQStyleSheet::escape() to escape for HTML #include <dom/dom_element.h> -#include <ntqpainter.h> -#include <ntqfileinfo.h> +#include <tqpainter.h> +#include <tqfileinfo.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/krecipes/src/exporters/htmlexporter.h b/krecipes/src/exporters/htmlexporter.h index 9382afb..95cee4c 100644 --- a/krecipes/src/exporters/htmlexporter.h +++ b/krecipes/src/exporters/htmlexporter.h @@ -11,8 +11,8 @@ #ifndef HTMLEXPORTER_H #define HTMLEXPORTER_H -#include <ntqdom.h> -#include <ntqmap.h> +#include <tqdom.h> +#include <tqmap.h> #include "baseexporter.h" #include "klomanager.h" diff --git a/krecipes/src/exporters/kreexporter.cpp b/krecipes/src/exporters/kreexporter.cpp index 04c556b..e0d27c0 100644 --- a/krecipes/src/exporters/kreexporter.cpp +++ b/krecipes/src/exporters/kreexporter.cpp @@ -13,10 +13,10 @@ #include "kreexporter.h" -#include <ntqfile.h> -#include <ntqstylesheet.h> -#include <ntqbuffer.h> -#include <ntqimage.h> +#include <tqfile.h> +#include <tqstylesheet.h> +#include <tqbuffer.h> +#include <tqimage.h> #include <kdebug.h> #include <tdelocale.h> diff --git a/krecipes/src/exporters/mmfexporter.cpp b/krecipes/src/exporters/mmfexporter.cpp index 8d08c73..33ee1ec 100644 --- a/krecipes/src/exporters/mmfexporter.cpp +++ b/krecipes/src/exporters/mmfexporter.cpp @@ -10,7 +10,7 @@ #include "mmfexporter.h" -#include <ntqregexp.h> +#include <tqregexp.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/krecipes/src/exporters/recipemlexporter.h b/krecipes/src/exporters/recipemlexporter.h index 2f8fcef..33b45d9 100644 --- a/krecipes/src/exporters/recipemlexporter.h +++ b/krecipes/src/exporters/recipemlexporter.h @@ -13,7 +13,7 @@ #include "baseexporter.h" -#include <ntqdom.h> +#include <tqdom.h> class IngredientData; diff --git a/krecipes/src/exporters/rezkonvexporter.cpp b/krecipes/src/exporters/rezkonvexporter.cpp index f9914f4..b286b65 100644 --- a/krecipes/src/exporters/rezkonvexporter.cpp +++ b/krecipes/src/exporters/rezkonvexporter.cpp @@ -10,7 +10,7 @@ #include "rezkonvexporter.h" -#include <ntqregexp.h> +#include <tqregexp.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/krecipes/src/importers/baseimporter.cpp b/krecipes/src/importers/baseimporter.cpp index 24e699b..b0ecd61 100644 --- a/krecipes/src/importers/baseimporter.cpp +++ b/krecipes/src/importers/baseimporter.cpp @@ -17,7 +17,7 @@ #include <kprogress.h> #include <tdemessagebox.h> -#include <ntqvaluevector.h> +#include <tqvaluevector.h> #include "datablocks/recipe.h" #include "backends/recipedb.h" diff --git a/krecipes/src/importers/baseimporter.h b/krecipes/src/importers/baseimporter.h index a3a2ece..944f50e 100644 --- a/krecipes/src/importers/baseimporter.h +++ b/krecipes/src/importers/baseimporter.h @@ -15,8 +15,8 @@ #include <tdelocale.h> -#include <ntqstring.h> -#include <ntqstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> #include "datablocks/recipelist.h" #include "datablocks/elementlist.h" diff --git a/krecipes/src/importers/kredbimporter.h b/krecipes/src/importers/kredbimporter.h index 4fb3667..1afc8e8 100644 --- a/krecipes/src/importers/kredbimporter.h +++ b/krecipes/src/importers/kredbimporter.h @@ -11,7 +11,7 @@ #ifndef KREDBIMPORTER_H #define KREDBIMPORTER_H -#include <ntqstring.h> +#include <tqstring.h> #include "baseimporter.h" diff --git a/krecipes/src/importers/kreimporter.cpp b/krecipes/src/importers/kreimporter.cpp index 59f715f..2e55589 100644 --- a/krecipes/src/importers/kreimporter.cpp +++ b/krecipes/src/importers/kreimporter.cpp @@ -16,8 +16,8 @@ #include <tdelocale.h> #include <kdebug.h> -#include <ntqfile.h> -#include <ntqstringlist.h> +#include <tqfile.h> +#include <tqstringlist.h> #include <kstandarddirs.h> #include "datablocks/recipe.h" diff --git a/krecipes/src/importers/kreimporter.h b/krecipes/src/importers/kreimporter.h index 6bd289f..af774d2 100644 --- a/krecipes/src/importers/kreimporter.h +++ b/krecipes/src/importers/kreimporter.h @@ -17,9 +17,9 @@ #include <ktar.h> #include <tdetempfile.h> -#include <ntqfile.h> -#include <ntqstringlist.h> -#include <ntqdom.h> +#include <tqfile.h> +#include <tqstringlist.h> +#include <tqdom.h> #include "baseimporter.h" diff --git a/krecipes/src/importers/mmfimporter.cpp b/krecipes/src/importers/mmfimporter.cpp index 6aa2f16..5487d2b 100644 --- a/krecipes/src/importers/mmfimporter.cpp +++ b/krecipes/src/importers/mmfimporter.cpp @@ -14,10 +14,10 @@ #include <tdelocale.h> #include <kdebug.h> -#include <ntqfile.h> -#include <ntqregexp.h> -#include <ntqtextstream.h> -#include <ntqstringlist.h> +#include <tqfile.h> +#include <tqregexp.h> +#include <tqtextstream.h> +#include <tqstringlist.h> #include "datablocks/mixednumber.h" #include "datablocks/recipe.h" diff --git a/krecipes/src/importers/mmfimporter.h b/krecipes/src/importers/mmfimporter.h index 89dd16e..8e7d0d2 100644 --- a/krecipes/src/importers/mmfimporter.h +++ b/krecipes/src/importers/mmfimporter.h @@ -11,7 +11,7 @@ #ifndef MMFIMPORTER_H #define MMFIMPORTER_H -#include <ntqstring.h> +#include <tqstring.h> #include "baseimporter.h" #include "datablocks/ingredientlist.h" diff --git a/krecipes/src/importers/mx2importer.cpp b/krecipes/src/importers/mx2importer.cpp index 0ccf6d0..75f75a7 100644 --- a/krecipes/src/importers/mx2importer.cpp +++ b/krecipes/src/importers/mx2importer.cpp @@ -22,10 +22,10 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA #include <tdelocale.h> #include <kdebug.h> -#include <ntqfile.h> -#include <ntqstringlist.h> -#include <ntqtextstream.h> -#include <ntqdatetime.h> +#include <tqfile.h> +#include <tqstringlist.h> +#include <tqtextstream.h> +#include <tqdatetime.h> #include "datablocks/recipe.h" diff --git a/krecipes/src/importers/mx2importer.h b/krecipes/src/importers/mx2importer.h index 0488565..df298dd 100644 --- a/krecipes/src/importers/mx2importer.h +++ b/krecipes/src/importers/mx2importer.h @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA #include "baseimporter.h" -#include <ntqdom.h> +#include <tqdom.h> class Recipe; diff --git a/krecipes/src/importers/mxpimporter.cpp b/krecipes/src/importers/mxpimporter.cpp index 35e8b64..20fbf0f 100644 --- a/krecipes/src/importers/mxpimporter.cpp +++ b/krecipes/src/importers/mxpimporter.cpp @@ -10,10 +10,10 @@ #include "mxpimporter.h" -#include <ntqfile.h> -#include <ntqtextstream.h> -#include <ntqstringlist.h> -#include <ntqdatetime.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqstringlist.h> +#include <tqdatetime.h> #include <tdeapplication.h> #include <tdelocale.h> diff --git a/krecipes/src/importers/mxpimporter.h b/krecipes/src/importers/mxpimporter.h index b5d37bd..6bdee22 100644 --- a/krecipes/src/importers/mxpimporter.h +++ b/krecipes/src/importers/mxpimporter.h @@ -11,7 +11,7 @@ #ifndef MXPIMPORTER_H #define MXPIMPORTER_H -#include <ntqstring.h> +#include <tqstring.h> #include "baseimporter.h" diff --git a/krecipes/src/importers/nycgenericimporter.cpp b/krecipes/src/importers/nycgenericimporter.cpp index ea0e622..30e5bdf 100644 --- a/krecipes/src/importers/nycgenericimporter.cpp +++ b/krecipes/src/importers/nycgenericimporter.cpp @@ -14,10 +14,10 @@ #include <tdelocale.h> #include <kdebug.h> -#include <ntqfile.h> -#include <ntqtextstream.h> -#include <ntqstringlist.h> -#include <ntqregexp.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqstringlist.h> +#include <tqregexp.h> #include "datablocks/mixednumber.h" #include "datablocks/recipe.h" diff --git a/krecipes/src/importers/nycgenericimporter.h b/krecipes/src/importers/nycgenericimporter.h index 7a215cd..6b3bc2f 100644 --- a/krecipes/src/importers/nycgenericimporter.h +++ b/krecipes/src/importers/nycgenericimporter.h @@ -11,8 +11,8 @@ #ifndef NYCGENERICIMPORTER_H #define NYCGENERICIMPORTER_H -#include <ntqstring.h> -#include <ntqdatetime.h> +#include <tqstring.h> +#include <tqdatetime.h> #include "baseimporter.h" #include "datablocks/ingredientlist.h" diff --git a/krecipes/src/importers/recipemlimporter.cpp b/krecipes/src/importers/recipemlimporter.cpp index ff3d017..8866648 100644 --- a/krecipes/src/importers/recipemlimporter.cpp +++ b/krecipes/src/importers/recipemlimporter.cpp @@ -13,8 +13,8 @@ #include "recipemlimporter.h" -#include <ntqfile.h> -#include <ntqdatetime.h> +#include <tqfile.h> +#include <tqdatetime.h> #include <tdelocale.h> #include <kdebug.h> diff --git a/krecipes/src/importers/recipemlimporter.h b/krecipes/src/importers/recipemlimporter.h index bd1a7c7..51c6f42 100644 --- a/krecipes/src/importers/recipemlimporter.h +++ b/krecipes/src/importers/recipemlimporter.h @@ -19,7 +19,7 @@ #include "datablocks/ingredient.h" #include "datablocks/recipe.h" -#include <ntqdom.h> +#include <tqdom.h> /** Class to import the RecipeML, XML-based file format. * More info at http://www.formatdata.com/recipeml diff --git a/krecipes/src/importers/rezkonvimporter.cpp b/krecipes/src/importers/rezkonvimporter.cpp index d85c0d2..58e59c0 100644 --- a/krecipes/src/importers/rezkonvimporter.cpp +++ b/krecipes/src/importers/rezkonvimporter.cpp @@ -14,9 +14,9 @@ #include <tdelocale.h> #include <kdebug.h> -#include <ntqfile.h> -#include <ntqregexp.h> -#include <ntqtextstream.h> +#include <tqfile.h> +#include <tqregexp.h> +#include <tqtextstream.h> #include "datablocks/mixednumber.h" diff --git a/krecipes/src/importers/rezkonvimporter.h b/krecipes/src/importers/rezkonvimporter.h index 90d873b..7f22255 100644 --- a/krecipes/src/importers/rezkonvimporter.h +++ b/krecipes/src/importers/rezkonvimporter.h @@ -11,7 +11,7 @@ #ifndef REZKONVIMPORTER_H #define REZKONVIMPORTER_H -#include <ntqstringlist.h> +#include <tqstringlist.h> #include "baseimporter.h" #include "datablocks/recipe.h" diff --git a/krecipes/src/klomanager.cpp b/krecipes/src/klomanager.cpp index 8026c7b..ac2639c 100644 --- a/krecipes/src/klomanager.cpp +++ b/krecipes/src/klomanager.cpp @@ -12,9 +12,9 @@ #include <kdebug.h> -#include <ntqdom.h> -#include <ntqfile.h> -#include <ntqstringlist.h> +#include <tqdom.h> +#include <tqfile.h> +#include <tqstringlist.h> KLOManager::KLOManager() { diff --git a/krecipes/src/klomanager.h b/krecipes/src/klomanager.h index 88db2d6..1d6364f 100644 --- a/krecipes/src/klomanager.h +++ b/krecipes/src/klomanager.h @@ -11,8 +11,8 @@ #ifndef KLOMANAGER_H #define KLOMANAGER_H -#include <ntqdom.h> -#include <ntqfont.h> +#include <tqdom.h> +#include <tqfont.h> #include "datablocks/kreborder.h" diff --git a/krecipes/src/krecipes.cpp b/krecipes/src/krecipes.cpp index c6dcefe..fa0b284 100644 --- a/krecipes/src/krecipes.cpp +++ b/krecipes/src/krecipes.cpp @@ -44,11 +44,11 @@ #include "backends/recipedb.h" #include "backends/progressinterface.h" -#include <ntqdragobject.h> +#include <tqdragobject.h> #include <kprinter.h> -#include <ntqpainter.h> -#include <ntqpaintdevicemetrics.h> -#include <ntqmessagebox.h> +#include <tqpainter.h> +#include <tqpaintdevicemetrics.h> +#include <tqmessagebox.h> #include <kprogress.h> #include <tdemessagebox.h> diff --git a/krecipes/src/krecipesiface.h b/krecipes/src/krecipesiface.h index 718dadb..fe9173f 100644 --- a/krecipes/src/krecipesiface.h +++ b/krecipes/src/krecipesiface.h @@ -14,7 +14,7 @@ #include <dcopobject.h> #include <dcopref.h> -#include <ntqvaluelist.h> +#include <tqvaluelist.h> class KrecipesIface : virtual public DCOPObject { diff --git a/krecipes/src/krecipesview.cpp b/krecipes/src/krecipesview.cpp index 63f1cb4..b9f79d1 100644 --- a/krecipes/src/krecipesview.cpp +++ b/krecipes/src/krecipesview.cpp @@ -15,10 +15,10 @@ #include <cstdlib> -#include <ntqlayout.h> -#include <ntqimage.h> -#include <ntqpainter.h> -#include <ntqpalette.h> +#include <tqlayout.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpalette.h> #include <tdeapplication.h> #include <tdeconfig.h> diff --git a/krecipes/src/krecipesview.h b/krecipes/src/krecipesview.h index 5ca62ec..01d22c0 100644 --- a/krecipes/src/krecipesview.h +++ b/krecipes/src/krecipesview.h @@ -13,17 +13,17 @@ #ifndef KRECIPESVIEW_H #define KRECIPESVIEW_H -#include <ntqbitmap.h> -#include <ntqbuttongroup.h> -#include <ntqevent.h> -#include <ntqlabel.h> -#include <ntqpushbutton.h> -#include <ntqtooltip.h> -#include <ntqhbox.h> -#include <ntqvaluelist.h> -#include <ntqvbox.h> -#include <ntqwidget.h> -#include <ntqwidgetstack.h> +#include <tqbitmap.h> +#include <tqbuttongroup.h> +#include <tqevent.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> +#include <tqhbox.h> +#include <tqvaluelist.h> +#include <tqvbox.h> +#include <tqwidget.h> +#include <tqwidgetstack.h> #include <kiconloader.h> #include <kpixmap.h> diff --git a/krecipes/src/krepagelayout.cpp b/krecipes/src/krepagelayout.cpp index 99a0eb4..72f4a6b 100644 --- a/krecipes/src/krepagelayout.cpp +++ b/krecipes/src/krepagelayout.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <tdeglobal.h> -#include <ntqdom.h> +#include <tqdom.h> #include "kreunit.h" diff --git a/krecipes/src/krepagelayout.h b/krecipes/src/krepagelayout.h index c392a26..2d788f2 100644 --- a/krecipes/src/krepagelayout.h +++ b/krecipes/src/krepagelayout.h @@ -23,7 +23,7 @@ #ifndef KREPAGELAYOUT_H #define KREPAGELAYOUT_H -#include <ntqstringlist.h> +#include <tqstringlist.h> class TQDomElement; class TQDomDocument; diff --git a/krecipes/src/kstartuplogo.cpp b/krecipes/src/kstartuplogo.cpp index 41982a0..350d705 100644 --- a/krecipes/src/kstartuplogo.cpp +++ b/krecipes/src/kstartuplogo.cpp @@ -18,7 +18,7 @@ #include <tdeconfig.h> #include <tdeglobal.h> -#include <ntqcursor.h> +#include <tqcursor.h> TDEStartupLogo::TDEStartupLogo( TQWidget * parent, const char *name ) : TQWidget( parent, name, WStyle_NoBorder | WStyle_Customize | WDestructiveClose ), m_bReadyToHide( false ) { diff --git a/krecipes/src/kstartuplogo.h b/krecipes/src/kstartuplogo.h index 9a22228..c4472cc 100644 --- a/krecipes/src/kstartuplogo.h +++ b/krecipes/src/kstartuplogo.h @@ -17,7 +17,7 @@ #ifndef KSTARTUPLOGO_H #define KSTARTUPLOGO_H -#include <ntqwidget.h> +#include <tqwidget.h> #include <tdeapplication.h> #include <kstandarddirs.h> diff --git a/krecipes/src/pref.cpp b/krecipes/src/pref.cpp index 9776fd9..c2575cf 100644 --- a/krecipes/src/pref.cpp +++ b/krecipes/src/pref.cpp @@ -18,17 +18,17 @@ #include "config.h" #endif -#include <ntqlayout.h> -#include <ntqlabel.h> -#include <ntqhbox.h> -#include <ntqbuttongroup.h> -#include <ntqcheckbox.h> -#include <ntqradiobutton.h> -#include <ntqpushbutton.h> -#include <ntqtooltip.h> -#include <ntqwhatsthis.h> -#include <ntqframe.h> -#include <ntqcombobox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqhbox.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqframe.h> +#include <tqcombobox.h> #include <tdeapplication.h> #include <tdeconfig.h> diff --git a/krecipes/src/pref.h b/krecipes/src/pref.h index 187c9a0..31b7707 100644 --- a/krecipes/src/pref.h +++ b/krecipes/src/pref.h @@ -17,7 +17,7 @@ #include <kdialogbase.h> -#include <ntqmap.h> +#include <tqmap.h> class ServerPrefs; class NumbersPrefs; diff --git a/krecipes/src/profiling.h b/krecipes/src/profiling.h index 42f7769..f42ac70 100644 --- a/krecipes/src/profiling.h +++ b/krecipes/src/profiling.h @@ -18,7 +18,7 @@ #define KRECIPES_PROFILING #ifdef KRECIPES_PROFILING - #include <ntqdatetime.h> + #include <tqdatetime.h> #include <kdebug.h> static TQTime dbg_timer; diff --git a/krecipes/src/recipeactionshandler.cpp b/krecipes/src/recipeactionshandler.cpp index 910c41a..dde3fcb 100644 --- a/krecipes/src/recipeactionshandler.cpp +++ b/krecipes/src/recipeactionshandler.cpp @@ -12,8 +12,8 @@ #include "recipeactionshandler.h" -#include <ntqwidget.h> -#include <ntqclipboard.h> +#include <tqwidget.h> +#include <tqclipboard.h> #include <tdeapplication.h> #include <tdefiledialog.h> diff --git a/krecipes/src/recipeactionshandler.h b/krecipes/src/recipeactionshandler.h index 8eebd83..f46e8de 100644 --- a/krecipes/src/recipeactionshandler.h +++ b/krecipes/src/recipeactionshandler.h @@ -13,9 +13,9 @@ #ifndef RECIPEACTIONSHANDLER_H #define RECIPEACTIONSHANDLER_H -#include <ntqobject.h> -#include <ntqvaluelist.h> -#include <ntqptrlist.h> +#include <tqobject.h> +#include <tqvaluelist.h> +#include <tqptrlist.h> class TQListViewItem; class TDEListView; diff --git a/krecipes/src/recipefilter.h b/krecipes/src/recipefilter.h index d8d6cf3..1418bfd 100644 --- a/krecipes/src/recipefilter.h +++ b/krecipes/src/recipefilter.h @@ -12,7 +12,7 @@ #ifndef RECIPEFILTER_H #define RECIPEFILTER_H -#include <ntqobject.h> +#include <tqobject.h> class TDEListView; class TQListViewItem; diff --git a/krecipes/src/setupwizard.cpp b/krecipes/src/setupwizard.cpp index 07deb1a..73921ca 100644 --- a/krecipes/src/setupwizard.cpp +++ b/krecipes/src/setupwizard.cpp @@ -16,12 +16,12 @@ #include <unistd.h> #include <pwd.h> -#include <ntqhbox.h> -#include <ntqvgroupbox.h> -#include <ntqlayout.h> -#include <ntqpixmap.h> -#include <ntqpushbutton.h> -#include <ntqtooltip.h> +#include <tqhbox.h> +#include <tqvgroupbox.h> +#include <tqlayout.h> +#include <tqpixmap.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/krecipes/src/setupwizard.h b/krecipes/src/setupwizard.h index 3b94287..a3ceac3 100644 --- a/krecipes/src/setupwizard.h +++ b/krecipes/src/setupwizard.h @@ -11,10 +11,10 @@ #ifndef SETUPWIZARD_H #define SETUPWIZARD_H -#include <ntqvbuttongroup.h> -#include <ntqcheckbox.h> -#include <ntqradiobutton.h> -#include <ntqlabel.h> +#include <tqvbuttongroup.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqlabel.h> #include <kwizard.h> #include <klineedit.h> #include <ktextedit.h> diff --git a/krecipes/src/tests/checks.h b/krecipes/src/tests/checks.h index 038395f..e697814 100644 --- a/krecipes/src/tests/checks.h +++ b/krecipes/src/tests/checks.h @@ -14,9 +14,9 @@ #include <cmath> #include <iostream> -#include <ntqstring.h> -#include <ntqpixmap.h> -#include <ntqimage.h> +#include <tqstring.h> +#include <tqpixmap.h> +#include <tqimage.h> #include "datablocks/categorytree.h" #include "datablocks/rating.h" diff --git a/krecipes/src/tests/exportertest.h b/krecipes/src/tests/exportertest.h index 6998d6a..739a57c 100644 --- a/krecipes/src/tests/exportertest.h +++ b/krecipes/src/tests/exportertest.h @@ -14,9 +14,9 @@ #include <cmath> #include <iostream> -#include <ntqstring.h> -#include <ntqfile.h> -#include <ntqtextstream.h> +#include <tqstring.h> +#include <tqfile.h> +#include <tqtextstream.h> #include "checks.h" diff --git a/krecipes/src/tests/importertest.h b/krecipes/src/tests/importertest.h index 62ab682..f5aff84 100644 --- a/krecipes/src/tests/importertest.h +++ b/krecipes/src/tests/importertest.h @@ -14,7 +14,7 @@ #include <cmath> #include <iostream> -#include <ntqstring.h> +#include <tqstring.h> #include "checks.h" #include "datablocks/categorytree.h" diff --git a/krecipes/src/tests/kretest.cpp b/krecipes/src/tests/kretest.cpp index d8ce8a3..10c88c2 100644 --- a/krecipes/src/tests/kretest.cpp +++ b/krecipes/src/tests/kretest.cpp @@ -10,8 +10,8 @@ #include <tdeapplication.h> -#include <ntqstring.h> -#include <ntqfile.h> +#include <tqstring.h> +#include <tqfile.h> #include <iostream> diff --git a/krecipes/src/tests/mmftest.cpp b/krecipes/src/tests/mmftest.cpp index ae4cd34..453fcaa 100644 --- a/krecipes/src/tests/mmftest.cpp +++ b/krecipes/src/tests/mmftest.cpp @@ -10,7 +10,7 @@ #include <tdeapplication.h> -#include <ntqstring.h> +#include <tqstring.h> #include <iostream> using std::cout; diff --git a/krecipes/src/tests/mx2test.cpp b/krecipes/src/tests/mx2test.cpp index 5153531..daa379e 100644 --- a/krecipes/src/tests/mx2test.cpp +++ b/krecipes/src/tests/mx2test.cpp @@ -10,7 +10,7 @@ #include <tdeapplication.h> -#include <ntqstring.h> +#include <tqstring.h> #include <iostream> using std::cout; diff --git a/krecipes/src/tests/mxptest.cpp b/krecipes/src/tests/mxptest.cpp index 620986a..3c56a6f 100644 --- a/krecipes/src/tests/mxptest.cpp +++ b/krecipes/src/tests/mxptest.cpp @@ -10,7 +10,7 @@ #include <tdeapplication.h> -#include <ntqstring.h> +#include <tqstring.h> #include <iostream> using std::cout; diff --git a/krecipes/src/tests/nyctest.cpp b/krecipes/src/tests/nyctest.cpp index 9101127..724b6a0 100644 --- a/krecipes/src/tests/nyctest.cpp +++ b/krecipes/src/tests/nyctest.cpp @@ -10,7 +10,7 @@ #include <tdeapplication.h> -#include <ntqstring.h> +#include <tqstring.h> #include <iostream> using std::cout; diff --git a/krecipes/src/tests/recipemltest.cpp b/krecipes/src/tests/recipemltest.cpp index 86afa08..eb11880 100644 --- a/krecipes/src/tests/recipemltest.cpp +++ b/krecipes/src/tests/recipemltest.cpp @@ -10,7 +10,7 @@ #include <tdeapplication.h> -#include <ntqstring.h> +#include <tqstring.h> #include <iostream> using std::cout; diff --git a/krecipes/src/tests/rezkonvtest.cpp b/krecipes/src/tests/rezkonvtest.cpp index 7999558..d9b8022 100644 --- a/krecipes/src/tests/rezkonvtest.cpp +++ b/krecipes/src/tests/rezkonvtest.cpp @@ -10,7 +10,7 @@ #include <tdeapplication.h> -#include <ntqstring.h> +#include <tqstring.h> #include <iostream> using std::cout; diff --git a/krecipes/src/widgets/amountunitinput.cpp b/krecipes/src/widgets/amountunitinput.cpp index 2461240..699f76d 100644 --- a/krecipes/src/widgets/amountunitinput.cpp +++ b/krecipes/src/widgets/amountunitinput.cpp @@ -10,8 +10,8 @@ #include "amountunitinput.h" -#include <ntqheader.h> -#include <ntqlistview.h> +#include <tqheader.h> +#include <tqlistview.h> #include "fractioninput.h" #include "unitcombobox.h" diff --git a/krecipes/src/widgets/amountunitinput.h b/krecipes/src/widgets/amountunitinput.h index 3f15e22..911e67c 100644 --- a/krecipes/src/widgets/amountunitinput.h +++ b/krecipes/src/widgets/amountunitinput.h @@ -13,7 +13,7 @@ #ifndef AMOUNTUNITINPUT_H #define AMOUNTUNITINPUT_H -#include <ntqhbox.h> +#include <tqhbox.h> #include "datablocks/unit.h" #include "datablocks/mixednumber.h" diff --git a/krecipes/src/widgets/categorycombobox.cpp b/krecipes/src/widgets/categorycombobox.cpp index 2b97f56..7935cbb 100644 --- a/krecipes/src/widgets/categorycombobox.cpp +++ b/krecipes/src/widgets/categorycombobox.cpp @@ -12,7 +12,7 @@ #include "categorycombobox.h" -#include <ntqlistbox.h> +#include <tqlistbox.h> #include <tdelocale.h> #include <tdeconfig.h> diff --git a/krecipes/src/widgets/categorycombobox.h b/krecipes/src/widgets/categorycombobox.h index 6284e0e..4cc99aa 100644 --- a/krecipes/src/widgets/categorycombobox.h +++ b/krecipes/src/widgets/categorycombobox.h @@ -15,7 +15,7 @@ #include <kcombobox.h> -#include <ntqmap.h> +#include <tqmap.h> #include "datablocks/element.h" diff --git a/krecipes/src/widgets/categorylistview.h b/krecipes/src/widgets/categorylistview.h index 280b939..1dcabba 100644 --- a/krecipes/src/widgets/categorylistview.h +++ b/krecipes/src/widgets/categorylistview.h @@ -12,8 +12,8 @@ #ifndef CATEGORYLISTVIEW_H #define CATEGORYLISTVIEW_H -#include <ntqmap.h> -#include <ntqpixmap.h> +#include <tqmap.h> +#include <tqpixmap.h> #include "dblistviewbase.h" diff --git a/krecipes/src/widgets/conversiontable.cpp b/krecipes/src/widgets/conversiontable.cpp index 7affdd7..a48b67e 100644 --- a/krecipes/src/widgets/conversiontable.cpp +++ b/krecipes/src/widgets/conversiontable.cpp @@ -15,7 +15,7 @@ #include "datablocks/mixednumber.h" #include "widgets/fractioninput.h" -#include <ntqtooltip.h> +#include <tqtooltip.h> #include <tdeglobal.h> #include <tdelocale.h> diff --git a/krecipes/src/widgets/conversiontable.h b/krecipes/src/widgets/conversiontable.h index 313c75f..16f761c 100644 --- a/krecipes/src/widgets/conversiontable.h +++ b/krecipes/src/widgets/conversiontable.h @@ -10,9 +10,9 @@ ***************************************************************************/ #ifndef CONVERSIONTABLE_H #define CONVERSIONTABLE_H -#include <ntqstring.h> -#include <ntqtable.h> -#include <ntqobject.h> +#include <tqstring.h> +#include <tqtable.h> +#include <tqobject.h> #include "datablocks/unitratio.h" #include "datablocks/elementlist.h" diff --git a/krecipes/src/widgets/criteriacombobox.cpp b/krecipes/src/widgets/criteriacombobox.cpp index f04c522..8fd911a 100644 --- a/krecipes/src/widgets/criteriacombobox.cpp +++ b/krecipes/src/widgets/criteriacombobox.cpp @@ -10,7 +10,7 @@ #include "criteriacombobox.h" -#include <ntqlistbox.h> +#include <tqlistbox.h> #include "backends/recipedb.h" #include "datablocks/elementlist.h" diff --git a/krecipes/src/widgets/criteriacombobox.h b/krecipes/src/widgets/criteriacombobox.h index b5c2679..4e35bb4 100644 --- a/krecipes/src/widgets/criteriacombobox.h +++ b/krecipes/src/widgets/criteriacombobox.h @@ -11,7 +11,7 @@ #ifndef CRITERIACOMBOBOX_H #define CRITERIACOMBOBOX_H -#include <ntqmap.h> +#include <tqmap.h> #include <kcombobox.h> diff --git a/krecipes/src/widgets/dblistviewbase.h b/krecipes/src/widgets/dblistviewbase.h index c122b22..d1514fe 100644 --- a/krecipes/src/widgets/dblistviewbase.h +++ b/krecipes/src/widgets/dblistviewbase.h @@ -11,8 +11,8 @@ #ifndef LISTVIEWHANDLER_H #define LISTVIEWHANDLER_H -#include <ntqobject.h> -#include <ntqmap.h> +#include <tqobject.h> +#include <tqmap.h> #include <tdelistview.h> diff --git a/krecipes/src/widgets/fractioninput.cpp b/krecipes/src/widgets/fractioninput.cpp index a643f7e..68a3cfd 100644 --- a/krecipes/src/widgets/fractioninput.cpp +++ b/krecipes/src/widgets/fractioninput.cpp @@ -10,7 +10,7 @@ #include "fractioninput.h" -#include <ntqtimer.h> +#include <tqtimer.h> #include <tdeglobalsettings.h> diff --git a/krecipes/src/widgets/headercombobox.cpp b/krecipes/src/widgets/headercombobox.cpp index 0857d55..3c43cbc 100644 --- a/krecipes/src/widgets/headercombobox.cpp +++ b/krecipes/src/widgets/headercombobox.cpp @@ -10,7 +10,7 @@ #include "headercombobox.h" -#include <ntqlistbox.h> +#include <tqlistbox.h> #include "backends/recipedb.h" #include "datablocks/elementlist.h" diff --git a/krecipes/src/widgets/inglistviewitem.h b/krecipes/src/widgets/inglistviewitem.h index 02c35de..89de283 100644 --- a/krecipes/src/widgets/inglistviewitem.h +++ b/krecipes/src/widgets/inglistviewitem.h @@ -11,7 +11,7 @@ #ifndef INGLISTVIEWITEM_H #define INGLISTVIEWITEM_H -#include "ntqlistview.h" +#include "tqlistview.h" #include "datablocks/ingredient.h" diff --git a/krecipes/src/widgets/ingredientcombobox.cpp b/krecipes/src/widgets/ingredientcombobox.cpp index f2a7bb5..0e036b0 100644 --- a/krecipes/src/widgets/ingredientcombobox.cpp +++ b/krecipes/src/widgets/ingredientcombobox.cpp @@ -10,8 +10,8 @@ #include "ingredientcombobox.h" -#include <ntqlistbox.h> -#include <ntqtimer.h> +#include <tqlistbox.h> +#include <tqtimer.h> #include <kdebug.h> #include <tdeapplication.h> diff --git a/krecipes/src/widgets/ingredientcombobox.h b/krecipes/src/widgets/ingredientcombobox.h index 05ae0ac..9bd5fb7 100644 --- a/krecipes/src/widgets/ingredientcombobox.h +++ b/krecipes/src/widgets/ingredientcombobox.h @@ -13,7 +13,7 @@ #include <kcombobox.h> -#include <ntqmap.h> +#include <tqmap.h> #include "datablocks/element.h" diff --git a/krecipes/src/widgets/ingredientinputwidget.cpp b/krecipes/src/widgets/ingredientinputwidget.cpp index df5880e..3c0aa7e 100644 --- a/krecipes/src/widgets/ingredientinputwidget.cpp +++ b/krecipes/src/widgets/ingredientinputwidget.cpp @@ -14,14 +14,14 @@ #include "ingredientinputwidget.h" -#include <ntqlabel.h> -#include <ntqwidgetstack.h> -#include <ntqhbox.h> -#include <ntqvbox.h> -#include <ntqgroupbox.h> -#include <ntqbuttongroup.h> -#include <ntqradiobutton.h> -#include <ntqcheckbox.h> +#include <tqlabel.h> +#include <tqwidgetstack.h> +#include <tqhbox.h> +#include <tqvbox.h> +#include <tqgroupbox.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> #include <kcombobox.h> #include <tdelocale.h> diff --git a/krecipes/src/widgets/ingredientinputwidget.h b/krecipes/src/widgets/ingredientinputwidget.h index 535c216..ecc623a 100644 --- a/krecipes/src/widgets/ingredientinputwidget.h +++ b/krecipes/src/widgets/ingredientinputwidget.h @@ -15,7 +15,7 @@ #ifndef INGREDIENTINPUTWIDGET_H #define INGREDIENTINPUTWIDGET_H -#include <ntqvbox.h> +#include <tqvbox.h> #include "datablocks/unit.h" diff --git a/krecipes/src/widgets/kdateedit.cpp b/krecipes/src/widgets/kdateedit.cpp index dd2b3b1..8becc83 100644 --- a/krecipes/src/widgets/kdateedit.cpp +++ b/krecipes/src/widgets/kdateedit.cpp @@ -21,10 +21,10 @@ Boston, MA 02110-1301 USA */ -#include <ntqapplication.h> -#include <ntqlineedit.h> -#include <ntqlistbox.h> -#include <ntqvalidator.h> +#include <tqapplication.h> +#include <tqlineedit.h> +#include <tqlistbox.h> +#include <tqvalidator.h> //#include <kcalendarsystem.h> #include <tdeglobal.h> diff --git a/krecipes/src/widgets/kdateedit.h b/krecipes/src/widgets/kdateedit.h index 255fed7..e3957b2 100644 --- a/krecipes/src/widgets/kdateedit.h +++ b/krecipes/src/widgets/kdateedit.h @@ -23,9 +23,9 @@ #ifndef KDATEEDIT_H #define KDATEEDIT_H -#include <ntqcombobox.h> -#include <ntqdatetime.h> -#include <ntqmap.h> +#include <tqcombobox.h> +#include <tqdatetime.h> +#include <tqmap.h> #include "kdatepickerpopup.h" diff --git a/krecipes/src/widgets/kdatepickerpopup.cpp b/krecipes/src/widgets/kdatepickerpopup.cpp index 7dfad4a..da68918 100644 --- a/krecipes/src/widgets/kdatepickerpopup.cpp +++ b/krecipes/src/widgets/kdatepickerpopup.cpp @@ -19,8 +19,8 @@ Boston, MA 02110-1301 USA */ -#include <ntqdatetime.h> -#include <ntqpopupmenu.h> +#include <tqdatetime.h> +#include <tqpopupmenu.h> #include <tdelocale.h> diff --git a/krecipes/src/widgets/kdatepickerpopup.h b/krecipes/src/widgets/kdatepickerpopup.h index 5158191..67f36dd 100644 --- a/krecipes/src/widgets/kdatepickerpopup.h +++ b/krecipes/src/widgets/kdatepickerpopup.h @@ -21,8 +21,8 @@ #ifndef KDATEPICKERPOPUP_H #define KDATEPICKERPOPUP_H -#include <ntqdatetime.h> -#include <ntqpopupmenu.h> +#include <tqdatetime.h> +#include <tqpopupmenu.h> #include <kdatepicker.h> diff --git a/krecipes/src/widgets/krelistview.h b/krecipes/src/widgets/krelistview.h index e273bbf..0884bda 100644 --- a/krecipes/src/widgets/krelistview.h +++ b/krecipes/src/widgets/krelistview.h @@ -11,8 +11,8 @@ #ifndef KRELISTVIEW_H #define KRELISTVIEW_H -#include <ntqlabel.h> -#include <ntqvbox.h> +#include <tqlabel.h> +#include <tqvbox.h> #include <tdelistview.h> #include <klineedit.h> diff --git a/krecipes/src/widgets/kremenu.cpp b/krecipes/src/widgets/kremenu.cpp index f252bcc..365fba9 100644 --- a/krecipes/src/widgets/kremenu.cpp +++ b/krecipes/src/widgets/kremenu.cpp @@ -11,14 +11,14 @@ ***************************************************************************/ #include "kremenu.h" -#include <ntqbitmap.h> -#include <ntqcursor.h> -#include <ntqfont.h> -#include <ntqimage.h> -#include <ntqobjectlist.h> -#include <ntqpainter.h> -#include <ntqpixmap.h> -#include <ntqsignalmapper.h> +#include <tqbitmap.h> +#include <tqcursor.h> +#include <tqfont.h> +#include <tqimage.h> +#include <tqobjectlist.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqsignalmapper.h> #include <tdeapplication.h> #include <kcursor.h> diff --git a/krecipes/src/widgets/kremenu.h b/krecipes/src/widgets/kremenu.h index 0f97561..4b02632 100644 --- a/krecipes/src/widgets/kremenu.h +++ b/krecipes/src/widgets/kremenu.h @@ -12,12 +12,12 @@ #ifndef KREMENU_H #define KREMENU_H -#include <ntqbuttongroup.h> -#include <ntqevent.h> -#include <ntqiconset.h> -#include <ntqmap.h> -#include <ntqpushbutton.h> -#include <ntqstring.h> +#include <tqbuttongroup.h> +#include <tqevent.h> +#include <tqiconset.h> +#include <tqmap.h> +#include <tqpushbutton.h> +#include <tqstring.h> #include "krecipesview.h" //for KrePanel enum diff --git a/krecipes/src/widgets/kreruler.cpp b/krecipes/src/widgets/kreruler.cpp index 01b005d..448a375 100644 --- a/krecipes/src/widgets/kreruler.cpp +++ b/krecipes/src/widgets/kreruler.cpp @@ -28,10 +28,10 @@ #include <tdeglobalsettings.h> #include <kdebug.h> #include <kiconloader.h> -#include <ntqcursor.h> -#include <ntqpainter.h> -#include <ntqpopupmenu.h> -#include <ntqtooltip.h> +#include <tqcursor.h> +#include <tqpainter.h> +#include <tqpopupmenu.h> +#include <tqtooltip.h> #include "krepagelayout.h" diff --git a/krecipes/src/widgets/kreruler.h b/krecipes/src/widgets/kreruler.h index ed0685e..b105547 100644 --- a/krecipes/src/widgets/kreruler.h +++ b/krecipes/src/widgets/kreruler.h @@ -25,8 +25,8 @@ #ifndef KRERULER_H #define KRERULER_H -#include <ntqframe.h> -#include <ntqpixmap.h> +#include <tqframe.h> +#include <tqpixmap.h> #include <kdemacros.h> diff --git a/krecipes/src/widgets/kretextedit.cpp b/krecipes/src/widgets/kretextedit.cpp index cf5e5ca..c6d150d 100644 --- a/krecipes/src/widgets/kretextedit.cpp +++ b/krecipes/src/widgets/kretextedit.cpp @@ -10,7 +10,7 @@ #include "kretextedit.h" -#include <ntqtextstream.h> +#include <tqtextstream.h> #include <tdeaccel.h> #include <kdebug.h> diff --git a/krecipes/src/widgets/kwidgetlistbox.h b/krecipes/src/widgets/kwidgetlistbox.h index 505e629..0ad463c 100644 --- a/krecipes/src/widgets/kwidgetlistbox.h +++ b/krecipes/src/widgets/kwidgetlistbox.h @@ -23,7 +23,7 @@ #ifndef KWIDGETLISTBOX_H #define KWIDGETLISTBOX_H -#include <ntqtable.h> +#include <tqtable.h> /** @author See README for the list of authors diff --git a/krecipes/src/widgets/paneldeco.cpp b/krecipes/src/widgets/paneldeco.cpp index a2ae935..8045a5b 100644 --- a/krecipes/src/widgets/paneldeco.cpp +++ b/krecipes/src/widgets/paneldeco.cpp @@ -9,9 +9,9 @@ ***************************************************************************/ #include "paneldeco.h" -#include <ntqpainter.h> -#include <ntqpoint.h> -#include <ntqrect.h> +#include <tqpainter.h> +#include <tqpoint.h> +#include <tqrect.h> #include <kiconloader.h> #include <kpixmap.h> diff --git a/krecipes/src/widgets/paneldeco.h b/krecipes/src/widgets/paneldeco.h index d911529..126f7fb 100644 --- a/krecipes/src/widgets/paneldeco.h +++ b/krecipes/src/widgets/paneldeco.h @@ -11,14 +11,14 @@ #define PANELDECO_H -#include <ntqevent.h> -#include <ntqiconset.h> -#include <ntqstring.h> -#include <ntqhbox.h> -#include <ntqpixmap.h> -#include <ntqvbox.h> -#include <ntqwidget.h> -#include <ntqwidgetstack.h> +#include <tqevent.h> +#include <tqiconset.h> +#include <tqstring.h> +#include <tqhbox.h> +#include <tqpixmap.h> +#include <tqvbox.h> +#include <tqwidget.h> +#include <tqwidgetstack.h> /** diff --git a/krecipes/src/widgets/prepmethodcombobox.cpp b/krecipes/src/widgets/prepmethodcombobox.cpp index 1cedbfc..b0b7660 100644 --- a/krecipes/src/widgets/prepmethodcombobox.cpp +++ b/krecipes/src/widgets/prepmethodcombobox.cpp @@ -10,7 +10,7 @@ #include "prepmethodcombobox.h" -#include <ntqlistbox.h> +#include <tqlistbox.h> #include <kdebug.h> diff --git a/krecipes/src/widgets/prepmethodcombobox.h b/krecipes/src/widgets/prepmethodcombobox.h index 2a657a8..ad902d7 100644 --- a/krecipes/src/widgets/prepmethodcombobox.h +++ b/krecipes/src/widgets/prepmethodcombobox.h @@ -13,7 +13,7 @@ #include <kcombobox.h> -#include <ntqmap.h> +#include <tqmap.h> #include "datablocks/element.h" diff --git a/krecipes/src/widgets/ratingwidget.cpp b/krecipes/src/widgets/ratingwidget.cpp index f195355..10f35af 100644 --- a/krecipes/src/widgets/ratingwidget.cpp +++ b/krecipes/src/widgets/ratingwidget.cpp @@ -17,8 +17,8 @@ #include <kiconloader.h> #include <kdebug.h> -#include <ntqintdict.h> -#include <ntqlayout.h> +#include <tqintdict.h> +#include <tqlayout.h> namespace { static const int RATING_WIDGET_MAX_STAR_SIZE = 24; diff --git a/krecipes/src/widgets/ratingwidget.h b/krecipes/src/widgets/ratingwidget.h index 4df58a6..a603def 100644 --- a/krecipes/src/widgets/ratingwidget.h +++ b/krecipes/src/widgets/ratingwidget.h @@ -14,11 +14,11 @@ #ifndef RATINGWIDGET_H #define RATINGWIDGET_H -#include <ntqhbox.h> -#include <ntqptrlist.h> -#include <ntqlabel.h> -#include <ntqpixmap.h> -#include <ntqstringlist.h> +#include <tqhbox.h> +#include <tqptrlist.h> +#include <tqlabel.h> +#include <tqpixmap.h> +#include <tqstringlist.h> /** * @author Robby Stephenson diff --git a/krecipes/src/widgets/recipelistview.cpp b/krecipes/src/widgets/recipelistview.cpp index c6ca440..536d06c 100644 --- a/krecipes/src/widgets/recipelistview.cpp +++ b/krecipes/src/widgets/recipelistview.cpp @@ -11,9 +11,9 @@ #include "recipelistview.h" -#include <ntqintdict.h> -#include <ntqdatastream.h> -#include <ntqtooltip.h> +#include <tqintdict.h> +#include <tqdatastream.h> +#include <tqtooltip.h> #include <tdeapplication.h> #include <kdebug.h> diff --git a/krecipes/src/widgets/recipelistview.h b/krecipes/src/widgets/recipelistview.h index b981f67..642f768 100644 --- a/krecipes/src/widgets/recipelistview.h +++ b/krecipes/src/widgets/recipelistview.h @@ -14,7 +14,7 @@ #ifndef RECIPELISTVIEW_H #define RECIPELISTVIEW_H -#include <ntqdragobject.h> +#include <tqdragobject.h> #include "categorylistview.h" #include "datablocks/recipe.h" diff --git a/krecipes/src/widgets/unitcombobox.cpp b/krecipes/src/widgets/unitcombobox.cpp index 40b5272..526f61a 100644 --- a/krecipes/src/widgets/unitcombobox.cpp +++ b/krecipes/src/widgets/unitcombobox.cpp @@ -10,7 +10,7 @@ #include "unitcombobox.h" -#include <ntqlistbox.h> +#include <tqlistbox.h> #include <tdelocale.h> #include <tdeconfig.h> diff --git a/krecipes/src/widgets/unitcombobox.h b/krecipes/src/widgets/unitcombobox.h index cbfb104..dd75107 100644 --- a/krecipes/src/widgets/unitcombobox.h +++ b/krecipes/src/widgets/unitcombobox.h @@ -13,7 +13,7 @@ #include <kcombobox.h> -#include <ntqmap.h> +#include <tqmap.h> #include "datablocks/unit.h" diff --git a/krecipes/src/widgets/unitlistview.cpp b/krecipes/src/widgets/unitlistview.cpp index a8dc8ad..9c70b1b 100644 --- a/krecipes/src/widgets/unitlistview.cpp +++ b/krecipes/src/widgets/unitlistview.cpp @@ -14,8 +14,8 @@ #include "unitlistview.h" -#include <ntqcombobox.h> -#include <ntqheader.h> +#include <tqcombobox.h> +#include <tqheader.h> #include <tdemessagebox.h> #include <tdeconfig.h> |