diff options
563 files changed, 5408 insertions, 5503 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt index a91bd2a..0176702 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,7 +9,11 @@ # ################################################# -cmake_minimum_required( VERSION 3.1 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# @@ -114,7 +114,7 @@ Class, file and Variable names: - Captilize logically so that it becomes easy to read it. Do not capitalize the first letter after _ (Use m_varName not m_VarName) - variable names should be indicative of their functionality and also of - the type they belong too if they are instances of qt widgets. + the type they belong too if they are instances of tqt widgets. for eg, QCheckBox* m_autoRotateCheckBox; ------------------------------------------------------------------------- diff --git a/acinclude.m4 b/acinclude.m4 index be94c35..5ce7ee4 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -241,8 +241,8 @@ AC_DEFUN([KDE_FIND_PATH], AC_DEFUN([KDE_MOC_ERROR_MESSAGE], [ - AC_MSG_ERROR([No Qt meta object compiler (moc) found! -Please check whether you installed Qt correctly. + AC_MSG_ERROR([No TQt meta object compiler (moc) found! +Please check whether you installed TQt correctly. You need to have a running moc binary. configure tried to run $ac_cv_path_moc and the test didn't succeed. If configure shouldn't have tried this one, set @@ -253,8 +253,8 @@ configure. AC_DEFUN([KDE_UIC_ERROR_MESSAGE], [ - AC_MSG_WARN([No Qt ui compiler (uic) found! -Please check whether you installed Qt correctly. + AC_MSG_WARN([No TQt ui compiler (uic) found! +Please check whether you installed TQt correctly. You need to have a running uic binary. configure tried to run $ac_cv_path_uic and the test didn't succeed. If configure shouldn't have tried this one, set @@ -306,7 +306,7 @@ AC_DEFUN([AC_PATH_TQT_MOC_UIC], for dir in $kde_qt_dirs; do qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc" done - qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin" + qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/tqt/bin" if test ! "$ac_qt_bindir" = "NO"; then qt_bindirs="$ac_qt_bindir $qt_bindirs" fi @@ -378,7 +378,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and tdelibs as you did use now. +same compiler to compile TQt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi @@ -874,21 +874,21 @@ AC_REQUIRE([KDE_CHECK_LIB64]) AC_ARG_ENABLE( embedded, - AC_HELP_STRING([--enable-embedded],[link to Qt-embedded, don't use X]), + AC_HELP_STRING([--enable-embedded],[link to TQt-embedded, don't use X]), kde_use_qt_emb=$enableval, kde_use_qt_emb=no ) AC_ARG_ENABLE( qtopia, - AC_HELP_STRING([--enable-qtopia],[link to Qt-embedded, link to the Qtopia Environment]), + AC_HELP_STRING([--enable-qtopia],[link to TQt-embedded, link to the Qtopia Environment]), kde_use_qt_emb_palm=$enableval, kde_use_qt_emb_palm=no ) AC_ARG_ENABLE( mac, - AC_HELP_STRING([--enable-mac],[link to Qt/Mac (don't use X)]), + AC_HELP_STRING([--enable-mac],[link to TQt/Mac (don't use X)]), kde_use_qt_mac=$enableval, kde_use_qt_mac=no ) @@ -1046,7 +1046,7 @@ LIB_XEXT="-lXext" QTE_NORTTI="" elif test "$kde_use_qt_emb" = "yes"; then - dnl We're using QT Embedded + dnl We're using TQT Embedded CPPFLAGS=-DQWS CXXFLAGS="$CXXFLAGS -fno-rtti" QTE_NORTTI="-fno-rtti -DQWS" @@ -1060,7 +1060,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 QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to + dnl We're using TQT/Mac (I use QT_MAC so that qglobal.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" @@ -1133,15 +1133,15 @@ cat >> conftest.$ac_ext <<EOF EOF if test $kde_qtsubver -gt 0; then cat >> conftest.$ac_ext <<EOF - QString s; + TQString s; s.setLatin1("Elvis is alive", 14); EOF fi fi if test "$kde_qtver" = "3"; then cat >> conftest.$ac_ext <<EOF - (void)QStyleFactory::create(QString::null); - QCursor c(Qt::WhatsThisCursor); + (void)QStyleFactory::create(TQString::null); + QCursor c(TQt::WhatsThisCursor); EOF fi cat >> conftest.$ac_ext <<EOF @@ -1231,8 +1231,8 @@ if test $kde_qtver = 3; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) fi if test "$PKG_CONFIG" != "no" ; then - if $PKG_CONFIG --exists qt-mt ; then - kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`" + if $PKG_CONFIG --exists tqt-mt ; then + kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix tqt-mt`" fi fi fi @@ -1247,7 +1247,7 @@ fi AC_DEFUN([KDE_CHECK_QT_DIRECT], [ AC_REQUIRE([KDE_USE_TQT]) -AC_MSG_CHECKING([if Qt compiles without flags]) +AC_MSG_CHECKING([if TQt compiles without flags]) AC_CACHE_VAL(kde_cv_qt_direct, [ AC_LANG_SAVE @@ -1302,7 +1302,7 @@ fi ]) dnl ------------------------------------------------------------------------ -dnl Try to find the Qt headers and libraries. +dnl Try to find the TQt headers and libraries. dnl $(QT_LDFLAGS) will be -Ltqtliblocation (if needed) dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed) dnl ------------------------------------------------------------------------ @@ -1314,12 +1314,12 @@ AC_REQUIRE([KDE_USE_TQT]) AC_REQUIRE([KDE_CHECK_LIB64]) dnl ------------------------------------------------------------------------ -dnl Add configure flag to enable linking to MT version of Qt library. +dnl Add configure flag to enable linking to MT version of TQt library. dnl ------------------------------------------------------------------------ AC_ARG_ENABLE( mt, - AC_HELP_STRING([--disable-mt],[link to non-threaded Qt (deprecated)]), + AC_HELP_STRING([--disable-mt],[link to non-threaded TQt (deprecated)]), kde_use_qt_mt=$enableval, [ if test $kde_qtver = 3; then @@ -1333,7 +1333,7 @@ AC_ARG_ENABLE( USING_QT_MT="" dnl ------------------------------------------------------------------------ -dnl If we not get --disable-qt-mt then adjust some vars for the host. +dnl If we not get --disable-tqt-mt then adjust some vars for the host. dnl ------------------------------------------------------------------------ KDE_MT_LDFLAGS= @@ -1354,7 +1354,7 @@ AC_SUBST(KDE_MT_LIBS) kde_qt_was_given=yes dnl ------------------------------------------------------------------------ -dnl If we haven't been told how to link to Qt, we work it out for ourselves. +dnl If we haven't been told how to link to TQt, we work it out for ourselves. dnl ------------------------------------------------------------------------ if test -z "$LIBTQT_GLOB"; then if test "x$kde_use_qt_emb" = "xyes"; then @@ -1365,12 +1365,12 @@ if test -z "$LIBTQT_GLOB"; then fi dnl ------------------------------------------------------------ -dnl If we got --enable-embedded then adjust the Qt library name. +dnl If we got --enable-embedded then adjust the TQt library name. dnl ------------------------------------------------------------ if test "x$kde_use_qt_emb" = "xyes"; then tqtlib="qte" else - tqtlib="qt" + tqtlib="tqt" fi kde_int_qt="-l$tqtlib" @@ -1391,7 +1391,7 @@ dnl ------------------------------------------------------------ fi dnl ------------------------------------------------------------------------ -dnl If we got --enable-qt-mt then adjust the Qt library name for the host. +dnl If we got --enable-tqt-mt then adjust the TQt library name for the host. dnl ------------------------------------------------------------------------ if test "x$kde_use_qt_mt" = "xyes"; then @@ -1415,7 +1415,7 @@ if test $kde_qtver = 3; then LIBTQT="$LIBTQT $LIBDL" fi -AC_MSG_CHECKING([for Qt]) +AC_MSG_CHECKING([for TQt]) if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then LIBTQT="$LIBTQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET" @@ -1423,29 +1423,29 @@ fi ac_tqt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO qt_libraries="" tqt_includes="" -AC_ARG_WITH(qt-dir, - AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), +AC_ARG_WITH(tqt-dir, + AC_HELP_STRING([--with-tqt-dir=DIR],[where the root of TQt is installed ]), [ ac_tqt_includes="$withval"/include ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) -AC_ARG_WITH(qt-includes, - AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]), +AC_ARG_WITH(tqt-includes, + AC_HELP_STRING([--with-tqt-includes=DIR],[where the TQt includes are. ]), [ ac_tqt_includes="$withval" ]) kde_qt_libs_given=no -AC_ARG_WITH(qt-libraries, - AC_HELP_STRING([--with-qt-libraries=DIR],[where the Qt library is installed.]), +AC_ARG_WITH(tqt-libraries, + AC_HELP_STRING([--with-tqt-libraries=DIR],[where the TQt library is installed.]), [ ac_qt_libraries="$withval" kde_qt_libs_given=yes ]) AC_CACHE_VAL(ac_cv_have_qt, -[#try to guess Qt locations +[#try to guess TQt locations qt_incdirs="" for dir in $kde_qt_dirs; do @@ -1455,11 +1455,11 @@ if test -z "$PKG_CONFIG"; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) fi if test "$PKG_CONFIG" != "no" ; then - if $PKG_CONFIG --exists qt-mt ; then - qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`" + if $PKG_CONFIG --exists tqt-mt ; then + qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir tqt-mt`" fi fi -qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes" +qt_incdirs="$QTINC $qt_incdirs /usr/local/tqt/include /usr/include/tqt /usr/include /usr/X11R6/include/X11/tqt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes" if test ! "$ac_tqt_includes" = "NO"; then qt_incdirs="$ac_tqt_includes $qt_incdirs" fi @@ -1481,16 +1481,16 @@ if test -z "$PKG_CONFIG"; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) fi if test "$PKG_CONFIG" != "no" ; then - if $PKG_CONFIG --exists qt-mt ; then - qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`" + if $PKG_CONFIG --exists tqt-mt ; then + qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir tqt-mt`" fi fi -qt_libdirs="$TQTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" +qt_libdirs="$TQTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/tqt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then qt_libdir=$ac_qt_libraries else qt_libdirs="$ac_qt_libraries $qt_libdirs" - # if the Qt was given, the chance is too big that libtqt.* doesn't exist + # if the TQt was given, the chance is too big that libtqt.* doesn't exist qt_libdir=NONE for dir in $qt_libdirs; do try="ls -1 $dir/${LIBTQT_GLOB}" @@ -1545,14 +1545,14 @@ if test "$ac_tqt_includes" = NO || test "$ac_qt_libraries" = NO; then else if test "x$kde_use_qt_mt" = "xyes"; then missing_qt_mt=" -Make sure that you have compiled Qt with thread support!" +Make sure that you have compiled TQt with thread support!" ac_qt_notfound="(library $tqtlib-mt)"; else ac_qt_notfound="(library $tqtlib)"; fi fi - AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation! + AC_MSG_ERROR([TQt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation! For more details about this problem, look at the end of config.log.$missing_qt_mt]) else have_qt="yes" @@ -1670,10 +1670,10 @@ if test "$kde_cv_uic_plugins" != yes; then AC_MSG_ERROR([ you need to install tdelibs first. -If you did install tdelibs, then the Qt version that is picked up by +If you did install tdelibs, then the TQt version that is picked up by this configure is not the same version you used to compile tdelibs. -The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the -_same Qt version_, compiled with the _same compiler_ and the same Qt +The TQt Plugin installed by tdelibs is *ONLY* loadable if it is the +_same TQt version_, compiled with the _same compiler_ and the same TQt configuration settings. ]) fi @@ -1907,7 +1907,7 @@ else all_includes="$KDE_INCLUDES $all_includes" fi -KDE_DEFAULT_CXXFLAGS="-DTQT_NO_ASCII_CAST -DTQT_NO_STL -DTQT_NO_COMPAT -DTQT_NO_TRANSLATION" +KDE_DEFAULT_CXXFLAGS="-DTQT_NO_ASCII_CAST -DTQT_NO_STL -DTQT_NO_TRANSLATION" KDE_LDFLAGS="-L$kde_libraries" if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then @@ -2046,14 +2046,14 @@ For more details about this problem, look at the end of config.log.]) AC_DEFUN([KDE_CHECK_KDEQTADDON], [ -AC_MSG_CHECKING(for kde-qt-addon) +AC_MSG_CHECKING(for kde-tqt-addon) AC_CACHE_VAL(kde_cv_have_kdetqtaddon, [ kde_ldflags_safe="$LDFLAGS" kde_libs_safe="$LIBS" kde_cxxflags_safe="$CXXFLAGS" - LIBS="-lkde-qt-addon $LIBTQT $LIBS" + LIBS="-lkde-tqt-addon $LIBTQT $LIBS" CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" @@ -2075,8 +2075,8 @@ AC_CACHE_VAL(kde_cv_have_kdetqtaddon, AC_MSG_RESULT($kde_cv_have_kdetqtaddon) if test "$kde_cv_have_kdetqtaddon" = "no"; then - AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first. -It is a separate package (and CVS module) named kde-qt-addon.]) + AC_MSG_ERROR([Can't find libkde-tqt-addon. You need to install it first. +It is a separate package (and CVS module) named kde-tqt-addon.]) fi ]) @@ -2608,7 +2608,7 @@ AH_VERBATIM(_AC_CHECK_JPEG, AC_DEFUN([KDE_CHECK_QT_JPEG], [ if test -n "$LIBJPEG"; then -AC_MSG_CHECKING([if Qt needs $LIBJPEG]) +AC_MSG_CHECKING([if TQt needs $LIBJPEG]) AC_CACHE_VAL(kde_cv_qt_jpeg, [ AC_LANG_SAVE @@ -3265,7 +3265,7 @@ AC_DEFUN([AC_CHECK_COMPILERS], AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes") if test "$CXX" = "KCC"; then dnl unfortunately we currently cannot disable exception support in KCC - dnl because doing so is binary incompatible and Qt by default links with exceptions :-( + dnl because doing so is binary incompatible and TQt by default links with exceptions :-( dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"]) dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS= ) @@ -3426,7 +3426,7 @@ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY], [kde_have_gcc_visibility=$enableval], [kde_have_gcc_visibility=no]) - AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched, + AC_CACHE_CHECK([if TQt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched, [ AC_LANG_SAVE AC_LANG_CPLUSPLUS @@ -4012,7 +4012,7 @@ AC_DEFUN([AC_HAVE_GL], AC_ARG_WITH(gl,AC_HELP_STRING([--without-gl],[disable 3D GL modes]), gl_test=$withval, gl_test="yes") if test "x$kde_use_qt_emb" = "xyes"; then - # GL and Qt Embedded is a no-go for now. + # GL and TQt Embedded is a no-go for now. ac_cv_have_gl=no elif test "x$gl_test" = xno; then ac_cv_have_gl=no @@ -4690,7 +4690,7 @@ AC_TRY_RUN(dnl #include <qimageio.h> #include <qstring.h> int main() { - QString t = "hallo"; + TQString t = "hallo"; t.fill('t'); qInitImageIO(); } @@ -4705,7 +4705,7 @@ AC_LANG_RESTORE if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then LIBQIMGIO="-lqimgio -lpng -lz $LIBJPEG" AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the Qt extension qimgio available]) + AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the TQt extension qimgio available]) AC_SUBST(LIBQIMGIO) else AC_MSG_RESULT(not found) @@ -5527,13 +5527,13 @@ the end of config.log]) AC_DEFUN([KDE_INIT_DOXYGEN], [ -AC_MSG_CHECKING([for Qt docs]) +AC_MSG_CHECKING([for TQt docs]) kde_qtdir= if test "${with_qt_dir+set}" = set; then kde_qtdir="$with_qt_dir" fi -AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/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/qt/html ], TQTDOCDIR) +AC_FIND_FILE(qsql.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) diff --git a/admin b/admin -Subproject a7f75ac0ff587d5b8694a1b78557597161f8104 +Subproject 59a8bf7c09f87fbccd6dc2987145c7216e043e7 diff --git a/configure.in b/configure.in index a6e5026..1d2fcd7 100644 --- a/configure.in +++ b/configure.in @@ -757,15 +757,15 @@ fi if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then echo "" - echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility" + echo "Your GCC supports symbol visibility, but the patch for TQt supporting visibility" echo "was not included. Therefore, GCC symbol visibility support remains disabled." echo "" - echo "For better performance, consider including the Qt visibility supporting patch" + echo "For better performance, consider including the TQt visibility supporting patch" echo "located at:" echo "" echo "http://bugs.kde.org/show_bug.cgi?id=109386" echo "" - echo "and recompile all of Qt and KDE. Note, this is entirely optional and" + echo "and recompile all of TQt and KDE. Note, this is entirely optional and" echo "everything will continue to work just fine without it." echo "" fi diff --git a/digikam/digikam/albumdb.cpp b/digikam/digikam/albumdb.cpp index ef46b5a..9b08d5c 100644 --- a/digikam/digikam/albumdb.cpp +++ b/digikam/digikam/albumdb.cpp @@ -323,7 +323,7 @@ AlbumInfo::List AlbumDB::scanAlbums() ++it; info.url = *it; ++it; - info.date = TQDate::fromString(*it, Qt::ISODate); + info.date = TQDate::fromString(*it, TQt::ISODate); ++it; info.caption = *it; ++it; @@ -433,7 +433,7 @@ int AlbumDB::addAlbum(const TQString& url, const TQString& caption, execSql( TQString("REPLACE INTO Albums (url, date, caption, collection) " "VALUES('%1', '%2', '%3', '%4');") .arg(escapeString(url), - date.toString(Qt::ISODate), + date.toString(TQt::ISODate), escapeString(caption), escapeString(collection))); @@ -458,7 +458,7 @@ void AlbumDB::setAlbumCollection(int albumID, const TQString& collection) void AlbumDB::setAlbumDate(int albumID, const TQDate& date) { execSql( TQString("UPDATE Albums SET date='%1' WHERE id=%2;") - .arg(date.toString(Qt::ISODate)) + .arg(date.toString(TQt::ISODate)) .arg(albumID) ); } @@ -766,7 +766,7 @@ TQDateTime AlbumDB::getItemDate(TQ_LLONG imageID) if (values.isEmpty()) return TQDateTime(); else - return TQDateTime::fromString(values[0], Qt::ISODate); + return TQDateTime::fromString(values[0], TQt::ISODate); } TQDateTime AlbumDB::getItemDate(int albumID, const TQString& name) @@ -782,7 +782,7 @@ TQDateTime AlbumDB::getItemDate(int albumID, const TQString& name) if (values.isEmpty()) return TQDateTime(); else - return TQDateTime::fromString(values[0], Qt::ISODate); + return TQDateTime::fromString(values[0], TQt::ISODate); } TQ_LLONG AlbumDB::getImageId(int albumID, const TQString& name) @@ -1027,7 +1027,7 @@ int AlbumDB::getOrCreateAlbumId(const TQString& folder) execSql( TQString ("INSERT INTO Albums (url, date) " "VALUES ('%1','%2')") .arg(escapeString(folder), - TQDateTime::currentDateTime().toString(Qt::ISODate)) ); + TQDateTime::currentDateTime().toString(TQt::ISODate)) ); albumID = sqlite3_last_insert_rowid(d->dataBase); } else albumID = values[0].toInt(); @@ -1046,7 +1046,7 @@ TQ_LLONG AlbumDB::addItem(int albumID, "( caption , datetime, name, dirid ) " " VALUES ('%1','%2','%3',%4) " ) .arg(escapeString(comment), - datetime.toString(Qt::ISODate), + datetime.toString(TQt::ISODate), escapeString(name), TQString::number(albumID)) ); @@ -1278,7 +1278,7 @@ bool AlbumDB::setItemDate(TQ_LLONG imageID, { execSql ( TQString ("UPDATE Images SET datetime='%1'" "WHERE id=%2;") - .arg(datetime.toString(Qt::ISODate), + .arg(datetime.toString(TQt::ISODate), TQString::number(imageID)) ); return true; @@ -1289,7 +1289,7 @@ bool AlbumDB::setItemDate(int albumID, const TQString& name, { execSql ( TQString ("UPDATE Images SET datetime='%1'" "WHERE dirid=%2 AND name='%3';") - .arg(datetime.toString(Qt::ISODate), + .arg(datetime.toString(TQt::ISODate), TQString::number(albumID), escapeString(name)) ); @@ -1456,7 +1456,7 @@ TQDate AlbumDB::getAlbumLowestDate(int albumID) execSql( TQString("SELECT MIN(datetime) FROM Images " "WHERE dirid=%1 GROUP BY dirid") .arg( albumID ), &values); - TQDate itemDate = TQDate::fromString( values[0], Qt::ISODate ); + TQDate itemDate = TQDate::fromString( values[0], TQt::ISODate ); return itemDate; } @@ -1466,7 +1466,7 @@ TQDate AlbumDB::getAlbumHighestDate(int albumID) execSql( TQString("SELECT MAX(datetime) FROM Images " "WHERE dirid=%1 GROUP BY dirid") .arg( albumID ), &values); - TQDate itemDate = TQDate::fromString( values[0], Qt::ISODate ); + TQDate itemDate = TQDate::fromString( values[0], TQt::ISODate ); return itemDate; } @@ -1482,7 +1482,7 @@ TQDate AlbumDB::getAlbumAverageDate(int albumID) for (TQStringList::iterator it = values.begin(); it != values.end(); ++it) { - TQDateTime itemDateTime = TQDateTime::fromString( *it, Qt::ISODate ); + TQDateTime itemDateTime = TQDateTime::fromString( *it, TQt::ISODate ); if (itemDateTime.isValid()) { ++amountOfImages; diff --git a/digikam/digikam/albumfolderview.cpp b/digikam/digikam/albumfolderview.cpp index 9d84999..6e9048a 100644 --- a/digikam/digikam/albumfolderview.cpp +++ b/digikam/digikam/albumfolderview.cpp @@ -273,40 +273,40 @@ AlbumFolderView::AlbumFolderView(TQWidget *parent) setAcceptDrops(true); viewport()->setAcceptDrops(true); - connect(d->albumMan, TQT_SIGNAL(signalAlbumAdded(Album*)), - this, TQT_SLOT(slotAlbumAdded(Album*))); + connect(d->albumMan, TQ_SIGNAL(signalAlbumAdded(Album*)), + this, TQ_SLOT(slotAlbumAdded(Album*))); - connect(d->albumMan, TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotAlbumDeleted(Album*))); + connect(d->albumMan, TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotAlbumDeleted(Album*))); - connect(d->albumMan, TQT_SIGNAL(signalAlbumsCleared()), - this, TQT_SLOT(slotAlbumsCleared())); + connect(d->albumMan, TQ_SIGNAL(signalAlbumsCleared()), + this, TQ_SLOT(slotAlbumsCleared())); - connect(d->albumMan, TQT_SIGNAL(signalAlbumIconChanged(Album*)), - this, TQT_SLOT(slotAlbumIconChanged(Album*))); + connect(d->albumMan, TQ_SIGNAL(signalAlbumIconChanged(Album*)), + this, TQ_SLOT(slotAlbumIconChanged(Album*))); - connect(d->albumMan, TQT_SIGNAL(signalAlbumRenamed(Album*)), - this, TQT_SLOT(slotAlbumRenamed(Album*))); + connect(d->albumMan, TQ_SIGNAL(signalAlbumRenamed(Album*)), + this, TQ_SLOT(slotAlbumRenamed(Album*))); - connect(d->albumMan, TQT_SIGNAL(signalPAlbumsDirty(const TQMap<int, int>&)), - this, TQT_SLOT(slotRefresh(const TQMap<int, int>&))); + connect(d->albumMan, TQ_SIGNAL(signalPAlbumsDirty(const TQMap<int, int>&)), + this, TQ_SLOT(slotRefresh(const TQMap<int, int>&))); AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); - connect(loader, TQT_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); + connect(loader, TQ_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); - connect(loader, TQT_SIGNAL(signalFailed(Album *)), - this, TQT_SLOT(slotThumbnailLost(Album *))); + connect(loader, TQ_SIGNAL(signalFailed(Album *)), + this, TQ_SLOT(slotThumbnailLost(Album *))); - connect(loader, TQT_SIGNAL(signalReloadThumbnails()), - this, TQT_SLOT(slotReloadThumbnails())); + connect(loader, TQ_SIGNAL(signalReloadThumbnails()), + this, TQ_SLOT(slotReloadThumbnails())); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); - connect(this, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); } AlbumFolderView::~AlbumFolderView() @@ -825,8 +825,8 @@ void AlbumFolderView::albumDelete(AlbumFolderViewItem *item) u.setProtocol("file"); u.setPath(album->folderPath()); TDEIO::Job* job = DIO::del(u, useTrash); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job *))); } void AlbumFolderView::addAlbumChildrenToList(KURL::List &list, Album *album) @@ -1082,8 +1082,8 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e) destAlbum = itemDrop->album(); } TDEIO::Job* job = DIO::move(album->kurl(), destAlbum->kurl()); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); } } else if (AlbumSettings::instance()->getAlbumSortOrder() @@ -1208,8 +1208,8 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e) case 10: { TDEIO::Job* job = DIO::move(extUrls, destAlbum->kurl()); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); // In recurssive album contents mode, we need to force AlbumLister to take a care about // moved items. This will have no incidence in normal mode. @@ -1223,8 +1223,8 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e) case 11: { TDEIO::Job* job = DIO::copy(extUrls, destAlbum->kurl()); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); break; } case 12: @@ -1334,15 +1334,15 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e) case 10: { TDEIO::Job* job = DIO::move(srcURLs, destAlbum->kurl()); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); break; } case 11: { TDEIO::Job* job = DIO::copy(srcURLs, destAlbum->kurl()); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); break; } default: @@ -1393,8 +1393,8 @@ void AlbumFolderView::albumImportFolder() return; TDEIO::Job* job = DIO::copy(urls, parent->kurl()); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job *))); } void AlbumFolderView::selectItem(int id) diff --git a/digikam/digikam/albumfolderview.h b/digikam/digikam/albumfolderview.h index 2cbd4c7..b02e57a 100644 --- a/digikam/digikam/albumfolderview.h +++ b/digikam/digikam/albumfolderview.h @@ -49,7 +49,7 @@ class AlbumFolderViewPriv; class AlbumFolderView : public FolderView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/albumhistory.h b/digikam/digikam/albumhistory.h index 18d0d98..585dad8 100644 --- a/digikam/digikam/albumhistory.h +++ b/digikam/digikam/albumhistory.h @@ -46,7 +46,7 @@ class HistoryItem; */ class AlbumHistory : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp index 2d3a7a4..88d6a3d 100644 --- a/digikam/digikam/albumiconview.cpp +++ b/digikam/digikam/albumiconview.cpp @@ -218,63 +218,63 @@ AlbumIconView::AlbumIconView(TQWidget* parent) // -- ImageLister connections ------------------------------------- - connect(d->imageLister, TQT_SIGNAL(signalNewFilteredItems(const ImageInfoList&)), - this, TQT_SLOT(slotImageListerNewItems(const ImageInfoList&))); + connect(d->imageLister, TQ_SIGNAL(signalNewFilteredItems(const ImageInfoList&)), + this, TQ_SLOT(slotImageListerNewItems(const ImageInfoList&))); - connect(d->imageLister, TQT_SIGNAL(signalDeleteFilteredItem(ImageInfo*)), - this, TQT_SLOT(slotImageListerDeleteItem(ImageInfo*)) ); + connect(d->imageLister, TQ_SIGNAL(signalDeleteFilteredItem(ImageInfo*)), + this, TQ_SLOT(slotImageListerDeleteItem(ImageInfo*)) ); - connect(d->imageLister, TQT_SIGNAL(signalClear()), - this, TQT_SLOT(slotImageListerClear())); + connect(d->imageLister, TQ_SIGNAL(signalClear()), + this, TQ_SLOT(slotImageListerClear())); // -- Icon connections -------------------------------------------- - connect(this, TQT_SIGNAL(signalDoubleClicked(IconItem*)), - this, TQT_SLOT(slotDoubleClicked(IconItem*))); + connect(this, TQ_SIGNAL(signalDoubleClicked(IconItem*)), + this, TQ_SLOT(slotDoubleClicked(IconItem*))); - connect(this, TQT_SIGNAL(signalReturnPressed(IconItem*)), - this, TQT_SLOT(slotDoubleClicked(IconItem*))); + connect(this, TQ_SIGNAL(signalReturnPressed(IconItem*)), + this, TQ_SLOT(slotDoubleClicked(IconItem*))); - connect(this, TQT_SIGNAL(signalRightButtonClicked(IconItem*, const TQPoint &)), - this, TQT_SLOT(slotRightButtonClicked(IconItem*, const TQPoint &))); + connect(this, TQ_SIGNAL(signalRightButtonClicked(IconItem*, const TQPoint &)), + this, TQ_SLOT(slotRightButtonClicked(IconItem*, const TQPoint &))); - connect(this, TQT_SIGNAL(signalRightButtonClicked(const TQPoint &)), - this, TQT_SLOT(slotRightButtonClicked(const TQPoint &))); + connect(this, TQ_SIGNAL(signalRightButtonClicked(const TQPoint &)), + this, TQ_SLOT(slotRightButtonClicked(const TQPoint &))); - connect(this, TQT_SIGNAL(signalSelectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(signalSelectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); - connect(this, TQT_SIGNAL(signalShowToolTip(IconItem*)), - this, TQT_SLOT(slotShowToolTip(IconItem*))); + connect(this, TQ_SIGNAL(signalShowToolTip(IconItem*)), + this, TQ_SLOT(slotShowToolTip(IconItem*))); // -- ThemeEngine connections --------------------------------------- - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + TQ_SLOT(slotThemeChanged())); // -- Pixmap manager connections ------------------------------------ - connect(d->pixMan, TQT_SIGNAL(signalPixmap(const KURL&)), - TQT_SLOT(slotGotThumbnail(const KURL&))); + connect(d->pixMan, TQ_SIGNAL(signalPixmap(const KURL&)), + TQ_SLOT(slotGotThumbnail(const KURL&))); // -- ImageAttributesWatch connections ------------------------------ ImageAttributesWatch *watch = ImageAttributesWatch::instance(); - connect(watch, TQT_SIGNAL(signalImageTagsChanged(TQ_LLONG)), - this, TQT_SLOT(slotImageAttributesChanged(TQ_LLONG))); + connect(watch, TQ_SIGNAL(signalImageTagsChanged(TQ_LLONG)), + this, TQ_SLOT(slotImageAttributesChanged(TQ_LLONG))); - connect(watch, TQT_SIGNAL(signalImagesChanged(int)), - this, TQT_SLOT(slotAlbumImagesChanged(int))); + connect(watch, TQ_SIGNAL(signalImagesChanged(int)), + this, TQ_SLOT(slotAlbumImagesChanged(int))); - connect(watch, TQT_SIGNAL(signalImageRatingChanged(TQ_LLONG)), - this, TQT_SLOT(slotImageAttributesChanged(TQ_LLONG))); + connect(watch, TQ_SIGNAL(signalImageRatingChanged(TQ_LLONG)), + this, TQ_SLOT(slotImageAttributesChanged(TQ_LLONG))); - connect(watch, TQT_SIGNAL(signalImageDateChanged(TQ_LLONG)), - this, TQT_SLOT(slotImageAttributesChanged(TQ_LLONG))); + connect(watch, TQ_SIGNAL(signalImageDateChanged(TQ_LLONG)), + this, TQ_SLOT(slotImageAttributesChanged(TQ_LLONG))); - connect(watch, TQT_SIGNAL(signalImageCaptionChanged(TQ_LLONG)), - this, TQT_SLOT(slotImageAttributesChanged(TQ_LLONG))); + connect(watch, TQ_SIGNAL(signalImageCaptionChanged(TQ_LLONG)), + this, TQ_SLOT(slotImageAttributesChanged(TQ_LLONG))); } AlbumIconView::~AlbumIconView() @@ -524,7 +524,7 @@ void AlbumIconView::slotRightButtonClicked(const TQPoint& pos) } TQPopupMenu popmenu(this); - TDEAction *paste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), 0); + TDEAction *paste = KStdAction::paste(this, TQ_SLOT(slotPaste()), 0); TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard); if(!data || !TQUriDrag::canDecode(data)) @@ -593,8 +593,8 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos) if (!man->albumDB()->hasTags(selectedImageIDs)) gotoMenu.setItemEnabled(gotoTagId, false); - connect(gotoTagsPopup, TQT_SIGNAL(signalTagActivated(int)), - this, TQT_SLOT(slotGotoTag(int))); + connect(gotoTagsPopup, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotGotoTag(int))); if (d->currentAlbum->type() == Album::PHYSICAL ) { @@ -682,8 +682,8 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos) // -------------------------------------------------------- - TDEAction *copy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), 0); - TDEAction *paste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), 0); + TDEAction *copy = KStdAction::copy(this, TQ_SLOT(slotCopy()), 0); + TDEAction *paste = KStdAction::paste(this, TQ_SLOT(slotPaste()), 0); TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard); if(!data || !TQUriDrag::canDecode(data)) { @@ -706,11 +706,11 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos) TagsPopupMenu* assignTagsPopup = new TagsPopupMenu(selectedImageIDs, 1000, TagsPopupMenu::ASSIGN); TagsPopupMenu* removeTagsPopup = new TagsPopupMenu(selectedImageIDs, 1000, TagsPopupMenu::REMOVE); - connect(assignTagsPopup, TQT_SIGNAL(signalTagActivated(int)), - this, TQT_SLOT(slotAssignTag(int))); + connect(assignTagsPopup, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotAssignTag(int))); - connect(removeTagsPopup, TQT_SIGNAL(signalTagActivated(int)), - this, TQT_SLOT(slotRemoveTag(int))); + connect(removeTagsPopup, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotRemoveTag(int))); popmenu.insertItem(i18n("Assign Tag"), assignTagsPopup); @@ -728,8 +728,8 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos) RatingPopupMenu ratingMenu; - connect(&ratingMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAssignRating(int))); + connect(&ratingMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAssignRating(int))); popmenu.insertItem(i18n("Assign Rating"), &ratingMenu); @@ -888,8 +888,8 @@ void AlbumIconView::slotPaste() KURLDrag::decode(data, srcURLs); TDEIO::Job* job = DIO::copy(srcURLs, destURL); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); } else if(d->currentAlbum->type() == Album::TAG && ItemDrag::canDecode(data)) { @@ -982,10 +982,10 @@ void AlbumIconView::slotRename(AlbumIconItem* item) newURL.setFileName(newName + ext); TDEIO::CopyJob* job = DIO::rename(oldURL, newURL); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); - connect(job, TQT_SIGNAL(copyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)), - this, TQT_SLOT(slotRenamed(TDEIO::Job*, const KURL &, const KURL&))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(copyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)), + this, TQ_SLOT(slotRenamed(TDEIO::Job*, const KURL &, const KURL&))); // The AlbumManager KDirWatch will trigger a DIO::scan. // When this is completed, DIO will call AlbumLister::instance()->refresh(). @@ -1038,8 +1038,8 @@ void AlbumIconView::slotDeleteSelectedItems(bool deletePermanently) // trash does not like non-local URLs, put is not implemented TDEIO::Job* job = DIO::del(useTrash ? urlList : kioUrlList, useTrash); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); // The AlbumManager KDirWatch will trigger a DIO::scan. // When this is completed, DIO will call AlbumLister::instance()->refresh(). @@ -1069,8 +1069,8 @@ void AlbumIconView::slotDeleteSelectedItemsDirectly(bool useTrash) // trash does not like non-local URLs, put is not implemented TDEIO::Job* job = DIO::del(useTrash ? urlList : kioUrlList , useTrash); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); } void AlbumIconView::slotFilesModified() @@ -1156,17 +1156,17 @@ void AlbumIconView::slotDisplayItem(AlbumIconItem *item) imview->disconnect(this); - connect(imview, TQT_SIGNAL(signalFileAdded(const KURL&)), - this, TQT_SLOT(slotFilesModified())); + connect(imview, TQ_SIGNAL(signalFileAdded(const KURL&)), + this, TQ_SLOT(slotFilesModified())); - connect(imview, TQT_SIGNAL(signalFileModified(const KURL&)), - this, TQT_SLOT(slotFilesModified(const KURL&))); + connect(imview, TQ_SIGNAL(signalFileModified(const KURL&)), + this, TQ_SLOT(slotFilesModified(const KURL&))); - connect(imview, TQT_SIGNAL(signalFileDeleted(const KURL&)), - this, TQT_SLOT(slotFilesModified())); + connect(imview, TQ_SIGNAL(signalFileDeleted(const KURL&)), + this, TQ_SLOT(slotFilesModified())); - connect(imview, TQT_SIGNAL(signalURLChanged(const KURL&)), - this, TQT_SLOT(slotImageWindowURLChanged(const KURL &))); + connect(imview, TQ_SIGNAL(signalURLChanged(const KURL&)), + this, TQ_SLOT(slotImageWindowURLChanged(const KURL &))); imview->loadImageInfos(imageInfoList, currentImageInfo, @@ -1207,11 +1207,11 @@ void AlbumIconView::insertToLightTable(const ImageInfoList& list, ImageInfo* cur ltview->disconnect(this); - connect(ltview, TQT_SIGNAL(signalFileDeleted(const KURL&)), - this, TQT_SLOT(slotFilesModified())); + connect(ltview, TQ_SIGNAL(signalFileDeleted(const KURL&)), + this, TQ_SLOT(slotFilesModified())); - connect(this, TQT_SIGNAL(signalItemsUpdated(const KURL::List&)), - ltview, TQT_SLOT(slotItemsUpdated(const KURL::List&))); + connect(this, TQ_SIGNAL(signalItemsUpdated(const KURL::List&)), + ltview, TQ_SLOT(slotItemsUpdated(const KURL::List&))); if (ltview->isHidden()) ltview->show(); @@ -1414,15 +1414,15 @@ void AlbumIconView::contentsDropEvent(TQDropEvent *event) case 10: { TDEIO::Job* job = DIO::move(srcURLs, destURL); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); break; } case 11: { TDEIO::Job* job = DIO::copy(srcURLs, destURL); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); break; } default: @@ -1452,15 +1452,15 @@ void AlbumIconView::contentsDropEvent(TQDropEvent *event) case 10: { TDEIO::Job* job = DIO::move(srcURLs, destURL); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); break; } case 11: { TDEIO::Job* job = DIO::copy(srcURLs, destURL); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); break; } default: diff --git a/digikam/digikam/albumiconview.h b/digikam/digikam/albumiconview.h index 612d545..0239a39 100644 --- a/digikam/digikam/albumiconview.h +++ b/digikam/digikam/albumiconview.h @@ -62,7 +62,7 @@ class AlbumIconViewPrivate; class AlbumIconView : public IconView, public AlbumItemHandler { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/albumiconviewfilter.cpp b/digikam/digikam/albumiconviewfilter.cpp index e45566b..85a7c5f 100644 --- a/digikam/digikam/albumiconviewfilter.cpp +++ b/digikam/digikam/albumiconviewfilter.cpp @@ -93,20 +93,20 @@ AlbumIconViewFilter::AlbumIconViewFilter(TQWidget* parent) setSpacing(KDialog::spacingHint()); setMargin(0); - connect(d->ratingFilter, TQT_SIGNAL(signalRatingFilterChanged(int, AlbumLister::RatingCondition)), - this, TQT_SLOT(slotRatingFilterChanged(int, AlbumLister::RatingCondition))); + connect(d->ratingFilter, TQ_SIGNAL(signalRatingFilterChanged(int, AlbumLister::RatingCondition)), + this, TQ_SLOT(slotRatingFilterChanged(int, AlbumLister::RatingCondition))); - connect(d->mimeFilter, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotMimeTypeFilterChanged(int))); + connect(d->mimeFilter, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotMimeTypeFilterChanged(int))); - connect(d->textFilter, TQT_SIGNAL(signalTextChanged(const TQString&)), - this, TQT_SLOT(slotTextFilterChanged(const TQString&))); + connect(d->textFilter, TQ_SIGNAL(signalTextChanged(const TQString&)), + this, TQ_SLOT(slotTextFilterChanged(const TQString&))); - connect(AlbumLister::instance(), TQT_SIGNAL(signalItemsTextFilterMatch(bool)), - d->textFilter, TQT_SLOT(slotSearchResult(bool))); + connect(AlbumLister::instance(), TQ_SIGNAL(signalItemsTextFilterMatch(bool)), + d->textFilter, TQ_SLOT(slotSearchResult(bool))); - connect(AlbumLister::instance(), TQT_SIGNAL(signalItemsFilterMatch(bool)), - this, TQT_SLOT(slotItemsFilterMatch(bool))); + connect(AlbumLister::instance(), TQ_SIGNAL(signalItemsFilterMatch(bool)), + this, TQ_SLOT(slotItemsFilterMatch(bool))); } AlbumIconViewFilter::~AlbumIconViewFilter() @@ -186,12 +186,12 @@ void AlbumIconViewFilter::slotItemsFilterMatch(bool match) bool AlbumIconViewFilter::eventFilter(TQObject *object, TQEvent *e) { - TQWidget *widget = TQT_TQWIDGET(object); + TQWidget *widget = static_cast<TQWidget*>(object); if (e->type() == TQEvent::MouseButtonRelease) { - TQMouseEvent* event = TQT_TQMOUSEEVENT(e); - if ( TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) && d->led->ledColor() != StatusLed::Gray) + TQMouseEvent* event = static_cast<TQMouseEvent*>(e); + if ( widget->rect().contains(event->pos()) && d->led->ledColor() != StatusLed::Gray) { // Reset all filters settings. d->textFilter->setText(TQString()); diff --git a/digikam/digikam/albumiconviewfilter.h b/digikam/digikam/albumiconviewfilter.h index c001319..8fdbaa6 100644 --- a/digikam/digikam/albumiconviewfilter.h +++ b/digikam/digikam/albumiconviewfilter.h @@ -43,7 +43,7 @@ class AlbumIconViewFilterPriv; class AlbumIconViewFilter : public TQHBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/albumlister.cpp b/digikam/digikam/albumlister.cpp index 170d033..6364877 100644 --- a/digikam/digikam/albumlister.cpp +++ b/digikam/digikam/albumlister.cpp @@ -134,8 +134,8 @@ AlbumLister::AlbumLister() d->itemList.setAutoDelete(true); d->filterTimer = new TQTimer(this); - connect(d->filterTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotFilterItems())); + connect(d->filterTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotFilterItems())); } AlbumLister::~AlbumLister() @@ -175,11 +175,11 @@ void AlbumLister::openAlbum(Album *album) d->job = new TDEIO::TransferJob(album->kurl(), TDEIO::CMD_SPECIAL, ba, TQByteArray(), false); - connect(d->job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotResult(TDEIO::Job*))); + connect(d->job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotResult(TDEIO::Job*))); - connect(d->job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(d->job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } void AlbumLister::refresh() @@ -214,11 +214,11 @@ void AlbumLister::refresh() d->job = new TDEIO::TransferJob(d->currAlbum->kurl(), TDEIO::CMD_SPECIAL, ba, TQByteArray(), false); - connect(d->job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotResult(TDEIO::Job*))); + connect(d->job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotResult(TDEIO::Job*))); - connect(d->job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(d->job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } void AlbumLister::setDayFilter(const TQValueList<TQDateTime>& days) @@ -618,7 +618,7 @@ void AlbumLister::slotData(TDEIO::Job*, const TQByteArray& data) } ImageInfo* info = new ImageInfo(imageID, albumID, name, - TQDateTime::fromString(date, Qt::ISODate), + TQDateTime::fromString(date, TQt::ISODate), size, dims); if (matchesFilter(info, foundText)) diff --git a/digikam/digikam/albumlister.h b/digikam/digikam/albumlister.h index b9f980a..7c14e4c 100644 --- a/digikam/digikam/albumlister.h +++ b/digikam/digikam/albumlister.h @@ -59,7 +59,7 @@ class AlbumListerPriv; */ class AlbumLister : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/albummanager.cpp b/digikam/digikam/albummanager.cpp index 80b477e..847ce99 100644 --- a/digikam/digikam/albummanager.cpp +++ b/digikam/digikam/albummanager.cpp @@ -374,8 +374,8 @@ void AlbumManager::startScan() d->changed = false; d->dirWatch = new KDirWatch(this); - connect(d->dirWatch, TQT_SIGNAL(dirty(const TQString&)), - this, TQT_SLOT(slotDirty(const TQString&))); + connect(d->dirWatch, TQ_SIGNAL(dirty(const TQString&)), + this, TQ_SLOT(slotDirty(const TQString&))); KDirWatch::Method m = d->dirWatch->internalMethod(); TQString mName("FAM"); @@ -545,11 +545,11 @@ void AlbumManager::scanPAlbums() ba, TQByteArray(), false); d->albumListJob->addMetaData("folders", "yes"); - connect(d->albumListJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotAlbumsJobResult(TDEIO::Job*))); + connect(d->albumListJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotAlbumsJobResult(TDEIO::Job*))); - connect(d->albumListJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotAlbumsJobData(TDEIO::Job*, const TQByteArray&))); + connect(d->albumListJob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(slotAlbumsJobData(TDEIO::Job*, const TQByteArray&))); } void AlbumManager::scanTAlbums() @@ -694,11 +694,11 @@ void AlbumManager::scanTAlbums() ba, TQByteArray(), false); d->tagListJob->addMetaData("folders", "yes"); - connect(d->tagListJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotTagsJobResult(TDEIO::Job*))); + connect(d->tagListJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotTagsJobResult(TDEIO::Job*))); - connect(d->tagListJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotTagsJobData(TDEIO::Job*, const TQByteArray&))); + connect(d->tagListJob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(slotTagsJobData(TDEIO::Job*, const TQByteArray&))); } void AlbumManager::scanSAlbums() @@ -764,11 +764,11 @@ void AlbumManager::scanDAlbums() ba, TQByteArray(), false); d->dateListJob->addMetaData("folders", "yes"); - connect(d->dateListJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDatesJobResult(TDEIO::Job*))); + connect(d->dateListJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDatesJobResult(TDEIO::Job*))); - connect(d->dateListJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotDatesJobData(TDEIO::Job*, const TQByteArray&))); + connect(d->dateListJob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(slotDatesJobData(TDEIO::Job*, const TQByteArray&))); } AlbumList AlbumManager::allPAlbums() const diff --git a/digikam/digikam/albummanager.h b/digikam/digikam/albummanager.h index 3e79033..3244f5a 100644 --- a/digikam/digikam/albummanager.h +++ b/digikam/digikam/albummanager.h @@ -86,7 +86,7 @@ typedef TQPair<int, int> YearMonth; */ class DIGIKAM_EXPORT AlbumManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/albumpropsedit.cpp b/digikam/digikam/albumpropsedit.cpp index 7983f42..703d8c4 100644 --- a/digikam/digikam/albumpropsedit.cpp +++ b/digikam/digikam/albumpropsedit.cpp @@ -141,7 +141,7 @@ AlbumPropsEdit::AlbumPropsEdit(PAlbum* album, bool create) titleLabel->setBuddy( d->titleEdit ); TQRegExp titleRx("[^/]+"); - TQValidator *titleValidator = new TQRegExpValidator(titleRx, TQT_TQOBJECT(this)); + TQValidator *titleValidator = new TQRegExpValidator(titleRx, this); d->titleEdit->setValidator(titleValidator); TQLabel *collectionLabel = new TQLabel( plainPage( ) ); @@ -223,17 +223,17 @@ AlbumPropsEdit::AlbumPropsEdit(PAlbum* album, bool create) // -- slots connections ------------------------------------------- - connect(d->titleEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotTitleChanged(const TQString&))); + connect(d->titleEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotTitleChanged(const TQString&))); - connect(dateLowButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotDateLowButtonClicked())); + connect(dateLowButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotDateLowButtonClicked())); - connect(dateAvgButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotDateAverageButtonClicked())); + connect(dateAvgButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotDateAverageButtonClicked())); - connect(dateHighButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotDateHighButtonClicked())); + connect(dateHighButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotDateHighButtonClicked())); adjustSize(); } diff --git a/digikam/digikam/albumpropsedit.h b/digikam/digikam/albumpropsedit.h index 55c9bba..cd8f756 100644 --- a/digikam/digikam/albumpropsedit.h +++ b/digikam/digikam/albumpropsedit.h @@ -44,7 +44,7 @@ class AlbumPropsEditPriv; class AlbumPropsEdit : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/albumthumbnailloader.cpp b/digikam/digikam/albumthumbnailloader.cpp index 4e5c94d..1fe2065 100644 --- a/digikam/digikam/albumthumbnailloader.cpp +++ b/digikam/digikam/albumthumbnailloader.cpp @@ -110,11 +110,11 @@ AlbumThumbnailLoader::AlbumThumbnailLoader() { d = new AlbumThumbnailLoaderPrivate; - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumIconChanged(Album*)), - this, TQT_SLOT(slotIconChanged(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumIconChanged(Album*)), + this, TQ_SLOT(slotIconChanged(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotIconChanged(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotIconChanged(Album*))); } @@ -281,11 +281,11 @@ void AlbumThumbnailLoader::addURL(Album *album, const KURL &url) true, AlbumSettings::instance()->getExifRotate()); connect(d->iconTagThumbJob, - TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), - TQT_SLOT(slotGotThumbnailFromIcon(const KURL&, const TQPixmap&))); + TQ_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + TQ_SLOT(slotGotThumbnailFromIcon(const KURL&, const TQPixmap&))); connect(d->iconTagThumbJob, - TQT_SIGNAL(signalFailed(const KURL&)), - TQT_SLOT(slotThumbnailLost(const KURL&))); + TQ_SIGNAL(signalFailed(const KURL&)), + TQ_SLOT(slotThumbnailLost(const KURL&))); } else { @@ -301,11 +301,11 @@ void AlbumThumbnailLoader::addURL(Album *album, const KURL &url) true, AlbumSettings::instance()->getExifRotate()); connect(d->iconAlbumThumbJob, - TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), - TQT_SLOT(slotGotThumbnailFromIcon(const KURL&, const TQPixmap&))); + TQ_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + TQ_SLOT(slotGotThumbnailFromIcon(const KURL&, const TQPixmap&))); connect(d->iconAlbumThumbJob, - TQT_SIGNAL(signalFailed(const KURL&)), - TQT_SLOT(slotThumbnailLost(const KURL&))); + TQ_SIGNAL(signalFailed(const KURL&)), + TQ_SLOT(slotThumbnailLost(const KURL&))); } else { diff --git a/digikam/digikam/albumthumbnailloader.h b/digikam/digikam/albumthumbnailloader.h index f126207..9d08c5a 100644 --- a/digikam/digikam/albumthumbnailloader.h +++ b/digikam/digikam/albumthumbnailloader.h @@ -45,7 +45,7 @@ class AlbumThumbnailLoaderPrivate; class AlbumThumbnailLoader : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/albumwidgetstack.cpp b/digikam/digikam/albumwidgetstack.cpp index a83df0c..79b1959 100644 --- a/digikam/digikam/albumwidgetstack.cpp +++ b/digikam/digikam/albumwidgetstack.cpp @@ -85,29 +85,29 @@ AlbumWidgetStack::AlbumWidgetStack(TQWidget *parent) // ----------------------------------------------------------------- - connect(d->imagePreviewView, TQT_SIGNAL(signalNextItem()), - this, TQT_SIGNAL(signalNextItem())); + connect(d->imagePreviewView, TQ_SIGNAL(signalNextItem()), + this, TQ_SIGNAL(signalNextItem())); - connect(d->imagePreviewView, TQT_SIGNAL(signalPrevItem()), - this, TQT_SIGNAL(signalPrevItem())); + connect(d->imagePreviewView, TQ_SIGNAL(signalPrevItem()), + this, TQ_SIGNAL(signalPrevItem())); - connect(d->imagePreviewView, TQT_SIGNAL(signalEditItem()), - this, TQT_SIGNAL(signalEditItem())); + connect(d->imagePreviewView, TQ_SIGNAL(signalEditItem()), + this, TQ_SIGNAL(signalEditItem())); - connect(d->imagePreviewView, TQT_SIGNAL(signalDeleteItem()), - this, TQT_SIGNAL(signalDeleteItem())); + connect(d->imagePreviewView, TQ_SIGNAL(signalDeleteItem()), + this, TQ_SIGNAL(signalDeleteItem())); - connect(d->imagePreviewView, TQT_SIGNAL(signalBack2Album()), - this, TQT_SIGNAL(signalBack2Album())); + connect(d->imagePreviewView, TQ_SIGNAL(signalBack2Album()), + this, TQ_SIGNAL(signalBack2Album())); - connect(d->imagePreviewView, TQT_SIGNAL(signalSlideShow()), - this, TQT_SIGNAL(signalSlideShow())); + connect(d->imagePreviewView, TQ_SIGNAL(signalSlideShow()), + this, TQ_SIGNAL(signalSlideShow())); - connect(d->imagePreviewView, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SLOT(slotZoomFactorChanged(double))); + connect(d->imagePreviewView, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SLOT(slotZoomFactorChanged(double))); - connect(d->imagePreviewView, TQT_SIGNAL(signalInsert2LightTable()), - this, TQT_SIGNAL(signalInsert2LightTable())); + connect(d->imagePreviewView, TQ_SIGNAL(signalInsert2LightTable()), + this, TQ_SIGNAL(signalInsert2LightTable())); } AlbumWidgetStack::~AlbumWidgetStack() diff --git a/digikam/digikam/albumwidgetstack.h b/digikam/digikam/albumwidgetstack.h index 6a7daf6..c8a6f6a 100644 --- a/digikam/digikam/albumwidgetstack.h +++ b/digikam/digikam/albumwidgetstack.h @@ -47,7 +47,7 @@ class AlbumWidgetStackPriv; class DIGIKAM_EXPORT AlbumWidgetStack : public TQWidgetStack { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/digikam/cameralist.cpp b/digikam/digikam/cameralist.cpp index bed6bcf..6a380e0 100644 --- a/digikam/digikam/cameralist.cpp +++ b/digikam/digikam/cameralist.cpp @@ -113,7 +113,7 @@ bool CameraList::load() TQDateTime lastAccess = TQDateTime::currentDateTime(); if (!e.attribute("lastaccess").isEmpty()) - lastAccess = TQDateTime::fromString(e.attribute("lastaccess"), Qt::ISODate); + lastAccess = TQDateTime::fromString(e.attribute("lastaccess"), TQt::ISODate); CameraType *ctype = new CameraType(title, model, port, path, lastAccess); insertPrivate(ctype); @@ -141,7 +141,7 @@ bool CameraList::save() elem.setAttribute("model", ctype->model()); elem.setAttribute("port", ctype->port()); elem.setAttribute("path", ctype->path()); - elem.setAttribute("lastaccess", ctype->lastAccess().toString(Qt::ISODate)); + elem.setAttribute("lastaccess", ctype->lastAccess().toString(TQt::ISODate)); docElem.appendChild(elem); } diff --git a/digikam/digikam/cameralist.h b/digikam/digikam/cameralist.h index 7e25d98..65ecbce 100644 --- a/digikam/digikam/cameralist.h +++ b/digikam/digikam/cameralist.h @@ -40,7 +40,7 @@ class CameraListPrivate; class CameraList : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/datefolderview.cpp b/digikam/digikam/datefolderview.cpp index 8c4bedb..8e36742 100644 --- a/digikam/digikam/datefolderview.cpp +++ b/digikam/digikam/datefolderview.cpp @@ -195,23 +195,23 @@ DateFolderView::DateFolderView(TQWidget* parent) d->listview->setResizeMode(TQListView::LastColumn); d->listview->setRootIsDecorated(true); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumAdded(Album*)), - this, TQT_SLOT(slotAlbumAdded(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumAdded(Album*)), + this, TQ_SLOT(slotAlbumAdded(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotAlbumDeleted(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotAlbumDeleted(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAllDAlbumsLoaded()), - this, TQT_SLOT(slotAllDAlbumsLoaded())); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAllDAlbumsLoaded()), + this, TQ_SLOT(slotAllDAlbumsLoaded())); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumsCleared()), - d->listview, TQT_SLOT(clear())); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumsCleared()), + d->listview, TQ_SLOT(clear())); - connect(AlbumManager::instance(), TQT_SIGNAL(signalDAlbumsDirty(const TQMap<YearMonth, int>&)), - this, TQT_SLOT(slotRefresh(const TQMap<YearMonth, int>&))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalDAlbumsDirty(const TQMap<YearMonth, int>&)), + this, TQ_SLOT(slotRefresh(const TQMap<YearMonth, int>&))); - connect(d->listview, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(d->listview, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); } DateFolderView::~DateFolderView() @@ -238,8 +238,8 @@ void DateFolderView::setActive(bool val) void DateFolderView::slotAllDAlbumsLoaded() { - disconnect(AlbumManager::instance(), TQT_SIGNAL(signalAllDAlbumsLoaded()), - this, TQT_SLOT(slotAllDAlbumsLoaded())); + disconnect(AlbumManager::instance(), TQ_SIGNAL(signalAllDAlbumsLoaded()), + this, TQ_SLOT(slotAllDAlbumsLoaded())); loadViewState(); } diff --git a/digikam/digikam/datefolderview.h b/digikam/digikam/datefolderview.h index f213ba1..2e467fe 100644 --- a/digikam/digikam/datefolderview.h +++ b/digikam/digikam/datefolderview.h @@ -44,7 +44,7 @@ class DAlbum; class DateFolderView : public TQVBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/dcopiface.h b/digikam/digikam/dcopiface.h index b203eb9..9367e6b 100644 --- a/digikam/digikam/dcopiface.h +++ b/digikam/digikam/dcopiface.h @@ -44,7 +44,7 @@ namespace Digikam class DCOPIface : public TQObject, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp index 6d5e583..5b12575 100644 --- a/digikam/digikam/digikamapp.cpp +++ b/digikam/digikam/digikamapp.cpp @@ -138,16 +138,16 @@ DigikamApp::DigikamApp() d->cameraMediaList = new TDEPopupMenu; - connect(d->cameraMediaList, TQT_SIGNAL( aboutToShow() ), - TQT_TQOBJECT(this), TQT_SLOT(slotCameraMediaMenu())); + connect(d->cameraMediaList, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT(slotCameraMediaMenu())); - d->cameraList = new CameraList(TQT_TQOBJECT(this), locateLocal("appdata", "cameras.xml")); + d->cameraList = new CameraList(this, locateLocal("appdata", "cameras.xml")); - connect(d->cameraList, TQT_SIGNAL(signalCameraAdded(CameraType *)), - TQT_TQOBJECT(this), TQT_SLOT(slotCameraAdded(CameraType *))); + connect(d->cameraList, TQ_SIGNAL(signalCameraAdded(CameraType *)), + this, TQ_SLOT(slotCameraAdded(CameraType *))); - connect(d->cameraList, TQT_SIGNAL(signalCameraRemoved(CameraType *)), - TQT_TQOBJECT(this), TQT_SLOT(slotCameraRemoved(CameraType *))); + connect(d->cameraList, TQ_SIGNAL(signalCameraRemoved(CameraType *)), + this, TQ_SLOT(slotCameraRemoved(CameraType *))); setupView(); setupStatusBar(); @@ -191,13 +191,13 @@ DigikamApp::DigikamApp() setAutoSaveSettings(); - d->dcopIface = new DCOPIface(TQT_TQOBJECT(this), "camera"); + d->dcopIface = new DCOPIface(this, "camera"); - connect(d->dcopIface, TQT_SIGNAL(signalCameraAutoDetect()), - TQT_TQOBJECT(this), TQT_SLOT(slotDcopCameraAutoDetect())); + connect(d->dcopIface, TQ_SIGNAL(signalCameraAutoDetect()), + this, TQ_SLOT(slotDcopCameraAutoDetect())); - connect(d->dcopIface, TQT_SIGNAL(signalDownloadImages( const TQString & )), - TQT_TQOBJECT(this), TQT_SLOT(slotDcopDownloadImages(const TQString &))); + connect(d->dcopIface, TQ_SIGNAL(signalDownloadImages( const TQString & )), + this, TQ_SLOT(slotDcopDownloadImages(const TQString &))); } DigikamApp::~DigikamApp() @@ -329,7 +329,7 @@ void DigikamApp::autoDetect() if(d->splashScreen) d->splashScreen->message(i18n("Auto-detect camera")); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotCameraAutoDetect())); + TQTimer::singleShot(0, this, TQ_SLOT(slotCameraAutoDetect())); } void DigikamApp::downloadFrom(const TQString &cameraGuiPath) @@ -343,7 +343,7 @@ void DigikamApp::downloadFrom(const TQString &cameraGuiPath) if(d->splashScreen) d->splashScreen->message(i18n("Opening Download Dialog")); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotDownloadImages())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDownloadImages())); } } @@ -366,14 +366,14 @@ void DigikamApp::setupView() setCentralWidget(d->view); d->view->applySettings(); - connect(d->view, TQT_SIGNAL(signalAlbumSelected(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotAlbumSelected(bool))); + connect(d->view, TQ_SIGNAL(signalAlbumSelected(bool)), + this, TQ_SLOT(slotAlbumSelected(bool))); - connect(d->view, TQT_SIGNAL(signalTagSelected(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotTagSelected(bool))); + connect(d->view, TQ_SIGNAL(signalTagSelected(bool)), + this, TQ_SLOT(slotTagSelected(bool))); - connect(d->view, TQT_SIGNAL(signalImageSelected(const TQPtrList<ImageInfo>&, bool, bool, const KURL::List&)), - TQT_TQOBJECT(this), TQT_SLOT(slotImageSelected(const TQPtrList<ImageInfo>&, bool, bool, const KURL::List&))); + connect(d->view, TQ_SIGNAL(signalImageSelected(const TQPtrList<ImageInfo>&, bool, bool, const KURL::List&)), + this, TQ_SLOT(slotImageSelected(const TQPtrList<ImageInfo>&, bool, bool, const KURL::List&))); } void DigikamApp::setupStatusBar() @@ -403,41 +403,41 @@ void DigikamApp::setupStatusBar() //------------------------------------------------------------------------------ - connect(d->statusZoomBar, TQT_SIGNAL(signalZoomMinusClicked()), - TQT_TQOBJECT(d->view), TQT_SLOT(slotZoomOut())); + connect(d->statusZoomBar, TQ_SIGNAL(signalZoomMinusClicked()), + d->view, TQ_SLOT(slotZoomOut())); - connect(d->statusZoomBar, TQT_SIGNAL(signalZoomPlusClicked()), - TQT_TQOBJECT(d->view), TQT_SLOT(slotZoomIn())); + connect(d->statusZoomBar, TQ_SIGNAL(signalZoomPlusClicked()), + d->view, TQ_SLOT(slotZoomIn())); - connect(d->statusZoomBar, TQT_SIGNAL(signalZoomSliderChanged(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotZoomSliderChanged(int))); + connect(d->statusZoomBar, TQ_SIGNAL(signalZoomSliderChanged(int)), + this, TQ_SLOT(slotZoomSliderChanged(int))); - connect(d->view, TQT_SIGNAL(signalThumbSizeChanged(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotThumbSizeChanged(int))); + connect(d->view, TQ_SIGNAL(signalThumbSizeChanged(int)), + this, TQ_SLOT(slotThumbSizeChanged(int))); - connect(d->view, TQT_SIGNAL(signalZoomChanged(double, int)), - TQT_TQOBJECT(this), TQT_SLOT(slotZoomChanged(double, int))); + connect(d->view, TQ_SIGNAL(signalZoomChanged(double, int)), + this, TQ_SLOT(slotZoomChanged(double, int))); - connect(d->view, TQT_SIGNAL(signalTogglePreview(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotTogglePreview(bool))); + connect(d->view, TQ_SIGNAL(signalTogglePreview(bool)), + this, TQ_SLOT(slotTogglePreview(bool))); - connect(d->albumIconViewFilter, TQT_SIGNAL(signalResetTagFilters()), - TQT_TQOBJECT(this), TQT_SIGNAL(signalResetTagFilters())); + connect(d->albumIconViewFilter, TQ_SIGNAL(signalResetTagFilters()), + this, TQ_SIGNAL(signalResetTagFilters())); - connect(d->statusNavigateBar, TQT_SIGNAL(signalFirstItem()), - TQT_TQOBJECT(d->view), TQT_SLOT(slotFirstItem())); + connect(d->statusNavigateBar, TQ_SIGNAL(signalFirstItem()), + d->view, TQ_SLOT(slotFirstItem())); - connect(d->statusNavigateBar, TQT_SIGNAL(signalNextItem()), - TQT_TQOBJECT(d->view), TQT_SLOT(slotNextItem())); + connect(d->statusNavigateBar, TQ_SIGNAL(signalNextItem()), + d->view, TQ_SLOT(slotNextItem())); - connect(d->statusNavigateBar, TQT_SIGNAL(signalPrevItem()), - TQT_TQOBJECT(d->view), TQT_SLOT(slotPrevItem())); + connect(d->statusNavigateBar, TQ_SIGNAL(signalPrevItem()), + d->view, TQ_SLOT(slotPrevItem())); - connect(d->statusNavigateBar, TQT_SIGNAL(signalLastItem()), - TQT_TQOBJECT(d->view), TQT_SLOT(slotLastItem())); + connect(d->statusNavigateBar, TQ_SIGNAL(signalLastItem()), + d->view, TQ_SLOT(slotLastItem())); - connect(d->statusProgressBar, TQT_SIGNAL(signalCancelButtonPressed()), - TQT_TQOBJECT(this), TQT_SIGNAL(signalCancelButtonPressed())); + connect(d->statusProgressBar, TQ_SIGNAL(signalCancelButtonPressed()), + this, TQ_SIGNAL(signalCancelButtonPressed())); } void DigikamApp::setupAccelerators() @@ -446,52 +446,52 @@ void DigikamApp::setupAccelerators() d->accelerators->insert("Exit Preview Mode", i18n("Exit Preview"), i18n("Exit preview mode"), - Key_Escape, TQT_TQOBJECT(this), TQT_SIGNAL(signalEscapePressed()), + Key_Escape, this, TQ_SIGNAL(signalEscapePressed()), false, true); d->accelerators->insert("Next Image Key_Space", i18n("Next Image"), i18n("Next Image"), - Key_Space, TQT_TQOBJECT(this), TQT_SIGNAL(signalNextItem()), + Key_Space, this, TQ_SIGNAL(signalNextItem()), false, true); d->accelerators->insert("Previous Image SHIFT+Key_Space", i18n("Previous Image"), i18n("Previous Image"), - SHIFT+Key_Space, TQT_TQOBJECT(this), TQT_SIGNAL(signalPrevItem()), + SHIFT+Key_Space, this, TQ_SIGNAL(signalPrevItem()), false, true); d->accelerators->insert("Previous Image Key_Backspace", i18n("Previous Image"), i18n("Previous Image"), - Key_Backspace, TQT_TQOBJECT(this), TQT_SIGNAL(signalPrevItem()), + Key_Backspace, this, TQ_SIGNAL(signalPrevItem()), false, true); d->accelerators->insert("Next Image Key_Next", i18n("Next Image"), i18n("Next Image"), - Key_Next, TQT_TQOBJECT(this), TQT_SIGNAL(signalNextItem()), + Key_Next, this, TQ_SIGNAL(signalNextItem()), false, true); d->accelerators->insert("Previous Image Key_Prior", i18n("Previous Image"), i18n("Previous Image"), - Key_Prior, TQT_TQOBJECT(this), TQT_SIGNAL(signalPrevItem()), + Key_Prior, this, TQ_SIGNAL(signalPrevItem()), false, true); d->accelerators->insert("First Image Key_Home", i18n("First Image"), i18n("First Image"), - Key_Home, TQT_TQOBJECT(this), TQT_SIGNAL(signalFirstItem()), + Key_Home, this, TQ_SIGNAL(signalFirstItem()), false, true); d->accelerators->insert("Last Image Key_End", i18n("Last Image"), i18n("Last Image"), - Key_End, TQT_TQOBJECT(this), TQT_SIGNAL(signalLastItem()), + Key_End, this, TQ_SIGNAL(signalLastItem()), false, true); d->accelerators->insert("Copy Album Items Selection CTRL+Key_C", i18n("Copy Album Items Selection"), i18n("Copy Album Items Selection"), - CTRL+Key_C, TQT_TQOBJECT(this), TQT_SIGNAL(signalCopyAlbumItemsSelection()), + CTRL+Key_C, this, TQ_SIGNAL(signalCopyAlbumItemsSelection()), false, true); d->accelerators->insert("Paste Album Items Selection CTRL+Key_V", i18n("Paste Album Items Selection"), i18n("Paste Album Items Selection"), - CTRL+Key_V, TQT_TQOBJECT(this), TQT_SIGNAL(signalPasteAlbumItemsSelection()), + CTRL+Key_V, this, TQ_SIGNAL(signalPasteAlbumItemsSelection()), false, true); } @@ -508,49 +508,49 @@ void DigikamApp::setupActions() // ----------------------------------------------------------------- d->themeMenuAction = new TDESelectAction(i18n("&Themes"), 0, actionCollection(), "theme_menu"); - connect(d->themeMenuAction, TQT_SIGNAL(activated(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotChangeTheme(const TQString&))); + connect(d->themeMenuAction, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotChangeTheme(const TQString&))); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - TQT_TQOBJECT(this), TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); // ----------------------------------------------------------------- d->backwardActionMenu = new TDEToolBarPopupAction(i18n("&Back"), "back", ALT+Key_Left, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotAlbumHistoryBack()), + d->view, + TQ_SLOT(slotAlbumHistoryBack()), actionCollection(), "album_back"); d->backwardActionMenu->setEnabled(false); - connect(d->backwardActionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), - TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowBackwardMenu())); + connect(d->backwardActionMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotAboutToShowBackwardMenu())); - connect(d->backwardActionMenu->popupMenu(), TQT_SIGNAL(activated(int)), - TQT_TQOBJECT(d->view), TQT_SLOT(slotAlbumHistoryBack(int))); + connect(d->backwardActionMenu->popupMenu(), TQ_SIGNAL(activated(int)), + d->view, TQ_SLOT(slotAlbumHistoryBack(int))); d->forwardActionMenu = new TDEToolBarPopupAction(i18n("Forward"), "forward", ALT+Key_Right, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotAlbumHistoryForward()), + d->view, + TQ_SLOT(slotAlbumHistoryForward()), actionCollection(), "album_forward"); d->forwardActionMenu->setEnabled(false); - connect(d->forwardActionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), - TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowForwardMenu())); + connect(d->forwardActionMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotAboutToShowForwardMenu())); - connect(d->forwardActionMenu->popupMenu(), TQT_SIGNAL(activated(int)), - TQT_TQOBJECT(d->view), TQT_SLOT(slotAlbumHistoryForward(int))); + connect(d->forwardActionMenu->popupMenu(), TQ_SIGNAL(activated(int)), + d->view, TQ_SLOT(slotAlbumHistoryForward(int))); d->newAction = new TDEAction(i18n("&New..."), "albumfolder-new", TDEStdAccel::shortcut(TDEStdAccel::New), - TQT_TQOBJECT(d->view), - TQT_SLOT(slotNewAlbum()), + d->view, + TQ_SLOT(slotNewAlbum()), actionCollection(), "album_new"); d->newAction->setWhatsThis(i18n("Creates a new empty Album in the database.")); @@ -561,8 +561,8 @@ void DigikamApp::setupActions() actionCollection(), "album_sort"); - connect(d->albumSortAction, TQT_SIGNAL(activated(int)), - TQT_TQOBJECT(d->view), TQT_SLOT(slotSortAlbums(int))); + connect(d->albumSortAction, TQ_SIGNAL(activated(int)), + d->view, TQ_SLOT(slotSortAlbums(int))); // Use same list order as in albumsettings enum TQStringList sortActionList; @@ -573,41 +573,41 @@ void DigikamApp::setupActions() d->recurseAlbumsAction = new TDEToggleAction(i18n("Include Album Sub-Tree"), 0, - TQT_TQOBJECT(this), + this, 0, actionCollection(), "albums_recursive"); d->recurseAlbumsAction->setWhatsThis(i18n("Activate this option to recursively show all sub-albums below " "the current album.")); - connect(d->recurseAlbumsAction, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotRecurseAlbums(bool))); + connect(d->recurseAlbumsAction, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotRecurseAlbums(bool))); d->recurseTagsAction = new TDEToggleAction(i18n("Include Tag Sub-Tree"), 0, - TQT_TQOBJECT(this), + this, 0, actionCollection(), "tags_recursive"); d->recurseTagsAction->setWhatsThis(i18n("Activate this option to show all images marked by the given tag " "and its all its sub-tags.")); - connect(d->recurseTagsAction, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotRecurseTags(bool))); + connect(d->recurseTagsAction, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotRecurseTags(bool))); d->deleteAction = new TDEAction(i18n("Delete"), "edit-delete", 0, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotDeleteAlbum()), + d->view, + TQ_SLOT(slotDeleteAlbum()), actionCollection(), "album_delete"); d->addImagesAction = new TDEAction( i18n("Add Images..."), "albumfolder-importimages", CTRL+Key_I, - TQT_TQOBJECT(this), - TQT_SLOT(slotAlbumAddImages()), + this, + TQ_SLOT(slotAlbumAddImages()), actionCollection(), "album_addImages"); d->addImagesAction->setWhatsThis(i18n("Adds new items to the current Album.")); @@ -615,16 +615,16 @@ void DigikamApp::setupActions() d->albumImportAction = new TDEAction( i18n("Add Folders..."), "albumfolder-importdir", 0, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotAlbumImportFolder()), + d->view, + TQ_SLOT(slotAlbumImportFolder()), actionCollection(), "album_importFolder"); d->propsEditAction = new TDEAction( i18n("Properties..."), "albumfolder-properties", 0, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotAlbumPropsEdit()), + d->view, + TQ_SLOT(slotAlbumPropsEdit()), actionCollection(), "album_propsEdit"); d->propsEditAction->setWhatsThis(i18n("Edit Album Properties and Collection information.")); @@ -632,8 +632,8 @@ void DigikamApp::setupActions() d->refreshAlbumAction = new TDEAction( i18n("Refresh"), "rebuild", Key_F5, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotAlbumRefresh()), + d->view, + TQ_SLOT(slotAlbumRefresh()), actionCollection(), "album_refresh"); d->refreshAlbumAction->setWhatsThis(i18n("Refresh all album contents")); @@ -641,8 +641,8 @@ void DigikamApp::setupActions() d->syncAlbumMetadataAction = new TDEAction( i18n("Synchronize Images with Database"), "rebuild", 0, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotAlbumSyncPicturesMetadata()), + d->view, + TQ_SLOT(slotAlbumSyncPicturesMetadata()), actionCollection(), "album_syncmetadata"); d->syncAlbumMetadataAction->setWhatsThis(i18n("Updates all image metadata of the current " @@ -652,23 +652,23 @@ void DigikamApp::setupActions() d->openInKonquiAction = new TDEAction( i18n("Open in File Manager"), "konqueror", 0, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotAlbumOpenInKonqui()), + d->view, + TQ_SLOT(slotAlbumOpenInKonqui()), actionCollection(), "album_openinkonqui"); // ----------------------------------------------------------- d->newTagAction = new TDEAction(i18n("New &Tag..."), "tag-new", - 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotNewTag()), + 0, d->view, TQ_SLOT(slotNewTag()), actionCollection(), "tag_new"); d->editTagAction = new TDEAction(i18n("Edit Tag Properties..."), "tag-properties", - 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotEditTag()), + 0, d->view, TQ_SLOT(slotEditTag()), actionCollection(), "tag_edit"); d->deleteTagAction = new TDEAction(i18n("Delete Tag"), "tag-delete", - 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotDeleteTag()), + 0, d->view, TQ_SLOT(slotDeleteTag()), actionCollection(), "tag_delete"); // ----------------------------------------------------------- @@ -676,16 +676,16 @@ void DigikamApp::setupActions() d->imagePreviewAction = new TDEToggleAction(i18n("View..."), "viewimage", Key_F3, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotImagePreview()), + d->view, + TQ_SLOT(slotImagePreview()), actionCollection(), "image_view"); d->imageViewAction = new TDEAction(i18n("Edit..."), "editimage", Key_F4, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotImageEdit()), + d->view, + TQ_SLOT(slotImageEdit()), actionCollection(), "image_edit"); d->imageViewAction->setWhatsThis(i18n("Open the selected item in the image editor.")); @@ -693,8 +693,8 @@ void DigikamApp::setupActions() d->imageLightTableAction = new TDEAction(i18n("Place onto Light Table"), "lighttable", CTRL+Key_L, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotImageLightTable()), + d->view, + TQ_SLOT(slotImageLightTable()), actionCollection(), "image_lighttable"); d->imageLightTableAction->setWhatsThis(i18n("Place the selected items on the light table thumbbar.")); @@ -702,8 +702,8 @@ void DigikamApp::setupActions() d->imageAddLightTableAction = new TDEAction(i18n("Add to Light Table"), "lighttableadd", SHIFT+CTRL+Key_L, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotImageAddToLightTable()), + d->view, + TQ_SLOT(slotImageAddToLightTable()), actionCollection(), "image_add_to_lighttable"); d->imageAddLightTableAction->setWhatsThis(i18n("Add selected items to the light table thumbbar.")); @@ -711,8 +711,8 @@ void DigikamApp::setupActions() d->imageRenameAction = new TDEAction(i18n("Rename..."), "pencil", Key_F2, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotImageRename()), + d->view, + TQ_SLOT(slotImageRename()), actionCollection(), "image_rename"); d->imageRenameAction->setWhatsThis(i18n("Change the filename of the currently selected item.")); @@ -721,8 +721,8 @@ void DigikamApp::setupActions() d->imageDeleteAction = new TDEAction(i18n("Delete"), "edittrash", Key_Delete, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotImageDelete()), + d->view, + TQ_SLOT(slotImageDelete()), actionCollection(), "image_delete"); @@ -730,8 +730,8 @@ void DigikamApp::setupActions() d->imageDeletePermanentlyAction = new TDEAction(i18n("Delete permanently"), "edit-delete", SHIFT+Key_Delete, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotImageDeletePermanently()), + d->view, + TQ_SLOT(slotImageDeletePermanently()), actionCollection(), "image_delete_permanently"); @@ -740,16 +740,16 @@ void DigikamApp::setupActions() d->imageDeletePermanentlyDirectlyAction = new TDEAction(i18n("Delete permanently without confirmation"), "edit-delete", 0, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotImageDeletePermanentlyDirectly()), + d->view, + TQ_SLOT(slotImageDeletePermanentlyDirectly()), actionCollection(), "image_delete_permanently_directly"); d->imageTrashDirectlyAction = new TDEAction(i18n("Move to trash without confirmation"), "edittrash", 0, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotImageTrashDirectly()), + d->view, + TQ_SLOT(slotImageTrashDirectly()), actionCollection(), "image_trash_directly"); @@ -759,8 +759,8 @@ void DigikamApp::setupActions() actionCollection(), "image_sort"); - connect(d->imageSortAction, TQT_SIGNAL(activated(int)), - TQT_TQOBJECT(d->view), TQT_SLOT(slotSortImages(int))); + connect(d->imageSortAction, TQ_SIGNAL(activated(int)), + d->view, TQ_SLOT(slotSortImages(int))); // Use same list order as in albumsettings enum TQStringList sortImagesActionList; @@ -773,10 +773,10 @@ void DigikamApp::setupActions() // ----------------------------------------------------------------- - TQSignalMapper *exifOrientationMapper = new TQSignalMapper( TQT_TQOBJECT(d->view) ); + TQSignalMapper *exifOrientationMapper = new TQSignalMapper( d->view ); - connect(exifOrientationMapper, TQT_SIGNAL(mapped(int) ), - TQT_TQOBJECT(d->view), TQT_SLOT(slotImageExifOrientation(int))); + connect(exifOrientationMapper, TQ_SIGNAL(mapped(int) ), + d->view, TQ_SLOT(slotImageExifOrientation(int))); d->imageExifOrientationActionMenu = new TDEActionMenu(i18n("Adjust Exif orientation tag"), actionCollection(), @@ -841,29 +841,29 @@ void DigikamApp::setupActions() d->imageExifOrientationActionMenu->insert(d->imageSetExifOrientation7Action); d->imageExifOrientationActionMenu->insert(d->imageSetExifOrientation8Action); - connect(d->imageSetExifOrientation1Action, TQT_SIGNAL(activated()), - exifOrientationMapper, TQT_SLOT(map())); + connect(d->imageSetExifOrientation1Action, TQ_SIGNAL(activated()), + exifOrientationMapper, TQ_SLOT(map())); - connect(d->imageSetExifOrientation2Action, TQT_SIGNAL(activated()), - exifOrientationMapper, TQT_SLOT(map())); + connect(d->imageSetExifOrientation2Action, TQ_SIGNAL(activated()), + exifOrientationMapper, TQ_SLOT(map())); - connect(d->imageSetExifOrientation3Action, TQT_SIGNAL(activated()), - exifOrientationMapper, TQT_SLOT(map())); + connect(d->imageSetExifOrientation3Action, TQ_SIGNAL(activated()), + exifOrientationMapper, TQ_SLOT(map())); - connect(d->imageSetExifOrientation4Action, TQT_SIGNAL(activated()), - exifOrientationMapper, TQT_SLOT(map())); + connect(d->imageSetExifOrientation4Action, TQ_SIGNAL(activated()), + exifOrientationMapper, TQ_SLOT(map())); - connect(d->imageSetExifOrientation5Action, TQT_SIGNAL(activated()), - exifOrientationMapper, TQT_SLOT(map())); + connect(d->imageSetExifOrientation5Action, TQ_SIGNAL(activated()), + exifOrientationMapper, TQ_SLOT(map())); - connect(d->imageSetExifOrientation6Action, TQT_SIGNAL(activated()), - exifOrientationMapper, TQT_SLOT(map())); + connect(d->imageSetExifOrientation6Action, TQ_SIGNAL(activated()), + exifOrientationMapper, TQ_SLOT(map())); - connect(d->imageSetExifOrientation7Action, TQT_SIGNAL(activated()), - exifOrientationMapper, TQT_SLOT(map())); + connect(d->imageSetExifOrientation7Action, TQ_SIGNAL(activated()), + exifOrientationMapper, TQ_SLOT(map())); - connect(d->imageSetExifOrientation8Action, TQT_SIGNAL(activated()), - exifOrientationMapper, TQT_SLOT(map())); + connect(d->imageSetExifOrientation8Action, TQ_SIGNAL(activated()), + exifOrientationMapper, TQ_SLOT(map())); exifOrientationMapper->setMapping(d->imageSetExifOrientation1Action, 1); exifOrientationMapper->setMapping(d->imageSetExifOrientation2Action, 2); @@ -879,66 +879,66 @@ void DigikamApp::setupActions() d->selectAllAction = new TDEAction(i18n("Select All"), 0, CTRL+Key_A, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotSelectAll()), + d->view, + TQ_SLOT(slotSelectAll()), actionCollection(), "selectAll"); d->selectNoneAction = new TDEAction(i18n("Select None"), 0, CTRL+SHIFT+Key_A, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotSelectNone()), + d->view, + TQ_SLOT(slotSelectNone()), actionCollection(), "selectNone"); d->selectInvertAction = new TDEAction(i18n("Invert Selection"), 0, CTRL+Key_Asterisk, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotSelectInvert()), + d->view, + TQ_SLOT(slotSelectInvert()), actionCollection(), "selectInvert"); // ----------------------------------------------------------- - d->showMenuBarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection()); + d->showMenuBarAction = KStdAction::showMenubar(this, TQ_SLOT(slotShowMenuBar()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbars()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotSetup()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotEditKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(slotSetup()), actionCollection()); // ----------------------------------------------------------- d->zoomPlusAction = new TDEAction(i18n("Zoom In"), "zoom-in", CTRL+Key_Plus, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotZoomIn()), + d->view, + TQ_SLOT(slotZoomIn()), actionCollection(), "album_zoomin"); d->zoomMinusAction = new TDEAction(i18n("Zoom Out"), "zoom-out", CTRL+Key_Minus, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotZoomOut()), + d->view, + TQ_SLOT(slotZoomOut()), actionCollection(), "album_zoomout"); d->zoomTo100percents = new TDEAction(i18n("Zoom to 100%"), "zoom-original", ALT+CTRL+Key_0, // NOTE: Photoshop 7 use ALT+CTRL+0. - TQT_TQOBJECT(d->view), - TQT_SLOT(slotZoomTo100Percents()), + d->view, + TQ_SLOT(slotZoomTo100Percents()), actionCollection(), "album_zoomto100percents"); d->zoomFitToWindowAction = new TDEAction(i18n("Fit to &Window"), "view_fit_window", CTRL+SHIFT+Key_E, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotFitToWindow()), + d->view, + TQ_SLOT(slotFitToWindow()), actionCollection(), "album_zoomfit2window"); @@ -946,8 +946,8 @@ void DigikamApp::setupActions() d->fullScreenAction = new TDEToggleAction(i18n("Full Screen"), "view-fullscreen", CTRL+SHIFT+Key_F, - TQT_TQOBJECT(this), - TQT_SLOT(slotToggleFullScreen()), + this, + TQ_SLOT(slotToggleFullScreen()), actionCollection(), "full_screen"); d->fullScreenAction->setWhatsThis(i18n("Switch the window to full screen mode")); @@ -958,61 +958,61 @@ void DigikamApp::setupActions() d->slideShowAction->setDelayed(false); d->slideShowAllAction = new TDEAction(i18n("All"), 0, Key_F9, - TQT_TQOBJECT(d->view), TQT_SLOT(slotSlideShowAll()), + d->view, TQ_SLOT(slotSlideShowAll()), actionCollection(), "slideshow_all"); d->slideShowAction->insert(d->slideShowAllAction); d->slideShowSelectionAction = new TDEAction(i18n("Selection"), 0, ALT+Key_F9, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotSlideShowSelection()), + d->view, + TQ_SLOT(slotSlideShowSelection()), actionCollection(), "slideshow_selected"); d->slideShowAction->insert(d->slideShowSelectionAction); d->slideShowRecursiveAction = new TDEAction(i18n("With All Sub-Albums"), 0, SHIFT+Key_F9, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotSlideShowRecursive()), + d->view, + TQ_SLOT(slotSlideShowRecursive()), actionCollection(), "slideshow_recursive"); d->slideShowAction->insert(d->slideShowRecursiveAction); - d->quitAction = KStdAction::quit(TQT_TQOBJECT(this), - TQT_SLOT(slotExit()), + d->quitAction = KStdAction::quit(this, + TQ_SLOT(slotExit()), actionCollection(), "app_exit"); d->rawCameraListAction = new TDEAction(i18n("Supported RAW Cameras"), "kdcraw", 0, - TQT_TQOBJECT(this), - TQT_SLOT(slotRawCameraList()), + this, + TQ_SLOT(slotRawCameraList()), actionCollection(), "help_rawcameralist"); d->kipiHelpAction = new TDEAction(i18n("Kipi Plugins Handbook"), "kipi", 0, - TQT_TQOBJECT(this), - TQT_SLOT(slotShowKipiHelp()), + this, + TQ_SLOT(slotShowKipiHelp()), actionCollection(), "help_kipi"); - d->tipAction = KStdAction::tipOfDay(TQT_TQOBJECT(this), - TQT_SLOT(slotShowTip()), + d->tipAction = KStdAction::tipOfDay(this, + TQ_SLOT(slotShowTip()), actionCollection(), "help_tipofday"); d->donateMoneyAction = new TDEAction(i18n("Donate..."), 0, 0, - TQT_TQOBJECT(this), - TQT_SLOT(slotDonateMoney()), + this, + TQ_SLOT(slotDonateMoney()), actionCollection(), "help_donatemoney"); d->contributeAction = new TDEAction(i18n("Contribute..."), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotContribute()), + this, TQ_SLOT(slotContribute()), actionCollection(), "help_contribute"); @@ -1021,50 +1021,50 @@ void DigikamApp::setupActions() // -- Rating actions --------------------------------------------------------------- d->rating0Star = new TDEAction(i18n("Assign Rating \"No Stars\""), CTRL+Key_0, - TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingNoStar()), + d->view, TQ_SLOT(slotAssignRatingNoStar()), actionCollection(), "ratenostar"); d->rating1Star = new TDEAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1, - TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingOneStar()), + d->view, TQ_SLOT(slotAssignRatingOneStar()), actionCollection(), "rateonestar"); d->rating2Star = new TDEAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2, - TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingTwoStar()), + d->view, TQ_SLOT(slotAssignRatingTwoStar()), actionCollection(), "ratetwostar"); d->rating3Star = new TDEAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3, - TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingThreeStar()), + d->view, TQ_SLOT(slotAssignRatingThreeStar()), actionCollection(), "ratethreestar"); d->rating4Star = new TDEAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4, - TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingFourStar()), + d->view, TQ_SLOT(slotAssignRatingFourStar()), actionCollection(), "ratefourstar"); d->rating5Star = new TDEAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5, - TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingFiveStar()), + d->view, TQ_SLOT(slotAssignRatingFiveStar()), actionCollection(), "ratefivestar"); // ----------------------------------------------------------- - TDEAction* findAction = KStdAction::find(TQT_TQOBJECT(d->view), TQT_SLOT(slotNewQuickSearch()), + TDEAction* findAction = KStdAction::find(d->view, TQ_SLOT(slotNewQuickSearch()), actionCollection(), "search_quick"); findAction->setText(i18n("Search...")); findAction->setIconSet(BarIcon("filefind")); - TDEAction* advFindAction = KStdAction::find(TQT_TQOBJECT(d->view), TQT_SLOT(slotNewAdvancedSearch()), + TDEAction* advFindAction = KStdAction::find(d->view, TQ_SLOT(slotNewAdvancedSearch()), actionCollection(), "search_advanced"); advFindAction->setText(i18n("Advanced Search...")); advFindAction->setShortcut("Ctrl+Alt+F"); new TDEAction(i18n("Light Table"), "idea", Key_L, - TQT_TQOBJECT(d->view), TQT_SLOT(slotLightTable()), actionCollection(), + d->view, TQ_SLOT(slotLightTable()), actionCollection(), "light_table"); new TDEAction(i18n("Scan for New Images"), "reload_page", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotDatabaseRescan()), actionCollection(), + this, TQ_SLOT(slotDatabaseRescan()), actionCollection(), "database_rescan"); new TDEAction(i18n("Rebuild All Thumbnails..."), "reload_page", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotRebuildAllThumbs()), actionCollection(), + this, TQ_SLOT(slotRebuildAllThumbs()), actionCollection(), "thumbs_rebuild"); new TDEAction(i18n("Update Metadata Database..."), "reload_page", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSyncAllPicturesMetadata()), actionCollection(), + this, TQ_SLOT(slotSyncAllPicturesMetadata()), actionCollection(), "sync_metadata"); // ----------------------------------------------------------- @@ -1350,7 +1350,7 @@ void DigikamApp::slotExit() if (d->fullScreen) { slotToggleFullScreen(); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(close())); + TQTimer::singleShot(0, this, TQ_SLOT(close())); } else close(); @@ -1448,7 +1448,7 @@ void DigikamApp::slotDownloadImages( const TQString& folder) { d->cameraGuiPath = folder; - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotDownloadImages())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDownloadImages())); } } @@ -1482,8 +1482,8 @@ void DigikamApp::slotDownloadImages() i18n("Browse %1").arg(KURL(d->cameraGuiPath).prettyURL()), "camera-photo", 0, - TQT_TQOBJECT(this), - TQT_SLOT(slotDownloadImages()), + this, + TQ_SLOT(slotDownloadImages()), actionCollection(), d->cameraGuiPath.latin1() ); @@ -1496,16 +1496,16 @@ void DigikamApp::slotDownloadImages() "directory browse","Fixed", localUrl, TQDateTime::currentDateTime()); cgui->show(); - connect(cgui, TQT_SIGNAL(signalLastDestination(const KURL&)), - TQT_TQOBJECT(d->view), TQT_SLOT(slotSelectAlbum(const KURL&))); + connect(cgui, TQ_SIGNAL(signalLastDestination(const KURL&)), + d->view, TQ_SLOT(slotSelectAlbum(const KURL&))); - connect(cgui, TQT_SIGNAL(signalAlbumSettingsChanged()), - TQT_TQOBJECT(this), TQT_SLOT(slotSetupChanged())); + connect(cgui, TQ_SIGNAL(signalAlbumSettingsChanged()), + this, TQ_SLOT(slotSetupChanged())); } void DigikamApp::slotCameraConnect() { - CameraType* ctype = d->cameraList->find(TQString::fromUtf8(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name())); + CameraType* ctype = d->cameraList->find(TQString::fromUtf8(sender()->name())); if (ctype) { @@ -1527,11 +1527,11 @@ void DigikamApp::slotCameraConnect() cgui->show(); - connect(cgui, TQT_SIGNAL(signalLastDestination(const KURL&)), - TQT_TQOBJECT(d->view), TQT_SLOT(slotSelectAlbum(const KURL&))); + connect(cgui, TQ_SIGNAL(signalLastDestination(const KURL&)), + d->view, TQ_SLOT(slotSelectAlbum(const KURL&))); - connect(cgui, TQT_SIGNAL(signalAlbumSettingsChanged()), - TQT_TQOBJECT(this), TQT_SLOT(slotSetupChanged())); + connect(cgui, TQ_SIGNAL(signalAlbumSettingsChanged()), + this, TQ_SLOT(slotSetupChanged())); } } } @@ -1541,7 +1541,7 @@ void DigikamApp::slotCameraAdded(CameraType *ctype) if (!ctype) return; TDEAction *cAction = new TDEAction(ctype->title(), "camera-photo", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotCameraConnect()), + this, TQ_SLOT(slotCameraConnect()), actionCollection(), ctype->title().utf8()); d->cameraMenuAction->insert(cAction, 0); @@ -1559,8 +1559,8 @@ void DigikamApp::slotCameraMediaMenu() KURL kurl("media:/"); TDEIO::ListJob *job = TDEIO::listDir(kurl, false, false); - connect( job, TQT_SIGNAL(entries(TDEIO::Job*,const TDEIO::UDSEntryList&)), - TQT_TQOBJECT(this), TQT_SLOT(slotCameraMediaMenuEntries(TDEIO::Job*,const TDEIO::UDSEntryList&)) ); + connect( job, TQ_SIGNAL(entries(TDEIO::Job*,const TDEIO::UDSEntryList&)), + this, TQ_SLOT(slotCameraMediaMenuEntries(TDEIO::Job*,const TDEIO::UDSEntryList&)) ); } void DigikamApp::slotCameraMediaMenuEntries( Job *, const UDSEntryList & list ) @@ -1590,7 +1590,7 @@ void DigikamApp::slotCameraMediaMenuEntries( Job *, const UDSEntryList & list ) d->mediaItems[i] = path; - d->cameraMediaList->insertItem(name, TQT_TQOBJECT(this), TQT_SLOT(slotDownloadImagesFromMedia(int)), 0, i); + d->cameraMediaList->insertItem(name, this, TQ_SLOT(slotDownloadImagesFromMedia(int)), 0, i); d->cameraMediaList->setItemParameter(i, i); i++; } @@ -1620,7 +1620,7 @@ void DigikamApp::slotCameraAutoDetect() if (!ctype && retry) { - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotCameraAutoDetect())); + TQTimer::singleShot(0, this, TQ_SLOT(slotCameraAutoDetect())); return; } @@ -1804,15 +1804,15 @@ void DigikamApp::loadPlugins() d->splashScreen->message(i18n("Loading Kipi Plugins")); TQStringList ignores; - d->kipiInterface = new DigikamKipiInterface( TQT_TQOBJECT(this), "Digikam_KIPI_interface" ); + d->kipiInterface = new DigikamKipiInterface( this, "Digikam_KIPI_interface" ); ignores.append( "HelloWorld" ); ignores.append( "KameraKlient" ); d->kipiPluginLoader = new KIPI::PluginLoader( ignores, d->kipiInterface ); - connect( d->kipiPluginLoader, TQT_SIGNAL( replug() ), - TQT_TQOBJECT(this), TQT_SLOT( slotKipiPluginPlug() ) ); + connect( d->kipiPluginLoader, TQ_SIGNAL( replug() ), + this, TQ_SLOT( slotKipiPluginPlug() ) ); d->kipiPluginLoader->loadPlugins(); @@ -1821,7 +1821,7 @@ void DigikamApp::loadPlugins() // Setting the initial menu options after all plugins have been loaded d->view->slotAlbumSelected(d->albumManager->currentAlbum()); - d->imagePluginsLoader = new ImagePluginLoader(TQT_TQOBJECT(this), d->splashScreen); + d->imagePluginsLoader = new ImagePluginLoader(this, d->splashScreen); } void DigikamApp::slotKipiPluginPlug() @@ -1925,7 +1925,7 @@ void DigikamApp::loadCameras() d->cameraMenuAction->popupMenu()->insertSeparator(); d->cameraMenuAction->insert(new TDEAction(i18n("Add Camera..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSetupCamera()), + this, TQ_SLOT(slotSetupCamera()), actionCollection(), "camera_add")); } @@ -1981,8 +1981,8 @@ void DigikamApp::slotRebuildAllThumbs() BatchThumbsGenerator *thumbsGenerator = new BatchThumbsGenerator(this); - connect(thumbsGenerator, TQT_SIGNAL(signalRebuildAllThumbsDone()), - TQT_TQOBJECT(this), TQT_SLOT(slotRebuildAllThumbsDone())); + connect(thumbsGenerator, TQ_SIGNAL(signalRebuildAllThumbsDone()), + this, TQ_SLOT(slotRebuildAllThumbsDone())); thumbsGenerator->exec(); } @@ -2001,8 +2001,8 @@ void DigikamApp::slotSyncAllPicturesMetadata() BatchAlbumsSyncMetadata *syncMetadata = new BatchAlbumsSyncMetadata(this); - connect(syncMetadata, TQT_SIGNAL(signalComplete()), - TQT_TQOBJECT(this), TQT_SLOT(slotSyncAllPicturesMetadataDone())); + connect(syncMetadata, TQ_SIGNAL(signalComplete()), + this, TQ_SLOT(slotSyncAllPicturesMetadataDone())); syncMetadata->exec(); } diff --git a/digikam/digikam/digikamapp.h b/digikam/digikam/digikamapp.h index 64864e7..899603d 100644 --- a/digikam/digikam/digikamapp.h +++ b/digikam/digikam/digikamapp.h @@ -54,7 +54,7 @@ class DigikamAppPriv; class DIGIKAM_EXPORT DigikamApp : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/digikamfirstrun.h b/digikam/digikam/digikamfirstrun.h index 8389961..e8921f5 100644 --- a/digikam/digikam/digikamfirstrun.h +++ b/digikam/digikam/digikamfirstrun.h @@ -43,7 +43,7 @@ class FirstRunWidget; class DIGIKAM_EXPORT DigikamFirstRun : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/digikamview.cpp b/digikam/digikam/digikamview.cpp index 2960282..a8fb42f 100644 --- a/digikam/digikam/digikamview.cpp +++ b/digikam/digikam/digikamview.cpp @@ -271,197 +271,197 @@ void DigikamView::setupConnections() { // -- DigikamApp connections ---------------------------------- - connect(d->parent, TQT_SIGNAL(signalEscapePressed()), - this, TQT_SLOT(slotEscapePreview())); + connect(d->parent, TQ_SIGNAL(signalEscapePressed()), + this, TQ_SLOT(slotEscapePreview())); - connect(d->parent, TQT_SIGNAL(signalEscapePressed()), - d->albumWidgetStack, TQT_SLOT(slotEscapePreview())); + connect(d->parent, TQ_SIGNAL(signalEscapePressed()), + d->albumWidgetStack, TQ_SLOT(slotEscapePreview())); - connect(d->parent, TQT_SIGNAL(signalNextItem()), - this, TQT_SLOT(slotNextItem())); + connect(d->parent, TQ_SIGNAL(signalNextItem()), + this, TQ_SLOT(slotNextItem())); - connect(d->parent, TQT_SIGNAL(signalPrevItem()), - this, TQT_SLOT(slotPrevItem())); + connect(d->parent, TQ_SIGNAL(signalPrevItem()), + this, TQ_SLOT(slotPrevItem())); - connect(d->parent, TQT_SIGNAL(signalFirstItem()), - this, TQT_SLOT(slotFirstItem())); + connect(d->parent, TQ_SIGNAL(signalFirstItem()), + this, TQ_SLOT(slotFirstItem())); - connect(d->parent, TQT_SIGNAL(signalLastItem()), - this, TQT_SLOT(slotLastItem())); + connect(d->parent, TQ_SIGNAL(signalLastItem()), + this, TQ_SLOT(slotLastItem())); - connect(d->parent, TQT_SIGNAL(signalCopyAlbumItemsSelection()), - d->iconView, TQT_SLOT(slotCopy())); + connect(d->parent, TQ_SIGNAL(signalCopyAlbumItemsSelection()), + d->iconView, TQ_SLOT(slotCopy())); - connect(d->parent, TQT_SIGNAL(signalPasteAlbumItemsSelection()), - d->iconView, TQT_SLOT(slotPaste())); + connect(d->parent, TQ_SIGNAL(signalPasteAlbumItemsSelection()), + d->iconView, TQ_SLOT(slotPaste())); - connect(this, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); + connect(this, TQ_SIGNAL(signalProgressBarMode(int, const TQString&)), + d->parent, TQ_SLOT(slotProgressBarMode(int, const TQString&))); - connect(this, TQT_SIGNAL(signalProgressValue(int)), - d->parent, TQT_SLOT(slotProgressValue(int))); + connect(this, TQ_SIGNAL(signalProgressValue(int)), + d->parent, TQ_SLOT(slotProgressValue(int))); - connect(d->parent, TQT_SIGNAL(signalCancelButtonPressed()), - this, TQT_SLOT(slotCancelSlideShow())); + connect(d->parent, TQ_SIGNAL(signalCancelButtonPressed()), + this, TQ_SLOT(slotCancelSlideShow())); // -- AlbumManager connections -------------------------------- - connect(d->albumManager, TQT_SIGNAL(signalAlbumCurrentChanged(Album*)), - this, TQT_SLOT(slotAlbumSelected(Album*))); + connect(d->albumManager, TQ_SIGNAL(signalAlbumCurrentChanged(Album*)), + this, TQ_SLOT(slotAlbumSelected(Album*))); - connect(d->albumManager, TQT_SIGNAL(signalAllAlbumsLoaded()), - this, TQT_SLOT(slotAllAlbumsLoaded())); + connect(d->albumManager, TQ_SIGNAL(signalAllAlbumsLoaded()), + this, TQ_SLOT(slotAllAlbumsLoaded())); - connect(d->albumManager, TQT_SIGNAL(signalAlbumItemsSelected(bool) ), - this, TQT_SLOT(slotImageSelected())); + connect(d->albumManager, TQ_SIGNAL(signalAlbumItemsSelected(bool) ), + this, TQ_SLOT(slotImageSelected())); - connect(d->albumManager, TQT_SIGNAL(signalAlbumAdded(Album*)), - this, TQT_SLOT(slotAlbumAdded(Album*))); + connect(d->albumManager, TQ_SIGNAL(signalAlbumAdded(Album*)), + this, TQ_SLOT(slotAlbumAdded(Album*))); - connect(d->albumManager, TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotAlbumDeleted(Album*))); + connect(d->albumManager, TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotAlbumDeleted(Album*))); - connect(d->albumManager, TQT_SIGNAL(signalAlbumRenamed(Album*)), - this, TQT_SLOT(slotAlbumRenamed(Album*))); + connect(d->albumManager, TQ_SIGNAL(signalAlbumRenamed(Album*)), + this, TQ_SLOT(slotAlbumRenamed(Album*))); - connect(d->albumManager, TQT_SIGNAL(signalAlbumsCleared()), - this, TQT_SLOT(slotAlbumsCleared())); + connect(d->albumManager, TQ_SIGNAL(signalAlbumsCleared()), + this, TQ_SLOT(slotAlbumsCleared())); // -- IconView Connections ------------------------------------- - connect(d->iconView, TQT_SIGNAL(signalItemsUpdated(const KURL::List&)), - d->albumWidgetStack, TQT_SLOT(slotItemsUpdated(const KURL::List&))); + connect(d->iconView, TQ_SIGNAL(signalItemsUpdated(const KURL::List&)), + d->albumWidgetStack, TQ_SLOT(slotItemsUpdated(const KURL::List&))); - connect(d->iconView, TQT_SIGNAL(signalItemsAdded()), - this, TQT_SLOT(slotImageSelected())); + connect(d->iconView, TQ_SIGNAL(signalItemsAdded()), + this, TQ_SLOT(slotImageSelected())); - connect(d->iconView, TQT_SIGNAL(signalItemsAdded()), - this, TQT_SLOT(slotAlbumHighlight())); + connect(d->iconView, TQ_SIGNAL(signalItemsAdded()), + this, TQ_SLOT(slotAlbumHighlight())); - connect(d->iconView, TQT_SIGNAL(signalPreviewItem(AlbumIconItem*)), - this, TQT_SLOT(slotTogglePreviewMode(AlbumIconItem*))); + connect(d->iconView, TQ_SIGNAL(signalPreviewItem(AlbumIconItem*)), + this, TQ_SLOT(slotTogglePreviewMode(AlbumIconItem*))); - //connect(d->iconView, TQT_SIGNAL(signalItemDeleted(AlbumIconItem*)), - // this, TQT_SIGNAL(signalNoCurrentItem())); + //connect(d->iconView, TQ_SIGNAL(signalItemDeleted(AlbumIconItem*)), + // this, TQ_SIGNAL(signalNoCurrentItem())); - connect(d->iconView, TQT_SIGNAL(signalGotoAlbumAndItem(AlbumIconItem *)), - this, TQT_SLOT(slotGotoAlbumAndItem(AlbumIconItem *))); + connect(d->iconView, TQ_SIGNAL(signalGotoAlbumAndItem(AlbumIconItem *)), + this, TQ_SLOT(slotGotoAlbumAndItem(AlbumIconItem *))); - connect(d->iconView, TQT_SIGNAL(signalGotoDateAndItem(AlbumIconItem *)), - this, TQT_SLOT(slotGotoDateAndItem(AlbumIconItem *))); + connect(d->iconView, TQ_SIGNAL(signalGotoDateAndItem(AlbumIconItem *)), + this, TQ_SLOT(slotGotoDateAndItem(AlbumIconItem *))); - connect(d->iconView, TQT_SIGNAL(signalGotoTagAndItem(int)), - this, TQT_SLOT(slotGotoTagAndItem(int))); + connect(d->iconView, TQ_SIGNAL(signalGotoTagAndItem(int)), + this, TQ_SLOT(slotGotoTagAndItem(int))); - connect(d->folderView, TQT_SIGNAL(signalAlbumModified()), - d->iconView, TQT_SLOT(slotAlbumModified())); + connect(d->folderView, TQ_SIGNAL(signalAlbumModified()), + d->iconView, TQ_SLOT(slotAlbumModified())); - connect(d->iconView, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); + connect(d->iconView, TQ_SIGNAL(signalProgressBarMode(int, const TQString&)), + d->parent, TQ_SLOT(slotProgressBarMode(int, const TQString&))); - connect(d->iconView, TQT_SIGNAL(signalProgressValue(int)), - d->parent, TQT_SLOT(slotProgressValue(int))); + connect(d->iconView, TQ_SIGNAL(signalProgressValue(int)), + d->parent, TQ_SLOT(slotProgressValue(int))); // -- Sidebar Connections ------------------------------------- - connect(d->leftSideBar, TQT_SIGNAL(signalChangedTab(TQWidget*)), - this, TQT_SLOT(slotLeftSidebarChangedTab(TQWidget*))); + connect(d->leftSideBar, TQ_SIGNAL(signalChangedTab(TQWidget*)), + this, TQ_SLOT(slotLeftSidebarChangedTab(TQWidget*))); - connect(d->rightSideBar, TQT_SIGNAL(signalFirstItem()), - this, TQT_SLOT(slotFirstItem())); + connect(d->rightSideBar, TQ_SIGNAL(signalFirstItem()), + this, TQ_SLOT(slotFirstItem())); - connect(d->rightSideBar, TQT_SIGNAL(signalNextItem()), - this, TQT_SLOT(slotNextItem())); + connect(d->rightSideBar, TQ_SIGNAL(signalNextItem()), + this, TQ_SLOT(slotNextItem())); - connect(d->rightSideBar, TQT_SIGNAL(signalPrevItem()), - this, TQT_SLOT(slotPrevItem())); + connect(d->rightSideBar, TQ_SIGNAL(signalPrevItem()), + this, TQ_SLOT(slotPrevItem())); - connect(d->rightSideBar, TQT_SIGNAL(signalLastItem()), - this, TQT_SLOT(slotLastItem())); + connect(d->rightSideBar, TQ_SIGNAL(signalLastItem()), + this, TQ_SLOT(slotLastItem())); - connect(this, TQT_SIGNAL(signalNoCurrentItem()), - d->rightSideBar, TQT_SLOT(slotNoCurrentItem())); + connect(this, TQ_SIGNAL(signalNoCurrentItem()), + d->rightSideBar, TQ_SLOT(slotNoCurrentItem())); - connect(d->rightSideBar, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); + connect(d->rightSideBar, TQ_SIGNAL(signalProgressBarMode(int, const TQString&)), + d->parent, TQ_SLOT(slotProgressBarMode(int, const TQString&))); - connect(d->rightSideBar, TQT_SIGNAL(signalProgressValue(int)), - d->parent, TQT_SLOT(slotProgressValue(int))); + connect(d->rightSideBar, TQ_SIGNAL(signalProgressValue(int)), + d->parent, TQ_SLOT(slotProgressValue(int))); - connect(d->tagFilterView, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); + connect(d->tagFilterView, TQ_SIGNAL(signalProgressBarMode(int, const TQString&)), + d->parent, TQ_SLOT(slotProgressBarMode(int, const TQString&))); - connect(d->tagFilterView, TQT_SIGNAL(signalProgressValue(int)), - d->parent, TQT_SLOT(slotProgressValue(int))); + connect(d->tagFilterView, TQ_SIGNAL(signalProgressValue(int)), + d->parent, TQ_SLOT(slotProgressValue(int))); - connect(d->tagFolderView, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); + connect(d->tagFolderView, TQ_SIGNAL(signalProgressBarMode(int, const TQString&)), + d->parent, TQ_SLOT(slotProgressBarMode(int, const TQString&))); - connect(d->tagFolderView, TQT_SIGNAL(signalProgressValue(int)), - d->parent, TQT_SLOT(slotProgressValue(int))); + connect(d->tagFolderView, TQ_SIGNAL(signalProgressValue(int)), + d->parent, TQ_SLOT(slotProgressValue(int))); - connect(d->parent, TQT_SIGNAL(signalResetTagFilters()), - d->tagFilterView, TQT_SLOT(slotResetTagFilters())); + connect(d->parent, TQ_SIGNAL(signalResetTagFilters()), + d->tagFilterView, TQ_SLOT(slotResetTagFilters())); // -- Filter Bars Connections --------------------------------- - connect(d->folderSearchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - d->folderView, TQT_SLOT(slotTextFolderFilterChanged(const TQString&))); + connect(d->folderSearchBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + d->folderView, TQ_SLOT(slotTextFolderFilterChanged(const TQString&))); - connect(d->tagSearchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - d->tagFolderView, TQT_SLOT(slotTextTagFilterChanged(const TQString&))); + connect(d->tagSearchBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + d->tagFolderView, TQ_SLOT(slotTextTagFilterChanged(const TQString&))); - connect(d->searchSearchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - d->searchFolderView, TQT_SLOT(slotTextSearchFilterChanged(const TQString&))); + connect(d->searchSearchBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + d->searchFolderView, TQ_SLOT(slotTextSearchFilterChanged(const TQString&))); - connect(d->tagFilterSearchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - d->tagFilterView, TQT_SLOT(slotTextTagFilterChanged(const TQString&))); + connect(d->tagFilterSearchBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + d->tagFilterView, TQ_SLOT(slotTextTagFilterChanged(const TQString&))); - connect(d->folderView, TQT_SIGNAL(signalTextFolderFilterMatch(bool)), - d->folderSearchBar, TQT_SLOT(slotSearchResult(bool))); + connect(d->folderView, TQ_SIGNAL(signalTextFolderFilterMatch(bool)), + d->folderSearchBar, TQ_SLOT(slotSearchResult(bool))); - connect(d->tagFolderView, TQT_SIGNAL(signalTextTagFilterMatch(bool)), - d->tagSearchBar, TQT_SLOT(slotSearchResult(bool))); + connect(d->tagFolderView, TQ_SIGNAL(signalTextTagFilterMatch(bool)), + d->tagSearchBar, TQ_SLOT(slotSearchResult(bool))); - connect(d->searchFolderView, TQT_SIGNAL(signalTextSearchFilterMatch(bool)), - d->searchSearchBar, TQT_SLOT(slotSearchResult(bool))); + connect(d->searchFolderView, TQ_SIGNAL(signalTextSearchFilterMatch(bool)), + d->searchSearchBar, TQ_SLOT(slotSearchResult(bool))); - connect(d->tagFilterView, TQT_SIGNAL(signalTextTagFilterMatch(bool)), - d->tagFilterSearchBar, TQT_SLOT(slotSearchResult(bool))); + connect(d->tagFilterView, TQ_SIGNAL(signalTextTagFilterMatch(bool)), + d->tagFilterSearchBar, TQ_SLOT(slotSearchResult(bool))); // -- Preview image widget Connections ------------------------ - connect(d->albumWidgetStack, TQT_SIGNAL(signalNextItem()), - this, TQT_SLOT(slotNextItem())); + connect(d->albumWidgetStack, TQ_SIGNAL(signalNextItem()), + this, TQ_SLOT(slotNextItem())); - connect(d->albumWidgetStack, TQT_SIGNAL(signalPrevItem()), - this, TQT_SLOT(slotPrevItem())); + connect(d->albumWidgetStack, TQ_SIGNAL(signalPrevItem()), + this, TQ_SLOT(slotPrevItem())); - connect(d->albumWidgetStack, TQT_SIGNAL(signalEditItem()), - this, TQT_SLOT(slotImageEdit())); + connect(d->albumWidgetStack, TQ_SIGNAL(signalEditItem()), + this, TQ_SLOT(slotImageEdit())); - connect(d->albumWidgetStack, TQT_SIGNAL(signalDeleteItem()), - this, TQT_SLOT(slotImageDelete())); + connect(d->albumWidgetStack, TQ_SIGNAL(signalDeleteItem()), + this, TQ_SLOT(slotImageDelete())); - connect(d->albumWidgetStack, TQT_SIGNAL(signalToggledToPreviewMode(bool)), - this, TQT_SLOT(slotToggledToPreviewMode(bool))); + connect(d->albumWidgetStack, TQ_SIGNAL(signalToggledToPreviewMode(bool)), + this, TQ_SLOT(slotToggledToPreviewMode(bool))); - connect(d->albumWidgetStack, TQT_SIGNAL(signalBack2Album()), - this, TQT_SLOT(slotEscapePreview())); + connect(d->albumWidgetStack, TQ_SIGNAL(signalBack2Album()), + this, TQ_SLOT(slotEscapePreview())); - connect(d->albumWidgetStack, TQT_SIGNAL(signalSlideShow()), - this, TQT_SLOT(slotSlideShowAll())); + connect(d->albumWidgetStack, TQ_SIGNAL(signalSlideShow()), + this, TQ_SLOT(slotSlideShowAll())); - connect(d->albumWidgetStack, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SLOT(slotZoomFactorChanged(double))); + connect(d->albumWidgetStack, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SLOT(slotZoomFactorChanged(double))); - connect(d->albumWidgetStack, TQT_SIGNAL(signalInsert2LightTable()), - this, TQT_SLOT(slotImageAddToLightTable())); + connect(d->albumWidgetStack, TQ_SIGNAL(signalInsert2LightTable()), + this, TQ_SLOT(slotImageAddToLightTable())); // -- Selection timer --------------- - connect(d->selectionTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotDispatchImageSelected())); + connect(d->selectionTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotDispatchImageSelected())); } void DigikamView::loadViewState() @@ -552,8 +552,8 @@ void DigikamView::slotLastItem(void) void DigikamView::slotAllAlbumsLoaded() { - disconnect(d->albumManager, TQT_SIGNAL(signalAllAlbumsLoaded()), - this, TQT_SLOT(slotAllAlbumsLoaded())); + disconnect(d->albumManager, TQ_SIGNAL(signalAllAlbumsLoaded()), + this, TQ_SLOT(slotAllAlbumsLoaded())); loadViewState(); Album *album = d->albumManager->findAlbum(d->initialAlbumID); @@ -1058,8 +1058,8 @@ void DigikamView::setThumbSize(int size) } d->thumbSizeTimer = new TQTimer( this ); - connect(d->thumbSizeTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotThumbSizeEffect()) ); + connect(d->thumbSizeTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotThumbSizeEffect()) ); d->thumbSizeTimer->start(300, true); } } @@ -1173,19 +1173,19 @@ void DigikamView::slotAlbumSyncPicturesMetadata() if (!album) return; - BatchSyncMetadata *syncMetadata = new BatchSyncMetadata(TQT_TQOBJECT(this), album); + BatchSyncMetadata *syncMetadata = new BatchSyncMetadata(this, album); - connect(syncMetadata, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); + connect(syncMetadata, TQ_SIGNAL(signalProgressBarMode(int, const TQString&)), + d->parent, TQ_SLOT(slotProgressBarMode(int, const TQString&))); - connect(syncMetadata, TQT_SIGNAL(signalProgressValue(int)), - d->parent, TQT_SLOT(slotProgressValue(int))); + connect(syncMetadata, TQ_SIGNAL(signalProgressValue(int)), + d->parent, TQ_SLOT(slotProgressValue(int))); - connect(syncMetadata, TQT_SIGNAL(signalComplete()), - this, TQT_SLOT(slotAlbumSyncPicturesMetadataDone())); + connect(syncMetadata, TQ_SIGNAL(signalComplete()), + this, TQ_SLOT(slotAlbumSyncPicturesMetadataDone())); - connect(d->parent, TQT_SIGNAL(signalCancelButtonPressed()), - syncMetadata, TQT_SLOT(slotAbort())); + connect(d->parent, TQ_SIGNAL(signalCancelButtonPressed()), + syncMetadata, TQ_SLOT(slotAbort())); syncMetadata->parseAlbum(); } @@ -1486,8 +1486,8 @@ void DigikamView::slotSlideShowRecursive() } ImageInfoAlbumsJob *job = new ImageInfoAlbumsJob; - connect(job, TQT_SIGNAL(signalCompleted(const ImageInfoList&)), - this, TQT_SLOT(slotItemsInfoFromAlbums(const ImageInfoList&))); + connect(job, TQ_SIGNAL(signalCompleted(const ImageInfoList&)), + this, TQ_SLOT(slotItemsInfoFromAlbums(const ImageInfoList&))); job->allItemsFromAlbums(albumList); } } diff --git a/digikam/digikam/digikamview.h b/digikam/digikam/digikamview.h index f587602..cf92907 100644 --- a/digikam/digikam/digikamview.h +++ b/digikam/digikam/digikamview.h @@ -46,7 +46,7 @@ class DigikamViewPriv; class DigikamView : public TQHBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/dio.cpp b/digikam/digikam/dio.cpp index 857dc03..f9639fc 100644 --- a/digikam/digikam/dio.cpp +++ b/digikam/digikam/dio.cpp @@ -244,8 +244,8 @@ bool running() Watch::Watch(TDEIO::Job* job) { m_runCount++; - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDone(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDone(TDEIO::Job*))); } void Watch::slotDone(TDEIO::Job*) diff --git a/digikam/digikam/dio_p.h b/digikam/digikam/dio_p.h index 8ce3c10..660cad0 100644 --- a/digikam/digikam/dio_p.h +++ b/digikam/digikam/dio_p.h @@ -38,7 +38,7 @@ namespace DIO class Watch : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/firstrun.h b/digikam/digikam/firstrun.h index d9cd513..e380399 100644 --- a/digikam/digikam/firstrun.h +++ b/digikam/digikam/firstrun.h @@ -41,7 +41,7 @@ namespace Digikam class DIGIKAM_EXPORT FirstRunWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/folderitem.cpp b/digikam/digikam/folderitem.cpp index eae4491..45b875f 100644 --- a/digikam/digikam/folderitem.cpp +++ b/digikam/digikam/folderitem.cpp @@ -218,7 +218,7 @@ void FolderCheckListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int co p->fillRect(0, 0, r, height(), cg.base()); - fv->style().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p, + fv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p, TQRect(x, y, boxsize, height()), cg, styleflags, TQStyleOption(this)); } diff --git a/digikam/digikam/folderview.cpp b/digikam/digikam/folderview.cpp index ffa5f03..0e2d515 100644 --- a/digikam/digikam/folderview.cpp +++ b/digikam/digikam/folderview.cpp @@ -83,14 +83,14 @@ FolderView::FolderView(TQWidget *parent, const char *name) d = new FolderViewPriv; - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAllAlbumsLoaded()), - this, TQT_SLOT(slotAllAlbumsLoaded())); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAllAlbumsLoaded()), + this, TQ_SLOT(slotAllAlbumsLoaded())); - connect(AlbumThumbnailLoader::instance(), TQT_SIGNAL(signalReloadThumbnails()), - this, TQT_SLOT(slotIconSizeChanged())); + connect(AlbumThumbnailLoader::instance(), TQ_SIGNAL(signalReloadThumbnails()), + this, TQ_SLOT(slotIconSizeChanged())); setColumnAlignment(0, TQt::AlignLeft|TQt::AlignVCenter); setShowSortIndicator(true); @@ -376,8 +376,8 @@ void FolderView::slotThemeChanged() void FolderView::slotAllAlbumsLoaded() { - disconnect(AlbumManager::instance(), TQT_SIGNAL(signalAllAlbumsLoaded()), - this, TQT_SLOT(slotAllAlbumsLoaded())); + disconnect(AlbumManager::instance(), TQ_SIGNAL(signalAllAlbumsLoaded()), + this, TQ_SLOT(slotAllAlbumsLoaded())); loadViewState(); } diff --git a/digikam/digikam/folderview.h b/digikam/digikam/folderview.h index bc3872a..e32737c 100644 --- a/digikam/digikam/folderview.h +++ b/digikam/digikam/folderview.h @@ -50,7 +50,7 @@ class FolderItem; class DIGIKAM_EXPORT FolderView : public TQListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/iconview.cpp b/digikam/digikam/iconview.cpp index e71e103..2dac3da 100644 --- a/digikam/digikam/iconview.cpp +++ b/digikam/digikam/iconview.cpp @@ -138,18 +138,18 @@ IconView::IconView(TQWidget* parent, const char* name) { viewport()->setBackgroundMode(TQt::NoBackground); viewport()->setFocusProxy(this); - viewport()->setFocusPolicy(TQ_WheelFocus); + viewport()->setFocusPolicy(TQWidget::WheelFocus); viewport()->setMouseTracking(true); d = new IconViewPriv; d->rearrangeTimer = new TQTimer(this); d->toolTipTimer = new TQTimer(this); - connect(d->rearrangeTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotRearrange())); + connect(d->rearrangeTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotRearrange())); - connect(d->toolTipTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotToolTip())); + connect(d->toolTipTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotToolTip())); setEnableToolTips(true); } @@ -925,7 +925,7 @@ void IconView::contentsMousePressEvent(TQMouseEvent* e) d->rubber = 0; } - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { IconItem* item = findItem(e->pos()); if (item) @@ -1067,7 +1067,7 @@ void IconView::drawRubber(TQPainter* p) TQPoint pnt(r.x(), r.y()); - style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, + style().drawPrimitive(TQStyle::PE_FocusRect, p, TQRect( pnt.x(), pnt.y(), r.width(), r.height() ), colorGroup(), TQStyle::Style_Default, @@ -1125,7 +1125,7 @@ void IconView::contentsMouseMoveEvent(TQMouseEvent* e) d->toolTipTimer->stop(); slotToolTip(); - if (d->dragging && (e->state() & Qt::LeftButton)) + if (d->dragging && (e->state() & TQt::LeftButton)) { if ( (d->dragStartPos - e->pos()).manhattanLength() > TQApplication::startDragDistance() ) @@ -1240,7 +1240,7 @@ void IconView::contentsMouseReleaseEvent(TQMouseEvent* e) d->rubber = 0; } - if (e->state() == Qt::LeftButton) + if (e->state() == TQt::LeftButton) { if (d->pressedMoved) { diff --git a/digikam/digikam/iconview.h b/digikam/digikam/iconview.h index 0db4d36..59a4b92 100644 --- a/digikam/digikam/iconview.h +++ b/digikam/digikam/iconview.h @@ -48,7 +48,7 @@ class IconViewPriv; class DIGIKAM_EXPORT IconView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/imageattributeswatch.h b/digikam/digikam/imageattributeswatch.h index eed5276..7d37760 100644 --- a/digikam/digikam/imageattributeswatch.h +++ b/digikam/digikam/imageattributeswatch.h @@ -37,7 +37,7 @@ namespace Digikam class ImageAttributesWatch : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/imagepreviewview.cpp b/digikam/digikam/imagepreviewview.cpp index 44bf96f..f636f68 100644 --- a/digikam/digikam/imagepreviewview.cpp +++ b/digikam/digikam/imagepreviewview.cpp @@ -148,23 +148,23 @@ ImagePreviewView::ImagePreviewView(AlbumWidgetStack *parent) // ------------------------------------------------------------ - connect(d->cornerButton, TQT_SIGNAL(pressed()), - this, TQT_SLOT(slotCornerButtonPressed())); + connect(d->cornerButton, TQ_SIGNAL(pressed()), + this, TQ_SLOT(slotCornerButtonPressed())); - connect(this, TQT_SIGNAL(signalShowNextImage()), - this, TQT_SIGNAL(signalNextItem())); + connect(this, TQ_SIGNAL(signalShowNextImage()), + this, TQ_SIGNAL(signalNextItem())); - connect(this, TQT_SIGNAL(signalShowPrevImage()), - this, TQT_SIGNAL(signalPrevItem())); + connect(this, TQ_SIGNAL(signalShowPrevImage()), + this, TQ_SIGNAL(signalPrevItem())); - connect(this, TQT_SIGNAL(signalRightButtonClicked()), - this, TQT_SLOT(slotContextMenu())); + connect(this, TQ_SIGNAL(signalRightButtonClicked()), + this, TQ_SLOT(slotContextMenu())); - connect(this, TQT_SIGNAL(signalLeftButtonClicked()), - this, TQT_SIGNAL(signalBack2Album())); + connect(this, TQ_SIGNAL(signalLeftButtonClicked()), + this, TQ_SIGNAL(signalBack2Album())); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); // ------------------------------------------------------------ @@ -229,14 +229,14 @@ void ImagePreviewView::setImagePath(const TQString& path) if (!d->previewThread) { d->previewThread = new PreviewLoadThread(); - connect(d->previewThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), - this, TQT_SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); + connect(d->previewThread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), + this, TQ_SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); } if (!d->previewPreloadThread) { d->previewPreloadThread = new PreviewLoadThread(); - connect(d->previewPreloadThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), - this, TQT_SLOT(slotNextPreload())); + connect(d->previewPreloadThread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), + this, TQ_SLOT(slotNextPreload())); } if (d->loadFullImageSize) @@ -425,11 +425,11 @@ void ImagePreviewView::slotContextMenu() popmenu.insertItem(i18n("Assign Tag"), assignTagsMenu); int i = popmenu.insertItem(i18n("Remove Tag"), removeTagsMenu); - connect(assignTagsMenu, TQT_SIGNAL(signalTagActivated(int)), - this, TQT_SLOT(slotAssignTag(int))); + connect(assignTagsMenu, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotAssignTag(int))); - connect(removeTagsMenu, TQT_SIGNAL(signalTagActivated(int)), - this, TQT_SLOT(slotRemoveTag(int))); + connect(removeTagsMenu, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotRemoveTag(int))); AlbumDB* db = AlbumManager::instance()->albumDB(); if (!db->hasTags( idList )) @@ -441,8 +441,8 @@ void ImagePreviewView::slotContextMenu() ratingMenu = new RatingPopupMenu(); - connect(ratingMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAssignRating(int))); + connect(ratingMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAssignRating(int))); popmenu.insertItem(i18n("Assign Rating"), ratingMenu); @@ -572,11 +572,11 @@ void ImagePreviewView::slotCornerButtonPressed() pan->setRegionSelection(r); pan->setMouseFocus(); - connect(pan, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), - this, TQT_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); + connect(pan, TQ_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQ_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); - connect(pan, TQT_SIGNAL(signalHiden()), - this, TQT_SLOT(slotPanIconHiden())); + connect(pan, TQ_SIGNAL(signalHiden()), + this, TQ_SLOT(slotPanIconHiden())); TQPoint g = mapToGlobal(viewport()->pos()); g.setX(g.x()+ viewport()->size().width()); diff --git a/digikam/digikam/imagepreviewview.h b/digikam/digikam/imagepreviewview.h index 89d9db4..f005880 100644 --- a/digikam/digikam/imagepreviewview.h +++ b/digikam/digikam/imagepreviewview.h @@ -48,7 +48,7 @@ class ImagePreviewViewPriv; class DIGIKAM_EXPORT ImagePreviewView : public PreviewWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/digikam/kdateedit.cpp b/digikam/digikam/kdateedit.cpp index 020f77d..1cf4ec4 100644 --- a/digikam/digikam/kdateedit.cpp +++ b/digikam/digikam/kdateedit.cpp @@ -47,7 +47,7 @@ class DateValidator : public TQValidator { public: DateValidator( const TQStringList &keywords, TQWidget* parent, const char* name = 0 ) - : TQValidator( TQT_TQOBJECT(parent), name ), mKeywords( keywords ) + : TQValidator( parent, name ), mKeywords( keywords ) {} virtual State validate( TQString &str, int& ) const @@ -89,17 +89,17 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name ) changeItem( today, 0 ); setMinimumSize( sizeHint() ); - connect( lineEdit(), TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( lineEnterPressed() ) ); - connect( this, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotTextChanged( const TQString& ) ) ); + connect( lineEdit(), TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( lineEnterPressed() ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotTextChanged( const TQString& ) ) ); mPopup = new KDatePickerPopup( KDatePickerPopup::DatePicker | KDatePickerPopup::Words ); mPopup->hide(); mPopup->installEventFilter( this ); - connect( mPopup, TQT_SIGNAL( dateChanged( TQDate ) ), - TQT_SLOT( dateSelected( TQDate ) ) ); + connect( mPopup, TQ_SIGNAL( dateChanged( TQDate ) ), + TQ_SLOT( dateSelected( TQDate ) ) ); // handle keyword entry setupKeywords(); @@ -261,7 +261,7 @@ TQDate KDateEdit::parseDate( bool *replaced ) const bool KDateEdit::eventFilter( TQObject *object, TQEvent *event ) { - if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(lineEdit()) ) { + if ( object == lineEdit() ) { // We only process the focus out event if the text has changed // since we got focus if ( (event->type() == TQEvent::FocusOut) && mTextChanged ) { @@ -299,7 +299,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event ) case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonPress: { TQMouseEvent *mouseEvent = (TQMouseEvent*)event; - if ( !TQT_TQRECT_OBJECT(mPopup->rect()).contains( mouseEvent->pos() ) ) { + if ( !mPopup->rect().contains( mouseEvent->pos() ) ) { TQPoint globalPos = mPopup->mapToGlobal( mouseEvent->pos() ); if ( TQApplication::widgetAt( globalPos, true ) == this ) { // The date picker is being closed by a click on the @@ -320,7 +320,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event ) void KDateEdit::mousePressEvent( TQMouseEvent *event ) { - if ( event->button() == Qt::LeftButton && mDiscardNextMousePress ) { + if ( event->button() == TQt::LeftButton && mDiscardNextMousePress ) { mDiscardNextMousePress = false; return; } diff --git a/digikam/digikam/kdateedit.h b/digikam/digikam/kdateedit.h index e283424..9244482 100644 --- a/digikam/digikam/kdateedit.h +++ b/digikam/digikam/kdateedit.h @@ -55,7 +55,7 @@ namespace Digikam */ class KDateEdit : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/kdatepickerpopup.cpp b/digikam/digikam/kdatepickerpopup.cpp index b471642..b4cb8bb 100644 --- a/digikam/digikam/kdatepickerpopup.cpp +++ b/digikam/digikam/kdatepickerpopup.cpp @@ -48,11 +48,11 @@ KDatePickerPopup::KDatePickerPopup(int items, const TQDate &date, TQWidget *pare mDatePicker = new KDatePicker( this ); mDatePicker->setCloseButton( false ); - connect( mDatePicker, TQT_SIGNAL( dateEntered( TQDate ) ), - this, TQT_SLOT( slotDateChanged( TQDate ) ) ); + connect( mDatePicker, TQ_SIGNAL( dateEntered( TQDate ) ), + this, TQ_SLOT( slotDateChanged( TQDate ) ) ); - connect( mDatePicker, TQT_SIGNAL( dateSelected( TQDate ) ), - this, TQT_SLOT( slotDateChanged( TQDate ) ) ); + connect( mDatePicker, TQ_SIGNAL( dateSelected( TQDate ) ), + this, TQ_SLOT( slotDateChanged( TQDate ) ) ); mDatePicker->setDate( date ); buildMenu(); @@ -73,19 +73,19 @@ void KDatePickerPopup::buildMenu() if ( mItems & Words ) { - insertItem( i18n("&Today"), this, TQT_SLOT( slotToday() ) ); - insertItem( i18n("Y&esterday"), this, TQT_SLOT( slotYesterday() ) ); - insertItem( i18n("Last &Monday"), this, TQT_SLOT( slotPrevMonday() ) ); - insertItem( i18n("Last &Friday"), this, TQT_SLOT( slotPrevFriday() ) ); - insertItem( i18n("Last &Week"), this, TQT_SLOT( slotPrevWeek() ) ); - insertItem( i18n("Last M&onth"), this, TQT_SLOT( slotPrevMonth() ) ); + insertItem( i18n("&Today"), this, TQ_SLOT( slotToday() ) ); + insertItem( i18n("Y&esterday"), this, TQ_SLOT( slotYesterday() ) ); + insertItem( i18n("Last &Monday"), this, TQ_SLOT( slotPrevMonday() ) ); + insertItem( i18n("Last &Friday"), this, TQ_SLOT( slotPrevFriday() ) ); + insertItem( i18n("Last &Week"), this, TQ_SLOT( slotPrevWeek() ) ); + insertItem( i18n("Last M&onth"), this, TQ_SLOT( slotPrevMonth() ) ); if ( mItems & NoDate ) insertSeparator(); } if ( mItems & NoDate ) - insertItem( i18n("No Date"), this, TQT_SLOT( slotNoDate() ) ); + insertItem( i18n("No Date"), this, TQ_SLOT( slotNoDate() ) ); } KDatePicker *KDatePickerPopup::datePicker() const diff --git a/digikam/digikam/kdatepickerpopup.h b/digikam/digikam/kdatepickerpopup.h index daa8b1b..e343594 100644 --- a/digikam/digikam/kdatepickerpopup.h +++ b/digikam/digikam/kdatepickerpopup.h @@ -55,7 +55,7 @@ namespace Digikam */ class KDatePickerPopup: public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/kdatetimeedit.cpp b/digikam/digikam/kdatetimeedit.cpp index fed7cee..e78c5ca 100644 --- a/digikam/digikam/kdatetimeedit.cpp +++ b/digikam/digikam/kdatetimeedit.cpp @@ -40,10 +40,10 @@ KDateTimeEdit::KDateTimeEdit(TQWidget *parent, const char *name) m_datePopUp = new KDateEdit(this, "datepopup"); m_timePopUp = new TQTimeEdit(TQTime::currentTime(), this); - connect(m_datePopUp, TQT_SIGNAL(dateChanged(const TQDate& )), - TQT_SLOT(slotDateTimeChanged()) ); - connect(m_timePopUp, TQT_SIGNAL(valueChanged(const TQTime& )), - TQT_SLOT(slotDateTimeChanged()) ); + connect(m_datePopUp, TQ_SIGNAL(dateChanged(const TQDate& )), + TQ_SLOT(slotDateTimeChanged()) ); + connect(m_timePopUp, TQ_SIGNAL(valueChanged(const TQTime& )), + TQ_SLOT(slotDateTimeChanged()) ); } KDateTimeEdit::~KDateTimeEdit() diff --git a/digikam/digikam/kdatetimeedit.h b/digikam/digikam/kdatetimeedit.h index 090300f..ac0575c 100644 --- a/digikam/digikam/kdatetimeedit.h +++ b/digikam/digikam/kdatetimeedit.h @@ -48,7 +48,7 @@ class KDateEdit; */ class KDateTimeEdit : public TQHBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/kipiinterface.cpp b/digikam/digikam/kipiinterface.cpp index 7b30c51..aaf012e 100644 --- a/digikam/digikam/kipiinterface.cpp +++ b/digikam/digikam/kipiinterface.cpp @@ -544,11 +544,11 @@ DigikamKipiInterface::DigikamKipiInterface( TQObject *parent, const char *name) albumManager_ = AlbumManager::instance(); albumDB_ = albumManager_->albumDB(); - connect( albumManager_, TQT_SIGNAL( signalAlbumItemsSelected( bool ) ), - this, TQT_SLOT( slotSelectionChanged( bool ) ) ); + connect( albumManager_, TQ_SIGNAL( signalAlbumItemsSelected( bool ) ), + this, TQ_SLOT( slotSelectionChanged( bool ) ) ); - connect( albumManager_, TQT_SIGNAL( signalAlbumCurrentChanged(Album*) ), - this, TQT_SLOT( slotCurrentAlbumChanged(Album*) ) ); + connect( albumManager_, TQ_SIGNAL( signalAlbumCurrentChanged(Album*) ), + this, TQ_SLOT( slotCurrentAlbumChanged(Album*) ) ); } DigikamKipiInterface::~DigikamKipiInterface() diff --git a/digikam/digikam/kipiinterface.h b/digikam/digikam/kipiinterface.h index 7c1a255..b2974ec 100644 --- a/digikam/digikam/kipiinterface.h +++ b/digikam/digikam/kipiinterface.h @@ -153,7 +153,7 @@ private: class DigikamKipiInterface : public KIPI::Interface { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/mediaplayerview.cpp b/digikam/digikam/mediaplayerview.cpp index 23c313a..97ef26a 100644 --- a/digikam/digikam/mediaplayerview.cpp +++ b/digikam/digikam/mediaplayerview.cpp @@ -120,8 +120,8 @@ MediaPlayerView::MediaPlayerView(TQWidget *parent) // -------------------------------------------------------------------------- - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); } MediaPlayerView::~MediaPlayerView() @@ -187,7 +187,7 @@ void MediaPlayerView::setMediaPlayerFromUrl(const KURL& url) DDebug() << "Find KPart library " << library << endl; int error = 0; d->mediaPlayerPart = KParts::ComponentFactory::createPartInstanceFromService - <KParts::ReadOnlyPart>(service, TQT_TQWIDGET(d->mediaPlayerView), 0, TQT_TQOBJECT(d->mediaPlayerView), + <KParts::ReadOnlyPart>(service, d->mediaPlayerView, 0, d->mediaPlayerView, 0, TQStringList(), &error); if (!d->mediaPlayerPart) { diff --git a/digikam/digikam/mediaplayerview.h b/digikam/digikam/mediaplayerview.h index 559e32f..0839917 100644 --- a/digikam/digikam/mediaplayerview.h +++ b/digikam/digikam/mediaplayerview.h @@ -43,7 +43,7 @@ class MediaPlayerViewPriv; class DIGIKAM_EXPORT MediaPlayerView : public TQWidgetStack { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/digikam/mimefilter.h b/digikam/digikam/mimefilter.h index 4efe225..bddb560 100644 --- a/digikam/digikam/mimefilter.h +++ b/digikam/digikam/mimefilter.h @@ -35,7 +35,7 @@ class MimeFilterPriv; class MimeFilter : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/monthwidget.cpp b/digikam/digikam/monthwidget.cpp index e6c255f..665318f 100644 --- a/digikam/digikam/monthwidget.cpp +++ b/digikam/digikam/monthwidget.cpp @@ -355,11 +355,11 @@ void MonthWidget::setActive(bool val) if (d->active) { - connect(AlbumLister::instance(), TQT_SIGNAL(signalNewItems(const ImageInfoList&)), - this, TQT_SLOT(slotAddItems(const ImageInfoList&))); + connect(AlbumLister::instance(), TQ_SIGNAL(signalNewItems(const ImageInfoList&)), + this, TQ_SLOT(slotAddItems(const ImageInfoList&))); - connect(AlbumLister::instance(), TQT_SIGNAL(signalDeleteItem(ImageInfo*)), - this, TQT_SLOT(slotDeleteItem(ImageInfo*))); + connect(AlbumLister::instance(), TQ_SIGNAL(signalDeleteItem(ImageInfo*)), + this, TQ_SLOT(slotDeleteItem(ImageInfo*))); } else { diff --git a/digikam/digikam/monthwidget.h b/digikam/digikam/monthwidget.h index cf96e15..70988c5 100644 --- a/digikam/digikam/monthwidget.h +++ b/digikam/digikam/monthwidget.h @@ -39,7 +39,7 @@ class MonthWidgetPriv; class MonthWidget : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/pixmapmanager.cpp b/digikam/digikam/pixmapmanager.cpp index 5ae5072..3da11b5 100644 --- a/digikam/digikam/pixmapmanager.cpp +++ b/digikam/digikam/pixmapmanager.cpp @@ -92,8 +92,8 @@ PixmapManager::PixmapManager(AlbumIconView* view) d->thumbCacheDir = TQDir::homeDirPath() + "/.thumbnails/"; d->timer = new TQTimer(this); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotCompleted())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotCompleted())); } PixmapManager::~PixmapManager() @@ -133,14 +133,14 @@ TQPixmap* PixmapManager::find(const KURL& url) { d->thumbJob = new ThumbnailJob(url, d->size, true, AlbumSettings::instance()->getExifRotate()); - connect(d->thumbJob, TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); + connect(d->thumbJob, TQ_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); - connect(d->thumbJob, TQT_SIGNAL(signalFailed(const KURL&)), - this, TQT_SLOT(slotFailedThumbnail(const KURL&))); + connect(d->thumbJob, TQ_SIGNAL(signalFailed(const KURL&)), + this, TQ_SLOT(slotFailedThumbnail(const KURL&))); - connect(d->thumbJob, TQT_SIGNAL(signalCompleted()), - this, TQT_SLOT(slotCompleted())); + connect(d->thumbJob, TQ_SIGNAL(signalCompleted()), + this, TQ_SLOT(slotCompleted())); } return 0; diff --git a/digikam/digikam/pixmapmanager.h b/digikam/digikam/pixmapmanager.h index f3501d4..62da7fa 100644 --- a/digikam/digikam/pixmapmanager.h +++ b/digikam/digikam/pixmapmanager.h @@ -49,7 +49,7 @@ class PixmapManagerPriv; */ class PixmapManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/ratingfilter.cpp b/digikam/digikam/ratingfilter.cpp index 9900635..1cfa0bb 100644 --- a/digikam/digikam/ratingfilter.cpp +++ b/digikam/digikam/ratingfilter.cpp @@ -82,8 +82,8 @@ RatingFilter::RatingFilter(TQWidget* parent) "set rating filter condition.")); // To dispatch signal from parent widget with filter condition. - connect(this, TQT_SIGNAL(signalRatingChanged(int)), - this, TQT_SLOT(slotRatingChanged())); + connect(this, TQ_SIGNAL(signalRatingChanged(int)), + this, TQ_SLOT(slotRatingChanged())); } RatingFilter::~RatingFilter() @@ -132,7 +132,7 @@ void RatingFilter::mousePressEvent(TQMouseEvent* e) d->dirty = false; - if ( e->button() == Qt::LeftButton || e->button() == Qt::MidButton ) + if ( e->button() == TQt::LeftButton || e->button() == TQt::MidButton ) { d->dirty = true; int pos = e->x() / regPixmapWidth() +1; @@ -143,7 +143,7 @@ void RatingFilter::mousePressEvent(TQMouseEvent* e) setRating(pos); updateRatingTooltip(); } - else if (e->button() == Qt::RightButton) + else if (e->button() == TQt::RightButton) { // Show pop-up menu about Rating Filter condition settings diff --git a/digikam/digikam/ratingfilter.h b/digikam/digikam/ratingfilter.h index 404fee9..ac527e4 100644 --- a/digikam/digikam/ratingfilter.h +++ b/digikam/digikam/ratingfilter.h @@ -37,7 +37,7 @@ class RatingFilterPriv; class RatingFilter : public RatingWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/ratingpopupmenu.h b/digikam/digikam/ratingpopupmenu.h index 2be1257..14b2fef 100644 --- a/digikam/digikam/ratingpopupmenu.h +++ b/digikam/digikam/ratingpopupmenu.h @@ -35,7 +35,7 @@ class RatingPopupMenuPriv; class RatingPopupMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/ratingwidget.cpp b/digikam/digikam/ratingwidget.cpp index f22ecb4..3371a2c 100644 --- a/digikam/digikam/ratingwidget.cpp +++ b/digikam/digikam/ratingwidget.cpp @@ -73,8 +73,8 @@ RatingWidget::RatingWidget(TQWidget* parent) slotThemeChanged(); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); } RatingWidget::~RatingWidget() diff --git a/digikam/digikam/ratingwidget.h b/digikam/digikam/ratingwidget.h index 573b532..a6a6ab5 100644 --- a/digikam/digikam/ratingwidget.h +++ b/digikam/digikam/ratingwidget.h @@ -36,7 +36,7 @@ class RatingWidgetPriv; class RatingWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/scanlib.cpp b/digikam/digikam/scanlib.cpp index 14781b7..71ea425 100644 --- a/digikam/digikam/scanlib.cpp +++ b/digikam/digikam/scanlib.cpp @@ -123,7 +123,7 @@ void ScanLib::startScan() deleteStaleEntries(); AlbumDB* db = AlbumManager::instance()->albumDB(); - db->setSetting("Scanned", TQDateTime::currentDateTime().toString(Qt::ISODate)); + db->setSetting("Scanned", TQDateTime::currentDateTime().toString(TQt::ISODate)); } void ScanLib::findFoldersWhichDoNotExist() @@ -278,7 +278,7 @@ void ScanLib::updateItemsWithoutDate() } else { - TQPair<TQString, int> fileID = tqMakePair(fi.fileName(),albumID); + TQPair<TQString, int> fileID = qMakePair(fi.fileName(),albumID); if (m_filesToBeDeleted.findIndex(fileID) == -1) { @@ -393,9 +393,9 @@ void ScanLib::allFiles(const TQString& directory) TQMapIterator<TQString,bool> it; for (it = filesFoundInDB.begin(); it != filesFoundInDB.end(); ++it) { - if (m_filesToBeDeleted.findIndex(tqMakePair(it.key(),albumID)) == -1) + if (m_filesToBeDeleted.findIndex(qMakePair(it.key(),albumID)) == -1) { - m_filesToBeDeleted.append(tqMakePair(it.key(),albumID)); + m_filesToBeDeleted.append(qMakePair(it.key(),albumID)); } } } diff --git a/digikam/digikam/searchadvanceddialog.cpp b/digikam/digikam/searchadvanceddialog.cpp index dff2b55..cb40b87 100644 --- a/digikam/digikam/searchadvanceddialog.cpp +++ b/digikam/digikam/searchadvanceddialog.cpp @@ -134,7 +134,7 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url) TQWhatsThis::add(groupbox1, i18n("<p>You can edit the search rules " "by adding/removing criteria.")); - groupbox1->setColumnLayout(0, Qt::Vertical ); + groupbox1->setColumnLayout(0, TQt::Vertical ); groupbox1->layout()->setSpacing( KDialog::spacingHint() ); groupbox1->layout()->setMargin( KDialog::marginHint() ); d->optionsCombo = new TQComboBox(groupbox1); @@ -159,7 +159,7 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url) TQGroupBox *groupbox2 = new TQGroupBox( i18n("Group/Ungroup Options"), page, "groupbox2" ); TQWhatsThis::add(groupbox1, i18n("<p>You can group or ungroup any search criteria " "from the Search Rule set.")); - groupbox2->setColumnLayout(0, Qt::Vertical); + groupbox2->setColumnLayout(0, TQt::Vertical); groupbox2->layout()->setSpacing( KDialog::spacingHint() ); groupbox2->layout()->setMargin( KDialog::marginHint() ); d->groupButton = new TQPushButton(i18n("&Group"), groupbox2); @@ -174,7 +174,7 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url) // box for saving the search. TQGroupBox *groupbox3 = new TQGroupBox( page, "groupbox3"); - groupbox3->setColumnLayout(0, Qt::Vertical ); + groupbox3->setColumnLayout(0, TQt::Vertical ); groupbox3->layout()->setSpacing( KDialog::spacingHint() ); groupbox3->setFrameStyle( TQFrame::NoFrame ); TQLabel* label = new TQLabel(i18n("&Save search as: "), groupbox3); @@ -213,23 +213,23 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url) // ---------------------------------------------------------------- - connect(d->addButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddRule())); + connect(d->addButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddRule())); - connect(d->delButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDelRules())); + connect(d->delButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDelRules())); - connect(d->groupButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotGroupRules())); + connect(d->groupButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotGroupRules())); - connect(d->ungroupButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotUnGroupRules())); + connect(d->ungroupButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotUnGroupRules())); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotTimeOut())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTimeOut())); - connect(d->title, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotChangeButtonStates())); + connect(d->title, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotChangeButtonStates())); } SearchAdvancedDialog::~SearchAdvancedDialog() @@ -253,11 +253,11 @@ void SearchAdvancedDialog::slotAddRule() SearchAdvancedRule* rule = new SearchAdvancedRule( d->rulesBox, type ); d->baseList.append(rule); - connect( rule, TQT_SIGNAL( signalBaseItemToggled() ), - this, TQT_SLOT( slotChangeButtonStates() ) ); + connect( rule, TQ_SIGNAL( signalBaseItemToggled() ), + this, TQ_SLOT( slotChangeButtonStates() ) ); - connect( rule, TQT_SIGNAL( signalPropertyChanged() ), - this, TQT_SLOT(slotPropertyChanged())); + connect( rule, TQ_SIGNAL( signalPropertyChanged() ), + this, TQ_SLOT(slotPropertyChanged())); slotChangeButtonStates(); slotPropertyChanged(); @@ -373,8 +373,8 @@ void SearchAdvancedDialog::slotGroupRules() d->rulesBox->layout()->add((*it)->widget()); } - connect( group, TQT_SIGNAL( signalBaseItemToggled() ), - this, TQT_SLOT( slotChangeButtonStates() ) ); + connect( group, TQ_SIGNAL( signalBaseItemToggled() ), + this, TQ_SLOT( slotChangeButtonStates() ) ); slotChangeButtonStates(); slotPropertyChanged(); @@ -619,11 +619,11 @@ void SearchAdvancedDialog::fillWidgets( const KURL& url ) SearchAdvancedRule* rule = new SearchAdvancedRule( d->rulesBox, type ); rule->setValues( rulesMap[num] ); - connect( rule, TQT_SIGNAL( signalBaseItemToggled() ), - this, TQT_SLOT( slotChangeButtonStates() ) ); + connect( rule, TQ_SIGNAL( signalBaseItemToggled() ), + this, TQ_SLOT( slotChangeButtonStates() ) ); - connect( rule, TQT_SIGNAL( signalPropertyChanged() ), - this, TQT_SLOT(slotPropertyChanged())); + connect( rule, TQ_SIGNAL( signalPropertyChanged() ), + this, TQ_SLOT(slotPropertyChanged())); if (groupingActive) group->addRule(rule); @@ -643,8 +643,8 @@ void SearchAdvancedDialog::fillWidgets( const KURL& url ) group = new SearchAdvancedGroup(d->rulesBox); d->baseList.append(group); - connect( group, TQT_SIGNAL( signalBaseItemToggled() ), - this, TQT_SLOT( slotChangeButtonStates() ) ); + connect( group, TQ_SIGNAL( signalBaseItemToggled() ), + this, TQ_SLOT( slotChangeButtonStates() ) ); groupingActive = true; } diff --git a/digikam/digikam/searchadvanceddialog.h b/digikam/digikam/searchadvanceddialog.h index d3080b8..e4f233b 100644 --- a/digikam/digikam/searchadvanceddialog.h +++ b/digikam/digikam/searchadvanceddialog.h @@ -50,7 +50,7 @@ class SearchAdvancedDialogPriv; */ class SearchAdvancedDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/searchfolderview.cpp b/digikam/digikam/searchfolderview.cpp index 5fd23e9..c302d70 100644 --- a/digikam/digikam/searchfolderview.cpp +++ b/digikam/digikam/searchfolderview.cpp @@ -111,23 +111,23 @@ SearchFolderView::SearchFolderView(TQWidget* parent) m_lastAddedItem = 0; - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumAdded(Album*)), - this, TQT_SLOT(slotAlbumAdded(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumAdded(Album*)), + this, TQ_SLOT(slotAlbumAdded(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotAlbumDeleted(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotAlbumDeleted(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumsCleared()), - this, TQT_SLOT(clear())); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumsCleared()), + this, TQ_SLOT(clear())); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotDoubleClicked(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotDoubleClicked(TQListViewItem*, const TQPoint&, int))); - connect(this, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); } SearchFolderView::~SearchFolderView() diff --git a/digikam/digikam/searchfolderview.h b/digikam/digikam/searchfolderview.h index f100b8b..8dab4ca 100644 --- a/digikam/digikam/searchfolderview.h +++ b/digikam/digikam/searchfolderview.h @@ -37,7 +37,7 @@ class SearchFolderItem; class SearchFolderView : public FolderView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/searchquickdialog.cpp b/digikam/digikam/searchquickdialog.cpp index 67ca2a6..9cca5df 100644 --- a/digikam/digikam/searchquickdialog.cpp +++ b/digikam/digikam/searchquickdialog.cpp @@ -102,14 +102,14 @@ SearchQuickDialog::SearchQuickDialog(TQWidget* parent, KURL& url) grid->addMultiCellWidget(label2, 2, 2, 0, 1); grid->addMultiCellWidget(d->nameEdit, 2, 2, 2, 2); - connect(d->searchEdit, TQT_SIGNAL(signalTextChanged(const TQString&)), - this, TQT_SLOT(slotSearchChanged(const TQString&))); + connect(d->searchEdit, TQ_SIGNAL(signalTextChanged(const TQString&)), + this, TQ_SLOT(slotSearchChanged(const TQString&))); - connect(d->resultsView, TQT_SIGNAL(signalSearchResultsMatch(bool)), - d->searchEdit, TQT_SLOT(slotSearchResult(bool))); + connect(d->resultsView, TQ_SIGNAL(signalSearchResultsMatch(bool)), + d->searchEdit, TQ_SLOT(slotSearchResult(bool))); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotTimeOut())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTimeOut())); enableButtonOK(false); resize(configDialogSize("QuickSearch Dialog")); diff --git a/digikam/digikam/searchquickdialog.h b/digikam/digikam/searchquickdialog.h index 64f3d90..3412283 100644 --- a/digikam/digikam/searchquickdialog.h +++ b/digikam/digikam/searchquickdialog.h @@ -50,7 +50,7 @@ class SearchQuickDialogPriv; */ class SearchQuickDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/searchresultsview.cpp b/digikam/digikam/searchresultsview.cpp index c88f093..968b14a 100644 --- a/digikam/digikam/searchresultsview.cpp +++ b/digikam/digikam/searchresultsview.cpp @@ -110,11 +110,11 @@ void SearchResultsView::openURL(const KURL& url) d->listJob = new TDEIO::TransferJob(url, TDEIO::CMD_SPECIAL, ba, TQByteArray(), false); - connect(d->listJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotResult(TDEIO::Job*))); + connect(d->listJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotResult(TDEIO::Job*))); - connect(d->listJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(d->listJob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } void SearchResultsView::clear() @@ -179,11 +179,11 @@ void SearchResultsView::slotData(TDEIO::Job*, const TQByteArray &data) { d->thumbJob = new ThumbnailJob(ulist, 128, true, true); - connect(d->thumbJob, TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); + connect(d->thumbJob, TQ_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); - connect(d->thumbJob, TQT_SIGNAL(signalFailed(const KURL&)), - this, TQT_SLOT(slotFailedThumbnail(const KURL&))); + connect(d->thumbJob, TQ_SIGNAL(signalFailed(const KURL&)), + this, TQ_SLOT(slotFailedThumbnail(const KURL&))); } } diff --git a/digikam/digikam/searchresultsview.h b/digikam/digikam/searchresultsview.h index b8c48a7..a3846a2 100644 --- a/digikam/digikam/searchresultsview.h +++ b/digikam/digikam/searchresultsview.h @@ -51,7 +51,7 @@ class SearchResultsViewPriv; class SearchResultsView : public TQIconView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/searchwidgets.cpp b/digikam/digikam/searchwidgets.cpp index 6089d54..c930d80 100644 --- a/digikam/digikam/searchwidgets.cpp +++ b/digikam/digikam/searchwidgets.cpp @@ -142,8 +142,8 @@ SearchAdvancedRule::SearchAdvancedRule(TQWidget* parent, SearchAdvancedRule::Opt m_label->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); hline->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - connect( m_label, TQT_SIGNAL( signalDoubleClick( TQMouseEvent* ) ), - this, TQT_SLOT( slotLabelDoubleClick() )); + connect( m_label, TQ_SIGNAL( signalDoubleClick( TQMouseEvent* ) ), + this, TQ_SLOT( slotLabelDoubleClick() )); } m_hbox = new TQWidget( m_box ); @@ -176,14 +176,14 @@ SearchAdvancedRule::SearchAdvancedRule(TQWidget* parent, SearchAdvancedRule::Opt m_box->show(); - connect( m_key, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT(slotKeyChanged(int))); - connect( m_key, TQT_SIGNAL( activated(int) ), - this, TQT_SIGNAL( signalPropertyChanged() )); - connect( m_operator, TQT_SIGNAL( activated(int) ), - this, TQT_SIGNAL( signalPropertyChanged() )); - connect( m_check, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( signalBaseItemToggled() )); + connect( m_key, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT(slotKeyChanged(int))); + connect( m_key, TQ_SIGNAL( activated(int) ), + this, TQ_SIGNAL( signalPropertyChanged() )); + connect( m_operator, TQ_SIGNAL( activated(int) ), + this, TQ_SIGNAL( signalPropertyChanged() )); + connect( m_check, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( signalBaseItemToggled() )); } void SearchAdvancedRule::setValues(const KURL& url) @@ -217,7 +217,7 @@ void SearchAdvancedRule::setValues(const KURL& url) m_lineEdit->setText( value ); if (m_widgetType == DATE) - m_dateEdit->setDate( TQDate::fromString( value, Qt::ISODate) ); + m_dateEdit->setDate( TQDate::fromString( value, TQt::ISODate) ); if (m_widgetType == RATING) { @@ -314,8 +314,8 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp m_dateEdit->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); m_dateEdit->show(); - connect( m_dateEdit, TQT_SIGNAL( dateChanged(const TQDate& ) ), - this, TQT_SIGNAL(signalPropertyChanged())); + connect( m_dateEdit, TQ_SIGNAL( dateChanged(const TQDate& ) ), + this, TQ_SIGNAL(signalPropertyChanged())); } else if (newType == LINEEDIT) { @@ -323,8 +323,8 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp m_lineEdit->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); m_lineEdit->show(); - connect( m_lineEdit, TQT_SIGNAL ( textChanged(const TQString&) ), - this, TQT_SIGNAL(signalPropertyChanged())); + connect( m_lineEdit, TQ_SIGNAL ( textChanged(const TQString&) ), + this, TQ_SIGNAL(signalPropertyChanged())); } else if (newType == ALBUMS) @@ -364,8 +364,8 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp m_valueCombo->show(); - connect( m_valueCombo, TQT_SIGNAL( activated(int) ), - this, TQT_SIGNAL( signalPropertyChanged() )); + connect( m_valueCombo, TQ_SIGNAL( activated(int) ), + this, TQ_SIGNAL( signalPropertyChanged() )); } else if (newType == TAGS) { @@ -404,16 +404,16 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp m_valueCombo->show(); - connect( m_valueCombo, TQT_SIGNAL( activated(int) ), - this, TQT_SIGNAL( signalPropertyChanged() )); + connect( m_valueCombo, TQ_SIGNAL( activated(int) ), + this, TQ_SIGNAL( signalPropertyChanged() )); } else if (newType == RATING) { m_ratingWidget = new RatingWidget( m_valueBox ); m_ratingWidget->show(); - connect( m_ratingWidget, TQT_SIGNAL( signalRatingChanged(int) ), - this, TQT_SIGNAL( signalPropertyChanged() )); + connect( m_ratingWidget, TQ_SIGNAL( signalRatingChanged(int) ), + this, TQ_SIGNAL( signalPropertyChanged() )); } } @@ -448,7 +448,7 @@ TQString SearchAdvancedRule::urlValue() const string = m_lineEdit->text() ; else if (m_widgetType == DATE) - string = m_dateEdit->date().toString(Qt::ISODate) ; + string = m_dateEdit->date().toString(TQt::ISODate) ; else if (m_widgetType == TAGS || m_widgetType == ALBUMS) string = TQString::number(m_itemsIndexIDMap[ m_valueCombo->currentItem() ]); @@ -504,8 +504,8 @@ void SearchAdvancedRule::addCheck() m_hboxLayout->addWidget( m_check, 0, TQt::AlignRight ); m_check->show(); - connect( m_check, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( signalBaseItemToggled() )); + connect( m_check, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( signalBaseItemToggled() )); } void SearchAdvancedRule::removeCheck() @@ -524,8 +524,8 @@ SearchAdvancedGroup::SearchAdvancedGroup(TQWidget* parent) m_option = SearchAdvancedRule::NONE; m_box->show(); - connect( m_check, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( signalBaseItemToggled() )); + connect( m_check, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( signalBaseItemToggled() )); } SearchAdvancedGroup::~SearchAdvancedGroup() diff --git a/digikam/digikam/searchwidgets.h b/digikam/digikam/searchwidgets.h index dd95563..75ca51c 100644 --- a/digikam/digikam/searchwidgets.h +++ b/digikam/digikam/searchwidgets.h @@ -53,7 +53,7 @@ class SqueezedComboBox; */ class SearchRuleLabel: public TQLabel { - Q_OBJECT + TQ_OBJECT public: @@ -93,7 +93,7 @@ private: */ class SearchAdvancedBase : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -193,7 +193,7 @@ class SearchAdvancedGroup; */ class SearchAdvancedRule : public SearchAdvancedBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/digikam/digikam/syncjob.cpp b/digikam/digikam/syncjob.cpp index 44b6829..b350aab 100644 --- a/digikam/digikam/syncjob.cpp +++ b/digikam/digikam/syncjob.cpp @@ -105,8 +105,8 @@ bool SyncJob::delPriv(const KURL::List& urls) success_ = true; TDEIO::Job* job = TDEIO::del( urls ); - connect( job, TQT_SIGNAL(result( TDEIO::Job* )), - TQT_SLOT(slotResult( TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job* )), + TQ_SLOT(slotResult( TDEIO::Job*)) ); enter_loop(); return success_; @@ -123,8 +123,8 @@ bool SyncJob::trashPriv(const KURL::List& urls) } TDEIO::Job* job = TDEIO::move( urls, dest ); - connect( job, TQT_SIGNAL(result( TDEIO::Job* )), - TQT_SLOT(slotResult( TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job* )), + TQ_SLOT(slotResult( TDEIO::Job*)) ); enter_loop(); return success_; @@ -136,8 +136,8 @@ bool SyncJob::fileMovePriv(const KURL &src, const KURL &dest) TDEIO::FileCopyJob* job = TDEIO::file_move(src, dest, -1, true, false, false); - connect( job, TQT_SIGNAL(result( TDEIO::Job* )), - TQT_SLOT(slotResult( TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job* )), + TQ_SLOT(slotResult( TDEIO::Job*)) ); enter_loop(); return success_; @@ -146,7 +146,7 @@ bool SyncJob::fileMovePriv(const KURL &src, const KURL &dest) void SyncJob::enter_loop() { TQWidget dummy(0,0,WType_Dialog | WShowModal); - dummy.setFocusPolicy( TQ_NoFocus ); + dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); tqApp->enter_loop(); tqt_leave_modal(&dummy); @@ -186,11 +186,11 @@ TQPixmap SyncJob::getTagThumbnailPriv(TAlbum *album) } else { - connect(loader, TQT_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); + connect(loader, TQ_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); - connect(loader, TQT_SIGNAL(signalFailed(Album *)), - this, TQT_SLOT(slotLoadThumbnailFailed(Album *))); + connect(loader, TQ_SIGNAL(signalFailed(Album *)), + this, TQ_SLOT(slotLoadThumbnailFailed(Album *))); album_ = album; enter_loop(); @@ -230,13 +230,13 @@ TQPixmap SyncJob::getTagThumbnailPriv(const TQString &name, int size) false, AlbumSettings::instance()->getExifRotate()); connect(job, - TQT_SIGNAL(signalThumbnail(const KURL&, + TQ_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), - TQT_SLOT(slotGotThumbnailFromIcon(const KURL&, + TQ_SLOT(slotGotThumbnailFromIcon(const KURL&, const TQPixmap&))); connect(job, - TQT_SIGNAL(signalFailed(const KURL&)), - TQT_SLOT(slotLoadThumbnailFailed())); + TQ_SIGNAL(signalFailed(const KURL&)), + TQ_SLOT(slotLoadThumbnailFailed())); enter_loop(); job->kill(); diff --git a/digikam/digikam/syncjob.h b/digikam/digikam/syncjob.h index 0039d0a..fca8261 100644 --- a/digikam/digikam/syncjob.h +++ b/digikam/digikam/syncjob.h @@ -54,7 +54,7 @@ class TAlbum; class SyncJob : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/tageditdlg.cpp b/digikam/digikam/tageditdlg.cpp index 956fd2e..d77a016 100644 --- a/digikam/digikam/tageditdlg.cpp +++ b/digikam/digikam/tageditdlg.cpp @@ -179,14 +179,14 @@ TagEditDlg::TagEditDlg(TQWidget *parent, TAlbum* album, bool create) // -------------------------------------------------------- - connect(d->iconButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotIconChanged())); + connect(d->iconButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotIconChanged())); - connect(d->resetIconButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotIconResetClicked())); + connect(d->resetIconButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotIconResetClicked())); - connect(d->titleEdit->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotTitleChanged(const TQString&))); + connect(d->titleEdit->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotTitleChanged(const TQString&))); // -------------------------------------------------------- diff --git a/digikam/digikam/tageditdlg.h b/digikam/digikam/tageditdlg.h index d82f1c0..a1bfcfa 100644 --- a/digikam/digikam/tageditdlg.h +++ b/digikam/digikam/tageditdlg.h @@ -44,7 +44,7 @@ class TagEditDlgPriv; class TagEditDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/tagfilterview.cpp b/digikam/digikam/tagfilterview.cpp index fe658c0..2bebc2b 100644 --- a/digikam/digikam/tagfilterview.cpp +++ b/digikam/digikam/tagfilterview.cpp @@ -288,45 +288,45 @@ TagFilterView::TagFilterView(TQWidget* parent) // ------------------------------------------------------------------------ - connect(AlbumManager::instance(), TQT_SIGNAL(signalTAlbumsDirty(const TQMap<int, int>&)), - this, TQT_SLOT(slotRefresh(const TQMap<int, int>&))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalTAlbumsDirty(const TQMap<int, int>&)), + this, TQ_SLOT(slotRefresh(const TQMap<int, int>&))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumAdded(Album*)), - this, TQT_SLOT(slotTagAdded(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumAdded(Album*)), + this, TQ_SLOT(slotTagAdded(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotTagDeleted(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotTagDeleted(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumRenamed(Album*)), - this, TQT_SLOT(slotTagRenamed(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumRenamed(Album*)), + this, TQ_SLOT(slotTagRenamed(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumsCleared()), - this, TQT_SLOT(slotClear())); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumsCleared()), + this, TQ_SLOT(slotClear())); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumIconChanged(Album*)), - this, TQT_SLOT(slotAlbumIconChanged(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumIconChanged(Album*)), + this, TQ_SLOT(slotAlbumIconChanged(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalTAlbumMoved(TAlbum*, TAlbum*)), - this, TQT_SLOT(slotTagMoved(TAlbum*, TAlbum*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalTAlbumMoved(TAlbum*, TAlbum*)), + this, TQ_SLOT(slotTagMoved(TAlbum*, TAlbum*))); // ------------------------------------------------------------------------ AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); - connect(loader, TQT_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); + connect(loader, TQ_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); - connect(loader, TQT_SIGNAL(signalFailed(Album *)), - this, TQT_SLOT(slotThumbnailLost(Album *))); + connect(loader, TQ_SIGNAL(signalFailed(Album *)), + this, TQ_SLOT(slotThumbnailLost(Album *))); - connect(loader, TQT_SIGNAL(signalReloadThumbnails()), - this, TQT_SLOT(slotReloadThumbnails())); + connect(loader, TQ_SIGNAL(signalReloadThumbnails()), + this, TQ_SLOT(slotReloadThumbnails())); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotTimeOut())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTimeOut())); // ------------------------------------------------------------------------ @@ -873,8 +873,8 @@ void TagFilterView::slotContextMenu(TQListViewItem* it, const TQPoint&, int) d->ABCMenu = new TQPopupMenu; - connect(d->ABCMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotABCContextMenu() )); + connect(d->ABCMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotABCContextMenu() )); TDEPopupMenu popmenu(this); popmenu.insertTitle(SmallIcon("digikam"), i18n("Tag Filters")); @@ -1134,13 +1134,13 @@ void TagFilterView::tagNew(TagFilterViewItem* item, const TQString& _title, cons if (title.isNull()) { - if (!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), parent, title, icon)) + if (!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon)) return; } TQMap<TQString, TQString> errMap; AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap); - TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap); + TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap); for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it) { @@ -1165,7 +1165,7 @@ void TagFilterView::tagEdit(TagFilterViewItem* item) return; TQString title, icon; - if (!TagEditDlg::tagEdit(TQT_TQWIDGET(kapp->activeWindow()), tag, title, icon)) + if (!TagEditDlg::tagEdit(kapp->activeWindow(), tag, title, icon)) { return; } diff --git a/digikam/digikam/tagfilterview.h b/digikam/digikam/tagfilterview.h index e5395d1..0cd977e 100644 --- a/digikam/digikam/tagfilterview.h +++ b/digikam/digikam/tagfilterview.h @@ -39,7 +39,7 @@ class TagFilterViewPrivate; class TagFilterView : public FolderView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/tagfolderview.cpp b/digikam/digikam/tagfolderview.cpp index 13629b9..c5d5433 100644 --- a/digikam/digikam/tagfolderview.cpp +++ b/digikam/digikam/tagfolderview.cpp @@ -195,45 +195,45 @@ TagFolderView::TagFolderView(TQWidget *parent) // ------------------------------------------------------------------------ - connect(d->albumMan, TQT_SIGNAL(signalTAlbumsDirty(const TQMap<int, int>&)), - this, TQT_SLOT(slotRefresh(const TQMap<int, int>&))); + connect(d->albumMan, TQ_SIGNAL(signalTAlbumsDirty(const TQMap<int, int>&)), + this, TQ_SLOT(slotRefresh(const TQMap<int, int>&))); - connect(d->albumMan, TQT_SIGNAL(signalAlbumAdded(Album*)), - this, TQT_SLOT(slotAlbumAdded(Album*))); + connect(d->albumMan, TQ_SIGNAL(signalAlbumAdded(Album*)), + this, TQ_SLOT(slotAlbumAdded(Album*))); - connect(d->albumMan, TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotAlbumDeleted(Album*))); + connect(d->albumMan, TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotAlbumDeleted(Album*))); - connect(d->albumMan, TQT_SIGNAL(signalAlbumRenamed(Album*)), - this, TQT_SLOT(slotAlbumRenamed(Album*))); + connect(d->albumMan, TQ_SIGNAL(signalAlbumRenamed(Album*)), + this, TQ_SLOT(slotAlbumRenamed(Album*))); - connect(d->albumMan, TQT_SIGNAL(signalAlbumsCleared()), - this, TQT_SLOT(slotAlbumsCleared())); + connect(d->albumMan, TQ_SIGNAL(signalAlbumsCleared()), + this, TQ_SLOT(slotAlbumsCleared())); - connect(d->albumMan, TQT_SIGNAL(signalAlbumIconChanged(Album*)), - this, TQT_SLOT(slotAlbumIconChanged(Album*))); + connect(d->albumMan, TQ_SIGNAL(signalAlbumIconChanged(Album*)), + this, TQ_SLOT(slotAlbumIconChanged(Album*))); - connect(d->albumMan, TQT_SIGNAL(signalTAlbumMoved(TAlbum*, TAlbum*)), - this, TQT_SLOT(slotAlbumMoved(TAlbum*, TAlbum*))); + connect(d->albumMan, TQ_SIGNAL(signalTAlbumMoved(TAlbum*, TAlbum*)), + this, TQ_SLOT(slotAlbumMoved(TAlbum*, TAlbum*))); // ------------------------------------------------------------------------ AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); - connect(loader, TQT_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); + connect(loader, TQ_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); - connect(loader, TQT_SIGNAL(signalFailed(Album *)), - this, TQT_SLOT(slotThumbnailLost(Album *))); + connect(loader, TQ_SIGNAL(signalFailed(Album *)), + this, TQ_SLOT(slotThumbnailLost(Album *))); - connect(loader, TQT_SIGNAL(signalReloadThumbnails()), - this, TQT_SLOT(slotReloadThumbnails())); + connect(loader, TQ_SIGNAL(signalReloadThumbnails()), + this, TQ_SLOT(slotReloadThumbnails())); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); - connect(this, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); } TagFolderView::~TagFolderView() @@ -533,8 +533,8 @@ void TagFolderView::slotContextMenu(TQListViewItem *item, const TQPoint &, int) { d->ABCMenu = new TQPopupMenu; - connect( d->ABCMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotABCContextMenu() ) ); + connect( d->ABCMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotABCContextMenu() ) ); TagFolderViewItem *tag = dynamic_cast<TagFolderViewItem*>(item); @@ -635,13 +635,13 @@ void TagFolderView::tagNew( TagFolderViewItem *item, const TQString& _title, con if (title.isNull()) { - if(!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), parent, title, icon)) + if(!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon)) return; } TQMap<TQString, TQString> errMap; AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap); - TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap); + TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap); for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it) { @@ -667,7 +667,7 @@ void TagFolderView::tagEdit(TagFolderViewItem *item) return; TQString title, icon; - if(!TagEditDlg::tagEdit(TQT_TQWIDGET(kapp->activeWindow()), tag, title, icon)) + if(!TagEditDlg::tagEdit(kapp->activeWindow(), tag, title, icon)) return; if(tag->title() != title) diff --git a/digikam/digikam/tagfolderview.h b/digikam/digikam/tagfolderview.h index 483e1d9..27523e9 100644 --- a/digikam/digikam/tagfolderview.h +++ b/digikam/digikam/tagfolderview.h @@ -43,7 +43,7 @@ class TagFolderViewPriv; class TagFolderView : public FolderView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/tagspopupmenu.cpp b/digikam/digikam/tagspopupmenu.cpp index bb0e052..8b9e464 100644 --- a/digikam/digikam/tagspopupmenu.cpp +++ b/digikam/digikam/tagspopupmenu.cpp @@ -103,7 +103,7 @@ public: TQFont fn = m_popup->font(); TQFontMetrics fm(fn); TQRect r(x + 5 + fm.width(m_txt), y + (h/2-checkHeight/2), checkWidth, checkHeight); - kapp->style().tqdrawPrimitive(TQStyle::PE_CheckMark, p, r, cg, flags); + kapp->style().drawPrimitive(TQStyle::PE_CheckMark, p, r, cg, flags); } private: @@ -148,11 +148,11 @@ TagsPopupMenu::TagsPopupMenu(const TQValueList<TQ_LLONG>& selectedImageIDs, int TDEIcon::DefaultState, 0, true); - connect(this, TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotAboutToShow())); - connect(this, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotActivated(int))); + connect(this, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotActivated(int))); } TagsPopupMenu::~TagsPopupMenu() @@ -175,8 +175,8 @@ TQPopupMenu* TagsPopupMenu::buildSubMenu(int tagid) TQPopupMenu* popup = new TQPopupMenu(this); - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotActivated(int))); if (d->mode == ASSIGN) { @@ -290,7 +290,7 @@ void TagsPopupMenu::iterateAndBuildMenu(TQPopupMenu *menu, TAlbum *album) for (Album* a = album->firstChild(); a; a = a->next()) { - sortedTags.push_back(tqMakePair(a->title(), a)); + sortedTags.push_back(qMakePair(a->title(), a)); } qHeapSort(sortedTags); @@ -346,12 +346,12 @@ void TagsPopupMenu::slotActivated(int id) } TQString title, icon; - if (!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), parent, title, icon)) + if (!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon)) return; TQMap<TQString, TQString> errMap; AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap); - TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap); + TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap); for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it) emit signalTagActivated((*it)->id()); diff --git a/digikam/digikam/tagspopupmenu.h b/digikam/digikam/tagspopupmenu.h index 942192b..5e74641 100644 --- a/digikam/digikam/tagspopupmenu.h +++ b/digikam/digikam/tagspopupmenu.h @@ -38,7 +38,7 @@ class TagsPopupMenuPriv; class TagsPopupMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/timelinefolderview.cpp b/digikam/digikam/timelinefolderview.cpp index 97225f7..0168b8c 100644 --- a/digikam/digikam/timelinefolderview.cpp +++ b/digikam/digikam/timelinefolderview.cpp @@ -97,23 +97,23 @@ TimeLineFolderView::TimeLineFolderView(TQWidget* parent) setResizeMode(TQListView::LastColumn); setRootIsDecorated(false); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumAdded(Album*)), - this, TQT_SLOT(slotAlbumAdded(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumAdded(Album*)), + this, TQ_SLOT(slotAlbumAdded(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotAlbumDeleted(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotAlbumDeleted(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumsCleared()), - this, TQT_SLOT(clear())); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumsCleared()), + this, TQ_SLOT(clear())); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumRenamed(Album*)), - this, TQT_SLOT(slotAlbumRenamed(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumRenamed(Album*)), + this, TQ_SLOT(slotAlbumRenamed(Album*))); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); - connect(this, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); } TimeLineFolderView::~TimeLineFolderView() diff --git a/digikam/digikam/timelinefolderview.h b/digikam/digikam/timelinefolderview.h index e2e02c0..2e8a8a8 100644 --- a/digikam/digikam/timelinefolderview.h +++ b/digikam/digikam/timelinefolderview.h @@ -37,7 +37,7 @@ class TimeLineFolderItem; class TimeLineFolderView : public FolderView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/timelineview.cpp b/digikam/digikam/timelineview.cpp index 1951d43..ae8a6bc 100644 --- a/digikam/digikam/timelineview.cpp +++ b/digikam/digikam/timelineview.cpp @@ -138,7 +138,7 @@ TimeLineView::TimeLineView(TQWidget *parent) d->timeUnitCB->insertItem(i18n("Month"), TimeLineWidget::Month); d->timeUnitCB->insertItem(i18n("Year"), TimeLineWidget::Year); d->timeUnitCB->setCurrentItem((int)TimeLineWidget::Month); - d->timeUnitCB->setFocusPolicy(TQ_NoFocus); + d->timeUnitCB->setFocusPolicy(TQWidget::NoFocus); TQWhatsThis::add(d->timeUnitCB, i18n("<p>Select the histogram time unit here.<p>" "You can change the graph decade to zoom in or zoom out over time.")); @@ -179,7 +179,7 @@ TimeLineView::TimeLineView(TQWidget *parent) d->timeLineWidget = new TimeLineWidget(panel); d->scrollBar = new TQScrollBar(panel); - d->scrollBar->setOrientation(Qt::Horizontal); + d->scrollBar->setOrientation(TQt::Horizontal); d->scrollBar->setMinValue(0); d->scrollBar->setLineStep(1); @@ -239,56 +239,56 @@ TimeLineView::TimeLineView(TQWidget *parent) // --------------------------------------------------------------- - connect(AlbumManager::instance(), TQT_SIGNAL(signalDatesMapDirty(const TQMap<TQDateTime, int>&)), - d->timeLineWidget, TQT_SLOT(slotDatesMap(const TQMap<TQDateTime, int>&))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalDatesMapDirty(const TQMap<TQDateTime, int>&)), + d->timeLineWidget, TQ_SLOT(slotDatesMap(const TQMap<TQDateTime, int>&))); - connect(d->timeLineFolderView, TQT_SIGNAL(signalAlbumSelected(SAlbum*)), - this, TQT_SLOT(slotAlbumSelected(SAlbum*))); + connect(d->timeLineFolderView, TQ_SIGNAL(signalAlbumSelected(SAlbum*)), + this, TQ_SLOT(slotAlbumSelected(SAlbum*))); - connect(d->timeLineFolderView, TQT_SIGNAL(signalRenameAlbum(SAlbum*)), - this, TQT_SLOT(slotRenameAlbum(SAlbum*))); + connect(d->timeLineFolderView, TQ_SIGNAL(signalRenameAlbum(SAlbum*)), + this, TQ_SLOT(slotRenameAlbum(SAlbum*))); - connect(d->timeLineFolderView, TQT_SIGNAL(signalTextSearchFilterMatch(bool)), - d->searchDateBar, TQT_SLOT(slotSearchResult(bool))); + connect(d->timeLineFolderView, TQ_SIGNAL(signalTextSearchFilterMatch(bool)), + d->searchDateBar, TQ_SLOT(slotSearchResult(bool))); - connect(d->searchDateBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - d->timeLineFolderView, TQT_SLOT(slotTextSearchFilterChanged(const TQString&))); + connect(d->searchDateBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + d->timeLineFolderView, TQ_SLOT(slotTextSearchFilterChanged(const TQString&))); - connect(d->timeUnitCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotTimeUnitChanged(int))); + connect(d->timeUnitCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotTimeUnitChanged(int))); - connect(d->scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(d->scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(d->timeLineWidget, TQT_SIGNAL(signalDateMapChanged()), - this, TQT_SLOT(slotInit())); + connect(d->timeLineWidget, TQ_SIGNAL(signalDateMapChanged()), + this, TQ_SLOT(slotInit())); - connect(d->timeLineWidget, TQT_SIGNAL(signalCursorPositionChanged()), - this, TQT_SLOT(slotCursorPositionChanged())); + connect(d->timeLineWidget, TQ_SIGNAL(signalCursorPositionChanged()), + this, TQ_SLOT(slotCursorPositionChanged())); - connect(d->timeLineWidget, TQT_SIGNAL(signalSelectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(d->timeLineWidget, TQ_SIGNAL(signalSelectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); - connect(d->timeLineWidget, TQT_SIGNAL(signalRefDateTimeChanged()), - this, TQT_SLOT(slotRefDateTimeChanged())); + connect(d->timeLineWidget, TQ_SIGNAL(signalRefDateTimeChanged()), + this, TQ_SLOT(slotRefDateTimeChanged())); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotUpdateCurrentDateSearchAlbum())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotUpdateCurrentDateSearchAlbum())); - connect(d->resetButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotResetSelection())); + connect(d->resetButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotResetSelection())); - connect(d->saveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSaveSelection())); + connect(d->saveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSaveSelection())); - connect(d->scrollBar, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotScrollBarValueChanged(int))); + connect(d->scrollBar, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotScrollBarValueChanged(int))); - connect(d->nameEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotCheckAboutSelection())); + connect(d->nameEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotCheckAboutSelection())); - connect(d->nameEdit, TQT_SIGNAL(returnPressed(const TQString&)), - d->saveButton, TQT_SLOT(animateClick())); + connect(d->nameEdit, TQ_SIGNAL(returnPressed(const TQString&)), + d->saveButton, TQ_SLOT(animateClick())); } TimeLineView::~TimeLineView() @@ -316,11 +316,11 @@ void TimeLineView::slotInit() readConfig(); - disconnect(d->timeLineWidget, TQT_SIGNAL(signalDateMapChanged()), - this, TQT_SLOT(slotInit())); + disconnect(d->timeLineWidget, TQ_SIGNAL(signalDateMapChanged()), + this, TQ_SLOT(slotInit())); - connect(d->timeLineWidget, TQT_SIGNAL(signalDateMapChanged()), - this, TQT_SLOT(slotCursorPositionChanged())); + connect(d->timeLineWidget, TQ_SIGNAL(signalDateMapChanged()), + this, TQ_SLOT(slotCursorPositionChanged())); } void TimeLineView::readConfig() @@ -469,10 +469,10 @@ void TimeLineView::createNewDateSearchAlbum(const TQString& name) end = (*it).second; url.addQueryItem(TQString("%1.key").arg(i*2+1), TQString("imagedate")); url.addQueryItem(TQString("%1.op").arg(i*2+1), TQString("GT")); - url.addQueryItem(TQString("%1.val").arg(i*2+1), start.date().toString(Qt::ISODate)); + url.addQueryItem(TQString("%1.val").arg(i*2+1), start.date().toString(TQt::ISODate)); url.addQueryItem(TQString("%1.key").arg(i*2+2), TQString("imagedate")); url.addQueryItem(TQString("%1.op").arg(i*2+2), TQString("LT")); - url.addQueryItem(TQString("%1.val").arg(i*2+2), end.date().toString(Qt::ISODate)); + url.addQueryItem(TQString("%1.val").arg(i*2+2), end.date().toString(TQt::ISODate)); i++; } @@ -529,14 +529,14 @@ void TimeLineView::slotAlbumSelected(SAlbum* salbum) key = TQString("%1.val").arg(TQString::number(i)); it2 = queries.find(key); if (it2 != queries.end()) - start = TQDateTime(TQDate::fromString(it2.data(), Qt::ISODate)); + start = TQDateTime(TQDate::fromString(it2.data(), TQt::ISODate)); //DDebug() << key << " :: " << it2.data() << endl; key = TQString("%1.val").arg(TQString::number(i+1)); it2 = queries.find(key); if (it2 != queries.end()) - end = TQDateTime(TQDate::fromString(it2.data(), Qt::ISODate)); + end = TQDateTime(TQDate::fromString(it2.data(), TQt::ISODate)); //DDebug() << key << " :: " << it2.data() << endl; @@ -546,8 +546,8 @@ void TimeLineView::slotAlbumSelected(SAlbum* salbum) /* DateRangeList::iterator it3; for (it3 = list.begin() ; it3 != list.end(); ++it3) - DDebug() << (*it3).first.date().toString(Qt::ISODate) << " :: " - << (*it3).second.date().toString(Qt::ISODate) << endl; + DDebug() << (*it3).first.date().toString(TQt::ISODate) << " :: " + << (*it3).second.date().toString(TQt::ISODate) << endl; */ d->timeLineWidget->setSelectedDateRange(list); diff --git a/digikam/digikam/timelineview.h b/digikam/digikam/timelineview.h index 014bc2a..fd67366 100644 --- a/digikam/digikam/timelineview.h +++ b/digikam/digikam/timelineview.h @@ -40,7 +40,7 @@ class TimeLineViewPriv; class TimeLineView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/timelinewidget.cpp b/digikam/digikam/timelinewidget.cpp index 46aff0e..b9033e4 100644 --- a/digikam/digikam/timelinewidget.cpp +++ b/digikam/digikam/timelinewidget.cpp @@ -124,8 +124,8 @@ TimeLineWidget::TimeLineWidget(TQWidget *parent) setCursorDateTime(ref); setRefDateTime(ref); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); } TimeLineWidget::~TimeLineWidget() @@ -421,8 +421,8 @@ DateRangeList TimeLineWidget::selectedDateRange(int& totalCount) /* for (it = list.begin() ; it != list.end(); ++it) - DDebug() << (*it).first.date().toString(Qt::ISODate) << " :: " - << (*it).second.date().toString(Qt::ISODate) << endl; + DDebug() << (*it).first.date().toString(TQt::ISODate) << " :: " + << (*it).second.date().toString(TQt::ISODate) << endl; DDebug() << "Total Count of Items = " << totalCount << endl; */ @@ -461,8 +461,8 @@ DateRangeList TimeLineWidget::selectedDateRange(int& totalCount) /* for (it = list2.begin() ; it != list2.end(); ++it) - DDebug() << (*it).first.date().toString(Qt::ISODate) << " :: " - << (*it).second.date().toString(Qt::ISODate) << endl; + DDebug() << (*it).first.date().toString(TQt::ISODate) << " :: " + << (*it).second.date().toString(TQt::ISODate) << endl; */ return list2; @@ -1492,7 +1492,7 @@ void TimeLineWidget::wheelEvent(TQWheelEvent* e) void TimeLineWidget::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { TQPoint pt(e->x(), e->y()); diff --git a/digikam/digikam/timelinewidget.h b/digikam/digikam/timelinewidget.h index bc865ae..33aeb7e 100644 --- a/digikam/digikam/timelinewidget.h +++ b/digikam/digikam/timelinewidget.h @@ -44,7 +44,7 @@ class TimeLineWidgetPriv; class TimeLineWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/digikam/welcomepageview.cpp b/digikam/digikam/welcomepageview.cpp index eef7e74..6327c94 100644 --- a/digikam/digikam/welcomepageview.cpp +++ b/digikam/digikam/welcomepageview.cpp @@ -50,7 +50,7 @@ namespace Digikam WelcomePageView::WelcomePageView(TQWidget* parent) : TDEHTMLPart(parent) { - widget()->setFocusPolicy(TQ_WheelFocus); + widget()->setFocusPolicy(TQWidget::WheelFocus); // Let's better be paranoid and disable plugins (it defaults to enabled): setPluginsEnabled(false); setJScriptEnabled(false); // just make this explicit. @@ -83,8 +83,8 @@ WelcomePageView::WelcomePageView(TQWidget* parent) end(); show(); - connect(browserExtension(), TQT_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)), - this, TQT_SLOT(slotUrlOpen(const KURL &))); + connect(browserExtension(), TQ_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)), + this, TQ_SLOT(slotUrlOpen(const KURL &))); } WelcomePageView::~WelcomePageView() diff --git a/digikam/digikam/welcomepageview.h b/digikam/digikam/welcomepageview.h index 2aca456..b69d82a 100644 --- a/digikam/digikam/welcomepageview.h +++ b/digikam/digikam/welcomepageview.h @@ -42,7 +42,7 @@ namespace Digikam class DIGIKAM_EXPORT WelcomePageView : public TDEHTMLPart { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/adjustcurves/adjustcurves.cpp b/digikam/imageplugins/adjustcurves/adjustcurves.cpp index 28af631..ace9c9b 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurves.cpp +++ b/digikam/imageplugins/adjustcurves/adjustcurves.cpp @@ -303,38 +303,38 @@ AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent) // ------------------------------------------------------------- - connect(m_curvesWidget, TQT_SIGNAL(signalCurvesChanged()), - this, TQT_SLOT(slotTimer())); + connect(m_curvesWidget, TQ_SIGNAL(signalCurvesChanged()), + this, TQ_SLOT(slotTimer())); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotSpotColorChanged( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotSpotColorChanged( const Digikam::DColor & ))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); // ------------------------------------------------------------- // ComboBox slots. - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_curveType, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(slotCurveTypeChanged(int))); + connect(m_curveType, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(slotCurveTypeChanged(int))); // ------------------------------------------------------------- // Bouttons slots. - connect(m_resetButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotResetCurrentChannel())); + connect(m_resetButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotResetCurrentChannel())); - connect(m_pickerColorButtonGroup, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotPickerColorButtonActived())); + connect(m_pickerColorButtonGroup, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotPickerColorButtonActived())); } AdjustCurveDialog::~AdjustCurveDialog() diff --git a/digikam/imageplugins/adjustcurves/adjustcurves.h b/digikam/imageplugins/adjustcurves/adjustcurves.h index 56e8474..f4cad2f 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurves.h +++ b/digikam/imageplugins/adjustcurves/adjustcurves.h @@ -49,7 +49,7 @@ namespace DigikamAdjustCurvesImagesPlugin class AdjustCurveDialog : public Digikam::ImageDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp index 2c7862c..7bfd00f 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp +++ b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp @@ -292,38 +292,38 @@ AdjustCurvesTool::AdjustCurvesTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_curvesWidget, TQT_SIGNAL(signalCurvesChanged()), - this, TQT_SLOT(slotTimer())); + connect(m_curvesWidget, TQ_SIGNAL(signalCurvesChanged()), + this, TQ_SLOT(slotTimer())); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const TQPoint&)), - this, TQT_SLOT(slotSpotColorChanged(const Digikam::DColor&))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const TQPoint&)), + this, TQ_SLOT(slotSpotColorChanged(const Digikam::DColor&))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const TQPoint&)), - this, TQT_SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const TQPoint&)), + this, TQ_SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); // ------------------------------------------------------------- // ComboBox slots. - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_curveType, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(slotCurveTypeChanged(int))); + connect(m_curveType, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(slotCurveTypeChanged(int))); // ------------------------------------------------------------- // Buttons slots. - connect(m_resetButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotResetCurrentChannel())); + connect(m_resetButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotResetCurrentChannel())); - connect(m_pickerColorButtonGroup, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotPickerColorButtonActived())); + connect(m_pickerColorButtonGroup, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotPickerColorButtonActived())); } AdjustCurvesTool::~AdjustCurvesTool() diff --git a/digikam/imageplugins/adjustcurves/adjustcurvestool.h b/digikam/imageplugins/adjustcurves/adjustcurvestool.h index cb035f2..4a38053 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurvestool.h +++ b/digikam/imageplugins/adjustcurves/adjustcurvestool.h @@ -50,7 +50,7 @@ namespace DigikamAdjustCurvesImagesPlugin class AdjustCurvesTool : public Digikam::EditorTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp index affae05..11b6e53 100644 --- a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp +++ b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp @@ -46,7 +46,7 @@ ImagePlugin_AdjustCurves::ImagePlugin_AdjustCurves(TQObject *parent, const char* { m_curvesAction = new TDEAction(i18n("Curves Adjust..."), "adjustcurves", CTRL+SHIFT+Key_M, // NOTE: Photoshop 7 use CTRL+M (but it's used in KDE to toogle menu bar). - this, TQT_SLOT(slotCurvesAdjust()), + this, TQ_SLOT(slotCurvesAdjust()), actionCollection(), "imageplugin_adjustcurves"); setXMLFile("digikamimageplugin_adjustcurves_ui.rc"); diff --git a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.h b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.h index c726ec3..f8e4357 100644 --- a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.h +++ b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.h @@ -33,7 +33,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_AdjustCurves : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.cpp b/digikam/imageplugins/adjustlevels/adjustlevels.cpp index 5bc4a1a..72d5e46 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevels.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevels.cpp @@ -342,62 +342,62 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent) // ------------------------------------------------------------- // Channels and scale selection slots. - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotSpotColorChanged( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotSpotColorChanged( const Digikam::DColor & ))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); // ------------------------------------------------------------- // Color sliders and spinbox slots. - connect(m_hGradientMinInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotAdjustMinInputSpinBox(int))); + connect(m_hGradientMinInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotAdjustMinInputSpinBox(int))); - connect(m_minInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotAdjustSliders())); + connect(m_minInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotAdjustSliders())); - connect(m_gammaInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotGammaInputchanged(double))); + connect(m_gammaInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotGammaInputchanged(double))); - connect(m_hGradientMaxInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotAdjustMaxInputSpinBox(int))); + connect(m_hGradientMaxInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotAdjustMaxInputSpinBox(int))); - connect(m_maxInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotAdjustSliders())); + connect(m_maxInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotAdjustSliders())); - connect(m_hGradientMinOutput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotAdjustMinOutputSpinBox(int))); + connect(m_hGradientMinOutput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotAdjustMinOutputSpinBox(int))); - connect(m_minOutput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotAdjustSliders())); + connect(m_minOutput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotAdjustSliders())); - connect(m_hGradientMaxOutput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotAdjustMaxOutputSpinBox(int))); + connect(m_hGradientMaxOutput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotAdjustMaxOutputSpinBox(int))); - connect(m_maxOutput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotAdjustSliders())); + connect(m_maxOutput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotAdjustSliders())); // ------------------------------------------------------------- // Bouttons slots. - connect(m_autoButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAutoLevels())); + connect(m_autoButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAutoLevels())); - connect(m_resetButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotResetCurrentChannel())); + connect(m_resetButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotResetCurrentChannel())); - connect(m_pickerColorButtonGroup, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotPickerColorButtonActived())); + connect(m_pickerColorButtonGroup, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotPickerColorButtonActived())); } @@ -813,15 +813,15 @@ bool AdjustLevelDialog::eventFilter(TQObject *obj, TQEvent *ev) { if ( ev->type() == TQEvent::MouseButtonPress) { - connect(m_minInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotShowHistogramGuide(int))); + connect(m_minInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotShowHistogramGuide(int))); return false; } if ( ev->type() == TQEvent::MouseButtonRelease) { - disconnect(m_minInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotShowHistogramGuide(int))); + disconnect(m_minInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotShowHistogramGuide(int))); m_levelsHistogramWidget->reset(); return false; @@ -835,15 +835,15 @@ bool AdjustLevelDialog::eventFilter(TQObject *obj, TQEvent *ev) { if ( ev->type() == TQEvent::MouseButtonPress) { - connect(m_maxInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotShowHistogramGuide(int))); + connect(m_maxInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotShowHistogramGuide(int))); return false; } if ( ev->type() == TQEvent::MouseButtonRelease) { - disconnect(m_maxInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotShowHistogramGuide(int))); + disconnect(m_maxInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotShowHistogramGuide(int))); m_levelsHistogramWidget->reset(); return false; @@ -857,15 +857,15 @@ bool AdjustLevelDialog::eventFilter(TQObject *obj, TQEvent *ev) { if ( ev->type() == TQEvent::MouseButtonPress) { - connect(m_minOutput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotShowHistogramGuide(int))); + connect(m_minOutput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotShowHistogramGuide(int))); return false; } if ( ev->type() == TQEvent::MouseButtonRelease) { - disconnect(m_minOutput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotShowHistogramGuide(int))); + disconnect(m_minOutput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotShowHistogramGuide(int))); m_levelsHistogramWidget->reset(); return false; @@ -879,15 +879,15 @@ bool AdjustLevelDialog::eventFilter(TQObject *obj, TQEvent *ev) { if ( ev->type() == TQEvent::MouseButtonPress) { - connect(m_maxOutput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotShowHistogramGuide(int))); + connect(m_maxOutput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotShowHistogramGuide(int))); return false; } if ( ev->type() == TQEvent::MouseButtonRelease) { - disconnect(m_maxOutput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotShowHistogramGuide(int))); + disconnect(m_maxOutput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotShowHistogramGuide(int))); m_levelsHistogramWidget->reset(); return false; diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.h b/digikam/imageplugins/adjustlevels/adjustlevels.h index c6bac9d..1b1ad9b 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevels.h +++ b/digikam/imageplugins/adjustlevels/adjustlevels.h @@ -50,7 +50,7 @@ namespace DigikamAdjustLevelsImagesPlugin class AdjustLevelDialog : public Digikam::ImageDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp index 186c873..2806677 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp @@ -332,62 +332,62 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent) // ------------------------------------------------------------- // Channels and scale selection slots. - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const TQPoint&)), - this, TQT_SLOT(slotSpotColorChanged(const Digikam::DColor&))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const TQPoint&)), + this, TQ_SLOT(slotSpotColorChanged(const Digikam::DColor&))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const TQPoint&)), - this, TQT_SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const TQPoint&)), + this, TQ_SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); // ------------------------------------------------------------- // Color sliders and spinbox slots. - connect(m_hGradientMinInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotAdjustMinInputSpinBox(int))); + connect(m_hGradientMinInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotAdjustMinInputSpinBox(int))); - connect(m_minInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotAdjustSliders())); + connect(m_minInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotAdjustSliders())); - connect(m_gammaInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotGammaInputchanged(double))); + connect(m_gammaInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotGammaInputchanged(double))); - connect(m_hGradientMaxInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotAdjustMaxInputSpinBox(int))); + connect(m_hGradientMaxInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotAdjustMaxInputSpinBox(int))); - connect(m_maxInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotAdjustSliders())); + connect(m_maxInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotAdjustSliders())); - connect(m_hGradientMinOutput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotAdjustMinOutputSpinBox(int))); + connect(m_hGradientMinOutput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotAdjustMinOutputSpinBox(int))); - connect(m_minOutput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotAdjustSliders())); + connect(m_minOutput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotAdjustSliders())); - connect(m_hGradientMaxOutput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotAdjustMaxOutputSpinBox(int))); + connect(m_hGradientMaxOutput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotAdjustMaxOutputSpinBox(int))); - connect(m_maxOutput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotAdjustSliders())); + connect(m_maxOutput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotAdjustSliders())); // ------------------------------------------------------------- // Bouttons slots. - connect(m_autoButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAutoLevels())); + connect(m_autoButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAutoLevels())); - connect(m_resetButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotResetCurrentChannel())); + connect(m_resetButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotResetCurrentChannel())); - connect(m_pickerColorButtonGroup, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotPickerColorButtonActived())); + connect(m_pickerColorButtonGroup, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotPickerColorButtonActived())); } AdjustLevelsTool::~AdjustLevelsTool() @@ -795,15 +795,15 @@ bool AdjustLevelsTool::eventFilter(TQObject *obj, TQEvent *ev) { if ( ev->type() == TQEvent::MouseButtonPress) { - connect(m_minInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotShowInputHistogramGuide(int))); + connect(m_minInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotShowInputHistogramGuide(int))); return false; } if ( ev->type() == TQEvent::MouseButtonRelease) { - disconnect(m_minInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotShowInputHistogramGuide(int))); + disconnect(m_minInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotShowInputHistogramGuide(int))); m_levelsHistogramWidget->reset(); return false; @@ -817,15 +817,15 @@ bool AdjustLevelsTool::eventFilter(TQObject *obj, TQEvent *ev) { if ( ev->type() == TQEvent::MouseButtonPress) { - connect(m_maxInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotShowInputHistogramGuide(int))); + connect(m_maxInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotShowInputHistogramGuide(int))); return false; } if ( ev->type() == TQEvent::MouseButtonRelease) { - disconnect(m_maxInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotShowInputHistogramGuide(int))); + disconnect(m_maxInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotShowInputHistogramGuide(int))); m_levelsHistogramWidget->reset(); return false; @@ -839,15 +839,15 @@ bool AdjustLevelsTool::eventFilter(TQObject *obj, TQEvent *ev) { if ( ev->type() == TQEvent::MouseButtonPress) { - connect(m_minOutput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotShowOutputHistogramGuide(int))); + connect(m_minOutput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotShowOutputHistogramGuide(int))); return false; } if ( ev->type() == TQEvent::MouseButtonRelease) { - disconnect(m_minOutput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotShowOutputHistogramGuide(int))); + disconnect(m_minOutput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotShowOutputHistogramGuide(int))); m_histogramWidget->reset(); return false; @@ -861,15 +861,15 @@ bool AdjustLevelsTool::eventFilter(TQObject *obj, TQEvent *ev) { if ( ev->type() == TQEvent::MouseButtonPress) { - connect(m_maxOutput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotShowOutputHistogramGuide(int))); + connect(m_maxOutput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotShowOutputHistogramGuide(int))); return false; } if ( ev->type() == TQEvent::MouseButtonRelease) { - disconnect(m_maxOutput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotShowOutputHistogramGuide(int))); + disconnect(m_maxOutput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotShowOutputHistogramGuide(int))); m_histogramWidget->reset(); return false; diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.h b/digikam/imageplugins/adjustlevels/adjustlevelstool.h index 304ea5d..9fdadf9 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevelstool.h +++ b/digikam/imageplugins/adjustlevels/adjustlevelstool.h @@ -54,7 +54,7 @@ namespace DigikamAdjustLevelsImagesPlugin class AdjustLevelsTool : public Digikam::EditorTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp index 242c95a..0f9dcb9 100644 --- a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp +++ b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp @@ -47,7 +47,7 @@ ImagePlugin_AdjustLevels::ImagePlugin_AdjustLevels(TQObject *parent, const char* { m_levelsAction = new TDEAction(i18n("Levels Adjust..."), "adjustlevels", CTRL+Key_L, // NOTE: Photoshop 7 use CTRL+L. - this, TQT_SLOT(slotLevelsAdjust()), + this, TQ_SLOT(slotLevelsAdjust()), actionCollection(), "imageplugin_adjustlevels"); setXMLFile("digikamimageplugin_adjustlevels_ui.rc"); diff --git a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.h b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.h index 62df077..16af4f3 100644 --- a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.h +++ b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.h @@ -33,7 +33,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_AdjustLevels : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/antivignetting/antivignettingtool.cpp b/digikam/imageplugins/antivignetting/antivignettingtool.cpp index f1a163a..d8f211c 100644 --- a/digikam/imageplugins/antivignetting/antivignettingtool.cpp +++ b/digikam/imageplugins/antivignetting/antivignettingtool.cpp @@ -177,23 +177,23 @@ AntiVignettingTool::AntiVignettingTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_densityInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotTimer())); + connect(m_densityInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotTimer())); - connect(m_powerInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotTimer())); + connect(m_powerInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotTimer())); - connect(m_radiusInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotTimer())); + connect(m_radiusInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotTimer())); - connect(m_brightnessInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_brightnessInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_contrastInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_contrastInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_gammaInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotTimer())); + connect(m_gammaInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotTimer())); } AntiVignettingTool::~AntiVignettingTool() diff --git a/digikam/imageplugins/antivignetting/antivignettingtool.h b/digikam/imageplugins/antivignetting/antivignettingtool.h index eab2068..467a19d 100644 --- a/digikam/imageplugins/antivignetting/antivignettingtool.h +++ b/digikam/imageplugins/antivignetting/antivignettingtool.h @@ -48,7 +48,7 @@ namespace DigikamAntiVignettingImagesPlugin class AntiVignettingTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp index 441ee20..7d7a00c 100644 --- a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp +++ b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp @@ -176,23 +176,23 @@ ImageEffect_AntiVignetting::ImageEffect_AntiVignetting(TQWidget* parent) // ------------------------------------------------------------- - connect(m_densityInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_densityInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_powerInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_powerInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_radiusInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_radiusInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_brightnessInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotTimer())); + connect(m_brightnessInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotTimer())); - connect(m_contrastInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotTimer())); + connect(m_contrastInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotTimer())); - connect(m_gammaInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_gammaInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); } ImageEffect_AntiVignetting::~ImageEffect_AntiVignetting() diff --git a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.h b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.h index a6061f3..3ee6f15 100644 --- a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.h +++ b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.h @@ -39,7 +39,7 @@ namespace DigikamAntiVignettingImagesPlugin class ImageEffect_AntiVignetting : public Digikam::ImageGuideDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp index 9f02f88..239d984 100644 --- a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp +++ b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp @@ -46,7 +46,7 @@ ImagePlugin_AntiVignetting::ImagePlugin_AntiVignetting(TQObject *parent, const c : Digikam::ImagePlugin(parent, "ImagePlugin_AntiVignetting") { m_antivignettingAction = new TDEAction(i18n("Vignetting Correction..."), "antivignetting", 0, - this, TQT_SLOT(slotAntiVignetting()), + this, TQ_SLOT(slotAntiVignetting()), actionCollection(), "imageplugin_antivignetting"); setXMLFile("digikamimageplugin_antivignetting_ui.rc"); diff --git a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.h b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.h index f3b475c..d8d4eed 100644 --- a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.h +++ b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.h @@ -34,7 +34,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_AntiVignetting : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/blurfx/blurfxtool.cpp b/digikam/imageplugins/blurfx/blurfxtool.cpp index 01627a6..2998dbd 100644 --- a/digikam/imageplugins/blurfx/blurfxtool.cpp +++ b/digikam/imageplugins/blurfx/blurfxtool.cpp @@ -148,14 +148,14 @@ BlurFXTool::BlurFXTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_effectType, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotEffectTypeChanged(int))); + connect(m_effectType, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotEffectTypeChanged(int))); - connect(m_distanceInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_distanceInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_levelInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_levelInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); } BlurFXTool::~BlurFXTool() diff --git a/digikam/imageplugins/blurfx/blurfxtool.h b/digikam/imageplugins/blurfx/blurfxtool.h index 2fb51df..9726e65 100644 --- a/digikam/imageplugins/blurfx/blurfxtool.h +++ b/digikam/imageplugins/blurfx/blurfxtool.h @@ -48,7 +48,7 @@ namespace DigikamBlurFXImagesPlugin class BlurFXTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp b/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp index e604ae2..62bcd52 100644 --- a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp +++ b/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp @@ -146,14 +146,14 @@ ImageEffect_BlurFX::ImageEffect_BlurFX(TQWidget* parent) // ------------------------------------------------------------- - connect(m_effectType, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotEffectTypeChanged(int))); + connect(m_effectType, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotEffectTypeChanged(int))); - connect(m_distanceInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_distanceInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_levelInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_levelInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); } ImageEffect_BlurFX::~ImageEffect_BlurFX() diff --git a/digikam/imageplugins/blurfx/imageeffect_blurfx.h b/digikam/imageplugins/blurfx/imageeffect_blurfx.h index 4e323d7..e2517d4 100644 --- a/digikam/imageplugins/blurfx/imageeffect_blurfx.h +++ b/digikam/imageplugins/blurfx/imageeffect_blurfx.h @@ -39,7 +39,7 @@ namespace DigikamBlurFXImagesPlugin class ImageEffect_BlurFX : public Digikam::CtrlPanelDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp b/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp index b4786ec..3bbd05e 100644 --- a/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp +++ b/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp @@ -46,7 +46,7 @@ ImagePlugin_BlurFX::ImagePlugin_BlurFX(TQObject *parent, const char*, const TQSt : Digikam::ImagePlugin(parent, "ImagePlugin_BlurFX") { m_blurfxAction = new TDEAction(i18n("Blur Effects..."), "blurfx", 0, - this, TQT_SLOT(slotBlurFX()), + this, TQ_SLOT(slotBlurFX()), actionCollection(), "imageplugin_blurfx"); setXMLFile( "digikamimageplugin_blurfx_ui.rc" ); diff --git a/digikam/imageplugins/blurfx/imageplugin_blurfx.h b/digikam/imageplugins/blurfx/imageplugin_blurfx.h index f1b9e98..13df653 100644 --- a/digikam/imageplugins/blurfx/imageplugin_blurfx.h +++ b/digikam/imageplugins/blurfx/imageplugin_blurfx.h @@ -33,7 +33,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_BlurFX : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/border/bordertool.cpp b/digikam/imageplugins/border/bordertool.cpp index a125b52..160f5b0 100644 --- a/digikam/imageplugins/border/bordertool.cpp +++ b/digikam/imageplugins/border/bordertool.cpp @@ -172,23 +172,23 @@ BorderTool::BorderTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_preserveAspectRatio, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotPreserveAspectRatioToggled(bool))); + connect(m_preserveAspectRatio, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotPreserveAspectRatioToggled(bool))); - connect(m_borderType, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotBorderTypeChanged(int))); + connect(m_borderType, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotBorderTypeChanged(int))); - connect(m_borderPercent, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_borderPercent, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_borderWidth, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_borderWidth, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_firstColorButton, TQT_SIGNAL(changed(const TQColor &)), - this, TQT_SLOT(slotColorForegroundChanged(const TQColor &))); + connect(m_firstColorButton, TQ_SIGNAL(changed(const TQColor &)), + this, TQ_SLOT(slotColorForegroundChanged(const TQColor &))); - connect(m_secondColorButton, TQT_SIGNAL(changed(const TQColor &)), - this, TQT_SLOT(slotColorBackgroundChanged(const TQColor &))); + connect(m_secondColorButton, TQ_SIGNAL(changed(const TQColor &)), + this, TQ_SLOT(slotColorBackgroundChanged(const TQColor &))); } BorderTool::~BorderTool() diff --git a/digikam/imageplugins/border/bordertool.h b/digikam/imageplugins/border/bordertool.h index 60757e8..a8ec5cc 100644 --- a/digikam/imageplugins/border/bordertool.h +++ b/digikam/imageplugins/border/bordertool.h @@ -57,7 +57,7 @@ namespace DigikamBorderImagesPlugin class BorderTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/border/imageeffect_border.cpp b/digikam/imageplugins/border/imageeffect_border.cpp index 13f4e3f..9f3dd6c 100644 --- a/digikam/imageplugins/border/imageeffect_border.cpp +++ b/digikam/imageplugins/border/imageeffect_border.cpp @@ -172,23 +172,23 @@ ImageEffect_Border::ImageEffect_Border(TQWidget* parent) // ------------------------------------------------------------- - connect(m_preserveAspectRatio, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotPreserveAspectRatioToggled(bool))); + connect(m_preserveAspectRatio, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotPreserveAspectRatioToggled(bool))); - connect(m_borderType, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotBorderTypeChanged(int))); + connect(m_borderType, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotBorderTypeChanged(int))); - connect(m_borderPercent, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_borderPercent, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_borderWidth, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_borderWidth, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_firstColorButton, TQT_SIGNAL(changed(const TQColor &)), - this, TQT_SLOT(slotColorForegroundChanged(const TQColor &))); + connect(m_firstColorButton, TQ_SIGNAL(changed(const TQColor &)), + this, TQ_SLOT(slotColorForegroundChanged(const TQColor &))); - connect(m_secondColorButton, TQT_SIGNAL(changed(const TQColor &)), - this, TQT_SLOT(slotColorBackgroundChanged(const TQColor &))); + connect(m_secondColorButton, TQ_SIGNAL(changed(const TQColor &)), + this, TQ_SLOT(slotColorBackgroundChanged(const TQColor &))); } ImageEffect_Border::~ImageEffect_Border() diff --git a/digikam/imageplugins/border/imageeffect_border.h b/digikam/imageplugins/border/imageeffect_border.h index 577ce88..787a76a 100644 --- a/digikam/imageplugins/border/imageeffect_border.h +++ b/digikam/imageplugins/border/imageeffect_border.h @@ -47,7 +47,7 @@ namespace DigikamBorderImagesPlugin class ImageEffect_Border : public Digikam::ImageGuideDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/border/imageplugin_border.cpp b/digikam/imageplugins/border/imageplugin_border.cpp index 75d9370..f0c5a23 100644 --- a/digikam/imageplugins/border/imageplugin_border.cpp +++ b/digikam/imageplugins/border/imageplugin_border.cpp @@ -47,7 +47,7 @@ ImagePlugin_Border::ImagePlugin_Border(TQObject *parent, const char*, const TQSt { m_borderAction = new TDEAction(i18n("Add Border..."), "bordertool", 0, - this, TQT_SLOT(slotBorder()), + this, TQ_SLOT(slotBorder()), actionCollection(), "imageplugin_border"); setXMLFile("digikamimageplugin_border_ui.rc"); diff --git a/digikam/imageplugins/border/imageplugin_border.h b/digikam/imageplugins/border/imageplugin_border.h index f50baff..e5b3d95 100644 --- a/digikam/imageplugins/border/imageplugin_border.h +++ b/digikam/imageplugins/border/imageplugin_border.h @@ -34,7 +34,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Border : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/channelmixer/channelmixer.cpp b/digikam/imageplugins/channelmixer/channelmixer.cpp index 2d40d15..849cc1e 100644 --- a/digikam/imageplugins/channelmixer/channelmixer.cpp +++ b/digikam/imageplugins/channelmixer/channelmixer.cpp @@ -231,41 +231,41 @@ ChannelMixerDialog::ChannelMixerDialog(TQWidget* parent) // ------------------------------------------------------------- // Channels and scale selection slots. - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); // ------------------------------------------------------------- // Gains settings slots. - connect(m_redGain, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotGainsChanged())); + connect(m_redGain, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotGainsChanged())); - connect(m_greenGain, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotGainsChanged())); + connect(m_greenGain, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotGainsChanged())); - connect(m_blueGain, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotGainsChanged())); + connect(m_blueGain, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotGainsChanged())); - connect(m_preserveLuminosity, TQT_SIGNAL(toggled (bool)), - this, TQT_SLOT(slotEffect())); + connect(m_preserveLuminosity, TQ_SIGNAL(toggled (bool)), + this, TQ_SLOT(slotEffect())); - connect(m_monochrome, TQT_SIGNAL(toggled (bool)), - this, TQT_SLOT(slotMonochromeActived(bool))); + connect(m_monochrome, TQ_SIGNAL(toggled (bool)), + this, TQ_SLOT(slotMonochromeActived(bool))); // ------------------------------------------------------------- // Bouttons slots. - connect(m_resetButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotResetCurrentChannel())); + connect(m_resetButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotResetCurrentChannel())); } ChannelMixerDialog::~ChannelMixerDialog() diff --git a/digikam/imageplugins/channelmixer/channelmixer.h b/digikam/imageplugins/channelmixer/channelmixer.h index 2f22640..9b4396d 100644 --- a/digikam/imageplugins/channelmixer/channelmixer.h +++ b/digikam/imageplugins/channelmixer/channelmixer.h @@ -48,7 +48,7 @@ namespace DigikamChannelMixerImagesPlugin class ChannelMixerDialog : public Digikam::ImageDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/channelmixer/channelmixertool.cpp b/digikam/imageplugins/channelmixer/channelmixertool.cpp index 473863f..c821517 100644 --- a/digikam/imageplugins/channelmixer/channelmixertool.cpp +++ b/digikam/imageplugins/channelmixer/channelmixertool.cpp @@ -228,41 +228,41 @@ ChannelMixerTool::ChannelMixerTool(TQObject* parent) // ------------------------------------------------------------- // Channels and scale selection slots. - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const TQPoint&)), - this, TQT_SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const TQPoint&)), + this, TQ_SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); // ------------------------------------------------------------- // Gains settings slots. - connect(m_redGain, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotGainsChanged())); + connect(m_redGain, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotGainsChanged())); - connect(m_greenGain, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotGainsChanged())); + connect(m_greenGain, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotGainsChanged())); - connect(m_blueGain, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotGainsChanged())); + connect(m_blueGain, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotGainsChanged())); - connect(m_preserveLuminosity, TQT_SIGNAL(toggled (bool)), - this, TQT_SLOT(slotEffect())); + connect(m_preserveLuminosity, TQ_SIGNAL(toggled (bool)), + this, TQ_SLOT(slotEffect())); - connect(m_monochrome, TQT_SIGNAL(toggled (bool)), - this, TQT_SLOT(slotMonochromeActived(bool))); + connect(m_monochrome, TQ_SIGNAL(toggled (bool)), + this, TQ_SLOT(slotMonochromeActived(bool))); // ------------------------------------------------------------- // Bouttons slots. - connect(m_resetButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotResetCurrentChannel())); + connect(m_resetButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotResetCurrentChannel())); } ChannelMixerTool::~ChannelMixerTool() diff --git a/digikam/imageplugins/channelmixer/channelmixertool.h b/digikam/imageplugins/channelmixer/channelmixertool.h index 3d4e80f..c15a30c 100644 --- a/digikam/imageplugins/channelmixer/channelmixertool.h +++ b/digikam/imageplugins/channelmixer/channelmixertool.h @@ -51,7 +51,7 @@ namespace DigikamChannelMixerImagesPlugin class ChannelMixerTool : public Digikam::EditorTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp index 2afbafd..19fe21a 100644 --- a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp +++ b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp @@ -47,7 +47,7 @@ ImagePlugin_ChannelMixer::ImagePlugin_ChannelMixer(TQObject *parent, const char* { m_channelMixerAction = new TDEAction(i18n("Channel Mixer..."), "channelmixer", CTRL+Key_H, - this, TQT_SLOT(slotChannelMixer()), + this, TQ_SLOT(slotChannelMixer()), actionCollection(), "imageplugin_channelmixer"); setXMLFile("digikamimageplugin_channelmixer_ui.rc"); diff --git a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.h b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.h index f87d482..444006a 100644 --- a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.h +++ b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.h @@ -33,7 +33,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_ChannelMixer : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/charcoal/charcoaltool.cpp b/digikam/imageplugins/charcoal/charcoaltool.cpp index 772cbe3..75ee22d 100644 --- a/digikam/imageplugins/charcoal/charcoaltool.cpp +++ b/digikam/imageplugins/charcoal/charcoaltool.cpp @@ -110,11 +110,11 @@ CharcoalTool::CharcoalTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_pencilInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_pencilInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_smoothInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_smoothInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); } CharcoalTool::~CharcoalTool() diff --git a/digikam/imageplugins/charcoal/charcoaltool.h b/digikam/imageplugins/charcoal/charcoaltool.h index 4e3058c..5833dd0 100644 --- a/digikam/imageplugins/charcoal/charcoaltool.h +++ b/digikam/imageplugins/charcoal/charcoaltool.h @@ -45,7 +45,7 @@ namespace DigikamCharcoalImagesPlugin class CharcoalTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp b/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp index f57f1ec..67a0269 100644 --- a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp +++ b/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp @@ -104,11 +104,11 @@ ImageEffect_Charcoal::ImageEffect_Charcoal(TQWidget* parent) // ------------------------------------------------------------- - connect(m_pencilInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_pencilInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_smoothInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_smoothInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); } ImageEffect_Charcoal::~ImageEffect_Charcoal() diff --git a/digikam/imageplugins/charcoal/imageeffect_charcoal.h b/digikam/imageplugins/charcoal/imageeffect_charcoal.h index 375531b..31916ec 100644 --- a/digikam/imageplugins/charcoal/imageeffect_charcoal.h +++ b/digikam/imageplugins/charcoal/imageeffect_charcoal.h @@ -36,7 +36,7 @@ namespace DigikamCharcoalImagesPlugin class ImageEffect_Charcoal : public Digikam::CtrlPanelDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp b/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp index c2aa269..ae28e7c 100644 --- a/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp +++ b/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp @@ -48,7 +48,7 @@ ImagePlugin_Charcoal::ImagePlugin_Charcoal(TQObject *parent, const char*, : Digikam::ImagePlugin(parent, "ImagePlugin_Charcoal") { m_charcoalAction = new TDEAction(i18n("Charcoal Drawing..."), "charcoaltool", 0, - this, TQT_SLOT(slotCharcoal()), + this, TQ_SLOT(slotCharcoal()), actionCollection(), "imageplugin_charcoal"); setXMLFile( "digikamimageplugin_charcoal_ui.rc" ); diff --git a/digikam/imageplugins/charcoal/imageplugin_charcoal.h b/digikam/imageplugins/charcoal/imageplugin_charcoal.h index 7d25f38..c642087 100644 --- a/digikam/imageplugins/charcoal/imageplugin_charcoal.h +++ b/digikam/imageplugins/charcoal/imageplugin_charcoal.h @@ -34,7 +34,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Charcoal : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/colorfx/colorfxtool.cpp b/digikam/imageplugins/colorfx/colorfxtool.cpp index ad9fd04..dd16e7c 100644 --- a/digikam/imageplugins/colorfx/colorfxtool.cpp +++ b/digikam/imageplugins/colorfx/colorfxtool.cpp @@ -203,26 +203,26 @@ ColorFXTool::ColorFXTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const DColor &, const TQPoint & )), - this, TQT_SLOT(slotColorSelectedFromTarget( const DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const DColor &, const TQPoint & )), + this, TQ_SLOT(slotColorSelectedFromTarget( const DColor & ))); - connect(m_levelInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_levelInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_iterationInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_iterationInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); - connect(m_effectType, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotEffectTypeChanged(int))); + connect(m_effectType, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotEffectTypeChanged(int))); } ColorFXTool::~ColorFXTool() diff --git a/digikam/imageplugins/colorfx/colorfxtool.h b/digikam/imageplugins/colorfx/colorfxtool.h index fd62a44..6040f53 100644 --- a/digikam/imageplugins/colorfx/colorfxtool.h +++ b/digikam/imageplugins/colorfx/colorfxtool.h @@ -53,7 +53,7 @@ namespace DigikamColorFXImagesPlugin class ColorFXTool : public Digikam::EditorTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp index 8edb2a1..a4ab6fe 100644 --- a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp +++ b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp @@ -208,26 +208,26 @@ ImageEffect_ColorFX::ImageEffect_ColorFX(TQWidget* parent) // ------------------------------------------------------------- - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_levelInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_levelInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_iterationInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_iterationInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); - connect(m_effectType, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotEffectTypeChanged(int))); + connect(m_effectType, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotEffectTypeChanged(int))); } ImageEffect_ColorFX::~ImageEffect_ColorFX() diff --git a/digikam/imageplugins/colorfx/imageeffect_colorfx.h b/digikam/imageplugins/colorfx/imageeffect_colorfx.h index f79fb4f..d6d7d10 100644 --- a/digikam/imageplugins/colorfx/imageeffect_colorfx.h +++ b/digikam/imageplugins/colorfx/imageeffect_colorfx.h @@ -49,7 +49,7 @@ namespace DigikamColorFXImagesPlugin class ImageEffect_ColorFX : public Digikam::ImageDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp b/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp index 21af85b..f472502 100644 --- a/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp +++ b/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp @@ -48,7 +48,7 @@ ImagePlugin_ColorFX::ImagePlugin_ColorFX(TQObject *parent, const char*, const TQ : Digikam::ImagePlugin(parent, "ImagePlugin_ColorFX") { m_solarizeAction = new TDEAction(i18n("Color Effects..."), "colorfx", 0, - this, TQT_SLOT(slotColorFX()), + this, TQ_SLOT(slotColorFX()), actionCollection(), "imageplugin_colorfx"); setXMLFile( "digikamimageplugin_colorfx_ui.rc" ); diff --git a/digikam/imageplugins/colorfx/imageplugin_colorfx.h b/digikam/imageplugins/colorfx/imageplugin_colorfx.h index b070eb0..d7aaa83 100644 --- a/digikam/imageplugins/colorfx/imageplugin_colorfx.h +++ b/digikam/imageplugins/colorfx/imageplugin_colorfx.h @@ -35,7 +35,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_ColorFX : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp index 8a661c0..32f00b4 100644 --- a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp +++ b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp @@ -229,20 +229,20 @@ AutoCorrectionTool::AutoCorrectionTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget(const DColor&, const TQPoint&)), - this, TQT_SLOT(slotColorSelectedFromTarget(const DColor&))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget(const DColor&, const TQPoint&)), + this, TQ_SLOT(slotColorSelectedFromTarget(const DColor&))); - connect(m_correctionTools, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(slotEffect())); + connect(m_correctionTools, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(slotEffect())); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); } AutoCorrectionTool::~AutoCorrectionTool() diff --git a/digikam/imageplugins/coreplugin/autocorrectiontool.h b/digikam/imageplugins/coreplugin/autocorrectiontool.h index 64f58c5..73a388f 100644 --- a/digikam/imageplugins/coreplugin/autocorrectiontool.h +++ b/digikam/imageplugins/coreplugin/autocorrectiontool.h @@ -51,7 +51,7 @@ namespace DigikamImagesPluginCore class AutoCorrectionTool : public Digikam::EditorTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/bcgtool.cpp b/digikam/imageplugins/coreplugin/bcgtool.cpp index 1f7954d..17ecf83 100644 --- a/digikam/imageplugins/coreplugin/bcgtool.cpp +++ b/digikam/imageplugins/coreplugin/bcgtool.cpp @@ -193,26 +193,26 @@ BCGTool::BCGTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_bInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_bInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_cInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_cInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_gInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotTimer())); + connect(m_gInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotTimer())); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); // ------------------------------------------------------------- diff --git a/digikam/imageplugins/coreplugin/bcgtool.h b/digikam/imageplugins/coreplugin/bcgtool.h index c592fef..4a1e9d2 100644 --- a/digikam/imageplugins/coreplugin/bcgtool.h +++ b/digikam/imageplugins/coreplugin/bcgtool.h @@ -53,7 +53,7 @@ namespace DigikamImagesPluginCore class BCGTool : public Digikam::EditorTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/blurtool.h b/digikam/imageplugins/coreplugin/blurtool.h index ee0b1e2..545f4aa 100644 --- a/digikam/imageplugins/coreplugin/blurtool.h +++ b/digikam/imageplugins/coreplugin/blurtool.h @@ -44,7 +44,7 @@ namespace DigikamImagesPluginCore class BlurTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/bwsepiatool.cpp b/digikam/imageplugins/coreplugin/bwsepiatool.cpp index 6fdca4e..06c3046 100644 --- a/digikam/imageplugins/coreplugin/bwsepiatool.cpp +++ b/digikam/imageplugins/coreplugin/bwsepiatool.cpp @@ -494,38 +494,38 @@ BWSepiaTool::BWSepiaTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const TQPoint&)), - this, TQT_SLOT(slotSpotColorChanged(const Digikam::DColor&))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const TQPoint&)), + this, TQ_SLOT(slotSpotColorChanged(const Digikam::DColor&))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_bwFilters, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(slotFilterSelected(int))); + connect(m_bwFilters, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(slotFilterSelected(int))); - connect(m_strengthInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_strengthInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_bwFilm, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(slotEffect())); + connect(m_bwFilm, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(slotEffect())); - connect(m_bwTone, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(slotEffect())); + connect(m_bwTone, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(slotEffect())); - connect(m_curvesWidget, TQT_SIGNAL(signalCurvesChanged()), - this, TQT_SLOT(slotTimer())); + connect(m_curvesWidget, TQ_SIGNAL(signalCurvesChanged()), + this, TQ_SLOT(slotTimer())); - connect(m_cInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_cInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); } BWSepiaTool::~BWSepiaTool() diff --git a/digikam/imageplugins/coreplugin/bwsepiatool.h b/digikam/imageplugins/coreplugin/bwsepiatool.h index cec77da..7145f56 100644 --- a/digikam/imageplugins/coreplugin/bwsepiatool.h +++ b/digikam/imageplugins/coreplugin/bwsepiatool.h @@ -63,7 +63,7 @@ class PreviewPixmapFactory; class BWSepiaTool : public Digikam::EditorTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp index a5a4075..5fa3d74 100644 --- a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp +++ b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp @@ -209,35 +209,35 @@ HSLTool::HSLTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_HSSelector, TQT_SIGNAL(valueChanged(int, int)), - this, TQT_SLOT(slotHSChanged(int, int))); + connect(m_HSSelector, TQ_SIGNAL(valueChanged(int, int)), + this, TQ_SLOT(slotHSChanged(int, int))); - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_hInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_hInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_hInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotHChanged(double))); + connect(m_hInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotHChanged(double))); - connect(m_sInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_sInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_sInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotSChanged(double))); + connect(m_sInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotSChanged(double))); - connect(m_lInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_lInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); // ------------------------------------------------------------- diff --git a/digikam/imageplugins/coreplugin/hsl/hsltool.h b/digikam/imageplugins/coreplugin/hsl/hsltool.h index 020f365..751bacf 100644 --- a/digikam/imageplugins/coreplugin/hsl/hsltool.h +++ b/digikam/imageplugins/coreplugin/hsl/hsltool.h @@ -55,7 +55,7 @@ class HSPreviewWidget; class HSLTool : public Digikam::EditorTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.h b/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.h index ce89419..3744907 100644 --- a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.h +++ b/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.h @@ -35,7 +35,7 @@ class HSPreviewWidgetPrivate; class HSPreviewWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp index 367919a..e179d36 100644 --- a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp +++ b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp @@ -191,35 +191,35 @@ ImageEffect_HSL::ImageEffect_HSL(TQWidget* parent) // ------------------------------------------------------------- - connect(m_HSSelector, TQT_SIGNAL(valueChanged(int, int)), - this, TQT_SLOT(slotHSChanged(int, int))); + connect(m_HSSelector, TQ_SIGNAL(valueChanged(int, int)), + this, TQ_SLOT(slotHSChanged(int, int))); - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_hInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_hInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_hInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotHChanged(double))); + connect(m_hInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotHChanged(double))); - connect(m_sInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_sInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_sInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotSChanged(double))); + connect(m_sInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotSChanged(double))); - connect(m_lInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_lInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); // ------------------------------------------------------------- diff --git a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.h b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.h index 3fcab18..24880f4 100644 --- a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.h +++ b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.h @@ -49,7 +49,7 @@ class HSPreviewWidget; class ImageEffect_HSL : public Digikam::ImageDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/iccprooftool.cpp b/digikam/imageplugins/coreplugin/iccprooftool.cpp index 35097d1..b74adf9 100644 --- a/digikam/imageplugins/coreplugin/iccprooftool.cpp +++ b/digikam/imageplugins/coreplugin/iccprooftool.cpp @@ -292,7 +292,7 @@ ICCProofTool::ICCProofTool(TQObject* parent) TQGridLayout *firstPageLayout = new TQGridLayout(inProfiles, 4, 2); - m_inProfileBG = new TQButtonGroup(4, Qt::Vertical, inProfiles); + m_inProfileBG = new TQButtonGroup(4, TQt::Vertical, inProfiles); m_inProfileBG->setFrameStyle(TQFrame::NoFrame); m_inProfileBG->setInsideMargin(0); @@ -318,7 +318,7 @@ ICCProofTool::ICCProofTool(TQObject* parent) TQPushButton *inProfilesInfo = new TQPushButton(i18n("Info..."), inProfiles); - TQGroupBox *pictureInfo = new TQGroupBox(2, Qt::Horizontal, i18n("Camera information"), inProfiles); + TQGroupBox *pictureInfo = new TQGroupBox(2, TQt::Horizontal, i18n("Camera information"), inProfiles); new TQLabel(i18n("Make:"), pictureInfo); KSqueezedTextLabel *make = new KSqueezedTextLabel(0, pictureInfo); new TQLabel(i18n("Model:"), pictureInfo); @@ -342,7 +342,7 @@ ICCProofTool::ICCProofTool(TQObject* parent) TQGridLayout *secondPageLayout = new TQGridLayout(spaceProfiles, 3, 2); - m_spaceProfileBG = new TQButtonGroup(2, Qt::Vertical, spaceProfiles); + m_spaceProfileBG = new TQButtonGroup(2, TQt::Vertical, spaceProfiles); m_spaceProfileBG->setFrameStyle(TQFrame::NoFrame); m_spaceProfileBG->setInsideMargin(0); @@ -376,7 +376,7 @@ ICCProofTool::ICCProofTool(TQObject* parent) TQGridLayout *thirdPageLayout = new TQGridLayout(proofProfiles, 3, 2); - m_proofProfileBG = new TQButtonGroup(2, Qt::Vertical, proofProfiles); + m_proofProfileBG = new TQButtonGroup(2, TQt::Vertical, proofProfiles); m_proofProfileBG->setFrameStyle(TQFrame::NoFrame); m_proofProfileBG->setInsideMargin(0); @@ -455,78 +455,78 @@ ICCProofTool::ICCProofTool(TQObject* parent) // ------------------------------------------------------------- - connect(lcmsLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(processLCMSURL(const TQString&))); + connect(lcmsLogoLabel, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(processLCMSURL(const TQString&))); - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_curvesWidget, TQT_SIGNAL(signalCurvesChanged()), - this, TQT_SLOT(slotTimer())); + connect(m_curvesWidget, TQ_SIGNAL(signalCurvesChanged()), + this, TQ_SLOT(slotTimer())); - connect(m_cInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotTimer())); + connect(m_cInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotTimer())); - connect(m_renderingIntentsCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotEffect())); + connect(m_renderingIntentsCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotEffect())); //-- Check box options connections ------------------------------------------- - connect(m_doSoftProofBox, TQT_SIGNAL(toggled (bool)), - this, TQT_SLOT(slotEffect())); + connect(m_doSoftProofBox, TQ_SIGNAL(toggled (bool)), + this, TQ_SLOT(slotEffect())); - connect(m_checkGamutBox, TQT_SIGNAL(toggled (bool)), - this, TQT_SLOT(slotEffect())); + connect(m_checkGamutBox, TQ_SIGNAL(toggled (bool)), + this, TQ_SLOT(slotEffect())); - connect(m_BPCBox, TQT_SIGNAL(toggled (bool)), - this, TQT_SLOT(slotEffect())); + connect(m_BPCBox, TQ_SIGNAL(toggled (bool)), + this, TQ_SLOT(slotEffect())); //-- Button Group ICC profile options connections ---------------------------- - connect(m_inProfileBG, TQT_SIGNAL(released (int)), - this, TQT_SLOT(slotEffect())); + connect(m_inProfileBG, TQ_SIGNAL(released (int)), + this, TQ_SLOT(slotEffect())); - connect(m_spaceProfileBG, TQT_SIGNAL(released (int)), - this, TQT_SLOT(slotEffect())); + connect(m_spaceProfileBG, TQ_SIGNAL(released (int)), + this, TQ_SLOT(slotEffect())); - connect(m_proofProfileBG, TQT_SIGNAL(released (int)), - this, TQT_SLOT(slotEffect())); + connect(m_proofProfileBG, TQ_SIGNAL(released (int)), + this, TQ_SLOT(slotEffect())); //-- url requester ICC profile connections ----------------------------------- - connect(m_inProfilesPath, TQT_SIGNAL(urlSelected(const TQString&)), - this, TQT_SLOT(slotEffect())); + connect(m_inProfilesPath, TQ_SIGNAL(urlSelected(const TQString&)), + this, TQ_SLOT(slotEffect())); - connect(m_spaceProfilePath, TQT_SIGNAL(urlSelected(const TQString&)), - this, TQT_SLOT(slotEffect())); + connect(m_spaceProfilePath, TQ_SIGNAL(urlSelected(const TQString&)), + this, TQ_SLOT(slotEffect())); - connect(m_proofProfilePath, TQT_SIGNAL(urlSelected(const TQString&)), - this, TQT_SLOT(slotEffect())); + connect(m_proofProfilePath, TQ_SIGNAL(urlSelected(const TQString&)), + this, TQ_SLOT(slotEffect())); //-- Image preview widget connections ---------------------------- - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotSpotColorChanged( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotSpotColorChanged( const Digikam::DColor & ))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); //-- ICC profile preview connections ----------------------------- - connect(inProfilesInfo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotInICCInfo())); + connect(inProfilesInfo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotInICCInfo())); - connect(spaceProfilesInfo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSpaceICCInfo())); + connect(spaceProfilesInfo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSpaceICCInfo())); - connect(proofProfilesInfo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotProofICCInfo())); + connect(proofProfilesInfo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotProofICCInfo())); } ICCProofTool::~ICCProofTool() diff --git a/digikam/imageplugins/coreplugin/iccprooftool.h b/digikam/imageplugins/coreplugin/iccprooftool.h index 179a27e..86d93ea 100644 --- a/digikam/imageplugins/coreplugin/iccprooftool.h +++ b/digikam/imageplugins/coreplugin/iccprooftool.h @@ -63,7 +63,7 @@ namespace DigikamImagesPluginCore class ICCProofTool : public Digikam::EditorTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp index bd116d6..290b93c 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp @@ -220,20 +220,20 @@ ImageEffect_AutoCorrection::ImageEffect_AutoCorrection(TQWidget* parent) // ------------------------------------------------------------- - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_correctionTools, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(slotEffect())); + connect(m_correctionTools, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(slotEffect())); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); } ImageEffect_AutoCorrection::~ImageEffect_AutoCorrection() diff --git a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.h b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.h index c85bc44..c707ac1 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.h +++ b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.h @@ -51,7 +51,7 @@ namespace DigikamImagesPluginCore class ImageEffect_AutoCorrection : public Digikam::ImageDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp index bafe063..9d21115 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp @@ -178,26 +178,26 @@ ImageEffect_BCG::ImageEffect_BCG(TQWidget* parent) // ------------------------------------------------------------- - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_bInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_bInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_cInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_cInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_gInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotTimer())); + connect(m_gInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotTimer())); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); // ------------------------------------------------------------- diff --git a/digikam/imageplugins/coreplugin/imageeffect_bcg.h b/digikam/imageplugins/coreplugin/imageeffect_bcg.h index 7bd05bc..a9cd020 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bcg.h +++ b/digikam/imageplugins/coreplugin/imageeffect_bcg.h @@ -50,7 +50,7 @@ namespace DigikamImagesPluginCore class ImageEffect_BCG : public Digikam::ImageDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/imageeffect_blur.h b/digikam/imageplugins/coreplugin/imageeffect_blur.h index ac01467..eab7694 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_blur.h +++ b/digikam/imageplugins/coreplugin/imageeffect_blur.h @@ -35,7 +35,7 @@ namespace DigikamImagesPluginCore class ImageEffect_Blur : public Digikam::CtrlPanelDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp index e7aebd8..7dcdf0d 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp @@ -492,38 +492,38 @@ ImageEffect_BWSepia::ImageEffect_BWSepia(TQWidget* parent) // ------------------------------------------------------------- - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const TQPoint&)), - this, TQT_SLOT(slotSpotColorChanged(const Digikam::DColor&))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const TQPoint&)), + this, TQ_SLOT(slotSpotColorChanged(const Digikam::DColor&))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_bwFilters, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(slotFilterSelected(int))); + connect(m_bwFilters, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(slotFilterSelected(int))); - connect(m_strengthInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_strengthInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_bwFilm, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(slotEffect())); + connect(m_bwFilm, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(slotEffect())); - connect(m_bwTone, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(slotEffect())); + connect(m_bwTone, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(slotEffect())); - connect(m_curvesWidget, TQT_SIGNAL(signalCurvesChanged()), - this, TQT_SLOT(slotTimer())); + connect(m_curvesWidget, TQ_SIGNAL(signalCurvesChanged()), + this, TQ_SLOT(slotTimer())); - connect(m_cInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_cInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); } ImageEffect_BWSepia::~ImageEffect_BWSepia() diff --git a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.h b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.h index 0919397..74b4edf 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.h +++ b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.h @@ -59,7 +59,7 @@ class PreviewPixmapFactory; class ImageEffect_BWSepia : public Digikam::ImageDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp index cd5e92d..79a0998 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp @@ -278,7 +278,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent) TQGridLayout *firstPageLayout = new TQGridLayout(inProfiles, 4, 2, spacingHint()); - m_inProfileBG = new TQButtonGroup(4, Qt::Vertical, inProfiles); + m_inProfileBG = new TQButtonGroup(4, TQt::Vertical, inProfiles); m_inProfileBG->setFrameStyle(TQFrame::NoFrame); m_inProfileBG->setInsideMargin(0); @@ -304,7 +304,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent) TQPushButton *inProfilesInfo = new TQPushButton(i18n("Info..."), inProfiles); - TQGroupBox *pictureInfo = new TQGroupBox(2, Qt::Horizontal, i18n("Camera information"), inProfiles); + TQGroupBox *pictureInfo = new TQGroupBox(2, TQt::Horizontal, i18n("Camera information"), inProfiles); new TQLabel(i18n("Make:"), pictureInfo); KSqueezedTextLabel *make = new KSqueezedTextLabel(0, pictureInfo); new TQLabel(i18n("Model:"), pictureInfo); @@ -328,7 +328,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent) TQGridLayout *secondPageLayout = new TQGridLayout(spaceProfiles, 3, 2, spacingHint()); - m_spaceProfileBG = new TQButtonGroup(2, Qt::Vertical, spaceProfiles); + m_spaceProfileBG = new TQButtonGroup(2, TQt::Vertical, spaceProfiles); m_spaceProfileBG->setFrameStyle(TQFrame::NoFrame); m_spaceProfileBG->setInsideMargin(0); @@ -363,7 +363,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent) TQGridLayout *thirdPageLayout = new TQGridLayout(proofProfiles, 3, 2, spacingHint(), spacingHint()); - m_proofProfileBG = new TQButtonGroup(2, Qt::Vertical, proofProfiles); + m_proofProfileBG = new TQButtonGroup(2, TQt::Vertical, proofProfiles); m_proofProfileBG->setFrameStyle(TQFrame::NoFrame); m_proofProfileBG->setInsideMargin(0); @@ -440,78 +440,78 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent) // ------------------------------------------------------------- - connect(lcmsLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(processLCMSURL(const TQString&))); + connect(lcmsLogoLabel, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(processLCMSURL(const TQString&))); - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_curvesWidget, TQT_SIGNAL(signalCurvesChanged()), - this, TQT_SLOT(slotTimer())); + connect(m_curvesWidget, TQ_SIGNAL(signalCurvesChanged()), + this, TQ_SLOT(slotTimer())); - connect(m_cInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotTimer())); + connect(m_cInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotTimer())); - connect(m_renderingIntentsCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotEffect())); + connect(m_renderingIntentsCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotEffect())); //-- Check box options connections ------------------------------------------- - connect(m_doSoftProofBox, TQT_SIGNAL(toggled (bool)), - this, TQT_SLOT(slotEffect())); + connect(m_doSoftProofBox, TQ_SIGNAL(toggled (bool)), + this, TQ_SLOT(slotEffect())); - connect(m_checkGamutBox, TQT_SIGNAL(toggled (bool)), - this, TQT_SLOT(slotEffect())); + connect(m_checkGamutBox, TQ_SIGNAL(toggled (bool)), + this, TQ_SLOT(slotEffect())); - connect(m_BPCBox, TQT_SIGNAL(toggled (bool)), - this, TQT_SLOT(slotEffect())); + connect(m_BPCBox, TQ_SIGNAL(toggled (bool)), + this, TQ_SLOT(slotEffect())); //-- Button Group ICC profile options connections ---------------------------- - connect(m_inProfileBG, TQT_SIGNAL(released (int)), - this, TQT_SLOT(slotEffect())); + connect(m_inProfileBG, TQ_SIGNAL(released (int)), + this, TQ_SLOT(slotEffect())); - connect(m_spaceProfileBG, TQT_SIGNAL(released (int)), - this, TQT_SLOT(slotEffect())); + connect(m_spaceProfileBG, TQ_SIGNAL(released (int)), + this, TQ_SLOT(slotEffect())); - connect(m_proofProfileBG, TQT_SIGNAL(released (int)), - this, TQT_SLOT(slotEffect())); + connect(m_proofProfileBG, TQ_SIGNAL(released (int)), + this, TQ_SLOT(slotEffect())); //-- url requester ICC profile connections ----------------------------------- - connect(m_inProfilesPath, TQT_SIGNAL(urlSelected(const TQString&)), - this, TQT_SLOT(slotEffect())); + connect(m_inProfilesPath, TQ_SIGNAL(urlSelected(const TQString&)), + this, TQ_SLOT(slotEffect())); - connect(m_spaceProfilePath, TQT_SIGNAL(urlSelected(const TQString&)), - this, TQT_SLOT(slotEffect())); + connect(m_spaceProfilePath, TQ_SIGNAL(urlSelected(const TQString&)), + this, TQ_SLOT(slotEffect())); - connect(m_proofProfilePath, TQT_SIGNAL(urlSelected(const TQString&)), - this, TQT_SLOT(slotEffect())); + connect(m_proofProfilePath, TQ_SIGNAL(urlSelected(const TQString&)), + this, TQ_SLOT(slotEffect())); //-- Image preview widget connections ---------------------------- - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotSpotColorChanged( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotSpotColorChanged( const Digikam::DColor & ))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); //-- ICC profile preview connections ----------------------------- - connect(inProfilesInfo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotInICCInfo())); + connect(inProfilesInfo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotInICCInfo())); - connect(spaceProfilesInfo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSpaceICCInfo())); + connect(spaceProfilesInfo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSpaceICCInfo())); - connect(proofProfilesInfo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotProofICCInfo())); + connect(proofProfilesInfo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotProofICCInfo())); } ImageEffect_ICCProof::~ImageEffect_ICCProof() diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.h b/digikam/imageplugins/coreplugin/imageeffect_iccproof.h index 5a087c3..58112ae 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.h +++ b/digikam/imageplugins/coreplugin/imageeffect_iccproof.h @@ -59,7 +59,7 @@ namespace DigikamImagesPluginCore class ImageEffect_ICCProof : public Digikam::ImageDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp index 496de54..df3ae2e 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp @@ -191,32 +191,32 @@ ImageEffect_RedEye::ImageEffect_RedEye(TQWidget* parent) // ------------------------------------------------------------- - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const TQPoint&)), - this, TQT_SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const TQPoint&)), + this, TQ_SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); - connect(m_redThreshold, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_redThreshold, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_smoothLevel, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_smoothLevel, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_HSSelector, TQT_SIGNAL(valueChanged(int, int)), - this, TQT_SLOT(slotHSChanged(int, int))); + connect(m_HSSelector, TQ_SIGNAL(valueChanged(int, int)), + this, TQ_SLOT(slotHSChanged(int, int))); - connect(m_VSelector, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_VSelector, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_tintLevel, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_tintLevel, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); } ImageEffect_RedEye::~ImageEffect_RedEye() diff --git a/digikam/imageplugins/coreplugin/imageeffect_redeye.h b/digikam/imageplugins/coreplugin/imageeffect_redeye.h index 5536f3c..79b517e 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_redeye.h +++ b/digikam/imageplugins/coreplugin/imageeffect_redeye.h @@ -79,7 +79,7 @@ private: class ImageEffect_RedEye : public Digikam::ImageDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp index 0ee78bc..fcff9c4 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp @@ -148,7 +148,7 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent) TQLabel *labelLeft = new TQLabel(i18n("Cyan"), gboxSettings); labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); - m_rSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, gboxSettings, "m_rSlider"); + m_rSlider = new TQSlider(-100, 100, 1, 0, TQt::Horizontal, gboxSettings, "m_rSlider"); m_rSlider->setTickmarks(TQSlider::Below); m_rSlider->setTickInterval(20); TQWhatsThis::add( m_rSlider, i18n("<p>Set here the cyan/red color adjustment of the image.")); @@ -165,7 +165,7 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent) labelLeft = new TQLabel(i18n("Magenta"), gboxSettings); labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); - m_gSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, gboxSettings, "m_gSlider"); + m_gSlider = new TQSlider(-100, 100, 1, 0, TQt::Horizontal, gboxSettings, "m_gSlider"); m_gSlider->setTickmarks(TQSlider::Below); m_gSlider->setTickInterval(20); TQWhatsThis::add( m_gSlider, i18n("<p>Set here the magenta/green color adjustment of the image.")); @@ -182,7 +182,7 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent) labelLeft = new TQLabel(i18n("Yellow"), gboxSettings); labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); - m_bSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, gboxSettings, "m_bSlider"); + m_bSlider = new TQSlider(-100, 100, 1, 0, TQt::Horizontal, gboxSettings, "m_bSlider"); m_bSlider->setTickmarks(TQSlider::Below); m_bSlider->setTickInterval(20); TQWhatsThis::add( m_bSlider, i18n("<p>Set here the yellow/blue color adjustment of the image.")); @@ -204,38 +204,38 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent) // ------------------------------------------------------------- - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_rSlider, TQT_SIGNAL(valueChanged(int)), - m_rInput, TQT_SLOT(setValue(int))); - connect(m_rInput, TQT_SIGNAL(valueChanged (int)), - m_rSlider, TQT_SLOT(setValue(int))); - connect(m_rInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotTimer())); - - connect(m_gSlider, TQT_SIGNAL(valueChanged(int)), - m_gInput, TQT_SLOT(setValue(int))); - connect(m_gInput, TQT_SIGNAL(valueChanged (int)), - m_gSlider, TQT_SLOT(setValue(int))); - connect(m_gInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotTimer())); - - connect(m_bSlider, TQT_SIGNAL(valueChanged(int)), - m_bInput, TQT_SLOT(setValue(int))); - connect(m_bInput, TQT_SIGNAL(valueChanged (int)), - m_bSlider, TQT_SLOT(setValue(int))); - connect(m_bInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotTimer())); - - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_rSlider, TQ_SIGNAL(valueChanged(int)), + m_rInput, TQ_SLOT(setValue(int))); + connect(m_rInput, TQ_SIGNAL(valueChanged (int)), + m_rSlider, TQ_SLOT(setValue(int))); + connect(m_rInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotTimer())); + + connect(m_gSlider, TQ_SIGNAL(valueChanged(int)), + m_gInput, TQ_SLOT(setValue(int))); + connect(m_gInput, TQ_SIGNAL(valueChanged (int)), + m_gSlider, TQ_SLOT(setValue(int))); + connect(m_gInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotTimer())); + + connect(m_bSlider, TQ_SIGNAL(valueChanged(int)), + m_bInput, TQ_SLOT(setValue(int))); + connect(m_bInput, TQ_SIGNAL(valueChanged (int)), + m_bSlider, TQ_SLOT(setValue(int))); + connect(m_bInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotTimer())); + + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); // ------------------------------------------------------------- diff --git a/digikam/imageplugins/coreplugin/imageeffect_rgb.h b/digikam/imageplugins/coreplugin/imageeffect_rgb.h index f56fc29..9f5db52 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_rgb.h +++ b/digikam/imageplugins/coreplugin/imageeffect_rgb.h @@ -47,7 +47,7 @@ namespace DigikamImagesPluginCore class ImageEffect_RGB : public Digikam::ImageDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/imageplugin_core.cpp b/digikam/imageplugins/coreplugin/imageplugin_core.cpp index 0bc4a18..22c63b3 100644 --- a/digikam/imageplugins/coreplugin/imageplugin_core.cpp +++ b/digikam/imageplugins/coreplugin/imageplugin_core.cpp @@ -66,66 +66,66 @@ ImagePlugin_Core::ImagePlugin_Core(TQObject *parent, const char*, const TQString // Fix and Colors menu actions m_blurAction = new TDEAction(i18n("Blur..."), "blurimage", 0, - this, TQT_SLOT(slotBlur()), + this, TQ_SLOT(slotBlur()), actionCollection(), "implugcore_blur"); m_sharpenAction = new TDEAction(i18n("Sharpen..."), "sharpenimage", 0, - this, TQT_SLOT(slotSharpen()), + this, TQ_SLOT(slotSharpen()), actionCollection(), "implugcore_sharpen"); m_redeyeAction = new TDEAction(i18n("Red Eye..."), "redeyes", 0, - this, TQT_SLOT(slotRedEye()), + this, TQ_SLOT(slotRedEye()), actionCollection(), "implugcore_redeye"); m_redeyeAction->setWhatsThis( i18n( "This filter can be used to correct red eyes in a photo. " "Select a region including the eyes to use this option.") ); m_BCGAction = new TDEAction(i18n("Brightness/Contrast/Gamma..."), "contrast", 0, - this, TQT_SLOT(slotBCG()), + this, TQ_SLOT(slotBCG()), actionCollection(), "implugcore_bcg"); m_HSLAction = new TDEAction(i18n("Hue/Saturation/Lightness..."), "adjusthsl", CTRL+Key_U, // NOTE: Photoshop 7 use CTRL+U. - this, TQT_SLOT(slotHSL()), + this, TQ_SLOT(slotHSL()), actionCollection(), "implugcore_hsl"); m_RGBAction = new TDEAction(i18n("Color Balance..."), "adjustrgb", CTRL+Key_B, // NOTE: Photoshop 7 use CTRL+B. - this, TQT_SLOT(slotRGB()), + this, TQ_SLOT(slotRGB()), actionCollection(), "implugcore_rgb"); m_autoCorrectionAction = new TDEAction(i18n("Auto-Correction..."), "autocorrection", CTRL+SHIFT+Key_B, // NOTE: Photoshop 7 use CTRL+SHIFT+B with 'Auto-Color' option. - this, TQT_SLOT(slotAutoCorrection()), + this, TQ_SLOT(slotAutoCorrection()), actionCollection(), "implugcore_autocorrection"); m_invertAction = new TDEAction(i18n("Invert"), "invertimage", CTRL+Key_I, // NOTE: Photoshop 7 use CTRL+I. - this, TQT_SLOT(slotInvert()), + this, TQ_SLOT(slotInvert()), actionCollection(), "implugcore_invert"); m_convertTo8Bits = new TDEAction(i18n("8 bits"), "depth16to8", 0, - this, TQT_SLOT(slotConvertTo8Bits()), + this, TQ_SLOT(slotConvertTo8Bits()), actionCollection(), "implugcore_convertto8bits"); m_convertTo16Bits = new TDEAction(i18n("16 bits"), "depth8to16", 0, - this, TQT_SLOT(slotConvertTo16Bits()), + this, TQ_SLOT(slotConvertTo16Bits()), actionCollection(), "implugcore_convertto16bits"); m_colorManagementAction = new TDEAction(i18n("Color Management..."), "colormanagement", 0, - this, TQT_SLOT(slotColorManagement()), + this, TQ_SLOT(slotColorManagement()), actionCollection(), "implugcore_colormanagement"); //------------------------------- // Filters menu actions. m_BWAction = new TDEAction(i18n("Black && White..."), "bwtonal", 0, - this, TQT_SLOT(slotBW()), + this, TQ_SLOT(slotBW()), actionCollection(), "implugcore_blackwhite"); //------------------------------- // Transform menu actions. m_aspectRatioCropAction = new TDEAction(i18n("Aspect Ratio Crop..."), "ratiocrop", 0, - this, TQT_SLOT(slotRatioCrop()), + this, TQ_SLOT(slotRatioCrop()), actionCollection(), "implugcore_ratiocrop"); //------------------------------- diff --git a/digikam/imageplugins/coreplugin/imageplugin_core.h b/digikam/imageplugins/coreplugin/imageplugin_core.h index f7cc8d6..41168d2 100644 --- a/digikam/imageplugins/coreplugin/imageplugin_core.h +++ b/digikam/imageplugins/coreplugin/imageplugin_core.h @@ -34,7 +34,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Core : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp index b66f391..64bc7a8 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp @@ -262,77 +262,77 @@ ImageEffect_RatioCrop::ImageEffect_RatioCrop(TQWidget* parent) // ------------------------------------------------------------- - connect(m_ratioCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotRatioChanged(int))); + connect(m_ratioCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotRatioChanged(int))); - connect(m_preciseCrop, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotPreciseCropChanged(bool))); + connect(m_preciseCrop, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotPreciseCropChanged(bool))); - connect(m_orientCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotOrientChanged(int))); + connect(m_orientCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotOrientChanged(int))); - connect(m_autoOrientation, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotAutoOrientChanged(bool))); + connect(m_autoOrientation, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotAutoOrientChanged(bool))); - connect(m_xInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotXChanged(int))); + connect(m_xInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotXChanged(int))); - connect(m_yInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotYChanged(int))); + connect(m_yInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotYChanged(int))); - connect(m_customRatioNInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotCustomNRatioChanged(int))); + connect(m_customRatioNInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotCustomNRatioChanged(int))); - connect(m_customRatioDInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotCustomDRatioChanged(int))); + connect(m_customRatioDInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotCustomDRatioChanged(int))); - connect(m_guideLinesCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotGuideTypeChanged(int))); + connect(m_guideLinesCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotGuideTypeChanged(int))); - connect(m_goldenSectionBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenSectionBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotGoldenGuideTypeChanged())); - connect(m_goldenSpiralSectionBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenSpiralSectionBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotGoldenGuideTypeChanged())); - connect(m_goldenSpiralBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenSpiralBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotGoldenGuideTypeChanged())); - connect(m_goldenTriangleBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenTriangleBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotGoldenGuideTypeChanged())); - connect(m_flipHorBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotGoldenGuideTypeChanged())); + connect(m_flipHorBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotGoldenGuideTypeChanged())); - connect(m_flipVerBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotGoldenGuideTypeChanged())); + connect(m_flipVerBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotGoldenGuideTypeChanged())); - connect(m_guideColorBt, TQT_SIGNAL(changed(const TQColor &)), - m_imageSelectionWidget, TQT_SLOT(slotChangeGuideColor(const TQColor &))); + connect(m_guideColorBt, TQ_SIGNAL(changed(const TQColor &)), + m_imageSelectionWidget, TQ_SLOT(slotChangeGuideColor(const TQColor &))); - connect(m_guideSize, TQT_SIGNAL(valueChanged(int)), - m_imageSelectionWidget, TQT_SLOT(slotChangeGuideSize(int))); + connect(m_guideSize, TQ_SIGNAL(valueChanged(int)), + m_imageSelectionWidget, TQ_SLOT(slotChangeGuideSize(int))); - connect(m_widthInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotWidthChanged(int))); + connect(m_widthInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotWidthChanged(int))); - connect(m_heightInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotHeightChanged(int))); + connect(m_heightInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotHeightChanged(int))); - connect(m_imageSelectionWidget, TQT_SIGNAL(signalSelectionChanged(TQRect)), - this, TQT_SLOT(slotSelectionChanged(TQRect))); + connect(m_imageSelectionWidget, TQ_SIGNAL(signalSelectionChanged(TQRect)), + this, TQ_SLOT(slotSelectionChanged(TQRect))); - connect(m_imageSelectionWidget, TQT_SIGNAL(signalSelectionMoved(TQRect)), - this, TQT_SLOT(slotSelectionChanged(TQRect))); + connect(m_imageSelectionWidget, TQ_SIGNAL(signalSelectionMoved(TQRect)), + this, TQ_SLOT(slotSelectionChanged(TQRect))); - connect(m_imageSelectionWidget, TQT_SIGNAL(signalSelectionOrientationChanged(int)), - this, TQT_SLOT(slotSelectionOrientationChanged(int))); + connect(m_imageSelectionWidget, TQ_SIGNAL(signalSelectionOrientationChanged(int)), + this, TQ_SLOT(slotSelectionOrientationChanged(int))); - connect(m_centerWidth, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCenterWidth())); + connect(m_centerWidth, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCenterWidth())); - connect(m_centerHeight, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCenterHeight())); + connect(m_centerHeight, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCenterHeight())); // ------------------------------------------------------------- diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.h b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.h index e66efc5..ca24eea 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.h +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.h @@ -47,7 +47,7 @@ class ImageSelectionWidget; class ImageEffect_RatioCrop : public Digikam::ImageDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp index 7baa2ee..17eaf41 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp @@ -1241,7 +1241,7 @@ void ImageSelectionWidget::placeSelection(TQPoint pm, bool symmetric, TQPoint ce void ImageSelectionWidget::mousePressEvent ( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { TQPoint pm = TQPoint(e->x(), e->y()); TQPoint pmVirtual = convertPoint(pm); @@ -1331,7 +1331,7 @@ void ImageSelectionWidget::mouseReleaseEvent ( TQMouseEvent * ) void ImageSelectionWidget::mouseMoveEvent ( TQMouseEvent * e ) { - if ( ( e->state() & Qt::LeftButton ) == Qt::LeftButton ) + if ( ( e->state() & TQt::LeftButton ) == TQt::LeftButton ) { if ( d->moving ) { diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h index eb40356..0d2bd4f 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h @@ -45,7 +45,7 @@ class ImageSelectionWidgetPriv; class ImageSelectionWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp index ad49e17..ed0e670 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp @@ -306,84 +306,84 @@ RatioCropTool::RatioCropTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_ratioCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotRatioChanged(int))); + connect(m_ratioCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotRatioChanged(int))); - connect(m_preciseCrop, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotPreciseCropChanged(bool))); + connect(m_preciseCrop, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotPreciseCropChanged(bool))); - connect(m_orientCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotOrientChanged(int))); + connect(m_orientCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotOrientChanged(int))); - connect(m_autoOrientation, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotAutoOrientChanged(bool))); + connect(m_autoOrientation, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotAutoOrientChanged(bool))); - connect(m_xInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotXChanged(int))); + connect(m_xInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotXChanged(int))); - connect(m_yInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotYChanged(int))); + connect(m_yInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotYChanged(int))); - connect(m_customRatioNInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotCustomNRatioChanged(int))); + connect(m_customRatioNInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotCustomNRatioChanged(int))); - connect(m_customRatioDInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotCustomDRatioChanged(int))); + connect(m_customRatioDInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotCustomDRatioChanged(int))); - connect(m_guideLinesCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotGuideTypeChanged(int))); + connect(m_guideLinesCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotGuideTypeChanged(int))); - connect(m_goldenSectionBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenSectionBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotGoldenGuideTypeChanged())); - connect(m_goldenSpiralSectionBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenSpiralSectionBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotGoldenGuideTypeChanged())); - connect(m_goldenSpiralBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenSpiralBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotGoldenGuideTypeChanged())); - connect(m_goldenTriangleBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenTriangleBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotGoldenGuideTypeChanged())); - connect(m_flipHorBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotGoldenGuideTypeChanged())); + connect(m_flipHorBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotGoldenGuideTypeChanged())); - connect(m_flipVerBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotGoldenGuideTypeChanged())); + connect(m_flipVerBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotGoldenGuideTypeChanged())); - connect(m_guideColorBt, TQT_SIGNAL(changed(const TQColor&)), - m_imageSelectionWidget, TQT_SLOT(slotChangeGuideColor(const TQColor&))); + connect(m_guideColorBt, TQ_SIGNAL(changed(const TQColor&)), + m_imageSelectionWidget, TQ_SLOT(slotChangeGuideColor(const TQColor&))); - connect(m_guideSize, TQT_SIGNAL(valueChanged(int)), - m_imageSelectionWidget, TQT_SLOT(slotChangeGuideSize(int))); + connect(m_guideSize, TQ_SIGNAL(valueChanged(int)), + m_imageSelectionWidget, TQ_SLOT(slotChangeGuideSize(int))); - connect(m_widthInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotWidthChanged(int))); + connect(m_widthInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotWidthChanged(int))); - connect(m_heightInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotHeightChanged(int))); + connect(m_heightInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotHeightChanged(int))); - connect(m_imageSelectionWidget, TQT_SIGNAL(signalSelectionChanged(TQRect)), - this, TQT_SLOT(slotSelectionChanged(TQRect))); + connect(m_imageSelectionWidget, TQ_SIGNAL(signalSelectionChanged(TQRect)), + this, TQ_SLOT(slotSelectionChanged(TQRect))); - connect(m_imageSelectionWidget, TQT_SIGNAL(signalSelectionMoved(TQRect)), - this, TQT_SLOT(slotSelectionChanged(TQRect))); + connect(m_imageSelectionWidget, TQ_SIGNAL(signalSelectionMoved(TQRect)), + this, TQ_SLOT(slotSelectionChanged(TQRect))); - connect(m_imageSelectionWidget, TQT_SIGNAL(signalSelectionOrientationChanged(int)), - this, TQT_SLOT(slotSelectionOrientationChanged(int))); + connect(m_imageSelectionWidget, TQ_SIGNAL(signalSelectionOrientationChanged(int)), + this, TQ_SLOT(slotSelectionOrientationChanged(int))); - connect(m_centerWidth, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCenterWidth())); + connect(m_centerWidth, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCenterWidth())); - connect(m_centerHeight, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCenterHeight())); + connect(m_centerHeight, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCenterHeight())); // we need to disconnect the standard connection of the Try button first - disconnect(m_gboxSettings, TQT_SIGNAL(signalTryClicked()), - this, TQT_SLOT(slotEffect())); + disconnect(m_gboxSettings, TQ_SIGNAL(signalTryClicked()), + this, TQ_SLOT(slotEffect())); - connect(m_gboxSettings, TQT_SIGNAL(signalTryClicked()), - this, TQT_SLOT(slotMaxAspectRatio())); + connect(m_gboxSettings, TQ_SIGNAL(signalTryClicked()), + this, TQ_SLOT(slotMaxAspectRatio())); // ------------------------------------------------------------- diff --git a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.h b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.h index b1e74b5..833677d 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.h +++ b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.h @@ -49,7 +49,7 @@ class ImageSelectionWidget; class RatioCropTool : public Digikam::EditorTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/redeyetool.cpp b/digikam/imageplugins/coreplugin/redeyetool.cpp index b1e5579..5b5af7e 100644 --- a/digikam/imageplugins/coreplugin/redeyetool.cpp +++ b/digikam/imageplugins/coreplugin/redeyetool.cpp @@ -208,32 +208,32 @@ RedEyeTool::RedEyeTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const TQPoint&)), - this, TQT_SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const TQPoint&)), + this, TQ_SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); - connect(m_redThreshold, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_redThreshold, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_smoothLevel, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_smoothLevel, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_HSSelector, TQT_SIGNAL(valueChanged(int, int)), - this, TQT_SLOT(slotHSChanged(int, int))); + connect(m_HSSelector, TQ_SIGNAL(valueChanged(int, int)), + this, TQ_SLOT(slotHSChanged(int, int))); - connect(m_VSelector, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_VSelector, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_tintLevel, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_tintLevel, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); } RedEyeTool::~RedEyeTool() diff --git a/digikam/imageplugins/coreplugin/redeyetool.h b/digikam/imageplugins/coreplugin/redeyetool.h index 7fd201b..eb614fd 100644 --- a/digikam/imageplugins/coreplugin/redeyetool.h +++ b/digikam/imageplugins/coreplugin/redeyetool.h @@ -83,7 +83,7 @@ private: class RedEyeTool : public Digikam::EditorTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/rgbtool.cpp b/digikam/imageplugins/coreplugin/rgbtool.cpp index c337d27..e27e396 100644 --- a/digikam/imageplugins/coreplugin/rgbtool.cpp +++ b/digikam/imageplugins/coreplugin/rgbtool.cpp @@ -161,7 +161,7 @@ RGBTool::RGBTool(TQObject* parent) TQLabel *labelLeft = new TQLabel(i18n("Cyan"), m_gboxSettings->plainPage()); labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); - m_rSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, m_gboxSettings->plainPage(), "m_rSlider"); + m_rSlider = new TQSlider(-100, 100, 1, 0, TQt::Horizontal, m_gboxSettings->plainPage(), "m_rSlider"); m_rSlider->setTickmarks(TQSlider::Below); m_rSlider->setTickInterval(20); TQWhatsThis::add( m_rSlider, i18n("<p>Set here the cyan/red color adjustment of the image.")); @@ -180,7 +180,7 @@ RGBTool::RGBTool(TQObject* parent) labelLeft = new TQLabel(i18n("Magenta"), m_gboxSettings->plainPage()); labelLeft->setAlignment(TQt::AlignRight | TQt::AlignVCenter); - m_gSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, m_gboxSettings->plainPage(), "m_gSlider"); + m_gSlider = new TQSlider(-100, 100, 1, 0, TQt::Horizontal, m_gboxSettings->plainPage(), "m_gSlider"); m_gSlider->setTickmarks(TQSlider::Below); m_gSlider->setTickInterval(20); TQWhatsThis::add( m_gSlider, i18n("<p>Set here the magenta/green color adjustment of the image.")); @@ -199,7 +199,7 @@ RGBTool::RGBTool(TQObject* parent) labelLeft = new TQLabel(i18n("Yellow"), m_gboxSettings->plainPage()); labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); - m_bSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, m_gboxSettings->plainPage(), "m_bSlider"); + m_bSlider = new TQSlider(-100, 100, 1, 0, TQt::Horizontal, m_gboxSettings->plainPage(), "m_bSlider"); m_bSlider->setTickmarks(TQSlider::Below); m_bSlider->setTickInterval(20); TQWhatsThis::add( m_bSlider, i18n("<p>Set here the yellow/blue color adjustment of the image.")); @@ -224,38 +224,38 @@ RGBTool::RGBTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); - - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); - - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - - connect(m_rSlider, TQT_SIGNAL(valueChanged(int)), - m_rInput, TQT_SLOT(setValue(int))); - connect(m_rInput, TQT_SIGNAL(valueChanged (int)), - m_rSlider, TQT_SLOT(setValue(int))); - connect(m_rInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotTimer())); - - connect(m_gSlider, TQT_SIGNAL(valueChanged(int)), - m_gInput, TQT_SLOT(setValue(int))); - connect(m_gInput, TQT_SIGNAL(valueChanged (int)), - m_gSlider, TQT_SLOT(setValue(int))); - connect(m_gInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotTimer())); - - connect(m_bSlider, TQT_SIGNAL(valueChanged(int)), - m_bInput, TQT_SLOT(setValue(int))); - connect(m_bInput, TQT_SIGNAL(valueChanged (int)), - m_bSlider, TQT_SLOT(setValue(int))); - connect(m_bInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotTimer())); - - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); + + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); + + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + + connect(m_rSlider, TQ_SIGNAL(valueChanged(int)), + m_rInput, TQ_SLOT(setValue(int))); + connect(m_rInput, TQ_SIGNAL(valueChanged (int)), + m_rSlider, TQ_SLOT(setValue(int))); + connect(m_rInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotTimer())); + + connect(m_gSlider, TQ_SIGNAL(valueChanged(int)), + m_gInput, TQ_SLOT(setValue(int))); + connect(m_gInput, TQ_SIGNAL(valueChanged (int)), + m_gSlider, TQ_SLOT(setValue(int))); + connect(m_gInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotTimer())); + + connect(m_bSlider, TQ_SIGNAL(valueChanged(int)), + m_bInput, TQ_SLOT(setValue(int))); + connect(m_bInput, TQ_SIGNAL(valueChanged (int)), + m_bSlider, TQ_SLOT(setValue(int))); + connect(m_bInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotTimer())); + + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); // ------------------------------------------------------------- diff --git a/digikam/imageplugins/coreplugin/rgbtool.h b/digikam/imageplugins/coreplugin/rgbtool.h index 080b370..dadb6a0 100644 --- a/digikam/imageplugins/coreplugin/rgbtool.h +++ b/digikam/imageplugins/coreplugin/rgbtool.h @@ -51,7 +51,7 @@ namespace DigikamImagesPluginCore class RGBTool : public Digikam::EditorTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/abort_.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/abort_.c index 889c89f..67278e9 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/abort_.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/abort_.c @@ -1,15 +1,9 @@ #include "stdio.h" #include "f2c.h" -#ifdef KR_headers -extern VOID sig_die(); - -int abort_() -#else extern void sig_die(char*,int); int abort_(void) -#endif { sig_die("Fortran abort routine called", 1); return 0; /* not reached */ diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/close.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/close.c index 5810059..d305ccf 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/close.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/close.c @@ -1,8 +1,5 @@ #include "f2c.h" #include "fio.h" -#ifdef KR_headers -integer f_clos(a) cllist *a; -#else #undef abs #undef min #undef max @@ -24,7 +21,6 @@ extern int unlink(const char*); #endif integer f_clos(cllist *a) -#endif { unit *b; if(a->cunit >= MXUNIT) return(0); @@ -62,12 +58,7 @@ integer f_clos(cllist *a) b->ufnm=NULL; return(0); } - void -#ifdef KR_headers -f_exit() -#else -f_exit(void) -#endif +void f_exit(void) { int i; static cllist xx; if (!xx.cerr) { @@ -80,12 +71,7 @@ f_exit(void) } } } - int -#ifdef KR_headers -flush_() -#else -flush_(void) -#endif +int flush_(void) { int i; for(i=0;i<MXUNIT;i++) if(f__units[i].ufd != NULL && f__units[i].uwrt) diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/endfile.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/endfile.c index f8802ee..d309fc2 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/endfile.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/endfile.c @@ -1,24 +1,15 @@ #include "f2c.h" #include "fio.h" -#ifdef KR_headers -extern char *strcpy(); -extern FILE *tmpfile(); -#else #undef abs #undef min #undef max #include "stdlib.h" #include "string.h" -#endif extern char *f__r_mode[], *f__w_mode[]; -#ifdef KR_headers -integer f_end(a) alist *a; -#else integer f_end(alist *a) -#endif { unit *b; FILE *tf; @@ -36,12 +27,7 @@ integer f_end(alist *a) return(b->useek ? t_runc(a) : 0); } - static int -#ifdef KR_headers -copy(from, len, to) FILE *from, *to; long len; -#else -copy(FILE *from, long len, FILE *to) -#endif +static int copy(FILE *from, long len, FILE *to) { int len1; char buf[BUFSIZ]; @@ -55,12 +41,7 @@ copy(FILE *from, long len, FILE *to) return 0; } - int -#ifdef KR_headers -t_runc(a) alist *a; -#else -t_runc(alist *a) -#endif +int t_runc(alist *a) { long loc, len; unit *b; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/err.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/err.c index de6f2cc..90af7ca 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/err.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/err.c @@ -5,14 +5,10 @@ #include "sys/stat.h" #endif #include "f2c.h" -#ifdef KR_headers -extern char *malloc(); -#else #undef abs #undef min #undef max #include "stdlib.h" -#endif #include "fio.h" #include "fmt.h" /* for struct syl */ @@ -25,17 +21,10 @@ flag f__reading; /*1 if reading, 0 if writing*/ flag f__cplus,f__cblank; char *f__fmtbuf; flag f__external; /*1 if external io, 0 if internal */ -#ifdef KR_headers -int (*f__doed)(),(*f__doned)(); -int (*f__doend)(),(*f__donewrec)(),(*f__dorevert)(); -int (*f__getn)(); /* for formatted input */ -void (*f__putn)(); /* for formatted output */ -#else int (*f__getn)(void); /* for formatted input */ void (*f__putn)(int); /* for formatted output */ int (*f__doed)(struct syl*, char*, ftnlen),(*f__doned)(struct syl*); int (*f__dorevert)(void),(*f__donewrec)(void),(*f__doend)(void); -#endif flag f__sequential; /*1 if sequential io, 0 if direct*/ flag f__formatted; /*1 if formatted io, 0 if unformatted*/ FILE *f__cf; /*current file*/ @@ -81,11 +70,7 @@ char *F_err[] = }; #define MAXERR (sizeof(F_err)/sizeof(char *)+100) -#ifdef KR_headers -f__canseek(f) FILE *f; /*SYSDEP*/ -#else -f__canseek(FILE *f) /*SYSDEP*/ -#endif +int f__canseek(FILE *f) /*SYSDEP*/ { #ifdef NON_UNIX_STDIO return !isatty(fileno(f)); @@ -135,12 +120,7 @@ f__canseek(FILE *f) /*SYSDEP*/ #endif } - void -#ifdef KR_headers -f__fatal(n,s) char *s; -#else -f__fatal(int n, char *s) -#endif +void f__fatal(int n, char *s) { if(n<100 && n>=0) perror(s); /*SYSDEP*/ else if(n >= (int)MAXERR || n < -1) @@ -186,11 +166,8 @@ f_init(Void) p->ufmt=1; p->uwrt=1; } -#ifdef KR_headers -f__nowreading(x) unit *x; -#else -f__nowreading(unit *x) -#endif + +int f__nowreading(unit *x) { long loc; int ufmt, urw; @@ -217,11 +194,8 @@ f__nowreading(unit *x) x->uwrt = 0; return 0; } -#ifdef KR_headers -f__nowwriting(x) unit *x; -#else -f__nowwriting(unit *x) -#endif + +int f__nowwriting(unit *x) { long loc; int ufmt; @@ -256,12 +230,7 @@ f__nowwriting(unit *x) return 0; } - int -#ifdef KR_headers -err__fl(f, m, s) int f, m; char *s; -#else -err__fl(int f, int m, char *s) -#endif +int err__fl(int f, int m, char *s) { if (!f) f__fatal(m, s); diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fio.h b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fio.h index bb20dd2..b1632d5 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fio.h +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fio.h @@ -45,16 +45,6 @@ extern flag f__init; extern cilist *f__elist; /*active external io list*/ extern flag f__reading,f__external,f__sequential,f__formatted; #undef Void -#ifdef KR_headers -#define Void /*void*/ -extern int (*f__getn)(); /* for formatted input */ -extern void (*f__putn)(); /* for formatted output */ -extern void x_putc(); -extern long f__inode(); -extern VOID sig_die(); -extern int (*f__donewrec)(), t_putc(), x_wSL(); -extern int c_sfe(), err__fl(), xrd_SL(), f__putbuf(); -#else #define Void void #ifdef __cplusplus extern "C" { @@ -80,7 +70,6 @@ extern int f__putbuf(int); #ifdef __cplusplus } #endif -#endif extern int (*f__doend)(Void); extern FILE *f__cf; /*current file*/ extern unit *f__curunit; /*current unit*/ diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.c index 364210c..a4fcbc3 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.c @@ -21,12 +21,7 @@ extern flag f__cblank,f__cplus; /*blanks in I and compulsory plus*/ static struct syl f__syl[SYLMX]; int f__parenlvl,f__pc,f__revloc; - static -#ifdef KR_headers -char *ap_end(s) char *s; -#else -char *ap_end(char *s) -#endif +static char *ap_end(char *s) { char quote; quote= *s++; for(;*s;s++) @@ -40,12 +35,8 @@ char *ap_end(char *s) f__fatal(100, "bad string"); /*NOTREACHED*/ return 0; } - static -#ifdef KR_headers -op_gen(a,b,c,d) -#else -op_gen(int a, int b, int c, int d) -#endif + +static int op_gen(int a, int b, int c, int d) { struct syl *p= &f__syl[f__pc]; if(f__pc>=SYLMX) { fprintf(stderr,"format too complicated:\n"); @@ -57,13 +48,9 @@ op_gen(int a, int b, int c, int d) p->p2.i[1]=d; return(f__pc++); } -#ifdef KR_headers -static char *f_list(); -static char *gt_num(s,n,n1) char *s; int *n, n1; -#else + static char *f_list(char*); static char *gt_num(char *s, int *n, int n1) -#endif { int m=0,f__cnt=0; char c; for(c= *s;;c = *s) @@ -85,12 +72,7 @@ static char *gt_num(char *s, int *n, int n1) return(s); } - static -#ifdef KR_headers -char *f_s(s,curloc) char *s; -#else -char *f_s(char *s, int curloc) -#endif +static char *f_s(char *s, int curloc) { skip(s); if(*s++!='(') @@ -107,12 +89,7 @@ char *f_s(char *s, int curloc) return(s); } - static -#ifdef KR_headers -ne_d(s,p) char *s,**p; -#else -ne_d(char *s, char **p) -#endif +static int ne_d(char *s, char **p) { int n,x,sign=0; struct syl *sp; switch(*s) @@ -199,12 +176,7 @@ ne_d(char *s, char **p) return(1); } - static -#ifdef KR_headers -e_d(s,p) char *s,**p; -#else -e_d(char *s, char **p) -#endif +static int e_d(char *s, char **p) { int i,im,n,w,d,e,found=0,x=0; char *sv=s; s=gt_num(s,&n,1); @@ -318,12 +290,8 @@ e_d(char *s, char **p) *p=s; return(1); } - static -#ifdef KR_headers -char *i_tem(s) char *s; -#else -char *i_tem(char *s) -#endif + +static char *i_tem(char *s) { char *t; int n,curloc; if(*s==')') return(s); @@ -334,12 +302,7 @@ char *i_tem(char *s) return(f_s(s,curloc)); } - static -#ifdef KR_headers -char *f_list(s) char *s; -#else -char *f_list(char *s) -#endif +static char *f_list(char *s) { for(;*s!=0;) { skip(s); @@ -359,11 +322,7 @@ char *f_list(char *s) return(NULL); } -#ifdef KR_headers -pars_f(s) char *s; -#else -pars_f(char *s) -#endif +int pars_f(char *s) { f__parenlvl=f__revloc=f__pc=0; if(f_s(s,0) == NULL) @@ -372,16 +331,12 @@ pars_f(char *s) } return(0); } + #define STKSZ 10 int f__cnt[STKSZ],f__ret[STKSZ],f__cp,f__rp; flag f__workdone, f__nonl; - static -#ifdef KR_headers -type_f(n) -#else -type_f(int n) -#endif +static int type_f(int n) { switch(n) { @@ -409,11 +364,8 @@ type_f(int n) return(ED); } } -#ifdef KR_headers -integer do_fio(number,ptr,len) ftnint *number; ftnlen len; char *ptr; -#else + integer do_fio(ftnint *number, char *ptr, ftnlen len) -#endif { struct syl *p; int n,i; for(i=0;i<*number;i++,ptr+=len) @@ -504,10 +456,12 @@ loop: switch(type_f((p= &f__syl[f__pc])->op)) } return(0); } -en_fio(Void) + +int en_fio(Void) { ftnint one=1; return(do_fio(&one,(char *)NULL,(ftnint)0)); } + VOID fmt_bg(Void) { diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.h b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.h index 19065a2..b46bc9c 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.h +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.h @@ -46,21 +46,12 @@ typedef union } ufloat; typedef union { short is; -#ifndef KR_headers - signed -#endif - char ic; + signed char ic; integer il; #ifdef Allow_TYQUAD longint ili; #endif } Uint; -#ifdef KR_headers -extern int (*f__doed)(),(*f__doned)(); -extern int (*f__dorevert)(); -extern int rd_ed(),rd_ned(); -extern int w_ed(),w_ned(); -#else #ifdef __cplusplus extern "C" { #endif @@ -76,7 +67,6 @@ extern int wrt_L(Uint*, int, ftnlen); #ifdef __cplusplus } #endif -#endif extern flag f__cblank,f__cplus,f__workdone, f__nonl; extern char *f__fmtbuf; extern int f__scale; @@ -93,8 +83,4 @@ extern int f__cursor; #define TYQUAD 14 #endif -#ifdef KR_headers -extern char *f__icvt(); -#else extern char *f__icvt(longint, int*, int*, int); -#endif diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c index 0c25dee..8343337 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c @@ -9,12 +9,7 @@ #define ulongint unsigned long #endif -#ifdef KR_headers -char *f__icvt(value,ndigit,sign, base) longint value; int *ndigit,*sign; - int base; -#else char *f__icvt(longint value, int *ndigit, int *sign, int base) -#endif { static char buf[MAXINTLENGTH+1]; int i; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/open.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/open.c index 493aaea..e781075 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/open.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/open.c @@ -9,20 +9,12 @@ #endif #endif -#ifdef KR_headers -extern char *malloc(); -#ifdef NON_ANSI_STDIO -extern char *mktemp(); -#endif -extern integer f_clos(); -#else #undef abs #undef min #undef max #include "stdlib.h" extern int f__canseek(FILE*); extern integer f_clos(cllist*); -#endif #ifdef NON_ANSI_RW_MODES char *f__r_mode[2] = {"r", "r"}; @@ -32,15 +24,10 @@ char *f__r_mode[2] = {"rb", "r"}; char *f__w_mode[4] = {"wb", "w", "r+b", "r+"}; #endif - static char f__buf0[400], *f__buf = f__buf0; - int f__buflen = (int)sizeof(f__buf0); +static char f__buf0[400], *f__buf = f__buf0; +int f__buflen = (int)sizeof(f__buf0); - static void -#ifdef KR_headers -f__bufadj(n, c) int n, c; -#else -f__bufadj(int n, int c) -#endif +static void f__bufadj(int n, int c) { unsigned int len; char *nbuf, *s, *t, *te; @@ -62,12 +49,7 @@ f__bufadj(int n, int c) f__buf = nbuf; } - int -#ifdef KR_headers -f__putbuf(c) int c; -#else -f__putbuf(int c) -#endif +int f__putbuf(int c) { char *s, *se; int n; @@ -92,12 +74,7 @@ f__putbuf(int c) return 0; } - void -#ifdef KR_headers -x_putc(c) -#else -x_putc(int c) -#endif +void x_putc(int c) { if (f__recpos >= f__buflen) f__bufadj(f__recpos, f__buflen); @@ -106,12 +83,7 @@ x_putc(int c) #define opnerr(f,m,s) {if(f) errno= m; else opn_err(m,s,a); return(m);} - static void -#ifdef KR_headers -opn_err(m, s, a) int m; char *s; olist *a; -#else -opn_err(int m, char *s, olist *a) -#endif +static void opn_err(int m, char *s, olist *a) { if (a->ofnm) { /* supply file name to error message */ @@ -122,11 +94,7 @@ opn_err(int m, char *s, olist *a) f__fatal(m, s); } -#ifdef KR_headers -integer f_open(a) olist *a; -#else integer f_open(olist *a) -#endif { unit *b; integer rv; char buf[256], *s; @@ -270,11 +238,8 @@ integer f_open(olist *a) opnerr(a->oerr,129,"open"); return(0); } -#ifdef KR_headers -fk_open(seq,fmt,n) ftnint n; -#else -fk_open(int seq, int fmt, ftnint n) -#endif + +int fk_open(int seq, int fmt, ftnint n) { char nbuf[10]; olist a; (void) sprintf(nbuf,"fort.%ld",(long)n); diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_cmp.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_cmp.c index c6fd9c0..cd6a7dc 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_cmp.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_cmp.c @@ -2,11 +2,7 @@ /* compare two strings */ -#ifdef KR_headers -integer s_cmp(a0, b0, la, lb) char *a0, *b0; ftnlen la, lb; -#else integer s_cmp(char *a0, char *b0, ftnlen la, ftnlen lb) -#endif { unsigned char *a, *aend, *b, *bend; a = (unsigned char *)a0; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_copy.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_copy.c index 9287d7f..289c67d 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_copy.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_copy.c @@ -8,11 +8,7 @@ /* assign strings: a = b */ -#ifdef KR_headers -VOID s_copy(a, b, la, lb) char *a, *b; ftnlen la, lb; -#else void s_copy(char *a, char *b, ftnlen la, ftnlen lb) -#endif { char *aend, *bend; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_stop.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_stop.c index fb57bde..049f71b 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_stop.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_stop.c @@ -1,10 +1,6 @@ #include "stdio.h" #include "f2c.h" -#ifdef KR_headers -extern void f_exit(); -VOID s_stop(s, n) char *s; ftnlen n; -#else #undef abs #undef min #undef max @@ -15,7 +11,6 @@ extern "C" { void f_exit(void); int s_stop(char *s, ftnlen n) -#endif { int i; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/sfe.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/sfe.c index cade56a..4f8907e 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/sfe.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/sfe.c @@ -10,11 +10,8 @@ integer e_rsfe(Void) f__fmtbuf=NULL; return(n); } -#ifdef KR_headers -c_sfe(a) cilist *a; /* check */ -#else -c_sfe(cilist *a) /* check */ -#endif + +int c_sfe(cilist *a) /* check */ { unit *p; f__curunit = p = &f__units[a->ciunit]; if(a->ciunit >= MXUNIT || a->ciunit<0) @@ -23,6 +20,7 @@ c_sfe(cilist *a) /* check */ if(!p->ufmt) err(a->cierr,102,"sfe") return(0); } + integer e_wsfe(Void) { int n = en_fio(); diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/sig_die.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/sig_die.c index d17bc6b..7833520 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/sig_die.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/sig_die.c @@ -7,9 +7,6 @@ #endif #endif -#ifdef KR_headers -void sig_die(s, kill) char *s; int kill; -#else #include "stdlib.h" #ifdef __cplusplus extern "C" { @@ -17,7 +14,6 @@ extern "C" { extern void f_exit(void); void sig_die(char *s, int kill) -#endif { /* print error message, then clear buffers */ fprintf(stderr, "%s\n", s); diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/util.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/util.c index 6468db0..684cdfc 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/util.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/util.c @@ -7,12 +7,7 @@ #include "f2c.h" #include "fio.h" - VOID -#ifdef KR_headers -g_char(a,alen,b) char *a,*b; ftnlen alen; -#else -g_char(char *a, ftnlen alen, char *b) -#endif +void g_char(char *a, ftnlen alen, char *b) { char *x = a + alen, *y = b + alen; @@ -29,22 +24,13 @@ g_char(char *a, ftnlen alen, char *b) while(x-- > a); } - VOID -#ifdef KR_headers -b_char(a,b,blen) char *a,*b; ftnlen blen; -#else -b_char(char *a, char *b, ftnlen blen) -#endif +void b_char(char *a, char *b, ftnlen blen) { int i; for(i=0;i<blen && *a!=0;i++) *b++= *a++; for(;i<blen;i++) *b++=' '; } #ifndef NON_UNIX_STDIO -#ifdef KR_headers -long f__inode(a, dev) char *a; int *dev; -#else long f__inode(char *a, int *dev) -#endif { struct stat x; if(stat(a,&x)<0) return(-1); *dev = x.st_dev; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wref.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wref.c index 2f3fce8..636489c 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wref.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wref.c @@ -1,13 +1,11 @@ #include "f2c.h" #include "fio.h" -#ifndef KR_headers #undef abs #undef min #undef max #include "stdlib.h" #include "string.h" -#endif #include "fmt.h" #include "fp.h" @@ -15,11 +13,7 @@ #include "ctype.h" #endif -#ifdef KR_headers -wrt_E(p,w,d,e,len) ufloat *p; ftnlen len; -#else -wrt_E(ufloat *p, int w, int d, int e, ftnlen len) -#endif +int wrt_E(ufloat *p, int w, int d, int e, ftnlen len) { char buf[FMAX+EXPMAXDIGS+4], *s, *se; int d1, delta, e1, i, sign, signspace; @@ -191,11 +185,7 @@ nogood: return 0; } -#ifdef KR_headers -wrt_F(p,w,d,len) ufloat *p; ftnlen len; -#else -wrt_F(ufloat *p, int w, int d, ftnlen len) -#endif +int wrt_F(ufloat *p, int w, int d, ftnlen len) { int d1, sign, n; double x; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c index 92ce295..74d1131 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c @@ -64,12 +64,7 @@ mv_cur(Void) /* shouldn't use fseek because it insists on calling fflush */ return(0); } - static int -#ifdef KR_headers -wrt_Z(n,w,minlen,len) Uint *n; int w, minlen; ftnlen len; -#else -wrt_Z(Uint *n, int w, int minlen, ftnlen len) -#endif +static int wrt_Z(Uint *n, int w, int minlen, ftnlen len) { char *s, *se; int i, w1; @@ -119,12 +114,7 @@ wrt_Z(Uint *n, int w, int minlen, ftnlen len) return 0; } - static int -#ifdef KR_headers -wrt_I(n,w,len, base) Uint *n; ftnlen len; int base; -#else -wrt_I(Uint *n, int w, ftnlen len, int base) -#endif +static int wrt_I(Uint *n, int w, ftnlen len, int base) { int ndigit,sign,spare,i; longint x; char *ans; @@ -147,12 +137,8 @@ wrt_I(Uint *n, int w, ftnlen len, int base) } return(0); } - static int -#ifdef KR_headers -wrt_IM(n,w,m,len,base) Uint *n; ftnlen len; int base; -#else -wrt_IM(Uint *n, int w, int m, ftnlen len, int base) -#endif + +static int wrt_IM(Uint *n, int w, int m, ftnlen len, int base) { int ndigit,sign,spare,i,xsign; longint x; char *ans; @@ -184,12 +170,8 @@ wrt_IM(Uint *n, int w, int m, ftnlen len, int base) for(i=0;i<ndigit;i++) (*f__putn)(*ans++); return(0); } - static int -#ifdef KR_headers -wrt_AP(s) char *s; -#else -wrt_AP(char *s) -#endif + +static int wrt_AP(char *s) { char quote; int i; @@ -203,12 +185,8 @@ wrt_AP(char *s) } return(1); } - static int -#ifdef KR_headers -wrt_H(a,s) char *s; -#else -wrt_H(int a, char *s) -#endif + +static int wrt_H(int a, char *s) { int i; @@ -217,11 +195,8 @@ wrt_H(int a, char *s) while(a--) (*f__putn)(*s++); return(1); } -#ifdef KR_headers -wrt_L(n,len, sz) Uint *n; ftnlen sz; -#else -wrt_L(Uint *n, int len, ftnlen sz) -#endif + +int wrt_L(Uint *n, int len, ftnlen sz) { int i; long x; if(sizeof(long)==sz) x=n->il; @@ -233,22 +208,14 @@ wrt_L(Uint *n, int len, ftnlen sz) else (*f__putn)('F'); return(0); } - static int -#ifdef KR_headers -wrt_A(p,len) char *p; ftnlen len; -#else -wrt_A(char *p, ftnlen len) -#endif + +static int wrt_A(char *p, ftnlen len) { while(len-- > 0) (*f__putn)(*p++); return(0); } - static int -#ifdef KR_headers -wrt_AW(p,w,len) char * p; ftnlen len; -#else -wrt_AW(char * p, int w, ftnlen len) -#endif + +static int wrt_AW(char * p, int w, ftnlen len) { while(w>len) { w--; @@ -259,12 +226,7 @@ wrt_AW(char * p, int w, ftnlen len) return(0); } - static int -#ifdef KR_headers -wrt_G(p,w,d,e,len) ufloat *p; ftnlen len; -#else -wrt_G(ufloat *p, int w, int d, int e, ftnlen len) -#endif +static int wrt_G(ufloat *p, int w, int d, int e, ftnlen len) { double up = 1,x; int i=0,oldscale,n,j; x = len==sizeof(real)?p->pf:p->pd; @@ -289,11 +251,8 @@ wrt_G(ufloat *p, int w, int d, int e, ftnlen len) } return(wrt_E(p,w,d,e,len)); } -#ifdef KR_headers -w_ed(p,ptr,len) struct syl *p; char *ptr; ftnlen len; -#else -w_ed(struct syl *p, char *ptr, ftnlen len) -#endif + +int w_ed(struct syl *p, char *ptr, ftnlen len) { int i; @@ -335,11 +294,8 @@ w_ed(struct syl *p, char *ptr, ftnlen len) return(wrt_Z((Uint *)ptr,p->p1,p->p2.i[0],len)); } } -#ifdef KR_headers -w_ned(p) struct syl *p; -#else -w_ned(struct syl *p) -#endif + +int w_ned(struct syl *p) { switch(p->op) { diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wsfe.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wsfe.c index a74e2d5..b772df3 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wsfe.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wsfe.c @@ -39,11 +39,7 @@ xw_rev(Void) return n; } -#ifdef KR_headers -integer s_wsfe(a) cilist *a; /*start*/ -#else integer s_wsfe(cilist *a) /*start*/ -#endif { int n; if(!f__init) f_init(); f__reading=0; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp index 8792695..b2ae9a6 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp @@ -205,8 +205,8 @@ ImageEffect_Sharpen::ImageEffect_Sharpen(TQWidget* parent) // ------------------------------------------------------------- - connect(m_sharpMethod, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSharpMethodActived(int))); + connect(m_sharpMethod, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSharpMethodActived(int))); // ------------------------------------------------------------- diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.h b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.h index e189689..fa92638 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.h +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.h @@ -44,7 +44,7 @@ namespace DigikamImagesPluginCore class ImageEffect_Sharpen : public Digikam::CtrlPanelDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp index b2a8239..aee5d84 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp @@ -248,8 +248,8 @@ SharpenTool::SharpenTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_sharpMethod, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSharpMethodActived(int))); + connect(m_sharpMethod, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSharpMethodActived(int))); // ------------------------------------------------------------- @@ -679,7 +679,7 @@ void SharpenTool::putFinalData() void SharpenTool::slotLoadSettings() { KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), TQT_TQWIDGET(kapp->activeWindow()), + TQString( "*" ), kapp->activeWindow(), TQString( i18n("Photograph Refocus Settings File to Load")) ); if ( loadRestorationFile.isEmpty() ) return; @@ -691,7 +691,7 @@ void SharpenTool::slotLoadSettings() TQTextStream stream( &file ); if ( stream.readLine() != "# Photograph Refocus Configuration File" ) { - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), + KMessageBox::error(kapp->activeWindow(), i18n("\"%1\" is not a Photograph Refocus settings text file.") .arg(loadRestorationFile.fileName())); file.close(); @@ -707,7 +707,7 @@ void SharpenTool::slotLoadSettings() blockSignals(false); } else - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Cannot load settings from the Photograph Refocus text file.")); + KMessageBox::error(kapp->activeWindow(), i18n("Cannot load settings from the Photograph Refocus text file.")); file.close(); } @@ -715,7 +715,7 @@ void SharpenTool::slotLoadSettings() void SharpenTool::slotSaveAsSettings() { KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), TQT_TQWIDGET(kapp->activeWindow()), + TQString( "*" ), kapp->activeWindow(), TQString( i18n("Photograph Refocus Settings File to Save")) ); if ( saveRestorationFile.isEmpty() ) return; @@ -733,7 +733,7 @@ void SharpenTool::slotSaveAsSettings() stream << m_noise->value() << "\n"; } else - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Cannot save settings to the Photograph Refocus text file.")); + KMessageBox::error(kapp->activeWindow(), i18n("Cannot save settings to the Photograph Refocus text file.")); file.close(); } diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.h b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.h index c9131f5..8dbca1c 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.h +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.h @@ -49,7 +49,7 @@ namespace DigikamImagesPluginCore class SharpenTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/distortionfx/distortionfxtool.cpp b/digikam/imageplugins/distortionfx/distortionfxtool.cpp index 3be193c..45ff0e4 100644 --- a/digikam/imageplugins/distortionfx/distortionfxtool.cpp +++ b/digikam/imageplugins/distortionfx/distortionfxtool.cpp @@ -164,17 +164,17 @@ DistortionFXTool::DistortionFXTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_effectType, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotEffectTypeChanged(int))); + connect(m_effectType, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotEffectTypeChanged(int))); - connect(m_levelInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_levelInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_iterationInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_iterationInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_gboxSettings, TQT_SIGNAL(signalColorGuideChanged()), - this, TQT_SLOT(slotColorGuideChanged())); + connect(m_gboxSettings, TQ_SIGNAL(signalColorGuideChanged()), + this, TQ_SLOT(slotColorGuideChanged())); } DistortionFXTool::~DistortionFXTool() diff --git a/digikam/imageplugins/distortionfx/distortionfxtool.h b/digikam/imageplugins/distortionfx/distortionfxtool.h index fe28315..bcdd608 100644 --- a/digikam/imageplugins/distortionfx/distortionfxtool.h +++ b/digikam/imageplugins/distortionfx/distortionfxtool.h @@ -50,7 +50,7 @@ namespace DigikamDistortionFXImagesPlugin class DistortionFXTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp index bf5fc9f..695e774 100644 --- a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp +++ b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp @@ -164,14 +164,14 @@ ImageEffect_DistortionFX::ImageEffect_DistortionFX(TQWidget* parent) // ------------------------------------------------------------- - connect(m_effectType, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotEffectTypeChanged(int))); + connect(m_effectType, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotEffectTypeChanged(int))); - connect(m_levelInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_levelInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_iterationInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_iterationInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); } ImageEffect_DistortionFX::~ImageEffect_DistortionFX() diff --git a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.h b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.h index fdf3cf7..652b372 100644 --- a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.h +++ b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.h @@ -42,7 +42,7 @@ namespace DigikamDistortionFXImagesPlugin class ImageEffect_DistortionFX : public Digikam::ImageGuideDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp index c6e6108..582e1b9 100644 --- a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp +++ b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp @@ -48,7 +48,7 @@ ImagePlugin_DistortionFX::ImagePlugin_DistortionFX(TQObject *parent, const char* : Digikam::ImagePlugin(parent, "ImagePlugin_DistortionFX") { m_distortionfxAction = new TDEAction(i18n("Distortion Effects..."), "distortionfx", 0, - this, TQT_SLOT(slotDistortionFX()), + this, TQ_SLOT(slotDistortionFX()), actionCollection(), "imageplugin_distortionfx"); setXMLFile( "digikamimageplugin_distortionfx_ui.rc" ); diff --git a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h index 975c085..2af33a1 100644 --- a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h +++ b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h @@ -36,7 +36,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_DistortionFX : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/emboss/embosstool.cpp b/digikam/imageplugins/emboss/embosstool.cpp index be03d07..f16ef4d 100644 --- a/digikam/imageplugins/emboss/embosstool.cpp +++ b/digikam/imageplugins/emboss/embosstool.cpp @@ -96,8 +96,8 @@ EmbossTool::EmbossTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_depthInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotTimer())); + connect(m_depthInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotTimer())); } EmbossTool::~EmbossTool() diff --git a/digikam/imageplugins/emboss/embosstool.h b/digikam/imageplugins/emboss/embosstool.h index 2b36472..224858f 100644 --- a/digikam/imageplugins/emboss/embosstool.h +++ b/digikam/imageplugins/emboss/embosstool.h @@ -46,7 +46,7 @@ namespace DigikamEmbossImagesPlugin class EmbossTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/emboss/imageeffect_emboss.cpp b/digikam/imageplugins/emboss/imageeffect_emboss.cpp index 9ec68b4..b4557c8 100644 --- a/digikam/imageplugins/emboss/imageeffect_emboss.cpp +++ b/digikam/imageplugins/emboss/imageeffect_emboss.cpp @@ -95,8 +95,8 @@ ImageEffect_Emboss::ImageEffect_Emboss(TQWidget* parent) // ------------------------------------------------------------- - connect(m_depthInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotTimer())); + connect(m_depthInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotTimer())); } ImageEffect_Emboss::~ImageEffect_Emboss() diff --git a/digikam/imageplugins/emboss/imageeffect_emboss.h b/digikam/imageplugins/emboss/imageeffect_emboss.h index 11f7228..19cf4f7 100644 --- a/digikam/imageplugins/emboss/imageeffect_emboss.h +++ b/digikam/imageplugins/emboss/imageeffect_emboss.h @@ -37,7 +37,7 @@ namespace DigikamEmbossImagesPlugin class ImageEffect_Emboss : public Digikam::CtrlPanelDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/emboss/imageplugin_emboss.cpp b/digikam/imageplugins/emboss/imageplugin_emboss.cpp index 9580480..6bd616d 100644 --- a/digikam/imageplugins/emboss/imageplugin_emboss.cpp +++ b/digikam/imageplugins/emboss/imageplugin_emboss.cpp @@ -48,7 +48,7 @@ ImagePlugin_Emboss::ImagePlugin_Emboss(TQObject *parent, const char*, : Digikam::ImagePlugin(parent, "ImagePlugin_Emboss") { m_embossAction = new TDEAction(i18n("Emboss..."), "embosstool", 0, - this, TQT_SLOT(slotEmboss()), + this, TQ_SLOT(slotEmboss()), actionCollection(), "imageplugin_emboss"); setXMLFile( "digikamimageplugin_emboss_ui.rc" ); diff --git a/digikam/imageplugins/emboss/imageplugin_emboss.h b/digikam/imageplugins/emboss/imageplugin_emboss.h index 92a1018..1ccac06 100644 --- a/digikam/imageplugins/emboss/imageplugin_emboss.h +++ b/digikam/imageplugins/emboss/imageplugin_emboss.h @@ -34,7 +34,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Emboss : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/filmgrain/filmgraintool.cpp b/digikam/imageplugins/filmgrain/filmgraintool.cpp index 7bb3aad..5799d81 100644 --- a/digikam/imageplugins/filmgrain/filmgraintool.cpp +++ b/digikam/imageplugins/filmgrain/filmgraintool.cpp @@ -76,7 +76,7 @@ FilmGrainTool::FilmGrainTool(TQObject* parent) TQGridLayout* grid = new TQGridLayout( m_gboxSettings->plainPage(), 2, 1); TQLabel *label1 = new TQLabel(i18n("Sensitivity (ISO):"), m_gboxSettings->plainPage()); - m_sensibilitySlider = new TQSlider(2, 30, 1, 12, Qt::Horizontal, m_gboxSettings->plainPage()); + m_sensibilitySlider = new TQSlider(2, 30, 1, 12, TQt::Horizontal, m_gboxSettings->plainPage()); m_sensibilitySlider->setTracking(false); m_sensibilitySlider->setTickInterval(1); m_sensibilitySlider->setTickmarks(TQSlider::Below); @@ -108,16 +108,16 @@ FilmGrainTool::FilmGrainTool(TQObject* parent) // ------------------------------------------------------------- - connect( m_sensibilitySlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer()) ); + connect( m_sensibilitySlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer()) ); // this connection is necessary to change the LCD display when // the value is changed by single clicking on the slider - connect( m_sensibilitySlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotSliderMoved(int)) ); + connect( m_sensibilitySlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotSliderMoved(int)) ); - connect( m_sensibilitySlider, TQT_SIGNAL(sliderMoved(int)), - this, TQT_SLOT(slotSliderMoved(int)) ); + connect( m_sensibilitySlider, TQ_SIGNAL(sliderMoved(int)), + this, TQ_SLOT(slotSliderMoved(int)) ); } FilmGrainTool::~FilmGrainTool() diff --git a/digikam/imageplugins/filmgrain/filmgraintool.h b/digikam/imageplugins/filmgrain/filmgraintool.h index 80a1f12..1a179b5 100644 --- a/digikam/imageplugins/filmgrain/filmgraintool.h +++ b/digikam/imageplugins/filmgrain/filmgraintool.h @@ -44,7 +44,7 @@ namespace DigikamFilmGrainImagesPlugin class FilmGrainTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp index 25bfc08..e008095 100644 --- a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp +++ b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp @@ -87,7 +87,7 @@ ImageEffect_FilmGrain::ImageEffect_FilmGrain(TQWidget* parent) TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 1, 1, 0, spacingHint()); TQLabel *label1 = new TQLabel(i18n("Sensitivity (ISO):"), gboxSettings); - m_sensibilitySlider = new TQSlider(2, 30, 1, 12, Qt::Horizontal, gboxSettings); + m_sensibilitySlider = new TQSlider(2, 30, 1, 12, TQt::Horizontal, gboxSettings); m_sensibilitySlider->setTracking ( false ); m_sensibilitySlider->setTickInterval(1); m_sensibilitySlider->setTickmarks(TQSlider::Below); @@ -108,16 +108,16 @@ ImageEffect_FilmGrain::ImageEffect_FilmGrain(TQWidget* parent) // ------------------------------------------------------------- - connect( m_sensibilitySlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer()) ); + connect( m_sensibilitySlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer()) ); // this connection is necessary to change the LCD display when // the value is changed by single clicking on the slider - connect( m_sensibilitySlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotSliderMoved(int)) ); + connect( m_sensibilitySlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotSliderMoved(int)) ); - connect( m_sensibilitySlider, TQT_SIGNAL(sliderMoved(int)), - this, TQT_SLOT(slotSliderMoved(int)) ); + connect( m_sensibilitySlider, TQ_SIGNAL(sliderMoved(int)), + this, TQ_SLOT(slotSliderMoved(int)) ); } ImageEffect_FilmGrain::~ImageEffect_FilmGrain() diff --git a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.h b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.h index 8f7cc92..ba66e0a 100644 --- a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.h +++ b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.h @@ -39,7 +39,7 @@ namespace DigikamFilmGrainImagesPlugin class ImageEffect_FilmGrain : public Digikam::CtrlPanelDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp index 2d4efe4..efa2c35 100644 --- a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp +++ b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp @@ -47,7 +47,7 @@ ImagePlugin_FilmGrain::ImagePlugin_FilmGrain(TQObject *parent, const char*, cons : Digikam::ImagePlugin(parent, "ImagePlugin_FilmGrain") { m_filmgrainAction = new TDEAction(i18n("Add Film Grain..."), "filmgrain", 0, - this, TQT_SLOT(slotFilmGrain()), + this, TQ_SLOT(slotFilmGrain()), actionCollection(), "imageplugin_filmgrain"); setXMLFile( "digikamimageplugin_filmgrain_ui.rc" ); diff --git a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.h b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.h index 457d80d..495da12 100644 --- a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.h +++ b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.h @@ -34,7 +34,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_FilmGrain : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/freerotation/freerotationtool.cpp b/digikam/imageplugins/freerotation/freerotationtool.cpp index 70c053c..b25f219 100644 --- a/digikam/imageplugins/freerotation/freerotationtool.cpp +++ b/digikam/imageplugins/freerotation/freerotationtool.cpp @@ -153,20 +153,20 @@ FreeRotationTool::FreeRotationTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_angleInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_angleInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_fineAngleInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotTimer())); + connect(m_fineAngleInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotTimer())); - connect(m_antialiasInput, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotEffect())); + connect(m_antialiasInput, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotEffect())); - connect(m_autoCropCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotEffect())); + connect(m_autoCropCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotEffect())); - connect(m_gboxSettings, TQT_SIGNAL(signalColorGuideChanged()), - this, TQT_SLOT(slotColorGuideChanged())); + connect(m_gboxSettings, TQ_SIGNAL(signalColorGuideChanged()), + this, TQ_SLOT(slotColorGuideChanged())); } FreeRotationTool::~FreeRotationTool() diff --git a/digikam/imageplugins/freerotation/freerotationtool.h b/digikam/imageplugins/freerotation/freerotationtool.h index ec50915..fd17f4f 100644 --- a/digikam/imageplugins/freerotation/freerotationtool.h +++ b/digikam/imageplugins/freerotation/freerotationtool.h @@ -51,7 +51,7 @@ namespace DigikamFreeRotationImagesPlugin class FreeRotationTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp index 9e546e0..bce50f0 100644 --- a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp +++ b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp @@ -156,17 +156,17 @@ ImageEffect_FreeRotation::ImageEffect_FreeRotation(TQWidget* parent) // ------------------------------------------------------------- - connect(m_angleInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotTimer())); + connect(m_angleInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotTimer())); - connect(m_fineAngleInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_fineAngleInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_antialiasInput, TQT_SIGNAL(toggled (bool)), - this, TQT_SLOT(slotEffect())); + connect(m_antialiasInput, TQ_SIGNAL(toggled (bool)), + this, TQ_SLOT(slotEffect())); - connect(m_autoCropCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotEffect())); + connect(m_autoCropCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotEffect())); } ImageEffect_FreeRotation::~ImageEffect_FreeRotation() diff --git a/digikam/imageplugins/freerotation/imageeffect_freerotation.h b/digikam/imageplugins/freerotation/imageeffect_freerotation.h index 89e3023..a90be09 100644 --- a/digikam/imageplugins/freerotation/imageeffect_freerotation.h +++ b/digikam/imageplugins/freerotation/imageeffect_freerotation.h @@ -42,7 +42,7 @@ namespace DigikamFreeRotationImagesPlugin class ImageEffect_FreeRotation : public Digikam::ImageGuideDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp b/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp index acf632b..0c04a2c 100644 --- a/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp +++ b/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp @@ -46,7 +46,7 @@ ImagePlugin_FreeRotation::ImagePlugin_FreeRotation(TQObject *parent, const char* : Digikam::ImagePlugin(parent, "ImagePlugin_FreeRotation") { m_freerotationAction = new TDEAction(i18n("Free Rotation..."), "freerotation", 0, - this, TQT_SLOT(slotFreeRotation()), + this, TQ_SLOT(slotFreeRotation()), actionCollection(), "imageplugin_freerotation"); setXMLFile("digikamimageplugin_freerotation_ui.rc"); diff --git a/digikam/imageplugins/freerotation/imageplugin_freerotation.h b/digikam/imageplugins/freerotation/imageplugin_freerotation.h index e99ab74..2a0c262 100644 --- a/digikam/imageplugins/freerotation/imageplugin_freerotation.h +++ b/digikam/imageplugins/freerotation/imageplugin_freerotation.h @@ -34,7 +34,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_FreeRotation : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/hotpixels/blackframelistview.cpp b/digikam/imageplugins/hotpixels/blackframelistview.cpp index 35fa8f7..1202b09 100644 --- a/digikam/imageplugins/hotpixels/blackframelistview.cpp +++ b/digikam/imageplugins/hotpixels/blackframelistview.cpp @@ -59,17 +59,17 @@ BlackFrameListViewItem::BlackFrameListViewItem(BlackFrameListView* parent, const m_parser = new BlackFrameParser(parent); m_parser->parseBlackFrame(url); - connect(m_parser, TQT_SIGNAL(parsed(TQValueList<HotPixel>)), - this, TQT_SLOT(slotParsed(TQValueList<HotPixel>))); + connect(m_parser, TQ_SIGNAL(parsed(TQValueList<HotPixel>)), + this, TQ_SLOT(slotParsed(TQValueList<HotPixel>))); - connect(this, TQT_SIGNAL(parsed(TQValueList<HotPixel>, const KURL&)), - parent, TQT_SLOT(slotParsed(TQValueList<HotPixel>, const KURL&))); + connect(this, TQ_SIGNAL(parsed(TQValueList<HotPixel>, const KURL&)), + parent, TQ_SLOT(slotParsed(TQValueList<HotPixel>, const KURL&))); - connect(m_parser, TQT_SIGNAL(signalLoadingProgress(float)), - this, TQT_SIGNAL(signalLoadingProgress(float))); + connect(m_parser, TQ_SIGNAL(signalLoadingProgress(float)), + this, TQ_SIGNAL(signalLoadingProgress(float))); - connect(m_parser, TQT_SIGNAL(signalLoadingComplete()), - this, TQT_SIGNAL(signalLoadingComplete())); + connect(m_parser, TQ_SIGNAL(signalLoadingComplete()), + this, TQ_SIGNAL(signalLoadingComplete())); } void BlackFrameListViewItem::activate() @@ -132,7 +132,7 @@ TQPixmap BlackFrameListViewItem::thumb(const TQSize& size) TQPixmap thumb; //First scale it down to the size - thumb = m_image.smoothScale(size, TQ_ScaleMin); + thumb = m_image.smoothScale(size, TQImage::ScaleMin); //And draw the hot pixel positions on the thumb TQPainter p(&thumb); diff --git a/digikam/imageplugins/hotpixels/blackframelistview.h b/digikam/imageplugins/hotpixels/blackframelistview.h index fe296d0..977d226 100644 --- a/digikam/imageplugins/hotpixels/blackframelistview.h +++ b/digikam/imageplugins/hotpixels/blackframelistview.h @@ -49,7 +49,7 @@ namespace DigikamHotPixelsImagesPlugin class BlackFrameListView : public TQListView { - Q_OBJECT + TQ_OBJECT public: @@ -73,7 +73,7 @@ private slots: class BlackFrameListViewItem : public TQObject, TQListViewItem { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/imageplugins/hotpixels/blackframeparser.cpp b/digikam/imageplugins/hotpixels/blackframeparser.cpp index b6e2c89..7306f4e 100644 --- a/digikam/imageplugins/hotpixels/blackframeparser.cpp +++ b/digikam/imageplugins/hotpixels/blackframeparser.cpp @@ -84,11 +84,11 @@ void BlackFrameParser::parseBlackFrame(const KURL &url) { m_imageLoaderThread = new LoadSaveThread(); - connect(m_imageLoaderThread, TQT_SIGNAL(signalLoadingProgress(const LoadingDescription&, float)), - this, TQT_SLOT(slotLoadingProgress(const LoadingDescription&, float))); + connect(m_imageLoaderThread, TQ_SIGNAL(signalLoadingProgress(const LoadingDescription&, float)), + this, TQ_SLOT(slotLoadingProgress(const LoadingDescription&, float))); - connect(m_imageLoaderThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription&, const DImg&)), - this, TQT_SLOT(slotLoadImageFromUrlComplete(const LoadingDescription&, const DImg&))); + connect(m_imageLoaderThread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription&, const DImg&)), + this, TQ_SLOT(slotLoadImageFromUrlComplete(const LoadingDescription&, const DImg&))); } LoadingDescription desc = LoadingDescription(m_localFile, DRawDecoding()); diff --git a/digikam/imageplugins/hotpixels/blackframeparser.h b/digikam/imageplugins/hotpixels/blackframeparser.h index 9862471..f13ebdc 100644 --- a/digikam/imageplugins/hotpixels/blackframeparser.h +++ b/digikam/imageplugins/hotpixels/blackframeparser.h @@ -57,7 +57,7 @@ namespace DigikamHotPixelsImagesPlugin class BlackFrameParser: public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/hotpixels/hotpixelstool.cpp b/digikam/imageplugins/hotpixels/hotpixelstool.cpp index 4cabb68..fbcc6c9 100644 --- a/digikam/imageplugins/hotpixels/hotpixelstool.cpp +++ b/digikam/imageplugins/hotpixels/hotpixelstool.cpp @@ -119,14 +119,14 @@ HotPixelsTool::HotPixelsTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_filterMethodCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotEffect())); + connect(m_filterMethodCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotEffect())); - connect(m_blackFrameButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddBlackFrame())); + connect(m_blackFrameButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddBlackFrame())); - connect(m_blackFrameListView, TQT_SIGNAL(blackFrameSelected(TQValueList<HotPixel>, const KURL&)), - this, TQT_SLOT(slotBlackFrame(TQValueList<HotPixel>, const KURL&))); + connect(m_blackFrameListView, TQ_SIGNAL(blackFrameSelected(TQValueList<HotPixel>, const KURL&)), + this, TQ_SLOT(slotBlackFrame(TQValueList<HotPixel>, const KURL&))); } HotPixelsTool::~HotPixelsTool() @@ -146,11 +146,11 @@ void HotPixelsTool::readSettings() EditorToolIface::editorToolIface()->setToolStartProgress(i18n("Loading: ")); BlackFrameListViewItem *item = new BlackFrameListViewItem(m_blackFrameListView, m_blackFrameURL); - connect(item, TQT_SIGNAL(signalLoadingProgress(float)), - this, TQT_SLOT(slotLoadingProgress(float))); + connect(item, TQ_SIGNAL(signalLoadingProgress(float)), + this, TQ_SLOT(slotLoadingProgress(float))); - connect(item, TQT_SIGNAL(signalLoadingComplete()), - this, TQT_SLOT(slotLoadingComplete())); + connect(item, TQ_SIGNAL(signalLoadingComplete()), + this, TQ_SLOT(slotLoadingComplete())); } } @@ -193,11 +193,11 @@ void HotPixelsTool::slotAddBlackFrame() m_blackFrameListView->clear(); BlackFrameListViewItem *item = new BlackFrameListViewItem(m_blackFrameListView, m_blackFrameURL); - connect(item, TQT_SIGNAL(signalLoadingProgress(float)), - this, TQT_SLOT(slotLoadingProgress(float))); + connect(item, TQ_SIGNAL(signalLoadingProgress(float)), + this, TQ_SLOT(slotLoadingProgress(float))); - connect(item, TQT_SIGNAL(signalLoadingComplete()), - this, TQT_SLOT(slotLoadingComplete())); + connect(item, TQ_SIGNAL(signalLoadingComplete()), + this, TQ_SLOT(slotLoadingComplete())); } } diff --git a/digikam/imageplugins/hotpixels/hotpixelstool.h b/digikam/imageplugins/hotpixels/hotpixelstool.h index 0581c58..727c638 100644 --- a/digikam/imageplugins/hotpixels/hotpixelstool.h +++ b/digikam/imageplugins/hotpixels/hotpixelstool.h @@ -64,7 +64,7 @@ class BlackFrameListView; class HotPixelsTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp index b8b9b86..67e9a1b 100644 --- a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp +++ b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp @@ -117,14 +117,14 @@ ImageEffect_HotPixels::ImageEffect_HotPixels(TQWidget* parent) // ------------------------------------------------------------- - connect(m_filterMethodCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotEffect())); + connect(m_filterMethodCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotEffect())); - connect(m_blackFrameButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddBlackFrame())); + connect(m_blackFrameButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddBlackFrame())); - connect(m_blackFrameListView, TQT_SIGNAL(blackFrameSelected(TQValueList<HotPixel>, const KURL&)), - this, TQT_SLOT(slotBlackFrame(TQValueList<HotPixel>, const KURL&))); + connect(m_blackFrameListView, TQ_SIGNAL(blackFrameSelected(TQValueList<HotPixel>, const KURL&)), + this, TQ_SLOT(slotBlackFrame(TQValueList<HotPixel>, const KURL&))); } ImageEffect_HotPixels::~ImageEffect_HotPixels() @@ -143,11 +143,11 @@ void ImageEffect_HotPixels::readUserSettings() { BlackFrameListViewItem *item = new BlackFrameListViewItem(m_blackFrameListView, m_blackFrameURL); - connect(item, TQT_SIGNAL(signalLoadingProgress(float)), - this, TQT_SLOT(slotLoadingProgress(float))); + connect(item, TQ_SIGNAL(signalLoadingProgress(float)), + this, TQ_SLOT(slotLoadingProgress(float))); - connect(item, TQT_SIGNAL(signalLoadingComplete()), - this, TQT_SLOT(slotLoadingComplete())); + connect(item, TQ_SIGNAL(signalLoadingComplete()), + this, TQ_SLOT(slotLoadingComplete())); } } @@ -180,11 +180,11 @@ void ImageEffect_HotPixels::slotAddBlackFrame() m_blackFrameListView->clear(); BlackFrameListViewItem *item = new BlackFrameListViewItem(m_blackFrameListView, m_blackFrameURL); - connect(item, TQT_SIGNAL(signalLoadingProgress(float)), - this, TQT_SLOT(slotLoadingProgress(float))); + connect(item, TQ_SIGNAL(signalLoadingProgress(float)), + this, TQ_SLOT(slotLoadingProgress(float))); - connect(item, TQT_SIGNAL(signalLoadingComplete()), - this, TQT_SLOT(slotLoadingComplete())); + connect(item, TQ_SIGNAL(signalLoadingComplete()), + this, TQ_SLOT(slotLoadingComplete())); } } diff --git a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.h b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.h index 180057b..4a8b086 100644 --- a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.h +++ b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.h @@ -56,7 +56,7 @@ class BlackFrameListView; class ImageEffect_HotPixels : public Digikam::CtrlPanelDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp index aaf26a3..864b59d 100644 --- a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp +++ b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp @@ -48,7 +48,7 @@ ImagePlugin_HotPixels::ImagePlugin_HotPixels(TQObject *parent, const char*, cons : Digikam::ImagePlugin(parent, "ImagePlugin_HotPixels") { m_hotpixelsAction = new TDEAction(i18n("Hot Pixels..."), "hotpixels", 0, - this, TQT_SLOT(slotHotPixels()), + this, TQ_SLOT(slotHotPixels()), actionCollection(), "imageplugin_hotpixels"); setXMLFile("digikamimageplugin_hotpixels_ui.rc"); diff --git a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.h b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.h index 686e618..c639b83 100644 --- a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.h +++ b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.h @@ -33,7 +33,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_HotPixels : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/infrared/imageeffect_infrared.cpp b/digikam/imageplugins/infrared/imageeffect_infrared.cpp index 06b6223..f806925 100644 --- a/digikam/imageplugins/infrared/imageeffect_infrared.cpp +++ b/digikam/imageplugins/infrared/imageeffect_infrared.cpp @@ -88,7 +88,7 @@ ImageEffect_Infrared::ImageEffect_Infrared(TQWidget* parent) TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 2, 1, 0, spacingHint()); TQLabel *label1 = new TQLabel(i18n("Sensitivity (ISO):"), gboxSettings); - m_sensibilitySlider = new TQSlider(1, 25, 1, 1, Qt::Horizontal, gboxSettings); + m_sensibilitySlider = new TQSlider(1, 25, 1, 1, TQt::Horizontal, gboxSettings); m_sensibilitySlider->setTracking ( false ); m_sensibilitySlider->setTickInterval(1); m_sensibilitySlider->setTickmarks(TQSlider::Below); @@ -123,19 +123,19 @@ ImageEffect_Infrared::ImageEffect_Infrared(TQWidget* parent) // ------------------------------------------------------------- - connect( m_sensibilitySlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer()) ); + connect( m_sensibilitySlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer()) ); // this connection is necessary to change the LCD display when // the value is changed by single clicking on the slider - connect( m_sensibilitySlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotSliderMoved(int)) ); + connect( m_sensibilitySlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotSliderMoved(int)) ); - connect( m_sensibilitySlider, TQT_SIGNAL(sliderMoved(int)), - this, TQT_SLOT(slotSliderMoved(int)) ); + connect( m_sensibilitySlider, TQ_SIGNAL(sliderMoved(int)), + this, TQ_SLOT(slotSliderMoved(int)) ); - connect( m_addFilmGrain, TQT_SIGNAL(toggled (bool)), - this, TQT_SLOT(slotEffect()) ); + connect( m_addFilmGrain, TQ_SIGNAL(toggled (bool)), + this, TQ_SLOT(slotEffect()) ); } ImageEffect_Infrared::~ImageEffect_Infrared() diff --git a/digikam/imageplugins/infrared/imageeffect_infrared.h b/digikam/imageplugins/infrared/imageeffect_infrared.h index f3e368d..d6c2823 100644 --- a/digikam/imageplugins/infrared/imageeffect_infrared.h +++ b/digikam/imageplugins/infrared/imageeffect_infrared.h @@ -39,7 +39,7 @@ namespace DigikamInfraredImagesPlugin class ImageEffect_Infrared : public Digikam::CtrlPanelDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/infrared/imageplugin_infrared.cpp b/digikam/imageplugins/infrared/imageplugin_infrared.cpp index fcd991b..4b84590 100644 --- a/digikam/imageplugins/infrared/imageplugin_infrared.cpp +++ b/digikam/imageplugins/infrared/imageplugin_infrared.cpp @@ -47,7 +47,7 @@ ImagePlugin_Infrared::ImagePlugin_Infrared(TQObject *parent, const char*, const : Digikam::ImagePlugin(parent, "ImagePlugin_Infrared") { m_infraredAction = new TDEAction(i18n("Infrared Film..."), "infrared", 0, - this, TQT_SLOT(slotInfrared()), + this, TQ_SLOT(slotInfrared()), actionCollection(), "imageplugin_infrared"); setXMLFile( "digikamimageplugin_infrared_ui.rc" ); diff --git a/digikam/imageplugins/infrared/imageplugin_infrared.h b/digikam/imageplugins/infrared/imageplugin_infrared.h index 7a6c829..7b6fa12 100644 --- a/digikam/imageplugins/infrared/imageplugin_infrared.h +++ b/digikam/imageplugins/infrared/imageplugin_infrared.h @@ -34,7 +34,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Infrared : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/infrared/infraredtool.cpp b/digikam/imageplugins/infrared/infraredtool.cpp index 6a482c5..f34d1c8 100644 --- a/digikam/imageplugins/infrared/infraredtool.cpp +++ b/digikam/imageplugins/infrared/infraredtool.cpp @@ -78,7 +78,7 @@ InfraredTool::InfraredTool(TQObject* parent) TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 3, 1); TQLabel *label1 = new TQLabel(i18n("Sensitivity (ISO):"), m_gboxSettings->plainPage()); - m_sensibilitySlider = new TQSlider(1, 25, 1, 1, Qt::Horizontal, m_gboxSettings->plainPage()); + m_sensibilitySlider = new TQSlider(1, 25, 1, 1, TQt::Horizontal, m_gboxSettings->plainPage()); m_sensibilitySlider->setTracking(false); m_sensibilitySlider->setTickInterval(1); m_sensibilitySlider->setTickmarks(TQSlider::Below); @@ -123,19 +123,19 @@ InfraredTool::InfraredTool(TQObject* parent) // ------------------------------------------------------------- - connect( m_sensibilitySlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer()) ); + connect( m_sensibilitySlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer()) ); // this connection is necessary to change the LCD display when // the value is changed by single clicking on the slider - connect( m_sensibilitySlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotSliderMoved(int)) ); + connect( m_sensibilitySlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotSliderMoved(int)) ); - connect( m_sensibilitySlider, TQT_SIGNAL(sliderMoved(int)), - this, TQT_SLOT(slotSliderMoved(int)) ); + connect( m_sensibilitySlider, TQ_SIGNAL(sliderMoved(int)), + this, TQ_SLOT(slotSliderMoved(int)) ); - connect( m_addFilmGrain, TQT_SIGNAL(toggled (bool)), - this, TQT_SLOT(slotEffect()) ); + connect( m_addFilmGrain, TQ_SIGNAL(toggled (bool)), + this, TQ_SLOT(slotEffect()) ); } InfraredTool::~InfraredTool() diff --git a/digikam/imageplugins/infrared/infraredtool.h b/digikam/imageplugins/infrared/infraredtool.h index 3a349c7..ddb5144 100644 --- a/digikam/imageplugins/infrared/infraredtool.h +++ b/digikam/imageplugins/infrared/infraredtool.h @@ -45,7 +45,7 @@ namespace DigikamInfraredImagesPlugin class InfraredTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp index f83ab76..d7f2f5f 100644 --- a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp +++ b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp @@ -200,11 +200,11 @@ ImageEffect_InPainting_Dialog::ImageEffect_InPainting_Dialog(TQWidget* parent) // ------------------------------------------------------------- - connect(cimgLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(processCImgURL(const TQString&))); + connect(cimgLogoLabel, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(processCImgURL(const TQString&))); - connect(m_inpaintingTypeCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotResetValues(int))); + connect(m_inpaintingTypeCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotResetValues(int))); } ImageEffect_InPainting_Dialog::~ImageEffect_InPainting_Dialog() diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.h b/digikam/imageplugins/inpainting/imageeffect_inpainting.h index 8c25454..542e950 100644 --- a/digikam/imageplugins/inpainting/imageeffect_inpainting.h +++ b/digikam/imageplugins/inpainting/imageeffect_inpainting.h @@ -59,7 +59,7 @@ public: class ImageEffect_InPainting_Dialog : public Digikam::ImageGuideDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp b/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp index 34073dc..2c1e30f 100644 --- a/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp +++ b/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp @@ -50,7 +50,7 @@ ImagePlugin_InPainting::ImagePlugin_InPainting(TQObject *parent, const char*, co { m_inPaintingAction = new TDEAction(i18n("Inpainting..."), "inpainting", CTRL+Key_E, - this, TQT_SLOT(slotInPainting()), + this, TQ_SLOT(slotInPainting()), actionCollection(), "imageplugin_inpainting"); m_inPaintingAction->setWhatsThis( i18n( "This filter can be used to inpaint a part in a photo. " diff --git a/digikam/imageplugins/inpainting/imageplugin_inpainting.h b/digikam/imageplugins/inpainting/imageplugin_inpainting.h index d149a42..fb2b1f5 100644 --- a/digikam/imageplugins/inpainting/imageplugin_inpainting.h +++ b/digikam/imageplugins/inpainting/imageplugin_inpainting.h @@ -34,7 +34,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_InPainting : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/inpainting/inpaintingtool.cpp b/digikam/imageplugins/inpainting/inpaintingtool.cpp index 95190ab..2ada52b 100644 --- a/digikam/imageplugins/inpainting/inpaintingtool.cpp +++ b/digikam/imageplugins/inpainting/inpaintingtool.cpp @@ -155,11 +155,11 @@ InPaintingTool::InPaintingTool(TQObject* parent) // ------------------------------------------------------------- - connect(cimgLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(processCImgURL(const TQString&))); + connect(cimgLogoLabel, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(processCImgURL(const TQString&))); - connect(m_inpaintingTypeCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotResetValues(int))); + connect(m_inpaintingTypeCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotResetValues(int))); // ------------------------------------------------------------- diff --git a/digikam/imageplugins/inpainting/inpaintingtool.h b/digikam/imageplugins/inpainting/inpaintingtool.h index 296a1de..44202c5 100644 --- a/digikam/imageplugins/inpainting/inpaintingtool.h +++ b/digikam/imageplugins/inpainting/inpaintingtool.h @@ -72,7 +72,7 @@ private: class InPaintingTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.cpp b/digikam/imageplugins/inserttext/fontchooserwidget.cpp index c4cd0c8..aa76ea8 100644 --- a/digikam/imageplugins/inserttext/fontchooserwidget.cpp +++ b/digikam/imageplugins/inserttext/fontchooserwidget.cpp @@ -104,8 +104,8 @@ FontChooserWidget::FontChooserWidget(TQWidget *parent, const char *name, { familyCheckbox = new TQCheckBox(i18n("Font"), page); - connect(familyCheckbox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(toggled_checkbox())); + connect(familyCheckbox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(toggled_checkbox())); familyLayout->addWidget(familyCheckbox, 0, TQt::AlignLeft); TQString familyCBToolTipText = @@ -131,8 +131,8 @@ FontChooserWidget::FontChooserWidget(TQWidget *parent, const char *name, { styleCheckbox = new TQCheckBox(i18n("Style:"), page); - connect(styleCheckbox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(toggled_checkbox())); + connect(styleCheckbox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(toggled_checkbox())); styleLayout->addWidget(styleCheckbox, 0, TQt::AlignLeft); TQString styleCBToolTipText = @@ -159,8 +159,8 @@ FontChooserWidget::FontChooserWidget(TQWidget *parent, const char *name, { sizeCheckbox = new TQCheckBox(i18n("Size"),page); - connect(sizeCheckbox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(toggled_checkbox())); + connect(sizeCheckbox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(toggled_checkbox())); sizeLayout->addWidget(sizeCheckbox, 0, TQt::AlignLeft); TQString sizeCBToolTipText = @@ -193,8 +193,8 @@ FontChooserWidget::FontChooserWidget(TQWidget *parent, const char *name, TQWhatsThis::add( familyListBox, fontFamilyWhatsThisText ); TQWhatsThis::add(diff?(TQWidget *) familyCheckbox:(TQWidget *) familyLabel, fontFamilyWhatsThisText ); - connect(familyListBox, TQT_SIGNAL(highlighted(const TQString &)), - this, TQT_SLOT(family_chosen_slot(const TQString &))); + connect(familyListBox, TQ_SIGNAL(highlighted(const TQString &)), + this, TQ_SLOT(family_chosen_slot(const TQString &))); if(!fontList.isEmpty()) { @@ -220,8 +220,8 @@ FontChooserWidget::FontChooserWidget(TQWidget *parent, const char *name, styleListBox->setMinimumWidth( minimumListWidth( styleListBox ) ); styleListBox->setMinimumHeight( minimumListHeight( styleListBox, visibleListSize ) ); - connect(styleListBox, TQT_SIGNAL(highlighted(const TQString &)), - this, TQT_SLOT(style_chosen_slot(const TQString &))); + connect(styleListBox, TQ_SIGNAL(highlighted(const TQString &)), + this, TQ_SLOT(style_chosen_slot(const TQString &))); sizeListBox = new TDEListBox( page, "sizeListBox"); sizeOfFont = new KIntNumInput( page, "sizeOfFont"); @@ -271,11 +271,11 @@ FontChooserWidget::FontChooserWidget(TQWidget *parent, const char *name, sizeListBox->fontMetrics().maxWidth() ); sizeListBox->setMinimumHeight( minimumListHeight( sizeListBox, visibleListSize ) ); - connect( sizeOfFont, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT(size_value_slot(int))); + connect( sizeOfFont, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT(size_value_slot(int))); - connect( sizeListBox, TQT_SIGNAL(highlighted(const TQString&)), - this, TQT_SLOT(size_chosen_slot(const TQString&)) ); + connect( sizeListBox, TQ_SIGNAL(highlighted(const TQString&)), + this, TQ_SLOT(size_chosen_slot(const TQString&)) ); sizeListBox->setSelected(sizeListBox->findItem(TQString::number(10)), true); // default to 10pt. @@ -546,7 +546,7 @@ void FontChooserWidget::style_chosen_slot(const TQString& style) sizeListBox->insertItem(TQString::number(*it)); } } - else // there are times QT does not provide the list.. + else // there are times TQT does not provide the list.. fillSizeList(); } sizeListBox->blockSignals(true); diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.h b/digikam/imageplugins/inserttext/fontchooserwidget.h index e1f8581..4585c23 100644 --- a/digikam/imageplugins/inserttext/fontchooserwidget.h +++ b/digikam/imageplugins/inserttext/fontchooserwidget.h @@ -45,7 +45,7 @@ namespace DigikamInsertTextImagesPlugin class FontChooserWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQFont font READ font WRITE setFont ) diff --git a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp index b6c1e4e..3f88644 100644 --- a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp +++ b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp @@ -192,28 +192,28 @@ ImageEffect_InsertText::ImageEffect_InsertText(TQWidget* parent) // ------------------------------------------------------------- - connect(m_fontChooserWidget, TQT_SIGNAL(fontSelected (const TQFont &)), - this, TQT_SLOT(slotFontPropertiesChanged(const TQFont &))); + connect(m_fontChooserWidget, TQ_SIGNAL(fontSelected (const TQFont &)), + this, TQ_SLOT(slotFontPropertiesChanged(const TQFont &))); - connect(m_fontColorButton, TQT_SIGNAL(changed(const TQColor &)), - this, TQT_SLOT(slotUpdatePreview())); + connect(m_fontColorButton, TQ_SIGNAL(changed(const TQColor &)), + this, TQ_SLOT(slotUpdatePreview())); - connect(m_textEdit, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(slotUpdatePreview())); + connect(m_textEdit, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(slotUpdatePreview())); - connect(m_alignButtonGroup, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotAlignModeChanged(int))); + connect(m_alignButtonGroup, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotAlignModeChanged(int))); - connect(m_borderText, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotUpdatePreview())); + connect(m_borderText, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotUpdatePreview())); - connect(m_transparentText, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotUpdatePreview())); + connect(m_transparentText, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotUpdatePreview())); - connect(m_textRotation, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotUpdatePreview())); + connect(m_textRotation, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotUpdatePreview())); - connect(this, TQT_SIGNAL(signalUpdatePreview()), TQT_SLOT(slotUpdatePreview())); + connect(this, TQ_SIGNAL(signalUpdatePreview()), TQ_SLOT(slotUpdatePreview())); // ------------------------------------------------------------- slotUpdatePreview(); diff --git a/digikam/imageplugins/inserttext/imageeffect_inserttext.h b/digikam/imageplugins/inserttext/imageeffect_inserttext.h index 784387d..2b7c204 100644 --- a/digikam/imageplugins/inserttext/imageeffect_inserttext.h +++ b/digikam/imageplugins/inserttext/imageeffect_inserttext.h @@ -50,7 +50,7 @@ class FontChooserWidget; class ImageEffect_InsertText : public Digikam::ImageDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp b/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp index 6ee5994..a7a5ab6 100644 --- a/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp +++ b/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp @@ -46,7 +46,7 @@ ImagePlugin_InsertText::ImagePlugin_InsertText(TQObject *parent, const char*, co { m_insertTextAction = new TDEAction(i18n("Insert Text..."), "inserttext", SHIFT+CTRL+Key_T, - this, TQT_SLOT(slotInsertText()), + this, TQ_SLOT(slotInsertText()), actionCollection(), "imageplugin_inserttext"); setXMLFile("digikamimageplugin_inserttext_ui.rc"); diff --git a/digikam/imageplugins/inserttext/imageplugin_inserttext.h b/digikam/imageplugins/inserttext/imageplugin_inserttext.h index 01f56e7..427b47c 100644 --- a/digikam/imageplugins/inserttext/imageplugin_inserttext.h +++ b/digikam/imageplugins/inserttext/imageplugin_inserttext.h @@ -33,7 +33,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_InsertText : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/inserttext/inserttexttool.cpp b/digikam/imageplugins/inserttext/inserttexttool.cpp index af66a97..3c85489 100644 --- a/digikam/imageplugins/inserttext/inserttexttool.cpp +++ b/digikam/imageplugins/inserttext/inserttexttool.cpp @@ -180,29 +180,29 @@ InsertTextTool::InsertTextTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_fontChooserWidget, TQT_SIGNAL(fontSelected (const TQFont&)), - this, TQT_SLOT(slotFontPropertiesChanged(const TQFont&))); + connect(m_fontChooserWidget, TQ_SIGNAL(fontSelected (const TQFont&)), + this, TQ_SLOT(slotFontPropertiesChanged(const TQFont&))); - connect(m_fontColorButton, TQT_SIGNAL(changed(const TQColor&)), - this, TQT_SLOT(slotUpdatePreview())); + connect(m_fontColorButton, TQ_SIGNAL(changed(const TQColor&)), + this, TQ_SLOT(slotUpdatePreview())); - connect(m_textEdit, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(slotUpdatePreview())); + connect(m_textEdit, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(slotUpdatePreview())); - connect(m_alignButtonGroup, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotAlignModeChanged(int))); + connect(m_alignButtonGroup, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotAlignModeChanged(int))); - connect(m_borderText, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotUpdatePreview())); + connect(m_borderText, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotUpdatePreview())); - connect(m_transparentText, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotUpdatePreview())); + connect(m_transparentText, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotUpdatePreview())); - connect(m_textRotation, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotUpdatePreview())); + connect(m_textRotation, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotUpdatePreview())); - connect(this, TQT_SIGNAL(signalUpdatePreview()), - this, TQT_SLOT(slotUpdatePreview())); + connect(this, TQ_SIGNAL(signalUpdatePreview()), + this, TQ_SLOT(slotUpdatePreview())); // ------------------------------------------------------------- diff --git a/digikam/imageplugins/inserttext/inserttexttool.h b/digikam/imageplugins/inserttext/inserttexttool.h index 76122d6..c148aa6 100644 --- a/digikam/imageplugins/inserttext/inserttexttool.h +++ b/digikam/imageplugins/inserttext/inserttexttool.h @@ -56,7 +56,7 @@ class FontChooserWidget; class InsertTextTool : public Digikam::EditorTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/inserttext/inserttextwidget.cpp b/digikam/imageplugins/inserttext/inserttextwidget.cpp index 214a3cb..dc5b65f 100644 --- a/digikam/imageplugins/inserttext/inserttextwidget.cpp +++ b/digikam/imageplugins/inserttext/inserttextwidget.cpp @@ -574,7 +574,7 @@ void InsertTextWidget::resizeEvent(TQResizeEvent * e) void InsertTextWidget::mousePressEvent ( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton && + if ( e->button() == TQt::LeftButton && m_textRect.contains( e->x(), e->y() ) ) { m_xpos = e->x(); @@ -594,7 +594,7 @@ void InsertTextWidget::mouseMoveEvent ( TQMouseEvent * e ) { if ( rect().contains( e->x(), e->y() ) ) { - if ( e->state() == Qt::LeftButton && m_currentMoving ) + if ( e->state() == TQt::LeftButton && m_currentMoving ) { uint newxpos = e->x(); uint newypos = e->y(); diff --git a/digikam/imageplugins/inserttext/inserttextwidget.h b/digikam/imageplugins/inserttext/inserttextwidget.h index ce6c4ea..bbce918 100644 --- a/digikam/imageplugins/inserttext/inserttextwidget.h +++ b/digikam/imageplugins/inserttext/inserttextwidget.h @@ -81,7 +81,7 @@ enum BorderMode class InsertTextWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp index 5d9dbf1..89420a9 100644 --- a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp +++ b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp @@ -155,17 +155,17 @@ ImageEffect_LensDistortion::ImageEffect_LensDistortion(TQWidget* parent) // ------------------------------------------------------------- - connect(m_mainInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_mainInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_edgeInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_edgeInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_rescaleInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_rescaleInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_brightenInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_brightenInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); // ------------------------------------------------------------- diff --git a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.h b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.h index 9d9001b..2688a5d 100644 --- a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.h +++ b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.h @@ -43,7 +43,7 @@ namespace DigikamLensDistortionImagesPlugin class ImageEffect_LensDistortion : public Digikam::ImageGuideDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp index dd1d022..73403fa 100644 --- a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp +++ b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp @@ -45,7 +45,7 @@ ImagePlugin_LensDistortion::ImagePlugin_LensDistortion(TQObject *parent, const c : Digikam::ImagePlugin(parent, "ImagePlugin_LensDistortion") { m_lensdistortionAction = new TDEAction(i18n("Lens Distortion..."), "lensdistortion", 0, - this, TQT_SLOT(slotLensDistortion()), + this, TQ_SLOT(slotLensDistortion()), actionCollection(), "imageplugin_lensdistortion"); setXMLFile("digikamimageplugin_lensdistortion_ui.rc"); diff --git a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.h b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.h index f07099d..ceb2475 100644 --- a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.h +++ b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.h @@ -33,7 +33,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_LensDistortion : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp b/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp index dde7aab..8d33e1d 100644 --- a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp +++ b/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp @@ -154,20 +154,20 @@ LensDistortionTool::LensDistortionTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_mainInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotTimer())); + connect(m_mainInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotTimer())); - connect(m_edgeInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotTimer())); + connect(m_edgeInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotTimer())); - connect(m_rescaleInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotTimer())); + connect(m_rescaleInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotTimer())); - connect(m_brightenInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotTimer())); + connect(m_brightenInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotTimer())); - connect(m_gboxSettings, TQT_SIGNAL(signalColorGuideChanged()), - this, TQT_SLOT(slotColorGuideChanged())); + connect(m_gboxSettings, TQ_SIGNAL(signalColorGuideChanged()), + this, TQ_SLOT(slotColorGuideChanged())); // ------------------------------------------------------------- diff --git a/digikam/imageplugins/lensdistortion/lensdistortiontool.h b/digikam/imageplugins/lensdistortion/lensdistortiontool.h index 4b01617..f3c7b67 100644 --- a/digikam/imageplugins/lensdistortion/lensdistortiontool.h +++ b/digikam/imageplugins/lensdistortion/lensdistortiontool.h @@ -48,7 +48,7 @@ namespace DigikamLensDistortionImagesPlugin class LensDistortionTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp index 9072855..707b05d 100644 --- a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp +++ b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp @@ -265,35 +265,35 @@ ImageEffect_NoiseReduction::ImageEffect_NoiseReduction(TQWidget* parent) // ------------------------------------------------------------- -// connect(m_radiusInput, TQT_SIGNAL(valueChanged(double)), -// this, TQT_SLOT(slotTimer())); +// connect(m_radiusInput, TQ_SIGNAL(valueChanged(double)), +// this, TQ_SLOT(slotTimer())); // -// connect(m_lumToleranceInput, TQT_SIGNAL(valueChanged(double)), -// this, TQT_SLOT(slotTimer())); +// connect(m_lumToleranceInput, TQ_SIGNAL(valueChanged(double)), +// this, TQ_SLOT(slotTimer())); // -// connect(m_thresholdInput, TQT_SIGNAL(valueChanged(double)), -// this, TQT_SLOT(slotTimer())); +// connect(m_thresholdInput, TQ_SIGNAL(valueChanged(double)), +// this, TQ_SLOT(slotTimer())); // -// connect(m_textureInput, TQT_SIGNAL(valueChanged(double)), -// this, TQT_SLOT(slotTimer())); +// connect(m_textureInput, TQ_SIGNAL(valueChanged(double)), +// this, TQ_SLOT(slotTimer())); // -// connect(m_sharpnessInput, TQT_SIGNAL(valueChanged(double)), -// this, TQT_SLOT(slotTimer())); +// connect(m_sharpnessInput, TQ_SIGNAL(valueChanged(double)), +// this, TQ_SLOT(slotTimer())); // -// connect(m_csmoothInput, TQT_SIGNAL(valueChanged(double)), -// this, TQT_SLOT(slotTimer())); +// connect(m_csmoothInput, TQ_SIGNAL(valueChanged(double)), +// this, TQ_SLOT(slotTimer())); // -// connect(m_lookaheadInput, TQT_SIGNAL(valueChanged(double)), -// this, TQT_SLOT(slotTimer())); +// connect(m_lookaheadInput, TQ_SIGNAL(valueChanged(double)), +// this, TQ_SLOT(slotTimer())); // -// connect(m_gammaInput, TQT_SIGNAL(valueChanged(double)), -// this, TQT_SLOT(slotTimer())); +// connect(m_gammaInput, TQ_SIGNAL(valueChanged(double)), +// this, TQ_SLOT(slotTimer())); // -// connect(m_dampingInput, TQT_SIGNAL(valueChanged(double)), -// this, TQT_SLOT(slotTimer())); +// connect(m_dampingInput, TQ_SIGNAL(valueChanged(double)), +// this, TQ_SLOT(slotTimer())); // -// connect(m_phaseInput, TQT_SIGNAL(valueChanged(double)), -// this, TQT_SLOT(slotTimer())); +// connect(m_phaseInput, TQ_SIGNAL(valueChanged(double)), +// this, TQ_SLOT(slotTimer())); } ImageEffect_NoiseReduction::~ImageEffect_NoiseReduction() diff --git a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.h b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.h index eeb6004..b7ee1bb 100644 --- a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.h +++ b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.h @@ -35,7 +35,7 @@ namespace DigikamNoiseReductionImagesPlugin class ImageEffect_NoiseReduction : public Digikam::CtrlPanelDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp index 01d05a5..8392933 100644 --- a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp +++ b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp @@ -46,7 +46,7 @@ ImagePlugin_NoiseReduction::ImagePlugin_NoiseReduction(TQObject *parent, const c : Digikam::ImagePlugin(parent, "ImagePlugin_NoiseReduction") { m_noiseReductionAction = new TDEAction(i18n("Noise Reduction..."), "noisereduction", 0, - this, TQT_SLOT(slotNoiseReduction()), + this, TQ_SLOT(slotNoiseReduction()), actionCollection(), "imageplugin_noisereduction"); setXMLFile("digikamimageplugin_noisereduction_ui.rc"); diff --git a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.h b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.h index 6e2fcb0..3cbcb31 100644 --- a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.h +++ b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.h @@ -33,7 +33,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_NoiseReduction : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/noisereduction/noisereductiontool.h b/digikam/imageplugins/noisereduction/noisereductiontool.h index 1335e31..8d7d582 100644 --- a/digikam/imageplugins/noisereduction/noisereductiontool.h +++ b/digikam/imageplugins/noisereduction/noisereductiontool.h @@ -44,7 +44,7 @@ namespace DigikamNoiseReductionImagesPlugin class NoiseReductionTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp index ea20ab1..da07be0 100644 --- a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp +++ b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp @@ -111,11 +111,11 @@ ImageEffect_OilPaint::ImageEffect_OilPaint(TQWidget* parent) // ------------------------------------------------------------- - connect(m_brushSizeInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotTimer())); + connect(m_brushSizeInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotTimer())); - connect(m_smoothInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotTimer())); + connect(m_smoothInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotTimer())); } ImageEffect_OilPaint::~ImageEffect_OilPaint() diff --git a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.h b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.h index 992691c..527cc2e 100644 --- a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.h +++ b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.h @@ -36,7 +36,7 @@ namespace DigikamOilPaintImagesPlugin class ImageEffect_OilPaint : public Digikam::CtrlPanelDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp index 7d44dd4..740e89f 100644 --- a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp +++ b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp @@ -46,7 +46,7 @@ ImagePlugin_OilPaint::ImagePlugin_OilPaint(TQObject *parent, const char*, const : Digikam::ImagePlugin(parent, "ImagePlugin_OilPaint") { m_oilpaintAction = new TDEAction(i18n("Oil Paint..."), "oilpaint", 0, - this, TQT_SLOT(slotOilPaint()), + this, TQ_SLOT(slotOilPaint()), actionCollection(), "imageplugin_oilpaint"); setXMLFile( "digikamimageplugin_oilpaint_ui.rc" ); diff --git a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.h b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.h index d74613b..032ee06 100644 --- a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.h +++ b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.h @@ -33,7 +33,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_OilPaint : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/oilpaint/oilpainttool.cpp b/digikam/imageplugins/oilpaint/oilpainttool.cpp index 80a6cd6..25bea30 100644 --- a/digikam/imageplugins/oilpaint/oilpainttool.cpp +++ b/digikam/imageplugins/oilpaint/oilpainttool.cpp @@ -115,11 +115,11 @@ OilPaintTool::OilPaintTool(TQObject* parent) // this filter is relative slow, so we should use the try button instead right now - // connect(m_brushSizeInput, TQT_SIGNAL(valueChanged (int)), - // this, TQT_SLOT(slotTimer())); + // connect(m_brushSizeInput, TQ_SIGNAL(valueChanged (int)), + // this, TQ_SLOT(slotTimer())); // - // connect(m_smoothInput, TQT_SIGNAL(valueChanged (int)), - // this, TQT_SLOT(slotTimer())); + // connect(m_smoothInput, TQ_SIGNAL(valueChanged (int)), + // this, TQ_SLOT(slotTimer())); } OilPaintTool::~OilPaintTool() diff --git a/digikam/imageplugins/oilpaint/oilpainttool.h b/digikam/imageplugins/oilpaint/oilpainttool.h index 443d513..9c488a5 100644 --- a/digikam/imageplugins/oilpaint/oilpainttool.h +++ b/digikam/imageplugins/oilpaint/oilpainttool.h @@ -45,7 +45,7 @@ namespace DigikamOilPaintImagesPlugin class OilPaintTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/perspective/imageeffect_perspective.cpp b/digikam/imageplugins/perspective/imageeffect_perspective.cpp index cf03ebc..15bef87 100644 --- a/digikam/imageplugins/perspective/imageeffect_perspective.cpp +++ b/digikam/imageplugins/perspective/imageeffect_perspective.cpp @@ -176,20 +176,20 @@ ImageEffect_Perspective::ImageEffect_Perspective(TQWidget* parent) // ------------------------------------------------------------- - connect(m_previewWidget, TQT_SIGNAL(signalPerspectiveChanged(TQRect, float, float, float, float)), - this, TQT_SLOT(slotUpdateInfo(TQRect, float, float, float, float))); + connect(m_previewWidget, TQ_SIGNAL(signalPerspectiveChanged(TQRect, float, float, float, float)), + this, TQ_SLOT(slotUpdateInfo(TQRect, float, float, float, float))); - connect(m_drawWhileMovingCheckBox, TQT_SIGNAL(toggled(bool)), - m_previewWidget, TQT_SLOT(slotToggleDrawWhileMoving(bool))); + connect(m_drawWhileMovingCheckBox, TQ_SIGNAL(toggled(bool)), + m_previewWidget, TQ_SLOT(slotToggleDrawWhileMoving(bool))); - connect(m_drawGridCheckBox, TQT_SIGNAL(toggled(bool)), - m_previewWidget, TQT_SLOT(slotToggleDrawGrid(bool))); + connect(m_drawGridCheckBox, TQ_SIGNAL(toggled(bool)), + m_previewWidget, TQ_SLOT(slotToggleDrawGrid(bool))); - connect(m_guideColorBt, TQT_SIGNAL(changed(const TQColor &)), - m_previewWidget, TQT_SLOT(slotChangeGuideColor(const TQColor &))); + connect(m_guideColorBt, TQ_SIGNAL(changed(const TQColor &)), + m_previewWidget, TQ_SLOT(slotChangeGuideColor(const TQColor &))); - connect(m_guideSize, TQT_SIGNAL(valueChanged(int)), - m_previewWidget, TQT_SLOT(slotChangeGuideSize(int))); + connect(m_guideSize, TQ_SIGNAL(valueChanged(int)), + m_previewWidget, TQ_SLOT(slotChangeGuideSize(int))); } ImageEffect_Perspective::~ImageEffect_Perspective() diff --git a/digikam/imageplugins/perspective/imageeffect_perspective.h b/digikam/imageplugins/perspective/imageeffect_perspective.h index 4437184..41388aa 100644 --- a/digikam/imageplugins/perspective/imageeffect_perspective.h +++ b/digikam/imageplugins/perspective/imageeffect_perspective.h @@ -45,7 +45,7 @@ class PerspectiveWidget; class ImageEffect_Perspective : public Digikam::ImageDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/perspective/imageplugin_perspective.cpp b/digikam/imageplugins/perspective/imageplugin_perspective.cpp index f99fd37..bb5d044 100644 --- a/digikam/imageplugins/perspective/imageplugin_perspective.cpp +++ b/digikam/imageplugins/perspective/imageplugin_perspective.cpp @@ -45,7 +45,7 @@ ImagePlugin_Perspective::ImagePlugin_Perspective(TQObject *parent, const char*, : Digikam::ImagePlugin(parent, "ImagePlugin_Perspective") { m_perspectiveAction = new TDEAction(i18n("Perspective Adjustment..."), "perspective", 0, - this, TQT_SLOT(slotPerspective()), + this, TQ_SLOT(slotPerspective()), actionCollection(), "imageplugin_perspective"); setXMLFile("digikamimageplugin_perspective_ui.rc"); diff --git a/digikam/imageplugins/perspective/imageplugin_perspective.h b/digikam/imageplugins/perspective/imageplugin_perspective.h index 44d9a3a..5dee7b1 100644 --- a/digikam/imageplugins/perspective/imageplugin_perspective.h +++ b/digikam/imageplugins/perspective/imageplugin_perspective.h @@ -33,7 +33,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Perspective : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/perspective/perspectivetool.cpp b/digikam/imageplugins/perspective/perspectivetool.cpp index eadf9a7..30d0a2c 100644 --- a/digikam/imageplugins/perspective/perspectivetool.cpp +++ b/digikam/imageplugins/perspective/perspectivetool.cpp @@ -170,20 +170,20 @@ PerspectiveTool::PerspectiveTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_previewWidget, TQT_SIGNAL(signalPerspectiveChanged(TQRect, float, float, float, float)), - this, TQT_SLOT(slotUpdateInfo(TQRect, float, float, float, float))); + connect(m_previewWidget, TQ_SIGNAL(signalPerspectiveChanged(TQRect, float, float, float, float)), + this, TQ_SLOT(slotUpdateInfo(TQRect, float, float, float, float))); - connect(m_drawWhileMovingCheckBox, TQT_SIGNAL(toggled(bool)), - m_previewWidget, TQT_SLOT(slotToggleDrawWhileMoving(bool))); + connect(m_drawWhileMovingCheckBox, TQ_SIGNAL(toggled(bool)), + m_previewWidget, TQ_SLOT(slotToggleDrawWhileMoving(bool))); - connect(m_drawGridCheckBox, TQT_SIGNAL(toggled(bool)), - m_previewWidget, TQT_SLOT(slotToggleDrawGrid(bool))); + connect(m_drawGridCheckBox, TQ_SIGNAL(toggled(bool)), + m_previewWidget, TQ_SLOT(slotToggleDrawGrid(bool))); - connect(m_guideColorBt, TQT_SIGNAL(changed(const TQColor&)), - m_previewWidget, TQT_SLOT(slotChangeGuideColor(const TQColor&))); + connect(m_guideColorBt, TQ_SIGNAL(changed(const TQColor&)), + m_previewWidget, TQ_SLOT(slotChangeGuideColor(const TQColor&))); - connect(m_guideSize, TQT_SIGNAL(valueChanged(int)), - m_previewWidget, TQT_SLOT(slotChangeGuideSize(int))); + connect(m_guideSize, TQ_SIGNAL(valueChanged(int)), + m_previewWidget, TQ_SLOT(slotChangeGuideSize(int))); } PerspectiveTool::~PerspectiveTool() diff --git a/digikam/imageplugins/perspective/perspectivetool.h b/digikam/imageplugins/perspective/perspectivetool.h index 1818176..6186712 100644 --- a/digikam/imageplugins/perspective/perspectivetool.h +++ b/digikam/imageplugins/perspective/perspectivetool.h @@ -54,7 +54,7 @@ class PerspectiveWidget; class PerspectiveTool : public Digikam::EditorTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/perspective/perspectivewidget.cpp b/digikam/imageplugins/perspective/perspectivewidget.cpp index a43aacf..ae2c5c0 100644 --- a/digikam/imageplugins/perspective/perspectivewidget.cpp +++ b/digikam/imageplugins/perspective/perspectivewidget.cpp @@ -675,7 +675,7 @@ void PerspectiveWidget::resizeEvent(TQResizeEvent * e) void PerspectiveWidget::mousePressEvent ( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton && + if ( e->button() == TQt::LeftButton && m_rect.contains( e->x(), e->y() )) { if ( m_topLeftCorner.contains( e->x(), e->y() ) ) @@ -719,7 +719,7 @@ void PerspectiveWidget::mouseReleaseEvent ( TQMouseEvent * e ) void PerspectiveWidget::mouseMoveEvent ( TQMouseEvent * e ) { - if ( e->state() == Qt::LeftButton ) + if ( e->state() == TQt::LeftButton ) { if ( m_currentResizing != ResizingNone ) { diff --git a/digikam/imageplugins/perspective/perspectivewidget.h b/digikam/imageplugins/perspective/perspectivewidget.h index 48abaa7..0047c3e 100644 --- a/digikam/imageplugins/perspective/perspectivewidget.h +++ b/digikam/imageplugins/perspective/perspectivewidget.h @@ -53,7 +53,7 @@ namespace DigikamPerspectiveImagesPlugin class PerspectiveWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp b/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp index 07101f5..8a82829 100644 --- a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp +++ b/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp @@ -130,14 +130,14 @@ ImageEffect_RainDrop::ImageEffect_RainDrop(TQWidget* parent) // ------------------------------------------------------------- - connect(m_dropInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_dropInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_amountInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_amountInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_coeffInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_coeffInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); } ImageEffect_RainDrop::~ImageEffect_RainDrop() diff --git a/digikam/imageplugins/raindrop/imageeffect_raindrop.h b/digikam/imageplugins/raindrop/imageeffect_raindrop.h index 7dd8f8d..fe567ba 100644 --- a/digikam/imageplugins/raindrop/imageeffect_raindrop.h +++ b/digikam/imageplugins/raindrop/imageeffect_raindrop.h @@ -36,7 +36,7 @@ namespace DigikamRainDropImagesPlugin class ImageEffect_RainDrop : public Digikam::ImageGuideDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp b/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp index d309b85..2074496 100644 --- a/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp +++ b/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp @@ -45,7 +45,7 @@ ImagePlugin_RainDrop::ImagePlugin_RainDrop(TQObject *parent, const char*, const : Digikam::ImagePlugin(parent, "ImagePlugin_RainDrop") { m_raindropAction = new TDEAction(i18n("Raindrops..."), "raindrop", 0, - this, TQT_SLOT(slotRainDrop()), + this, TQ_SLOT(slotRainDrop()), actionCollection(), "imageplugin_raindrop"); setXMLFile( "digikamimageplugin_raindrop_ui.rc" ); diff --git a/digikam/imageplugins/raindrop/imageplugin_raindrop.h b/digikam/imageplugins/raindrop/imageplugin_raindrop.h index c5ba09b..a85076f 100644 --- a/digikam/imageplugins/raindrop/imageplugin_raindrop.h +++ b/digikam/imageplugins/raindrop/imageplugin_raindrop.h @@ -33,7 +33,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_RainDrop : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/raindrop/raindroptool.cpp b/digikam/imageplugins/raindrop/raindroptool.cpp index 3c153a4..3d19238 100644 --- a/digikam/imageplugins/raindrop/raindroptool.cpp +++ b/digikam/imageplugins/raindrop/raindroptool.cpp @@ -123,14 +123,14 @@ RainDropTool::RainDropTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_dropInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_dropInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_amountInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_amountInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_coeffInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_coeffInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); } RainDropTool::~RainDropTool() diff --git a/digikam/imageplugins/raindrop/raindroptool.h b/digikam/imageplugins/raindrop/raindroptool.h index b46e841..d083eb9 100644 --- a/digikam/imageplugins/raindrop/raindroptool.h +++ b/digikam/imageplugins/raindrop/raindroptool.h @@ -44,7 +44,7 @@ namespace DigikamRainDropImagesPlugin class RainDropTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/restoration/imageeffect_restoration.cpp b/digikam/imageplugins/restoration/imageeffect_restoration.cpp index 7edf075..825ef23 100644 --- a/digikam/imageplugins/restoration/imageeffect_restoration.cpp +++ b/digikam/imageplugins/restoration/imageeffect_restoration.cpp @@ -130,11 +130,11 @@ ImageEffect_Restoration::ImageEffect_Restoration(TQWidget* parent) // ------------------------------------------------------------- - connect(cimgLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(processCImgURL(const TQString&))); + connect(cimgLogoLabel, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(processCImgURL(const TQString&))); - connect(m_restorationTypeCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotResetValues(int))); + connect(m_restorationTypeCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotResetValues(int))); } ImageEffect_Restoration::~ImageEffect_Restoration() diff --git a/digikam/imageplugins/restoration/imageeffect_restoration.h b/digikam/imageplugins/restoration/imageeffect_restoration.h index fa68b5a..7c28bd9 100644 --- a/digikam/imageplugins/restoration/imageeffect_restoration.h +++ b/digikam/imageplugins/restoration/imageeffect_restoration.h @@ -46,7 +46,7 @@ namespace DigikamRestorationImagesPlugin class ImageEffect_Restoration : public Digikam::CtrlPanelDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/restoration/imageplugin_restoration.cpp b/digikam/imageplugins/restoration/imageplugin_restoration.cpp index 4bcb9ad..01cd52f 100644 --- a/digikam/imageplugins/restoration/imageplugin_restoration.cpp +++ b/digikam/imageplugins/restoration/imageplugin_restoration.cpp @@ -47,7 +47,7 @@ ImagePlugin_Restoration::ImagePlugin_Restoration(TQObject *parent, const char*, : Digikam::ImagePlugin(parent, "ImagePlugin_Restoration") { m_restorationAction = new TDEAction(i18n("Restoration..."), "restoration", 0, - this, TQT_SLOT(slotRestoration()), + this, TQ_SLOT(slotRestoration()), actionCollection(), "imageplugin_restoration"); setXMLFile( "digikamimageplugin_restoration_ui.rc" ); diff --git a/digikam/imageplugins/restoration/imageplugin_restoration.h b/digikam/imageplugins/restoration/imageplugin_restoration.h index 588fac5..50ac832 100644 --- a/digikam/imageplugins/restoration/imageplugin_restoration.h +++ b/digikam/imageplugins/restoration/imageplugin_restoration.h @@ -34,7 +34,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Restoration : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/restoration/restorationtool.cpp b/digikam/imageplugins/restoration/restorationtool.cpp index 977633e..a689613 100644 --- a/digikam/imageplugins/restoration/restorationtool.cpp +++ b/digikam/imageplugins/restoration/restorationtool.cpp @@ -134,11 +134,11 @@ RestorationTool::RestorationTool(TQObject* parent) // ------------------------------------------------------------- - connect(cimgLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(processCImgURL(const TQString&))); + connect(cimgLogoLabel, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(processCImgURL(const TQString&))); - connect(m_restorationTypeCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotResetValues(int))); + connect(m_restorationTypeCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotResetValues(int))); // ------------------------------------------------------------- diff --git a/digikam/imageplugins/restoration/restorationtool.h b/digikam/imageplugins/restoration/restorationtool.h index 41ab3e5..6242a2b 100644 --- a/digikam/imageplugins/restoration/restorationtool.h +++ b/digikam/imageplugins/restoration/restorationtool.h @@ -48,7 +48,7 @@ namespace DigikamRestorationImagesPlugin class RestorationTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp index dba6d20..e65bd91 100644 --- a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp +++ b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp @@ -159,20 +159,20 @@ ImageEffect_ShearTool::ImageEffect_ShearTool(TQWidget* parent) // ------------------------------------------------------------- - connect(m_mainHAngleInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotTimer())); + connect(m_mainHAngleInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotTimer())); - connect(m_fineHAngleInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_fineHAngleInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_mainVAngleInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotTimer())); + connect(m_mainVAngleInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotTimer())); - connect(m_fineVAngleInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_fineVAngleInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_antialiasInput, TQT_SIGNAL(toggled (bool)), - this, TQT_SLOT(slotEffect())); + connect(m_antialiasInput, TQ_SIGNAL(toggled (bool)), + this, TQ_SLOT(slotEffect())); } ImageEffect_ShearTool::~ImageEffect_ShearTool() diff --git a/digikam/imageplugins/sheartool/imageeffect_sheartool.h b/digikam/imageplugins/sheartool/imageeffect_sheartool.h index 38c63ca..311b4e0 100644 --- a/digikam/imageplugins/sheartool/imageeffect_sheartool.h +++ b/digikam/imageplugins/sheartool/imageeffect_sheartool.h @@ -41,7 +41,7 @@ namespace DigikamShearToolImagesPlugin class ImageEffect_ShearTool : public Digikam::ImageGuideDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp b/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp index e0490a2..3403089 100644 --- a/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp +++ b/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp @@ -45,7 +45,7 @@ ImagePlugin_ShearTool::ImagePlugin_ShearTool(TQObject *parent, const char*, cons : Digikam::ImagePlugin(parent, "ImagePlugin_ShearTool") { m_sheartoolAction = new TDEAction(i18n("Shear..."), "shear", 0, - this, TQT_SLOT(slotShearTool()), + this, TQ_SLOT(slotShearTool()), actionCollection(), "imageplugin_sheartool"); setXMLFile("digikamimageplugin_sheartool_ui.rc"); diff --git a/digikam/imageplugins/sheartool/imageplugin_sheartool.h b/digikam/imageplugins/sheartool/imageplugin_sheartool.h index 9ded889..2423a1b 100644 --- a/digikam/imageplugins/sheartool/imageplugin_sheartool.h +++ b/digikam/imageplugins/sheartool/imageplugin_sheartool.h @@ -33,7 +33,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_ShearTool : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/sheartool/sheartool.cpp b/digikam/imageplugins/sheartool/sheartool.cpp index 4e2538a..9f65b6d 100644 --- a/digikam/imageplugins/sheartool/sheartool.cpp +++ b/digikam/imageplugins/sheartool/sheartool.cpp @@ -155,23 +155,23 @@ ShearTool::ShearTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_mainHAngleInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_mainHAngleInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_fineHAngleInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotTimer())); + connect(m_fineHAngleInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotTimer())); - connect(m_mainVAngleInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_mainVAngleInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); - connect(m_fineVAngleInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotTimer())); + connect(m_fineVAngleInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotTimer())); - connect(m_antialiasInput, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotEffect())); + connect(m_antialiasInput, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotEffect())); - connect(m_gboxSettings, TQT_SIGNAL(signalColorGuideChanged()), - this, TQT_SLOT(slotColorGuideChanged())); + connect(m_gboxSettings, TQ_SIGNAL(signalColorGuideChanged()), + this, TQ_SLOT(slotColorGuideChanged())); } ShearTool::~ShearTool() diff --git a/digikam/imageplugins/sheartool/sheartool.h b/digikam/imageplugins/sheartool/sheartool.h index 6d36562..1c8161b 100644 --- a/digikam/imageplugins/sheartool/sheartool.h +++ b/digikam/imageplugins/sheartool/sheartool.h @@ -50,7 +50,7 @@ namespace DigikamShearToolImagesPlugin class ShearTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/superimpose/dirselectwidget.cpp b/digikam/imageplugins/superimpose/dirselectwidget.cpp index 858bbd2..4856d73 100644 --- a/digikam/imageplugins/superimpose/dirselectwidget.cpp +++ b/digikam/imageplugins/superimpose/dirselectwidget.cpp @@ -93,8 +93,8 @@ void DirSelectWidget::load() { if ( d->m_pendingPath.isEmpty() ) { - disconnect( d->m_item, TQT_SIGNAL( populateFinished(KFileTreeViewItem *) ), - this, TQT_SLOT( load() ) ); + disconnect( d->m_item, TQ_SIGNAL( populateFinished(KFileTreeViewItem *) ), + this, TQ_SLOT( load() ) ); emit folderItemSelected(currentURL()); return; @@ -135,8 +135,8 @@ void DirSelectWidget::setCurrentPath(KURL currentUrl) if ( !d->m_pendingPath[0].isEmpty() ) d->m_pendingPath.prepend( "" ); // ensure we open the root first. - connect( d->m_item, TQT_SIGNAL( populateFinished(KFileTreeViewItem *) ), - this, TQT_SLOT( load() ) ); + connect( d->m_item, TQ_SIGNAL( populateFinished(KFileTreeViewItem *) ), + this, TQ_SLOT( load() ) ); load(); } @@ -159,13 +159,13 @@ void DirSelectWidget::setRootPath(KURL rootUrl, KURL currentUrl) if ( !d->m_pendingPath[0].isEmpty() ) d->m_pendingPath.prepend( "" ); // ensure we open the root first. - connect( d->m_item, TQT_SIGNAL( populateFinished(KFileTreeViewItem *) ), - this, TQT_SLOT( load() ) ); + connect( d->m_item, TQ_SIGNAL( populateFinished(KFileTreeViewItem *) ), + this, TQ_SLOT( load() ) ); load(); - connect( this, TQT_SIGNAL( executed(TQListViewItem *) ), - this, TQT_SLOT( slotFolderSelected(TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( executed(TQListViewItem *) ), + this, TQ_SLOT( slotFolderSelected(TQListViewItem *) ) ); } KURL DirSelectWidget::rootPath(void) diff --git a/digikam/imageplugins/superimpose/dirselectwidget.h b/digikam/imageplugins/superimpose/dirselectwidget.h index 2c047ac..1ee4abc 100644 --- a/digikam/imageplugins/superimpose/dirselectwidget.h +++ b/digikam/imageplugins/superimpose/dirselectwidget.h @@ -41,7 +41,7 @@ namespace DigikamSuperImposeImagesPlugin class DirSelectWidget : public KFileTreeView { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp index 05bce11..1cea3e0 100644 --- a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp +++ b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp @@ -160,17 +160,17 @@ ImageEffect_SuperImpose::ImageEffect_SuperImpose(TQWidget* parent) // ------------------------------------------------------------- - connect(bGroup, TQT_SIGNAL(released(int)), - m_previewWidget, TQT_SLOT(slotEditModeChanged(int))); + connect(bGroup, TQ_SIGNAL(released(int)), + m_previewWidget, TQ_SLOT(slotEditModeChanged(int))); - connect(m_thumbnailsBar, TQT_SIGNAL(signalURLSelected(const KURL&)), - m_previewWidget, TQT_SLOT(slotSetCurrentTemplate(const KURL&))); + connect(m_thumbnailsBar, TQ_SIGNAL(signalURLSelected(const KURL&)), + m_previewWidget, TQ_SLOT(slotSetCurrentTemplate(const KURL&))); - connect(m_dirSelect, TQT_SIGNAL(folderItemSelected(const KURL &)), - this, TQT_SLOT(slotTemplateDirChanged(const KURL &))); + connect(m_dirSelect, TQ_SIGNAL(folderItemSelected(const KURL &)), + this, TQ_SLOT(slotTemplateDirChanged(const KURL &))); - connect(templateDirButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRootTemplateDirChanged())); + connect(templateDirButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRootTemplateDirChanged())); // ------------------------------------------------------------- diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.h b/digikam/imageplugins/superimpose/imageeffect_superimpose.h index 95c7db4..8eb8c18 100644 --- a/digikam/imageplugins/superimpose/imageeffect_superimpose.h +++ b/digikam/imageplugins/superimpose/imageeffect_superimpose.h @@ -49,7 +49,7 @@ class SuperImposeWidget; class ImageEffect_SuperImpose : public Digikam::ImageDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp b/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp index 9672471..ceba44e 100644 --- a/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp +++ b/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp @@ -47,7 +47,7 @@ ImagePlugin_SuperImpose::ImagePlugin_SuperImpose(TQObject *parent, const char*, : Digikam::ImagePlugin(parent, "ImagePlugin_SuperImpose") { m_superimposeAction = new TDEAction(i18n("Template Superimpose..."), "superimpose", 0, - this, TQT_SLOT(slotSuperImpose()), + this, TQ_SLOT(slotSuperImpose()), actionCollection(), "imageplugin_superimpose"); setXMLFile("digikamimageplugin_superimpose_ui.rc"); diff --git a/digikam/imageplugins/superimpose/imageplugin_superimpose.h b/digikam/imageplugins/superimpose/imageplugin_superimpose.h index 5d3ec37..6f3c3a6 100644 --- a/digikam/imageplugins/superimpose/imageplugin_superimpose.h +++ b/digikam/imageplugins/superimpose/imageplugin_superimpose.h @@ -35,7 +35,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_SuperImpose : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/superimpose/superimposetool.cpp b/digikam/imageplugins/superimpose/superimposetool.cpp index 6d3686f..f035559 100644 --- a/digikam/imageplugins/superimpose/superimposetool.cpp +++ b/digikam/imageplugins/superimpose/superimposetool.cpp @@ -152,17 +152,17 @@ SuperImposeTool::SuperImposeTool(TQObject* parent) // ------------------------------------------------------------- - connect(bGroup, TQT_SIGNAL(released(int)), - m_previewWidget, TQT_SLOT(slotEditModeChanged(int))); + connect(bGroup, TQ_SIGNAL(released(int)), + m_previewWidget, TQ_SLOT(slotEditModeChanged(int))); - connect(m_thumbnailsBar, TQT_SIGNAL(signalURLSelected(const KURL&)), - m_previewWidget, TQT_SLOT(slotSetCurrentTemplate(const KURL&))); + connect(m_thumbnailsBar, TQ_SIGNAL(signalURLSelected(const KURL&)), + m_previewWidget, TQ_SLOT(slotSetCurrentTemplate(const KURL&))); - connect(m_dirSelect, TQT_SIGNAL(folderItemSelected(const KURL &)), - this, TQT_SLOT(slotTemplateDirChanged(const KURL &))); + connect(m_dirSelect, TQ_SIGNAL(folderItemSelected(const KURL &)), + this, TQ_SLOT(slotTemplateDirChanged(const KURL &))); - connect(templateDirButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRootTemplateDirChanged())); + connect(templateDirButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRootTemplateDirChanged())); // ------------------------------------------------------------- diff --git a/digikam/imageplugins/superimpose/superimposetool.h b/digikam/imageplugins/superimpose/superimposetool.h index 6622a2b..7501f23 100644 --- a/digikam/imageplugins/superimpose/superimposetool.h +++ b/digikam/imageplugins/superimpose/superimposetool.h @@ -50,7 +50,7 @@ class SuperImposeWidget; class SuperImposeTool : public Digikam::EditorTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/superimpose/superimposewidget.cpp b/digikam/imageplugins/superimpose/superimposewidget.cpp index cc89e8a..edae15a 100644 --- a/digikam/imageplugins/superimpose/superimposewidget.cpp +++ b/digikam/imageplugins/superimpose/superimposewidget.cpp @@ -243,7 +243,7 @@ bool SuperImposeWidget::zoomSelection(float deltaZoomFactor) void SuperImposeWidget::mousePressEvent ( TQMouseEvent * e ) { - if ( isEnabled() && e->button() == Qt::LeftButton && + if ( isEnabled() && e->button() == TQt::LeftButton && rect().contains( e->x(), e->y() ) ) { switch (m_editMode) @@ -274,7 +274,7 @@ void SuperImposeWidget::mouseMoveEvent ( TQMouseEvent * e ) { if ( isEnabled() ) { - if ( e->state() == Qt::LeftButton ) + if ( e->state() == TQt::LeftButton ) { switch (m_editMode) { diff --git a/digikam/imageplugins/superimpose/superimposewidget.h b/digikam/imageplugins/superimpose/superimposewidget.h index 785216d..8b3fb04 100644 --- a/digikam/imageplugins/superimpose/superimposewidget.h +++ b/digikam/imageplugins/superimpose/superimposewidget.h @@ -62,7 +62,7 @@ enum Action class SuperImposeWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/imageplugins/texture/imageeffect_texture.cpp b/digikam/imageplugins/texture/imageeffect_texture.cpp index 56f08d7..5f5d7e9 100644 --- a/digikam/imageplugins/texture/imageeffect_texture.cpp +++ b/digikam/imageplugins/texture/imageeffect_texture.cpp @@ -124,11 +124,11 @@ ImageEffect_Texture::ImageEffect_Texture(TQWidget* parent) // ------------------------------------------------------------- - connect(m_textureType, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotEffect())); + connect(m_textureType, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotEffect())); - connect(m_blendGain, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_blendGain, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); } ImageEffect_Texture::~ImageEffect_Texture() diff --git a/digikam/imageplugins/texture/imageeffect_texture.h b/digikam/imageplugins/texture/imageeffect_texture.h index d192f61..d37068b 100644 --- a/digikam/imageplugins/texture/imageeffect_texture.h +++ b/digikam/imageplugins/texture/imageeffect_texture.h @@ -42,7 +42,7 @@ namespace DigikamTextureImagesPlugin class ImageEffect_Texture : public Digikam::CtrlPanelDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/texture/imageplugin_texture.cpp b/digikam/imageplugins/texture/imageplugin_texture.cpp index 7114fa6..ec0e3ba 100644 --- a/digikam/imageplugins/texture/imageplugin_texture.cpp +++ b/digikam/imageplugins/texture/imageplugin_texture.cpp @@ -46,7 +46,7 @@ ImagePlugin_Texture::ImagePlugin_Texture(TQObject *parent, const char*, const TQ : Digikam::ImagePlugin(parent, "ImagePlugin_Texture") { m_textureAction = new TDEAction(i18n("Apply Texture..."), "texture", 0, - this, TQT_SLOT(slotTexture()), + this, TQ_SLOT(slotTexture()), actionCollection(), "imageplugin_texture"); setXMLFile( "digikamimageplugin_texture_ui.rc" ); diff --git a/digikam/imageplugins/texture/imageplugin_texture.h b/digikam/imageplugins/texture/imageplugin_texture.h index f121987..bae2ba5 100644 --- a/digikam/imageplugins/texture/imageplugin_texture.h +++ b/digikam/imageplugins/texture/imageplugin_texture.h @@ -33,7 +33,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Texture : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/texture/texturetool.cpp b/digikam/imageplugins/texture/texturetool.cpp index 143cf14..71e29ae 100644 --- a/digikam/imageplugins/texture/texturetool.cpp +++ b/digikam/imageplugins/texture/texturetool.cpp @@ -125,11 +125,11 @@ TextureTool::TextureTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_textureType, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotEffect())); + connect(m_textureType, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotEffect())); - connect(m_blendGain, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimer())); + connect(m_blendGain, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimer())); } TextureTool::~TextureTool() diff --git a/digikam/imageplugins/texture/texturetool.h b/digikam/imageplugins/texture/texturetool.h index 7eacb63..1287bb3 100644 --- a/digikam/imageplugins/texture/texturetool.h +++ b/digikam/imageplugins/texture/texturetool.h @@ -50,7 +50,7 @@ namespace DigikamTextureImagesPlugin class TextureTool : public Digikam::EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp index afae201..f72609d 100644 --- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp +++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp @@ -333,59 +333,59 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent) // ------------------------------------------------------------- - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotColorSelectedFromOriginal( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotColorSelectedFromOriginal( const Digikam::DColor & ))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); // ------------------------------------------------------------- // Correction Filter Slider controls. - connect(m_temperaturePresetCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotTemperaturePresetChanged(int))); + connect(m_temperaturePresetCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotTemperaturePresetChanged(int))); - connect(m_temperatureInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTemperatureChanged(double))); + connect(m_temperatureInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTemperatureChanged(double))); - connect(m_darkInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_darkInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_blackInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_blackInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_mainExposureInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_mainExposureInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_fineExposureInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_fineExposureInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_gammaInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_gammaInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_saturationInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_saturationInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_greenInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_greenInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); // ------------------------------------------------------------- // Bouttons slots. - connect(m_autoAdjustExposure, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAutoAdjustExposure())); + connect(m_autoAdjustExposure, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAutoAdjustExposure())); - connect(m_pickTemperature, TQT_SIGNAL(released()), - this, TQT_SLOT(slotPickerColorButtonActived())); + connect(m_pickTemperature, TQ_SIGNAL(released()), + this, TQ_SLOT(slotPickerColorButtonActived())); } ImageEffect_WhiteBalance::~ImageEffect_WhiteBalance() diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h index 64bc49b..6bef560 100644 --- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h +++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h @@ -56,7 +56,7 @@ namespace DigikamWhiteBalanceImagesPlugin class ImageEffect_WhiteBalance : public Digikam::ImageDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp index ada29ae..071097f 100644 --- a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp +++ b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp @@ -47,7 +47,7 @@ ImagePlugin_WhiteBalance::ImagePlugin_WhiteBalance(TQObject *parent, const char* { m_whitebalanceAction = new TDEAction(i18n("White Balance..."), "whitebalance", CTRL+SHIFT+Key_W, - this, TQT_SLOT(slotWhiteBalance()), + this, TQ_SLOT(slotWhiteBalance()), actionCollection(), "imageplugin_whitebalance"); setXMLFile("digikamimageplugin_whitebalance_ui.rc"); diff --git a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.h b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.h index c246256..afc870c 100644 --- a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.h +++ b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.h @@ -34,7 +34,7 @@ class TDEAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_WhiteBalance : public Digikam::ImagePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.cpp b/digikam/imageplugins/whitebalance/whitebalancetool.cpp index 47aa8a3..fdbe723 100644 --- a/digikam/imageplugins/whitebalance/whitebalancetool.cpp +++ b/digikam/imageplugins/whitebalance/whitebalancetool.cpp @@ -342,59 +342,59 @@ WhiteBalanceTool::WhiteBalanceTool(TQObject* parent) // ------------------------------------------------------------- - connect(m_channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const TQPoint&)), - this, TQT_SLOT(slotColorSelectedFromOriginal(const Digikam::DColor&))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const TQPoint&)), + this, TQ_SLOT(slotColorSelectedFromOriginal(const Digikam::DColor&))); - connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const TQPoint&)), - this, TQT_SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); + connect(m_previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const TQPoint&)), + this, TQ_SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); - connect(m_previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotEffect())); + connect(m_previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotEffect())); // ------------------------------------------------------------- // Correction Filter Slider controls. - connect(m_temperaturePresetCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotTemperaturePresetChanged(int))); + connect(m_temperaturePresetCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotTemperaturePresetChanged(int))); - connect(m_temperatureInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTemperatureChanged(double))); + connect(m_temperatureInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTemperatureChanged(double))); - connect(m_darkInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_darkInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_blackInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_blackInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_mainExposureInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_mainExposureInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_fineExposureInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_fineExposureInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_gammaInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_gammaInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_saturationInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_saturationInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); - connect(m_greenInput, TQT_SIGNAL(valueChanged (double)), - this, TQT_SLOT(slotTimer())); + connect(m_greenInput, TQ_SIGNAL(valueChanged (double)), + this, TQ_SLOT(slotTimer())); // ------------------------------------------------------------- // Bouttons slots. - connect(m_autoAdjustExposure, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAutoAdjustExposure())); + connect(m_autoAdjustExposure, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAutoAdjustExposure())); - connect(m_pickTemperature, TQT_SIGNAL(released()), - this, TQT_SLOT(slotPickerColorButtonActived())); + connect(m_pickTemperature, TQ_SIGNAL(released()), + this, TQ_SLOT(slotPickerColorButtonActived())); } WhiteBalanceTool::~WhiteBalanceTool() diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.h b/digikam/imageplugins/whitebalance/whitebalancetool.h index 8b7412b..2df2877 100644 --- a/digikam/imageplugins/whitebalance/whitebalancetool.h +++ b/digikam/imageplugins/whitebalance/whitebalancetool.h @@ -62,7 +62,7 @@ namespace DigikamWhiteBalanceImagesPlugin class WhiteBalanceTool : public Digikam::EditorTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/dialogs/ctrlpaneldlg.cpp b/digikam/libs/dialogs/ctrlpaneldlg.cpp index a40dc68..450d380 100644 --- a/digikam/libs/dialogs/ctrlpaneldlg.cpp +++ b/digikam/libs/dialogs/ctrlpaneldlg.cpp @@ -142,7 +142,7 @@ CtrlPanelDlg::CtrlPanelDlg(TQWidget* parent, TQString title, TQString name, // ------------------------------------------------------------- - TQTimer::singleShot(0, this, TQT_SLOT(slotInit())); + TQTimer::singleShot(0, this, TQ_SLOT(slotInit())); kapp->restoreOverrideCursor(); } @@ -163,17 +163,17 @@ CtrlPanelDlg::~CtrlPanelDlg() void CtrlPanelDlg::slotInit() { // Reset values to defaults. - TQTimer::singleShot(0, this, TQT_SLOT(readUserSettings())); + TQTimer::singleShot(0, this, TQ_SLOT(readUserSettings())); if (!d->tryAction) { - connect(m_imagePreviewWidget, TQT_SIGNAL(signalOriginalClipFocusChanged()), - this, TQT_SLOT(slotFocusChanged())); + connect(m_imagePreviewWidget, TQ_SIGNAL(signalOriginalClipFocusChanged()), + this, TQ_SLOT(slotFocusChanged())); } else { - connect(m_imagePreviewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotFocusChanged())); + connect(m_imagePreviewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotFocusChanged())); } } @@ -183,7 +183,7 @@ void CtrlPanelDlg::setAboutData(TDEAboutData *about) TQPushButton *helpButton = actionButton( Help ); KHelpMenu* helpMenu = new KHelpMenu(this, d->aboutData, false); helpMenu->menu()->removeItemAt(0); - helpMenu->menu()->insertItem(i18n("digiKam Handbook"), this, TQT_SLOT(slotHelp()), 0, -1, 0); + helpMenu->menu()->insertItem(i18n("digiKam Handbook"), this, TQ_SLOT(slotHelp()), 0, -1, 0); helpButton->setPopup( helpMenu->menu() ); } @@ -262,7 +262,7 @@ void CtrlPanelDlg::slotFocusChanged(void) m_threadedFilter->stopComputation(); } - TQTimer::singleShot(0, this, TQT_SLOT(slotEffect())); + TQTimer::singleShot(0, this, TQ_SLOT(slotEffect())); } void CtrlPanelDlg::slotHelp() @@ -285,8 +285,8 @@ void CtrlPanelDlg::slotTimer() } d->timer = new TQTimer( this ); - connect( d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotEffect()) ); + connect( d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotEffect()) ); d->timer->start(500, true); } diff --git a/digikam/libs/dialogs/ctrlpaneldlg.h b/digikam/libs/dialogs/ctrlpaneldlg.h index a69fb8b..eb60877 100644 --- a/digikam/libs/dialogs/ctrlpaneldlg.h +++ b/digikam/libs/dialogs/ctrlpaneldlg.h @@ -48,7 +48,7 @@ class DImgThreadedFilter; class DIGIKAM_EXPORT CtrlPanelDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/dialogs/deletedialog.cpp b/digikam/libs/dialogs/deletedialog.cpp index bbe7041..1db9b9c 100644 --- a/digikam/libs/dialogs/deletedialog.cpp +++ b/digikam/libs/dialogs/deletedialog.cpp @@ -199,8 +199,8 @@ DeleteDialog::DeleteDialog(TQWidget *parent, const char *name) adjustSize(); slotShouldDelete(shouldDelete()); - connect(m_widget->ddShouldDelete, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotShouldDelete(bool))); + connect(m_widget->ddShouldDelete, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotShouldDelete(bool))); actionButton(Ok)->setFocus(); } diff --git a/digikam/libs/dialogs/deletedialog.h b/digikam/libs/dialogs/deletedialog.h index 9d1cbd6..16ab9f8 100644 --- a/digikam/libs/dialogs/deletedialog.h +++ b/digikam/libs/dialogs/deletedialog.h @@ -70,7 +70,7 @@ namespace DeleteDialogMode class DeleteWidget : public DeleteDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -94,7 +94,7 @@ protected: class DIGIKAM_EXPORT DeleteDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/dialogs/dprogressdlg.cpp b/digikam/libs/dialogs/dprogressdlg.cpp index 754047d..d4b0dc2 100644 --- a/digikam/libs/dialogs/dprogressdlg.cpp +++ b/digikam/libs/dialogs/dprogressdlg.cpp @@ -144,11 +144,11 @@ void DProgressDlg::addedAction(const TQPixmap& pix, const TQString &text) "image-broken.png"); dir = dir + "/image-broken.png"; TQPixmap pixbi(dir); - img = pixbi.convertToImage().scale(32, 32, TQ_ScaleMin); + img = pixbi.convertToImage().scale(32, 32, TQImage::ScaleMin); } else { - img = pix.convertToImage().scale(32, 32, TQ_ScaleMin); + img = pix.convertToImage().scale(32, 32, TQImage::ScaleMin); } TQPixmap pixmap(img); diff --git a/digikam/libs/dialogs/dprogressdlg.h b/digikam/libs/dialogs/dprogressdlg.h index 7aa77fe..d75f509 100644 --- a/digikam/libs/dialogs/dprogressdlg.h +++ b/digikam/libs/dialogs/dprogressdlg.h @@ -41,7 +41,7 @@ class DProgressDlgPriv; class DIGIKAM_EXPORT DProgressDlg : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/dialogs/imagedialog.cpp b/digikam/libs/dialogs/imagedialog.cpp index 4473024..d052a2a 100644 --- a/digikam/libs/dialogs/imagedialog.cpp +++ b/digikam/libs/dialogs/imagedialog.cpp @@ -104,8 +104,8 @@ ImageDialogPreview::ImageDialogPreview(TQWidget *parent) d->timer = new TQTimer(this); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(showPreview()) ); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(showPreview()) ); } ImageDialogPreview::~ImageDialogPreview() @@ -156,11 +156,11 @@ void ImageDialogPreview::showPreview(const KURL& url) d->thumbJob = new ThumbnailJob(url, ThumbnailSize::Huge, true, true); - connect(d->thumbJob, TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); + connect(d->thumbJob, TQ_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); - connect(d->thumbJob, TQT_SIGNAL(signalFailed(const KURL&)), - this, TQT_SLOT(slotFailedThumbnail(const KURL&))); + connect(d->thumbJob, TQ_SIGNAL(signalFailed(const KURL&)), + this, TQ_SLOT(slotFailedThumbnail(const KURL&))); d->metaIface.load(d->currentURL.path()); PhotoInfoContainer info = d->metaIface.getPhotographInformations(); @@ -219,7 +219,7 @@ void ImageDialogPreview::slotGotThumbnail(const KURL& url, const TQPixmap& pix) TQSize s = d->imageLabel->contentsRect().size(); if (s.width() < pix.width() || s.height() < pix.height()) - pixmap = pix.convertToImage().smoothScale(s, TQ_ScaleMin); + pixmap = pix.convertToImage().smoothScale(s, TQImage::ScaleMin); else pixmap = pix; diff --git a/digikam/libs/dialogs/imagedialog.h b/digikam/libs/dialogs/imagedialog.h index f45729b..275765c 100644 --- a/digikam/libs/dialogs/imagedialog.h +++ b/digikam/libs/dialogs/imagedialog.h @@ -41,7 +41,7 @@ class ImageDialogPreviewPrivate; class DIGIKAM_EXPORT ImageDialogPreview : public KPreviewWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/dialogs/imagedlgbase.cpp b/digikam/libs/dialogs/imagedlgbase.cpp index fbc2b86..6166640 100644 --- a/digikam/libs/dialogs/imagedlgbase.cpp +++ b/digikam/libs/dialogs/imagedlgbase.cpp @@ -219,7 +219,7 @@ void ImageDlgBase::setAboutData(TDEAboutData *about) TQPushButton *helpButton = actionButton( Help ); KHelpMenu* helpMenu = new KHelpMenu(this, d->aboutData, false); helpMenu->menu()->removeItemAt(0); - helpMenu->menu()->insertItem(i18n("digiKam Handbook"), this, TQT_SLOT(slotHelp()), 0, -1, 0); + helpMenu->menu()->insertItem(i18n("digiKam Handbook"), this, TQ_SLOT(slotHelp()), 0, -1, 0); helpButton->setPopup( helpMenu->menu() ); } @@ -252,8 +252,8 @@ void ImageDlgBase::slotTimer() } d->timer = new TQTimer( this ); - connect( d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotEffect()) ); + connect( d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotEffect()) ); d->timer->start(500, true); } diff --git a/digikam/libs/dialogs/imagedlgbase.h b/digikam/libs/dialogs/imagedlgbase.h index 202b9ca..97dc6a3 100644 --- a/digikam/libs/dialogs/imagedlgbase.h +++ b/digikam/libs/dialogs/imagedlgbase.h @@ -50,7 +50,7 @@ class ImageDlgBasePriv; class DIGIKAM_EXPORT ImageDlgBase : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/dialogs/imageguidedlg.cpp b/digikam/libs/dialogs/imageguidedlg.cpp index 9c6c086..9713a87 100644 --- a/digikam/libs/dialogs/imageguidedlg.cpp +++ b/digikam/libs/dialogs/imageguidedlg.cpp @@ -212,7 +212,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name, TQWidget *gboxGuideSettings = new TQWidget(d->settings); TQGridLayout* grid = new TQGridLayout( gboxGuideSettings, 2, 2, marginHint(), spacingHint()); - KSeparator *line = new KSeparator(Qt::Horizontal, gboxGuideSettings); + KSeparator *line = new KSeparator(TQt::Horizontal, gboxGuideSettings); grid->addMultiCellWidget(line, 0, 0, 0, 2); TQLabel *label5 = new TQLabel(i18n("Guide color:"), gboxGuideSettings); @@ -260,7 +260,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name, // ------------------------------------------------------------- - TQTimer::singleShot(0, this, TQT_SLOT(slotInit())); + TQTimer::singleShot(0, this, TQ_SLOT(slotInit())); kapp->restoreOverrideCursor(); } @@ -305,19 +305,19 @@ void ImageGuideDlg::slotInit() { readSettings(); // Reset values to defaults. - TQTimer::singleShot(0, this, TQT_SLOT(readUserSettings())); + TQTimer::singleShot(0, this, TQ_SLOT(readUserSettings())); if (!d->tryAction) { - connect(m_imagePreviewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotResized())); + connect(m_imagePreviewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotResized())); } - connect(d->guideColorBt, TQT_SIGNAL(changed(const TQColor &)), - m_imagePreviewWidget, TQT_SLOT(slotChangeGuideColor(const TQColor &))); + connect(d->guideColorBt, TQ_SIGNAL(changed(const TQColor &)), + m_imagePreviewWidget, TQ_SLOT(slotChangeGuideColor(const TQColor &))); - connect(d->guideSize, TQT_SIGNAL(valueChanged(int)), - m_imagePreviewWidget, TQT_SLOT(slotChangeGuideSize(int))); + connect(d->guideSize, TQ_SIGNAL(valueChanged(int)), + m_imagePreviewWidget, TQ_SLOT(slotChangeGuideSize(int))); } void ImageGuideDlg::setUserAreaWidget(TQWidget *w) @@ -334,7 +334,7 @@ void ImageGuideDlg::setAboutData(TDEAboutData *about) TQPushButton *helpButton = actionButton( Help ); KHelpMenu* helpMenu = new KHelpMenu(this, d->aboutData, false); helpMenu->menu()->removeItemAt(0); - helpMenu->menu()->insertItem(i18n("digiKam Handbook"), this, TQT_SLOT(slotHelp()), 0, -1, 0); + helpMenu->menu()->insertItem(i18n("digiKam Handbook"), this, TQ_SLOT(slotHelp()), 0, -1, 0); helpButton->setPopup( helpMenu->menu() ); } @@ -378,7 +378,7 @@ void ImageGuideDlg::slotResized(void) m_threadedFilter->stopComputation(); } - TQTimer::singleShot(0, this, TQT_SLOT(slotEffect())); + TQTimer::singleShot(0, this, TQ_SLOT(slotEffect())); } void ImageGuideDlg::slotUser1() @@ -442,8 +442,8 @@ void ImageGuideDlg::slotTimer() } d->timer = new TQTimer( this ); - connect( d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotEffect()) ); + connect( d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotEffect()) ); d->timer->start(500, true); } diff --git a/digikam/libs/dialogs/imageguidedlg.h b/digikam/libs/dialogs/imageguidedlg.h index aa57e61..e6841c4 100644 --- a/digikam/libs/dialogs/imageguidedlg.h +++ b/digikam/libs/dialogs/imageguidedlg.h @@ -51,7 +51,7 @@ class DImgThreadedFilter; class DIGIKAM_EXPORT ImageGuideDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/dialogs/rawcameradlg.cpp b/digikam/libs/dialogs/rawcameradlg.cpp index e67a565..298b47d 100644 --- a/digikam/libs/dialogs/rawcameradlg.cpp +++ b/digikam/libs/dialogs/rawcameradlg.cpp @@ -139,8 +139,8 @@ RawCameraDlg::RawCameraDlg(TQWidget *parent) // -------------------------------------------------------- - connect(d->searchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - this, TQT_SLOT(slotSearchTextChanged(const TQString&))); + connect(d->searchBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + this, TQ_SLOT(slotSearchTextChanged(const TQString&))); resize(500, 500); } diff --git a/digikam/libs/dialogs/rawcameradlg.h b/digikam/libs/dialogs/rawcameradlg.h index 0d1869f..41d4a7d 100644 --- a/digikam/libs/dialogs/rawcameradlg.h +++ b/digikam/libs/dialogs/rawcameradlg.h @@ -39,7 +39,7 @@ class RawCameraDlgPriv; class DIGIKAM_EXPORT RawCameraDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/dimg/README b/digikam/libs/dimg/README index 8b79bde..4b13f3f 100644 --- a/digikam/libs/dimg/README +++ b/digikam/libs/dimg/README @@ -16,20 +16,20 @@ some imlib2 bugreports I reported to upstream have gone unfixed for long time now. Also, we need to think about 16bit imaging support. this won't come from -imlib2 and neither from qt. with qt4 there was hope of 16bit image +imlib2 and neither from tqt. with qt4 there was hope of 16bit image support, but trolltech has made it clear that imaging apps forms only 0.1% of their customer base and they are not interested in providing custom support for them. so the only solution I see (without depending on imagemagick) is to roll our own library. i have been working on a imaging library for digikam, its called DImg. -it doesn't aim to be a complete imaging library; it uses QImage for +it doesn't aim to be a complete imaging library; it uses TQImage for rendering and for loading files which are not supported natively by it. some of the working/planned features: * Native Image Loaders, for some imageformats which are of interest to us: JPEG (complete), TIFF (a rudimentary one currently), PNG (planned), PPM -(planned). for the rest qt's qimage is used. +(planned). for the rest tqt's qimage is used. * Metadata preservation: when a file is loaded, its metadata like XMP, IPTC, EXIF, JFIF are read and held in memory. now when you save back the @@ -39,7 +39,7 @@ imlib2 is on saving a file: we save the file to a temporary file, reread the exif info from the original file and then write to a second temporary file.) -* Explicitly Shared Container format (see qt docs): this is necessary for +* Explicitly Shared Container format (see tqt docs): this is necessary for performance reasons. * 8bit and 16bit support: if the file format is 16 bit, it will load up @@ -53,11 +53,11 @@ scale (this has been ported from Imlib2 - originally ported by Mosfet, I added 16 bit scaling support and support for scaling of only a section of the image) -* Rendering to Pixmap: using QImage/QPixmap. (see above for rendering of +* Rendering to Pixmap: using TQImage/QPixmap. (see above for rendering of 16bit images). -* Pixel format: the pixel format is different from QImage/Imlib2 pixel -format. In QImage/Imlib2 the pixel data is stored as unsigned ints and to +* Pixel format: the pixel format is different from TQImage/Imlib2 pixel +format. In TQImage/Imlib2 the pixel data is stored as unsigned ints and to access the individual colors you need to use bit-shifting to ensure endian correctness. in DImg, the pixel data is stored as unsigned char. the color layout is B,G,R,A (blue, green, red, alpha) @@ -89,7 +89,7 @@ for (int i=0; i<image.width()*image.height(); i++) } the above is true for both big and little endian platforms. What this also -means is that the pixel format is different from that of QImage for big +means is that the pixel format is different from that of TQImage for big endian machines. Functions are provided if you want to get a copy of the -DImg as a QImage. +DImg as a TQImage. diff --git a/digikam/libs/dimg/loaders/README b/digikam/libs/dimg/loaders/README index e3a8c60..b77e9c4 100644 --- a/digikam/libs/dimg/loaders/README +++ b/digikam/libs/dimg/loaders/README @@ -11,7 +11,7 @@ RAW Done N.A N.A Done Done yes yes dcraw Metadat PPM Done TODO N.A N.A N.A yes yes none JPEG2K Done Done Done TODO N.A yes yes libjasper Metadata are EXIF/XMP/ICC profil -Others file formats are supported only in 8 bits/color/pixel using QImage/kimgio. +Others file formats are supported only in 8 bits/color/pixel using TQImage/kimgio. QT3.x + KDE 3.4.x support these formats : Format Read Write Remarks diff --git a/digikam/libs/dimg/loaders/jp2ksettings.cpp b/digikam/libs/dimg/loaders/jp2ksettings.cpp index ca5c473..af0737c 100644 --- a/digikam/libs/dimg/loaders/jp2ksettings.cpp +++ b/digikam/libs/dimg/loaders/jp2ksettings.cpp @@ -96,11 +96,11 @@ JP2KSettings::JP2KSettings(TQWidget *parent) d->JPEG2000Grid->addMultiCellWidget(d->JPEG2000compression, 1, 1, 1, 1); d->JPEG2000Grid->setColStretch(1, 10); - connect(d->JPEG2000LossLess, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggleJPEG2000LossLess(bool))); + connect(d->JPEG2000LossLess, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleJPEG2000LossLess(bool))); - connect(d->JPEG2000LossLess, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggleJPEG2000LossLess(bool))); + connect(d->JPEG2000LossLess, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleJPEG2000LossLess(bool))); } JP2KSettings::~JP2KSettings() diff --git a/digikam/libs/dimg/loaders/jp2ksettings.h b/digikam/libs/dimg/loaders/jp2ksettings.h index 929fce9..951cb2f 100644 --- a/digikam/libs/dimg/loaders/jp2ksettings.h +++ b/digikam/libs/dimg/loaders/jp2ksettings.h @@ -39,7 +39,7 @@ class JP2KSettingsPriv; class DIGIKAM_EXPORT JP2KSettings : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/dimg/loaders/jpegsettings.h b/digikam/libs/dimg/loaders/jpegsettings.h index 1162d1c..70e20d4 100644 --- a/digikam/libs/dimg/loaders/jpegsettings.h +++ b/digikam/libs/dimg/loaders/jpegsettings.h @@ -39,7 +39,7 @@ class JPEGSettingsPriv; class DIGIKAM_EXPORT JPEGSettings : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/dimg/loaders/pngsettings.h b/digikam/libs/dimg/loaders/pngsettings.h index ef5f77c..aecca93 100644 --- a/digikam/libs/dimg/loaders/pngsettings.h +++ b/digikam/libs/dimg/loaders/pngsettings.h @@ -39,7 +39,7 @@ class PNGSettingsPriv; class DIGIKAM_EXPORT PNGSettings : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/dimg/loaders/rawloader.h b/digikam/libs/dimg/loaders/rawloader.h index 9d7fbe6..22171a2 100644 --- a/digikam/libs/dimg/loaders/rawloader.h +++ b/digikam/libs/dimg/loaders/rawloader.h @@ -43,7 +43,7 @@ class DImg; class DIGIKAM_EXPORT RAWLoader : public KDcrawIface::KDcraw, public DImgLoader { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/dimg/loaders/tiffsettings.h b/digikam/libs/dimg/loaders/tiffsettings.h index 60375f6..e546ce0 100644 --- a/digikam/libs/dimg/loaders/tiffsettings.h +++ b/digikam/libs/dimg/loaders/tiffsettings.h @@ -39,7 +39,7 @@ class TIFFSettingsPriv; class DIGIKAM_EXPORT TIFFSettings : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/dmetadata/dmetadata.cpp b/digikam/libs/dmetadata/dmetadata.cpp index d342b37..bb37506 100644 --- a/digikam/libs/dmetadata/dmetadata.cpp +++ b/digikam/libs/dmetadata/dmetadata.cpp @@ -470,7 +470,7 @@ bool DMetadata::getXMLImageProperties(TQString& comments, TQDateTime& date, else if (name == TQString::fromLatin1("date")) { if (val.isEmpty()) continue; - date = TQDateTime::fromString(val, Qt::ISODate); + date = TQDateTime::fromString(val, TQt::ISODate); } else if (name == TQString::fromLatin1("rating")) { @@ -516,7 +516,7 @@ bool DMetadata::setXMLImageProperties(const TQString& comments, const TQDateTime propertiesElem.appendChild(c); TQDomElement d = xmlDoc.createElement(TQString::fromLatin1("date")); - d.setAttribute(TQString::fromLatin1("value"), date.toString(Qt::ISODate)); + d.setAttribute(TQString::fromLatin1("value"), date.toString(TQt::ISODate)); propertiesElem.appendChild(d); TQDomElement r = xmlDoc.createElement(TQString::fromLatin1("rating")); diff --git a/digikam/libs/greycstoration/greycstorationwidget.cpp b/digikam/libs/greycstoration/greycstorationwidget.cpp index 147a92f..93f2579 100644 --- a/digikam/libs/greycstoration/greycstorationwidget.cpp +++ b/digikam/libs/greycstoration/greycstorationwidget.cpp @@ -126,7 +126,7 @@ public: }; GreycstorationWidget::GreycstorationWidget(TQTabWidget *parent) - : TQObject(TQT_TQOBJECT(parent)) + : TQObject(parent) { d = new GreycstorationWidgetPriv; d->parent = parent; diff --git a/digikam/libs/greycstoration/greycstorationwidget.h b/digikam/libs/greycstoration/greycstorationwidget.h index 6d995fb..2279707 100644 --- a/digikam/libs/greycstoration/greycstorationwidget.h +++ b/digikam/libs/greycstoration/greycstorationwidget.h @@ -43,7 +43,7 @@ class GreycstorationWidgetPriv; class DIGIKAM_EXPORT GreycstorationWidget : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.cpp b/digikam/libs/imageproperties/cameraitempropertiestab.cpp index 0427840..8593e9c 100644 --- a/digikam/libs/imageproperties/cameraitempropertiestab.cpp +++ b/digikam/libs/imageproperties/cameraitempropertiestab.cpp @@ -191,7 +191,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar) d->newFileName = new TQLabel(i18n("<nobr><b>New Name</b></nobr>:"), d->settingsArea); d->downloaded = new TQLabel(i18n("<b>Downloaded</b>:"), d->settingsArea); - KSeparator *line = new KSeparator(Qt::Horizontal, d->settingsArea); + KSeparator *line = new KSeparator(TQt::Horizontal, d->settingsArea); d->title2 = new TQLabel(i18n("<big><b>Photograph Properties</b></big>"), d->settingsArea); d->make = new TQLabel(i18n("<b>Make</b>:"), d->settingsArea); d->model = new TQLabel(i18n("<b>Model</b>:"), d->settingsArea); diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.h b/digikam/libs/imageproperties/cameraitempropertiestab.h index f690c85..badf4a7 100644 --- a/digikam/libs/imageproperties/cameraitempropertiestab.h +++ b/digikam/libs/imageproperties/cameraitempropertiestab.h @@ -46,7 +46,7 @@ class CameraItemPropertiesTabPriv; class DIGIKAM_EXPORT CameraItemPropertiesTab : public NavigateBarTab { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/digikam/libs/imageproperties/imagedescedittab.cpp index 3c350b1..f79b1d7 100644 --- a/digikam/libs/imageproperties/imagedescedittab.cpp +++ b/digikam/libs/imageproperties/imagedescedittab.cpp @@ -234,50 +234,50 @@ ImageDescEditTab::ImageDescEditTab(TQWidget *parent, bool navBar) // -------------------------------------------------- - connect(d->tagsView, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - this, TQT_SIGNAL(signalProgressBarMode(int, const TQString&))); + connect(d->tagsView, TQ_SIGNAL(signalProgressBarMode(int, const TQString&)), + this, TQ_SIGNAL(signalProgressBarMode(int, const TQString&))); - connect(d->tagsView, TQT_SIGNAL(signalProgressValue(int)), - this, TQT_SIGNAL(signalProgressValue(int))); + connect(d->tagsView, TQ_SIGNAL(signalProgressValue(int)), + this, TQ_SIGNAL(signalProgressValue(int))); - connect(popupMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotRecentTagsMenuActivated(int))); + connect(popupMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotRecentTagsMenuActivated(int))); - connect(d->tagsView, TQT_SIGNAL(signalItemStateChanged(TAlbumCheckListItem *)), - this, TQT_SLOT(slotItemStateChanged(TAlbumCheckListItem *))); + connect(d->tagsView, TQ_SIGNAL(signalItemStateChanged(TAlbumCheckListItem *)), + this, TQ_SLOT(slotItemStateChanged(TAlbumCheckListItem *))); - connect(d->commentsEdit, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(slotCommentChanged())); + connect(d->commentsEdit, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(slotCommentChanged())); - connect(d->dateTimeEdit, TQT_SIGNAL(dateTimeChanged(const TQDateTime& )), - this, TQT_SLOT(slotDateTimeChanged(const TQDateTime&))); + connect(d->dateTimeEdit, TQ_SIGNAL(dateTimeChanged(const TQDateTime& )), + this, TQ_SLOT(slotDateTimeChanged(const TQDateTime&))); - connect(d->ratingWidget, TQT_SIGNAL(signalRatingChanged(int)), - this, TQT_SLOT(slotRatingChanged(int))); + connect(d->ratingWidget, TQ_SIGNAL(signalRatingChanged(int)), + this, TQ_SLOT(slotRatingChanged(int))); - connect(d->tagsView, TQT_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint &, int)), - this, TQT_SLOT(slotRightButtonClicked(TQListViewItem*, const TQPoint&, int))); + connect(d->tagsView, TQ_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint &, int)), + this, TQ_SLOT(slotRightButtonClicked(TQListViewItem*, const TQPoint&, int))); - connect(d->tagsSearchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - this, TQT_SLOT(slotTagsSearchChanged(const TQString&))); + connect(d->tagsSearchBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + this, TQ_SLOT(slotTagsSearchChanged(const TQString&))); - connect(this, TQT_SIGNAL(signalTagFilterMatch(bool)), - d->tagsSearchBar, TQT_SLOT(slotSearchResult(bool))); + connect(this, TQ_SIGNAL(signalTagFilterMatch(bool)), + d->tagsSearchBar, TQ_SLOT(slotSearchResult(bool))); - connect(d->assignedTagsBtn, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotAssignedTagsToggled(bool))); + connect(d->assignedTagsBtn, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotAssignedTagsToggled(bool))); - connect(d->newTagEdit->lineEdit(), TQT_SIGNAL(returnPressed(const TQString&)), - this, TQT_SLOT(slotCreateNewTag())); + connect(d->newTagEdit->lineEdit(), TQ_SIGNAL(returnPressed(const TQString&)), + this, TQ_SLOT(slotCreateNewTag())); - connect(d->applyBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplyAllChanges())); + connect(d->applyBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplyAllChanges())); - connect(d->revertBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRevertAllChanges())); + connect(d->revertBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRevertAllChanges())); - connect(d->moreMenu, TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotMoreMenu())); + connect(d->moreMenu, TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotMoreMenu())); // Initialize --------------------------------------------- @@ -291,55 +291,55 @@ ImageDescEditTab::ImageDescEditTab(TQWidget *parent, bool navBar) AlbumManager* man = AlbumManager::instance(); - connect(man, TQT_SIGNAL(signalAlbumAdded(Album*)), - this, TQT_SLOT(slotAlbumAdded(Album*))); + connect(man, TQ_SIGNAL(signalAlbumAdded(Album*)), + this, TQ_SLOT(slotAlbumAdded(Album*))); - connect(man, TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotAlbumDeleted(Album*))); + connect(man, TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotAlbumDeleted(Album*))); - connect(man, TQT_SIGNAL(signalAlbumRenamed(Album*)), - this, TQT_SLOT(slotAlbumRenamed(Album*))); + connect(man, TQ_SIGNAL(signalAlbumRenamed(Album*)), + this, TQ_SLOT(slotAlbumRenamed(Album*))); - connect(man, TQT_SIGNAL(signalAlbumsCleared()), - this, TQT_SLOT(slotAlbumsCleared())); + connect(man, TQ_SIGNAL(signalAlbumsCleared()), + this, TQ_SLOT(slotAlbumsCleared())); - connect(man, TQT_SIGNAL(signalAlbumIconChanged(Album*)), - this, TQT_SLOT(slotAlbumIconChanged(Album*))); + connect(man, TQ_SIGNAL(signalAlbumIconChanged(Album*)), + this, TQ_SLOT(slotAlbumIconChanged(Album*))); - connect(man, TQT_SIGNAL(signalTAlbumMoved(TAlbum*, TAlbum*)), - this, TQT_SLOT(slotAlbumMoved(TAlbum*, TAlbum*))); + connect(man, TQ_SIGNAL(signalTAlbumMoved(TAlbum*, TAlbum*)), + this, TQ_SLOT(slotAlbumMoved(TAlbum*, TAlbum*))); // Connect to thumbnail loader ----------------------------- AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); - connect(loader, TQT_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); + connect(loader, TQ_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); - connect(loader, TQT_SIGNAL(signalFailed(Album *)), - this, TQT_SLOT(slotThumbnailLost(Album *))); + connect(loader, TQ_SIGNAL(signalFailed(Album *)), + this, TQ_SLOT(slotThumbnailLost(Album *))); - connect(loader, TQT_SIGNAL(signalReloadThumbnails()), - this, TQT_SLOT(slotReloadThumbnails())); + connect(loader, TQ_SIGNAL(signalReloadThumbnails()), + this, TQ_SLOT(slotReloadThumbnails())); // Connect to attribute watch ------------------------------ ImageAttributesWatch *watch = ImageAttributesWatch::instance(); - connect(watch, TQT_SIGNAL(signalImageTagsChanged(TQ_LLONG)), - this, TQT_SLOT(slotImageTagsChanged(TQ_LLONG))); + connect(watch, TQ_SIGNAL(signalImageTagsChanged(TQ_LLONG)), + this, TQ_SLOT(slotImageTagsChanged(TQ_LLONG))); - connect(watch, TQT_SIGNAL(signalImagesChanged(int)), - this, TQT_SLOT(slotImagesChanged(int))); + connect(watch, TQ_SIGNAL(signalImagesChanged(int)), + this, TQ_SLOT(slotImagesChanged(int))); - connect(watch, TQT_SIGNAL(signalImageRatingChanged(TQ_LLONG)), - this, TQT_SLOT(slotImageRatingChanged(TQ_LLONG))); + connect(watch, TQ_SIGNAL(signalImageRatingChanged(TQ_LLONG)), + this, TQ_SLOT(slotImageRatingChanged(TQ_LLONG))); - connect(watch, TQT_SIGNAL(signalImageDateChanged(TQ_LLONG)), - this, TQT_SLOT(slotImageDateChanged(TQ_LLONG))); + connect(watch, TQ_SIGNAL(signalImageDateChanged(TQ_LLONG)), + this, TQ_SLOT(slotImageDateChanged(TQ_LLONG))); - connect(watch, TQT_SIGNAL(signalImageCaptionChanged(TQ_LLONG)), - this, TQT_SLOT(slotImageCaptionChanged(TQ_LLONG))); + connect(watch, TQ_SIGNAL(signalImageCaptionChanged(TQ_LLONG)), + this, TQ_SLOT(slotImageCaptionChanged(TQ_LLONG))); // -- read config --------------------------------------------------------- @@ -819,8 +819,8 @@ void ImageDescEditTab::slotRightButtonClicked(TQListViewItem *item, const TQPoin d->ABCMenu = new TQPopupMenu; - connect(d->ABCMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotABCContextMenu() )); + connect(d->ABCMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotABCContextMenu() )); TDEPopupMenu popmenu(this); popmenu.insertTitle(SmallIcon("digikam"), i18n("Tags")); @@ -1043,8 +1043,8 @@ void ImageDescEditTab::slotMoreMenu() if (singleSelection()) { - d->moreMenu->insertItem(i18n("Read metadata from file to database"), this, TQT_SLOT(slotReadFromFileMetadataToDatabase())); - int writeActionId = d->moreMenu->insertItem(i18n("Write metadata to each file"), this, TQT_SLOT(slotWriteToFileMetadataFromDatabase())); + d->moreMenu->insertItem(i18n("Read metadata from file to database"), this, TQ_SLOT(slotReadFromFileMetadataToDatabase())); + int writeActionId = d->moreMenu->insertItem(i18n("Write metadata to each file"), this, TQ_SLOT(slotWriteToFileMetadataFromDatabase())); // we do not need a "Write to file" action here because the apply button will do just that // if selection is a single file. // Adding the option will confuse users: Does the apply button not write to file? @@ -1056,8 +1056,8 @@ void ImageDescEditTab::slotMoreMenu() { // We need to make clear that this action is different from the Apply button, // which saves the same changes to all files. These batch operations operate on each single file. - d->moreMenu->insertItem(i18n("Read metadata from each file to database"), this, TQT_SLOT(slotReadFromFileMetadataToDatabase())); - d->moreMenu->insertItem(i18n("Write metadata to each file"), this, TQT_SLOT(slotWriteToFileMetadataFromDatabase())); + d->moreMenu->insertItem(i18n("Read metadata from each file to database"), this, TQ_SLOT(slotReadFromFileMetadataToDatabase())); + d->moreMenu->insertItem(i18n("Write metadata to each file"), this, TQ_SLOT(slotWriteToFileMetadataFromDatabase())); } } @@ -1071,13 +1071,13 @@ void ImageDescEditTab::tagNew(TAlbum* parAlbum, const TQString& _title, const TQ if (title.isNull()) { - if (!TagEditDlg::tagCreate(TQT_TQWIDGET(TQT_TQWIDGET(kapp->activeWindow())), parAlbum, title, icon)) + if (!TagEditDlg::tagCreate(kapp->activeWindow(), parAlbum, title, icon)) return; } TQMap<TQString, TQString> errMap; AlbumList tList = TagEditDlg::createTAlbum(parAlbum, title, icon, errMap); - TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap); + TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap); for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it) { @@ -1171,7 +1171,7 @@ void ImageDescEditTab::tagEdit(TAlbum* album) TQString title; TQString icon; - if (!TagEditDlg::tagEdit(TQT_TQWIDGET(kapp->activeWindow()), album, title, icon)) + if (!TagEditDlg::tagEdit(kapp->activeWindow(), album, title, icon)) return; AlbumManager *albumMan = AlbumManager::instance(); diff --git a/digikam/libs/imageproperties/imagedescedittab.h b/digikam/libs/imageproperties/imagedescedittab.h index a482864..617bd59 100644 --- a/digikam/libs/imageproperties/imagedescedittab.h +++ b/digikam/libs/imageproperties/imagedescedittab.h @@ -49,7 +49,7 @@ class ImageDescEditTabPriv; class DIGIKAM_EXPORT ImageDescEditTab : public NavigateBarTab { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp index 7388444..af85953 100644 --- a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp +++ b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp @@ -277,7 +277,7 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar // ------------------------------------------------------------- - TQGroupBox *gbox = new TQGroupBox(2, Qt::Horizontal, i18n("Statistics"), histogramPage); + TQGroupBox *gbox = new TQGroupBox(2, TQt::Horizontal, i18n("Statistics"), histogramPage); TQWhatsThis::add( gbox, i18n("<p>Here you can see the statistical results calculated from the " "selected histogram part. These values are available for all " "channels.")); @@ -349,35 +349,35 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar // ------------------------------------------------------------- - connect(d->channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(d->channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(d->scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(d->scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(d->colorsCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotColorsChanged(int))); + connect(d->colorsCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotColorsChanged(int))); - connect(d->regionBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotRenderingChanged(int))); + connect(d->regionBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotRenderingChanged(int))); - connect(d->histogramWidget, TQT_SIGNAL(signalIntervalChanged( int, int )), - this, TQT_SLOT(slotUpdateInterval(int, int))); + connect(d->histogramWidget, TQ_SIGNAL(signalIntervalChanged( int, int )), + this, TQ_SLOT(slotUpdateInterval(int, int))); - connect(d->histogramWidget, TQT_SIGNAL(signalMaximumValueChanged( int )), - this, TQT_SLOT(slotUpdateIntervRange(int))); + connect(d->histogramWidget, TQ_SIGNAL(signalMaximumValueChanged( int )), + this, TQ_SLOT(slotUpdateIntervRange(int))); - connect(d->histogramWidget, TQT_SIGNAL(signalHistogramComputationDone(bool)), - this, TQT_SLOT(slotRefreshOptions(bool))); + connect(d->histogramWidget, TQ_SIGNAL(signalHistogramComputationDone(bool)), + this, TQ_SLOT(slotRefreshOptions(bool))); - connect(d->histogramWidget, TQT_SIGNAL(signalHistogramComputationFailed(void)), - this, TQT_SLOT(slotHistogramComputationFailed(void))); + connect(d->histogramWidget, TQ_SIGNAL(signalHistogramComputationFailed(void)), + this, TQ_SLOT(slotHistogramComputationFailed(void))); - connect(d->minInterv, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotMinValueChanged(int))); + connect(d->minInterv, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotMinValueChanged(int))); - connect(d->maxInterv, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotMaxValueChanged(int))); + connect(d->maxInterv, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotMaxValueChanged(int))); // -- read config --------------------------------------------------------- @@ -509,11 +509,11 @@ void ImagePropertiesColorsTab::loadImageFromUrl(const KURL& url) { d->imageLoaderThread = new SharedLoadSaveThread(); - connect(d->imageLoaderThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg&)), - this, TQT_SLOT(slotLoadImageFromUrlComplete(const LoadingDescription &, const DImg&))); + connect(d->imageLoaderThread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg&)), + this, TQ_SLOT(slotLoadImageFromUrlComplete(const LoadingDescription &, const DImg&))); - connect(d->imageLoaderThread, TQT_SIGNAL(signalMoreCompleteLoadingAvailable(const LoadingDescription &, const LoadingDescription &)), - this, TQT_SLOT(slotMoreCompleteLoadingAvailable(const LoadingDescription &, const LoadingDescription &))); + connect(d->imageLoaderThread, TQ_SIGNAL(signalMoreCompleteLoadingAvailable(const LoadingDescription &, const LoadingDescription &)), + this, TQ_SLOT(slotMoreCompleteLoadingAvailable(const LoadingDescription &, const LoadingDescription &))); } LoadingDescription desc = LoadingDescription(url.path()); diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.h b/digikam/libs/imageproperties/imagepropertiescolorstab.h index d35c547..0e01cad 100644 --- a/digikam/libs/imageproperties/imagepropertiescolorstab.h +++ b/digikam/libs/imageproperties/imagepropertiescolorstab.h @@ -49,7 +49,7 @@ class ImagePropertiesColorsTabPriv; class DIGIKAM_EXPORT ImagePropertiesColorsTab : public NavigateBarTab { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/imagepropertiesmetadatatab.h b/digikam/libs/imageproperties/imagepropertiesmetadatatab.h index 559a22e..95b8ecb 100644 --- a/digikam/libs/imageproperties/imagepropertiesmetadatatab.h +++ b/digikam/libs/imageproperties/imagepropertiesmetadatatab.h @@ -45,7 +45,7 @@ class ImagePropertiesMetadataTabPriv; class DIGIKAM_EXPORT ImagePropertiesMetaDataTab : public NavigateBarTab { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/imagepropertiessidebar.cpp b/digikam/libs/imageproperties/imagepropertiessidebar.cpp index c54721c..6725438 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebar.cpp +++ b/digikam/libs/imageproperties/imagepropertiessidebar.cpp @@ -70,8 +70,8 @@ ImagePropertiesSideBar::ImagePropertiesSideBar(TQWidget *parent, const char *nam appendTab(m_metadataTab, SmallIcon("exifinfo"), i18n("Metadata")); appendTab(m_colorTab, SmallIcon("blend"), i18n("Colors")); - connect(this, TQT_SIGNAL(signalChangedTab(TQWidget*)), - this, TQT_SLOT(slotChangedTab(TQWidget*))); + connect(this, TQ_SIGNAL(signalChangedTab(TQWidget*)), + this, TQ_SLOT(slotChangedTab(TQWidget*))); } ImagePropertiesSideBar::~ImagePropertiesSideBar() diff --git a/digikam/libs/imageproperties/imagepropertiessidebar.h b/digikam/libs/imageproperties/imagepropertiessidebar.h index 29b58dc..43e08df 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebar.h +++ b/digikam/libs/imageproperties/imagepropertiessidebar.h @@ -48,7 +48,7 @@ class ImagePropertiesColorsTab; class DIGIKAM_EXPORT ImagePropertiesSideBar : public Sidebar { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp index f69b7f4..942c33e 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp +++ b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp @@ -106,8 +106,8 @@ ImagePropertiesSideBarCamGui::ImagePropertiesSideBarCamGui(TQWidget *parent, con connectNavigateSignals(d->cameraItemTab); connectNavigateSignals(d->metadataTab); - connect(this, TQT_SIGNAL(signalChangedTab(TQWidget*)), - this, TQT_SLOT(slotChangedTab(TQWidget*))); + connect(this, TQ_SIGNAL(signalChangedTab(TQWidget*)), + this, TQ_SLOT(slotChangedTab(TQWidget*))); } ImagePropertiesSideBarCamGui::~ImagePropertiesSideBarCamGui() @@ -117,17 +117,17 @@ ImagePropertiesSideBarCamGui::~ImagePropertiesSideBarCamGui() void ImagePropertiesSideBarCamGui::connectNavigateSignals(NavigateBarTab *tab) { - connect(tab, TQT_SIGNAL(signalFirstItem()), - this, TQT_SIGNAL(signalFirstItem())); + connect(tab, TQ_SIGNAL(signalFirstItem()), + this, TQ_SIGNAL(signalFirstItem())); - connect(tab, TQT_SIGNAL(signalPrevItem()), - this, TQT_SIGNAL(signalPrevItem())); + connect(tab, TQ_SIGNAL(signalPrevItem()), + this, TQ_SIGNAL(signalPrevItem())); - connect(tab, TQT_SIGNAL(signalNextItem()), - this, TQT_SIGNAL(signalNextItem())); + connect(tab, TQ_SIGNAL(signalNextItem()), + this, TQ_SIGNAL(signalNextItem())); - connect(tab, TQT_SIGNAL(signalLastItem()), - this, TQT_SIGNAL(signalLastItem())); + connect(tab, TQ_SIGNAL(signalLastItem()), + this, TQ_SIGNAL(signalLastItem())); } void ImagePropertiesSideBarCamGui::itemChanged(GPItemInfo* itemInfo, const KURL& url, diff --git a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.h b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.h index b8acb77..3c2eafd 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.h +++ b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.h @@ -48,7 +48,7 @@ class ImagePropertiesSideBarCamGuiPriv; class DIGIKAM_EXPORT ImagePropertiesSideBarCamGui : public Sidebar { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/imagepropertiessidebardb.cpp b/digikam/libs/imageproperties/imagepropertiessidebardb.cpp index e360622..f3dc5f7 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebardb.cpp +++ b/digikam/libs/imageproperties/imagepropertiessidebardb.cpp @@ -92,19 +92,19 @@ ImagePropertiesSideBarDB::ImagePropertiesSideBarDB(TQWidget *parent, const char // ---------------------------------------------------------- - connect(this, TQT_SIGNAL(signalChangedTab(TQWidget*)), - this, TQT_SLOT(slotChangedTab(TQWidget*))); + connect(this, TQ_SIGNAL(signalChangedTab(TQWidget*)), + this, TQ_SLOT(slotChangedTab(TQWidget*))); - connect(d->desceditTab, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - this, TQT_SIGNAL(signalProgressBarMode(int, const TQString&))); + connect(d->desceditTab, TQ_SIGNAL(signalProgressBarMode(int, const TQString&)), + this, TQ_SIGNAL(signalProgressBarMode(int, const TQString&))); - connect(d->desceditTab, TQT_SIGNAL(signalProgressValue(int)), - this, TQT_SIGNAL(signalProgressValue(int))); + connect(d->desceditTab, TQ_SIGNAL(signalProgressValue(int)), + this, TQ_SIGNAL(signalProgressValue(int))); ImageAttributesWatch *watch = ImageAttributesWatch::instance(); - connect(watch, TQT_SIGNAL(signalFileMetadataChanged(const KURL &)), - this, TQT_SLOT(slotFileMetadataChanged(const KURL &))); + connect(watch, TQ_SIGNAL(signalFileMetadataChanged(const KURL &)), + this, TQ_SLOT(slotFileMetadataChanged(const KURL &))); } ImagePropertiesSideBarDB::~ImagePropertiesSideBarDB() diff --git a/digikam/libs/imageproperties/imagepropertiessidebardb.h b/digikam/libs/imageproperties/imagepropertiessidebardb.h index 6fd78e7..7037b64 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebardb.h +++ b/digikam/libs/imageproperties/imagepropertiessidebardb.h @@ -55,7 +55,7 @@ class ImagePropertiesSideBarDBPriv; class DIGIKAM_EXPORT ImagePropertiesSideBarDB : public ImagePropertiesSideBar { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/imagepropertiestab.cpp b/digikam/libs/imageproperties/imagepropertiestab.cpp index 952bb64..7141c03 100644 --- a/digikam/libs/imageproperties/imagepropertiestab.cpp +++ b/digikam/libs/imageproperties/imagepropertiestab.cpp @@ -202,7 +202,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar) d->owner = new TQLabel(i18n("<b>Owner</b>:"), d->settingsArea); d->permissions = new TQLabel(i18n("<b>Permissions</b>:"), d->settingsArea); - KSeparator *line = new KSeparator(Qt::Horizontal, d->settingsArea); + KSeparator *line = new KSeparator(TQt::Horizontal, d->settingsArea); d->title2 = new TQLabel(i18n("<big><b>Image Properties</b></big>"), d->settingsArea); d->mime = new TQLabel(i18n("<b>Type</b>:"), d->settingsArea); d->dimensions = new TQLabel(i18n("<b>Dimensions</b>:"), d->settingsArea); @@ -210,7 +210,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar) d->bitDepth = new TQLabel(i18n("<nobr><b>Bit depth</b></nobr>:"), d->settingsArea); d->colorMode = new TQLabel(i18n("<nobr><b>Color mode</b></nobr>:"), d->settingsArea); - KSeparator *line2 = new KSeparator(Qt::Horizontal, d->settingsArea); + KSeparator *line2 = new KSeparator(TQt::Horizontal, d->settingsArea); d->title3 = new TQLabel(i18n("<big><b>Photograph Properties</b></big>"), d->settingsArea); d->make = new TQLabel(i18n("<b>Make</b>:"), d->settingsArea); d->model = new TQLabel(i18n("<b>Model</b>:"), d->settingsArea); diff --git a/digikam/libs/imageproperties/imagepropertiestab.h b/digikam/libs/imageproperties/imagepropertiestab.h index 891bddc..2a69ce9 100644 --- a/digikam/libs/imageproperties/imagepropertiestab.h +++ b/digikam/libs/imageproperties/imagepropertiestab.h @@ -46,7 +46,7 @@ class ImagePropertiesTabPriv; class DIGIKAM_EXPORT ImagePropertiesTab : public NavigateBarTab { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/navigatebartab.cpp b/digikam/libs/imageproperties/navigatebartab.cpp index 87540cd..d40ae13 100644 --- a/digikam/libs/imageproperties/navigatebartab.cpp +++ b/digikam/libs/imageproperties/navigatebartab.cpp @@ -80,17 +80,17 @@ void NavigateBarTab::setupNavigateBar(bool withBar) d->navigateBar = new NavigateBarWidget(d->stack, withBar); d->stack->addWidget(d->navigateBar); - connect(d->navigateBar, TQT_SIGNAL(signalFirstItem()), - this, TQT_SIGNAL(signalFirstItem())); + connect(d->navigateBar, TQ_SIGNAL(signalFirstItem()), + this, TQ_SIGNAL(signalFirstItem())); - connect(d->navigateBar, TQT_SIGNAL(signalPrevItem()), - this, TQT_SIGNAL(signalPrevItem())); + connect(d->navigateBar, TQ_SIGNAL(signalPrevItem()), + this, TQ_SIGNAL(signalPrevItem())); - connect(d->navigateBar, TQT_SIGNAL(signalNextItem()), - this, TQT_SIGNAL(signalNextItem())); + connect(d->navigateBar, TQ_SIGNAL(signalNextItem()), + this, TQ_SIGNAL(signalNextItem())); - connect(d->navigateBar, TQT_SIGNAL(signalLastItem()), - this, TQT_SIGNAL(signalLastItem())); + connect(d->navigateBar, TQ_SIGNAL(signalLastItem()), + this, TQ_SIGNAL(signalLastItem())); d->label = new TQLabel(d->stack); d->label->setAlignment(TQt::AlignCenter); diff --git a/digikam/libs/imageproperties/navigatebartab.h b/digikam/libs/imageproperties/navigatebartab.h index d52fd96..a93090e 100644 --- a/digikam/libs/imageproperties/navigatebartab.h +++ b/digikam/libs/imageproperties/navigatebartab.h @@ -49,7 +49,7 @@ class NavigateBarTabPriv; class DIGIKAM_EXPORT NavigateBarTab : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/navigatebarwidget.cpp b/digikam/libs/imageproperties/navigatebarwidget.cpp index ba923cf..9232c55 100644 --- a/digikam/libs/imageproperties/navigatebarwidget.cpp +++ b/digikam/libs/imageproperties/navigatebarwidget.cpp @@ -70,17 +70,17 @@ NavigateBarWidget::NavigateBarWidget(TQWidget *parent, bool show) if (!show) hide(); - connect(d->navBar, TQT_SIGNAL(signalFirstItem()), - this, TQT_SIGNAL(signalFirstItem())); + connect(d->navBar, TQ_SIGNAL(signalFirstItem()), + this, TQ_SIGNAL(signalFirstItem())); - connect(d->navBar, TQT_SIGNAL(signalPrevItem()), - this, TQT_SIGNAL(signalPrevItem())); + connect(d->navBar, TQ_SIGNAL(signalPrevItem()), + this, TQ_SIGNAL(signalPrevItem())); - connect(d->navBar, TQT_SIGNAL(signalNextItem()), - this, TQT_SIGNAL(signalNextItem())); + connect(d->navBar, TQ_SIGNAL(signalNextItem()), + this, TQ_SIGNAL(signalNextItem())); - connect(d->navBar, TQT_SIGNAL(signalLastItem()), - this, TQT_SIGNAL(signalLastItem())); + connect(d->navBar, TQ_SIGNAL(signalLastItem()), + this, TQ_SIGNAL(signalLastItem())); } NavigateBarWidget::~NavigateBarWidget() diff --git a/digikam/libs/imageproperties/navigatebarwidget.h b/digikam/libs/imageproperties/navigatebarwidget.h index 2bb4571..7be088e 100644 --- a/digikam/libs/imageproperties/navigatebarwidget.h +++ b/digikam/libs/imageproperties/navigatebarwidget.h @@ -40,7 +40,7 @@ class NavigateBarWidgetPriv; class DIGIKAM_EXPORT NavigateBarWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/talbumlistview.cpp b/digikam/libs/imageproperties/talbumlistview.cpp index 4191962..1369d22 100644 --- a/digikam/libs/imageproperties/talbumlistview.cpp +++ b/digikam/libs/imageproperties/talbumlistview.cpp @@ -178,8 +178,8 @@ TAlbumListView::TAlbumListView(TQWidget* parent) setAcceptDrops(true); viewport()->setAcceptDrops(true); - connect(AlbumManager::instance(), TQT_SIGNAL(signalTAlbumsDirty(const TQMap<int, int>&)), - this, TQT_SLOT(slotRefresh(const TQMap<int, int>&))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalTAlbumsDirty(const TQMap<int, int>&)), + this, TQ_SLOT(slotRefresh(const TQMap<int, int>&))); } TAlbumListView::~TAlbumListView() diff --git a/digikam/libs/imageproperties/talbumlistview.h b/digikam/libs/imageproperties/talbumlistview.h index cc98722..b483706 100644 --- a/digikam/libs/imageproperties/talbumlistview.h +++ b/digikam/libs/imageproperties/talbumlistview.h @@ -70,7 +70,7 @@ private : class DIGIKAM_EXPORT TAlbumListView : public FolderView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/jpegutils/jpegutils.cpp b/digikam/libs/jpegutils/jpegutils.cpp index 2db3402..2f2aabb 100644 --- a/digikam/libs/jpegutils/jpegutils.cpp +++ b/digikam/libs/jpegutils/jpegutils.cpp @@ -423,7 +423,7 @@ bool exifRotate(const TQString& file, const TQString& documentName) metaData.setImageDimensions(img.size()); // Update the image thumbnail. - TQImage thumb = img.scale(160, 120, TQ_ScaleMin); + TQImage thumb = img.scale(160, 120, TQImage::ScaleMin); metaData.setExifThumbnail(thumb); // Update Exif Document Name tag (the orinal file name from camera for example). @@ -495,7 +495,7 @@ bool jpegConvert(const TQString& src, const TQString& dest, const TQString& docu meta.setImagePreview(preview); // Update Exif thumbnail. - TQImage thumb = preview.smoothScale(160, 120, TQ_ScaleMin); + TQImage thumb = preview.smoothScale(160, 120, TQImage::ScaleMin); meta.setExifThumbnail(thumb); // Update Exif Document Name tag (the orinal file name from camera for example). diff --git a/digikam/libs/jpegutils/transupp.cpp b/digikam/libs/jpegutils/transupp.cpp index 43fe36c..47a9aa8 100644 --- a/digikam/libs/jpegutils/transupp.cpp +++ b/digikam/libs/jpegutils/transupp.cpp @@ -1625,7 +1625,7 @@ namespace Digikam * or recompression of the image. * Thanks to Guido Vollbeding for the initial design and code of this feature. * - *Qt::Horizontal flipping is done in-place, using a single top-to-bottom + * Horizontal flipping is done in-place, using a single top-to-bottom * pass through the virtual source array. It will thus be much the * fastest option for images larger than main memory. * @@ -1660,7 +1660,7 @@ namespace Digikam LOCAL(void) do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays) -/*Qt::Horizontal flip; done in-place, so no separate dest array is required */ +/* Horizontal flip; done in-place, so no separate dest array is required */ { JDIMENSION MCU_cols, comp_width, blk_x, blk_y; int ci, k, offset_y; @@ -1669,7 +1669,7 @@ do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JCOEF temp1, temp2; jpeg_component_info *compptr; - /*Qt::Horizontal mirroring of DCT blocks is accomplished by swapping + /* Horizontal mirroring of DCT blocks is accomplished by swapping * pairs of blocks in-place. Within a DCT block, we perform horizontal * mirroring by changing the signs of odd-numbered columns. * Partial iMCUs at the right edge are left untouched. @@ -1710,7 +1710,7 @@ LOCAL(void) do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, jvirt_barray_ptr *dst_coef_arrays) -/*Qt::Vertical flip */ +/* Vertical flip */ { JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y; int ci, i, j, offset_y; @@ -1827,7 +1827,7 @@ do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *dst_coef_arrays) /* 90 degree rotation is equivalent to * 1. Transposing the image; - * 2.Qt::Horizontal mirroring. + * 2. Horizontal mirroring. * These two steps are merged into a single processing routine. */ { @@ -1890,7 +1890,7 @@ do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, jvirt_barray_ptr *dst_coef_arrays) /* 270 degree rotation is equivalent to - * 1.Qt::Horizontal mirroring; + * 1. Horizontal mirroring; * 2. Transposing the image. * These two steps are merged into a single processing routine. */ @@ -1954,8 +1954,8 @@ do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, jvirt_barray_ptr *dst_coef_arrays) /* 180 degree rotation is equivalent to - * 1.Qt::Vertical mirroring; - * 2.Qt::Horizontal mirroring. + * 1. Vertical mirroring; + * 2. Horizontal mirroring. * These two steps are merged into a single processing routine. */ { @@ -2058,9 +2058,9 @@ do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, * 1. 180 degree rotation; * 2. Transposition; * or - * 1.Qt::Horizontal mirroring; + * 1. Horizontal mirroring; * 2. Transposition; - * 3.Qt::Horizontal mirroring. + * 3. Horizontal mirroring. * These steps are merged into a single processing routine. */ { diff --git a/digikam/libs/themeengine/themeengine.cpp b/digikam/libs/themeengine/themeengine.cpp index f788def..331ffa5 100644 --- a/digikam/libs/themeengine/themeengine.cpp +++ b/digikam/libs/themeengine/themeengine.cpp @@ -248,7 +248,7 @@ void ThemeEngine::setCurrentTheme(const TQString& name) changePalette(); - TQTimer::singleShot(0, this, TQT_SIGNAL(signalThemeChanged())); + TQTimer::singleShot(0, this, TQ_SIGNAL(signalThemeChanged())); } void ThemeEngine::setCurrentTheme(const Theme& theme, const TQString& name, bool loadFromDisk) @@ -271,7 +271,7 @@ void ThemeEngine::setCurrentTheme(const Theme& theme, const TQString& name, bool changePalette(); - TQTimer::singleShot(0, this, TQT_SIGNAL(signalThemeChanged())); + TQTimer::singleShot(0, this, TQ_SIGNAL(signalThemeChanged())); } void ThemeEngine::changePalette() diff --git a/digikam/libs/themeengine/themeengine.h b/digikam/libs/themeengine/themeengine.h index e19eae7..33abfb0 100644 --- a/digikam/libs/themeengine/themeengine.h +++ b/digikam/libs/themeengine/themeengine.h @@ -45,7 +45,7 @@ class ThemeEnginePriv; class DIGIKAM_EXPORT ThemeEngine : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/threadimageio/loadingcache.cpp b/digikam/libs/threadimageio/loadingcache.cpp index e2b39fe..04dd3e4 100644 --- a/digikam/libs/threadimageio/loadingcache.cpp +++ b/digikam/libs/threadimageio/loadingcache.cpp @@ -78,8 +78,8 @@ LoadingCache::LoadingCache() d->watch = new KDirWatch; - connect(d->watch, TQT_SIGNAL(dirty(const TQString &)), - this, TQT_SLOT(slotFileDirty(const TQString &))); + connect(d->watch, TQ_SIGNAL(dirty(const TQString &)), + this, TQ_SLOT(slotFileDirty(const TQString &))); } LoadingCache::~LoadingCache() diff --git a/digikam/libs/threadimageio/loadingcache.h b/digikam/libs/threadimageio/loadingcache.h index bbd27c7..d468930 100644 --- a/digikam/libs/threadimageio/loadingcache.h +++ b/digikam/libs/threadimageio/loadingcache.h @@ -63,7 +63,7 @@ class LoadingCachePriv; class LoadingCache : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/threadimageio/loadsavethread.h b/digikam/libs/threadimageio/loadsavethread.h index c3031ad..c935e47 100644 --- a/digikam/libs/threadimageio/loadsavethread.h +++ b/digikam/libs/threadimageio/loadsavethread.h @@ -49,7 +49,7 @@ class LoadSaveTask; class DIGIKAM_EXPORT LoadSaveThread : public TQObject, public TQThread { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/threadimageio/previewloadthread.h b/digikam/libs/threadimageio/previewloadthread.h index 231308f..59cc6d7 100644 --- a/digikam/libs/threadimageio/previewloadthread.h +++ b/digikam/libs/threadimageio/previewloadthread.h @@ -31,7 +31,7 @@ namespace Digikam class DIGIKAM_EXPORT PreviewLoadThread : public ManagedLoadSaveThread { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/thumbbar/thumbbar.cpp b/digikam/libs/thumbbar/thumbbar.cpp index 53fa9b0..f5b3276 100644 --- a/digikam/libs/thumbbar/thumbbar.cpp +++ b/digikam/libs/thumbbar/thumbbar.cpp @@ -163,8 +163,8 @@ ThumbBarView::ThumbBarView(TQWidget* parent, int orientation, bool exifRotate, d->toolTip = new ThumbBarToolTip(this); d->timer = new TQTimer(this); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotUpdate())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotUpdate())); viewport()->setBackgroundMode(TQt::NoBackground); viewport()->setMouseTracking(true); @@ -173,7 +173,7 @@ ThumbBarView::ThumbBarView(TQWidget* parent, int orientation, bool exifRotate, setFrameStyle(TQFrame::NoFrame); setAcceptDrops(true); - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) { setHScrollBarMode(TQScrollView::AlwaysOff); } @@ -204,7 +204,7 @@ void ThumbBarView::resizeEvent(TQResizeEvent* e) TQScrollView::resizeEvent(e); - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) { d->tileSize = width() - 2*d->margin - verticalScrollBar()->sizeHint().width(); verticalScrollBar()->setLineStep(d->tileSize); @@ -345,7 +345,7 @@ ThumbBarItem* ThumbBarView::findItem(const TQPoint& pos) const { int itemPos; - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) itemPos = pos.y(); else itemPos = pos.x(); @@ -403,7 +403,7 @@ void ThumbBarView::ensureItemVisible(ThumbBarItem* item) // We want the complete thumb visible and the next one. // find the middle of the image and give a margin of 1,5 image // When changed, watch regression for bug 104031 - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) ensureVisible(0, (int)(item->d->pos + d->margin + d->tileSize*.5), 0, (int)(d->tileSize*1.5 + 3*d->margin)); else @@ -442,11 +442,11 @@ void ThumbBarView::invalidateThumb(ThumbBarItem* item) d->thumbJob = new ThumbnailJob(item->url(), ThumbnailSize::Huge, true, d->exifRotate); - connect(d->thumbJob, TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); + connect(d->thumbJob, TQ_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); - connect(d->thumbJob, TQT_SIGNAL(signalFailed(const KURL&)), - this, TQT_SLOT(slotFailedThumbnail(const KURL&))); + connect(d->thumbJob, TQ_SIGNAL(signalFailed(const KURL&)), + this, TQ_SLOT(slotFailedThumbnail(const KURL&))); } void ThumbBarView::viewportPaintEvent(TQPaintEvent* e) @@ -455,7 +455,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e) TQPixmap bgPix, tile; TQRect er(e->rect()); - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) { cy = viewportToContents(er.topLeft()).y(); @@ -484,7 +484,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e) for (ThumbBarItem *item = d->firstItem; item; item = item->d->next) { - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) { if (y1 <= item->d->pos && item->d->pos <= y2) { @@ -502,7 +502,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e) { TQPixmap pix; pix.convertFromImage(TQImage(item->d->pixmap->convertToImage()). - smoothScale(d->tileSize, d->tileSize, TQ_ScaleMin)); + smoothScale(d->tileSize, d->tileSize, TQImage::ScaleMin)); int x = (tile.width() - pix.width())/2; int y = (tile.height() - pix.height())/2; bitBlt(&tile, x, y, &pix); @@ -529,7 +529,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e) { TQPixmap pix; pix.convertFromImage(TQImage(item->d->pixmap->convertToImage()). - smoothScale(d->tileSize, d->tileSize, TQ_ScaleMin)); + smoothScale(d->tileSize, d->tileSize, TQImage::ScaleMin)); int x = (tile.width() - pix.width())/2; int y = (tile.height()- pix.height())/2; bitBlt(&tile, x, y, &pix); @@ -540,7 +540,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e) } } - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) bitBlt(viewport(), 0, er.y(), &bgPix); else bitBlt(viewport(), er.x(), 0, &bgPix); @@ -570,7 +570,7 @@ void ThumbBarView::contentsMouseMoveEvent(TQMouseEvent *e) { if (!e) return; - if (d->dragging && (e->state() & Qt::LeftButton)) + if (d->dragging && (e->state() & TQt::LeftButton)) { if ( findItem(d->dragStartPos) && (d->dragStartPos - e->pos()).manhattanLength() > TQApplication::startDragDistance() ) @@ -600,14 +600,14 @@ void ThumbBarView::contentsWheelEvent(TQWheelEvent *e) { if (e->state() & TQt::ShiftButton) { - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) scrollBy(0, verticalScrollBar()->pageStep()); else scrollBy(horizontalScrollBar()->pageStep(), 0); } else { - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) scrollBy(0, verticalScrollBar()->lineStep()); else scrollBy(horizontalScrollBar()->lineStep(), 0); @@ -618,14 +618,14 @@ void ThumbBarView::contentsWheelEvent(TQWheelEvent *e) { if (e->state() & TQt::ShiftButton) { - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) scrollBy(0, (-1)*verticalScrollBar()->pageStep()); else scrollBy((-1)*horizontalScrollBar()->pageStep(), 0); } else { - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) scrollBy(0, (-1)*verticalScrollBar()->lineStep()); else scrollBy((-1)*horizontalScrollBar()->lineStep(), 0); @@ -736,7 +736,7 @@ void ThumbBarView::rearrangeItems() item = item->d->next; } - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) resizeContents(visibleWidth(), d->count*(d->tileSize+2*d->margin)); else resizeContents(d->count*(d->tileSize+2*d->margin), visibleHeight()); @@ -751,11 +751,11 @@ void ThumbBarView::rearrangeItems() d->thumbJob = new ThumbnailJob(urlList, ThumbnailSize::Huge, true, d->exifRotate); - connect(d->thumbJob, TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); + connect(d->thumbJob, TQ_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); - connect(d->thumbJob, TQT_SIGNAL(signalFailed(const KURL&)), - this, TQT_SLOT(slotFailedThumbnail(const KURL&))); + connect(d->thumbJob, TQ_SIGNAL(signalFailed(const KURL&)), + this, TQ_SLOT(slotFailedThumbnail(const KURL&))); } } @@ -763,7 +763,7 @@ void ThumbBarView::repaintItem(ThumbBarItem* item) { if (item) { - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) repaintContents(0, item->d->pos, visibleWidth(), d->tileSize+2*d->margin); else repaintContents(item->d->pos, 0, d->tileSize+2*d->margin, visibleHeight()); diff --git a/digikam/libs/thumbbar/thumbbar.h b/digikam/libs/thumbbar/thumbbar.h index fb02576..48ac574 100644 --- a/digikam/libs/thumbbar/thumbbar.h +++ b/digikam/libs/thumbbar/thumbbar.h @@ -87,7 +87,7 @@ public: class DIGIKAM_EXPORT ThumbBarView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/thumbbar/thumbnailjob.cpp b/digikam/libs/thumbbar/thumbnailjob.cpp index 46d4e46..dcabb39 100644 --- a/digikam/libs/thumbbar/thumbnailjob.cpp +++ b/digikam/libs/thumbbar/thumbnailjob.cpp @@ -206,8 +206,8 @@ void ThumbnailJob::processNext() if (d->exifRotate) job->addMetaData("exif", "yes"); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotThumbData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotThumbData(TDEIO::Job *, const TQByteArray &))); addSubjob(job); d->running = true; diff --git a/digikam/libs/thumbbar/thumbnailjob.h b/digikam/libs/thumbbar/thumbnailjob.h index 637304d..cc7080e 100644 --- a/digikam/libs/thumbbar/thumbnailjob.h +++ b/digikam/libs/thumbbar/thumbnailjob.h @@ -44,7 +44,7 @@ class ThumbnailJobPriv; class ThumbnailJob : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/colorgradientwidget.cpp b/digikam/libs/widgets/common/colorgradientwidget.cpp index 9270fd5..df4c96c 100644 --- a/digikam/libs/widgets/common/colorgradientwidget.cpp +++ b/digikam/libs/widgets/common/colorgradientwidget.cpp @@ -61,7 +61,7 @@ ColorGradientWidget::ColorGradientWidget(int o, int size, TQWidget *parent) setFrameStyle(TQFrame::Box|TQFrame::Plain); setLineWidth(1); - if ( d->orientation ==Qt::Horizontal ) + if ( d->orientation ==TQt::Horizontal ) setFixedHeight( size ); else setFixedWidth( size ); @@ -105,7 +105,7 @@ void ColorGradientWidget::drawContents(TQPainter *p) int greenDiff = color2.green() - color1.green(); int blueDiff = color2.blue() - color1.blue(); - if ( d->orientation ==Qt::Vertical ) + if ( d->orientation ==TQt::Vertical ) { for ( int y = 0; y < image.height(); y++ ) { diff --git a/digikam/libs/widgets/common/colorgradientwidget.h b/digikam/libs/widgets/common/colorgradientwidget.h index 2b63dc9..aafc3df 100644 --- a/digikam/libs/widgets/common/colorgradientwidget.h +++ b/digikam/libs/widgets/common/colorgradientwidget.h @@ -40,7 +40,7 @@ class ColorGradientWidgetPriv; class DIGIKAM_EXPORT ColorGradientWidget : public TQFrame { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/curveswidget.cpp b/digikam/libs/widgets/common/curveswidget.cpp index 6409a0b..281aecc 100644 --- a/digikam/libs/widgets/common/curveswidget.cpp +++ b/digikam/libs/widgets/common/curveswidget.cpp @@ -153,8 +153,8 @@ void CurvesWidget::setup(int w, int h, bool readOnly) d->blinkTimer = new TQTimer( this ); - connect(d->blinkTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotBlinkTimerDone())); + connect(d->blinkTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotBlinkTimerDone())); } void CurvesWidget::updateData(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits) @@ -168,7 +168,7 @@ void CurvesWidget::updateData(uchar *i_data, uint i_w, uint i_h, bool i_sixteenB delete m_imageHistogram; // Calc new histogram data - m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, TQT_TQOBJECT(this)); + m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, this); if (d->curves) delete d->curves; @@ -312,7 +312,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*) int asize = 24; TQPixmap anim(asize, asize); TQPainter p2; - p2.begin(TQT_TQPAINTDEVICE(&anim), this); + p2.begin(&anim, this); p2.fillRect(0, 0, asize, asize, palette().active().background()); p2.translate(asize/2, asize/2); @@ -330,7 +330,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*) TQPixmap pm(size()); TQPainter p1; - p1.begin(TQT_TQPAINTDEVICE(&pm), this); + p1.begin(&pm, this); p1.fillRect(0, 0, width(), height(), palette().active().background()); p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine)); p1.drawRect(0, 0, width(), height()); @@ -353,7 +353,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*) { TQPixmap pm(size()); TQPainter p1; - p1.begin(TQT_TQPAINTDEVICE(&pm), this); + p1.begin(&pm, this); p1.fillRect(0, 0, width(), height(), palette().active().background()); p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine)); p1.drawRect(0, 0, width(), height()); @@ -418,7 +418,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*) TQPixmap pm(size()); TQPainter p1; - p1.begin(TQT_TQPAINTDEVICE(&pm), this); + p1.begin(&pm, this); int curvePrevVal = 0; @@ -616,7 +616,7 @@ void CurvesWidget::mousePressEvent(TQMouseEvent *e) int closest_point; int distance; - if (e->button() != Qt::LeftButton || d->clearFlag == CurvesWidgetPriv::HistogramStarted) + if (e->button() != TQt::LeftButton || d->clearFlag == CurvesWidgetPriv::HistogramStarted) return; int x = CLAMP((int)(e->pos().x() * @@ -701,7 +701,7 @@ void CurvesWidget::mouseReleaseEvent(TQMouseEvent *e) { if (d->readOnlyMode || !m_imageHistogram) return; - if (e->button() != Qt::LeftButton || d->clearFlag == CurvesWidgetPriv::HistogramStarted) + if (e->button() != TQt::LeftButton || d->clearFlag == CurvesWidgetPriv::HistogramStarted) return; setCursor(KCursor::arrowCursor()); diff --git a/digikam/libs/widgets/common/curveswidget.h b/digikam/libs/widgets/common/curveswidget.h index c85cfff..c9cfed4 100644 --- a/digikam/libs/widgets/common/curveswidget.h +++ b/digikam/libs/widgets/common/curveswidget.h @@ -44,7 +44,7 @@ class CurvesWidgetPriv; class DIGIKAM_EXPORT CurvesWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/dcursortracker.cpp b/digikam/libs/widgets/common/dcursortracker.cpp index 2e3ae53..bb9490c 100644 --- a/digikam/libs/widgets/common/dcursortracker.cpp +++ b/digikam/libs/widgets/common/dcursortracker.cpp @@ -58,15 +58,15 @@ void DCursorTracker::setEnable(bool b) bool DCursorTracker::eventFilter(TQObject *object, TQEvent *e) { - TQWidget *widget = TQT_TQWIDGET(object); + TQWidget *widget = static_cast<TQWidget*>(object); switch (e->type()) { case TQEvent::MouseMove: { - TQMouseEvent *event = TQT_TQMOUSEEVENT(e); - if (m_enable && (TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) || - (event->stateAfter() & Qt::LeftButton))) + TQMouseEvent *event = static_cast<TQMouseEvent*>(e); + if (m_enable && (widget->rect().contains(event->pos()) || + (event->stateAfter() & TQt::LeftButton))) { show(); TQPoint p = widget->mapToGlobal(TQPoint(widget->width()/2, 0)); @@ -81,8 +81,8 @@ bool DCursorTracker::eventFilter(TQObject *object, TQEvent *e) case TQEvent::MouseButtonRelease: { - TQMouseEvent* event = TQT_TQMOUSEEVENT(e); - if ( !TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) ) + TQMouseEvent* event = static_cast<TQMouseEvent*>(e); + if ( !widget->rect().contains(event->pos()) ) { hide(); } diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/digikam/libs/widgets/common/dlogoaction.cpp index eea2bc4..60cfd77 100644 --- a/digikam/libs/widgets/common/dlogoaction.cpp +++ b/digikam/libs/widgets/common/dlogoaction.cpp @@ -67,18 +67,18 @@ int DLogoAction::plug(TQWidget *widget, int index) TDEGlobal::dirs()->addResourceType("banner-digikam", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); TQString directory = TDEGlobal::dirs()->findResourceDir("banner-digikam", "banner-digikam.png"); pixmapLogo->setPixmap(TQPixmap( directory + "banner-digikam.png" )); - pixmapLogo->setFocusPolicy(TQ_NoFocus); + pixmapLogo->setFocusPolicy(TQWidget::NoFocus); bar->insertWidget(id, pixmapLogo->width(), pixmapLogo); bar->alignItemRight(id); addContainer(bar, id); - connect(bar, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(slotDestroyed())); + connect(bar, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(slotDestroyed())); - connect(pixmapLogo, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(slotProcessURL(const TQString&))); + connect(pixmapLogo, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(slotProcessURL(const TQString&))); return containerCount() - 1; } diff --git a/digikam/libs/widgets/common/dlogoaction.h b/digikam/libs/widgets/common/dlogoaction.h index c731ab1..11a0052 100644 --- a/digikam/libs/widgets/common/dlogoaction.h +++ b/digikam/libs/widgets/common/dlogoaction.h @@ -37,7 +37,7 @@ namespace Digikam class DIGIKAM_EXPORT DLogoAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/dpopupmenu.cpp b/digikam/libs/widgets/common/dpopupmenu.cpp index 55139df..f41404c 100644 --- a/digikam/libs/widgets/common/dpopupmenu.cpp +++ b/digikam/libs/widgets/common/dpopupmenu.cpp @@ -188,7 +188,7 @@ void DPopupMenu::paintEvent(TQPaintEvent* e) drawContents(&p); - style().tqdrawPrimitive(TQStyle::PE_PanelPopup, &p, + style().drawPrimitive(TQStyle::PE_PanelPopup, &p, TQRect(0, 0, width(), height()), colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0)); diff --git a/digikam/libs/widgets/common/filesaveoptionsbox.h b/digikam/libs/widgets/common/filesaveoptionsbox.h index 64ba44f..9d9f84f 100644 --- a/digikam/libs/widgets/common/filesaveoptionsbox.h +++ b/digikam/libs/widgets/common/filesaveoptionsbox.h @@ -42,7 +42,7 @@ class FileSaveOptionsBoxPriv; class DIGIKAM_EXPORT FileSaveOptionsBox : public TQWidgetStack { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/histogramwidget.cpp b/digikam/libs/widgets/common/histogramwidget.cpp index 44b52c7..b301720 100644 --- a/digikam/libs/widgets/common/histogramwidget.cpp +++ b/digikam/libs/widgets/common/histogramwidget.cpp @@ -134,7 +134,7 @@ HistogramWidget::HistogramWidget(int w, int h, d->sixteenBits = i_sixteenBits; setup(w, h, selectMode, showProgress, statisticsVisible); - m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, TQT_TQOBJECT(this)); + m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, this); m_selectionHistogram = 0L; } @@ -152,8 +152,8 @@ HistogramWidget::HistogramWidget(int w, int h, d->sixteenBits = i_sixteenBits; setup(w, h, selectMode, showProgress, statisticsVisible); - m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, TQT_TQOBJECT(this)); - m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, TQT_TQOBJECT(this)); + m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, this); + m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, this); } HistogramWidget::~HistogramWidget() @@ -184,8 +184,8 @@ void HistogramWidget::setup(int w, int h, bool selectMode, bool showProgress, bo d->blinkTimer = new TQTimer( this ); - connect( d->blinkTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotBlinkTimerDone()) ); + connect( d->blinkTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotBlinkTimerDone()) ); } void HistogramWidget::setHistogramGuideByColor(const DColor& color) @@ -340,10 +340,10 @@ void HistogramWidget::updateData(uchar *i_data, uint i_w, uint i_h, delete m_selectionHistogram; // Calc new histogram data - m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, TQT_TQOBJECT(this)); + m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, this); if (s_data && s_w && s_h) - m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, TQT_TQOBJECT(this)); + m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, this); else m_selectionHistogram = 0L; } @@ -360,7 +360,7 @@ void HistogramWidget::updateSelectionData(uchar *s_data, uint s_w, uint s_h, delete m_selectionHistogram; // Calc new histogram data - m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, TQT_TQOBJECT(this)); + m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, this); } void HistogramWidget::slotBlinkTimerDone() @@ -383,7 +383,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*) { TQPixmap pm(size()); TQPainter p1; - p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this)); + p1.begin(&pm, this); p1.fillRect(0, 0, size().width(), size().height(), palette().disabled().background()); p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine)); p1.drawRect(0, 0, width(), height()); @@ -405,7 +405,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*) int asize = 24; TQPixmap anim(asize, asize); TQPainter p2; - p2.begin(TQT_TQPAINTDEVICE(&anim), TQT_TQOBJECT(this)); + p2.begin(&anim, this); p2.fillRect(0, 0, asize, asize, palette().active().background()); p2.translate(asize/2, asize/2); @@ -423,7 +423,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*) TQPixmap pm(size()); TQPainter p1; - p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this)); + p1.begin(&pm, this); p1.fillRect(0, 0, width(), height(), palette().active().background()); p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine)); p1.drawRect(0, 0, width(), height()); @@ -447,7 +447,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*) { TQPixmap pm(size()); TQPainter p1; - p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this)); + p1.begin(&pm, this); p1.fillRect(0, 0, width(), height(), palette().active().background()); p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine)); p1.drawRect(0, 0, width(), height()); @@ -524,7 +524,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*) TQPixmap pm(size()); TQPainter p1; - p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this)); + p1.begin(&pm, this); p1.fillRect(0, 0, width(), height(), palette().active().background()); // Drawing selection or all histogram values. diff --git a/digikam/libs/widgets/common/histogramwidget.h b/digikam/libs/widgets/common/histogramwidget.h index 6c7a4d6..2615717 100644 --- a/digikam/libs/widgets/common/histogramwidget.h +++ b/digikam/libs/widgets/common/histogramwidget.h @@ -43,7 +43,7 @@ class HistogramWidgetPriv; class DIGIKAM_EXPORT HistogramWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/paniconwidget.cpp b/digikam/libs/widgets/common/paniconwidget.cpp index a64ba02..d554969 100644 --- a/digikam/libs/widgets/common/paniconwidget.cpp +++ b/digikam/libs/widgets/common/paniconwidget.cpp @@ -247,7 +247,7 @@ void PanIconWidget::hideEvent(TQHideEvent *e) void PanIconWidget::mousePressEvent ( TQMouseEvent * e ) { - if ( (e->button() == Qt::LeftButton || e->button() == Qt::MidButton) && + if ( (e->button() == TQt::LeftButton || e->button() == TQt::MidButton) && m_localRegionSelection.contains( e->x(), e->y() ) ) { d->xpos = e->x(); @@ -261,7 +261,7 @@ void PanIconWidget::mousePressEvent ( TQMouseEvent * e ) void PanIconWidget::mouseMoveEvent ( TQMouseEvent * e ) { if ( d->moveSelection && - (e->state() == Qt::LeftButton || e->state() == Qt::MidButton) ) + (e->state() == TQt::LeftButton || e->state() == TQt::MidButton) ) { int newxpos = e->x(); int newypos = e->y(); diff --git a/digikam/libs/widgets/common/paniconwidget.h b/digikam/libs/widgets/common/paniconwidget.h index 62dbaf3..40b0758 100644 --- a/digikam/libs/widgets/common/paniconwidget.h +++ b/digikam/libs/widgets/common/paniconwidget.h @@ -43,7 +43,7 @@ class PanIconWidgetPriv; class PanIconWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/previewwidget.cpp b/digikam/libs/widgets/common/previewwidget.cpp index 9e34d00..0fe5cb2 100644 --- a/digikam/libs/widgets/common/previewwidget.cpp +++ b/digikam/libs/widgets/common/previewwidget.cpp @@ -545,16 +545,16 @@ void PreviewWidget::viewportPaintEvent(TQPaintEvent *e) void PreviewWidget::contentsMousePressEvent(TQMouseEvent *e) { - if (!e || e->button() == Qt::RightButton) + if (!e || e->button() == TQt::RightButton) return; m_movingInProgress = false; - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { emit signalLeftButtonClicked(); } - else if (e->button() == Qt::MidButton) + else if (e->button() == TQt::MidButton) { if (visibleWidth() < d->zoomWidth || visibleHeight() < d->zoomHeight) @@ -575,7 +575,7 @@ void PreviewWidget::contentsMouseMoveEvent(TQMouseEvent *e) { if (!e) return; - if (e->state() & Qt::MidButton) + if (e->state() & TQt::MidButton) { if (m_movingInProgress) { @@ -592,14 +592,14 @@ void PreviewWidget::contentsMouseReleaseEvent(TQMouseEvent *e) m_movingInProgress = false; - if (e->button() == Qt::MidButton) + if (e->button() == TQt::MidButton) { emit signalContentsMovedEvent(true); viewport()->unsetCursor(); viewport()->repaint(false); } - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { emit signalRightButtonClicked(); } diff --git a/digikam/libs/widgets/common/previewwidget.h b/digikam/libs/widgets/common/previewwidget.h index 6d284dc..03369a4 100644 --- a/digikam/libs/widgets/common/previewwidget.h +++ b/digikam/libs/widgets/common/previewwidget.h @@ -43,7 +43,7 @@ class PreviewWidgetPriv; class DIGIKAM_EXPORT PreviewWidget : public TQScrollView { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/searchtextbar.cpp b/digikam/libs/widgets/common/searchtextbar.cpp index a6379c4..1a81c03 100644 --- a/digikam/libs/widgets/common/searchtextbar.cpp +++ b/digikam/libs/widgets/common/searchtextbar.cpp @@ -156,7 +156,7 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new SearchTextBarPriv; - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setName(name); TQHBoxLayout *hlay = new TQHBoxLayout(this); @@ -179,11 +179,11 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString hlay->addWidget(d->searchEdit); hlay->addWidget(d->clearButton); - connect(d->clearButton, TQT_SIGNAL(clicked()), - d->searchEdit, TQT_SLOT(clear())); + connect(d->clearButton, TQ_SIGNAL(clicked()), + d->searchEdit, TQ_SLOT(clear())); - connect(d->searchEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotTextChanged(const TQString&))); + connect(d->searchEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotTextChanged(const TQString&))); TDEConfig *config = kapp->config(); config->setGroup(name + TQString(" Search Text Tool")); diff --git a/digikam/libs/widgets/common/searchtextbar.h b/digikam/libs/widgets/common/searchtextbar.h index 9e59976..04ef994 100644 --- a/digikam/libs/widgets/common/searchtextbar.h +++ b/digikam/libs/widgets/common/searchtextbar.h @@ -46,7 +46,7 @@ class SearchTextBarPriv; class DIGIKAM_EXPORT DLineEdit : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: @@ -73,7 +73,7 @@ private : class DIGIKAM_EXPORT SearchTextBar : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/sidebar.cpp b/digikam/libs/widgets/common/sidebar.cpp index 57dd502..a1bcd75 100644 --- a/digikam/libs/widgets/common/sidebar.cpp +++ b/digikam/libs/widgets/common/sidebar.cpp @@ -94,8 +94,8 @@ Sidebar::Sidebar(TQWidget *parent, const char *name, Side side, bool minimizedDe d->side = side; d->dragSwitchTimer = new TQTimer(this); - connect(d->dragSwitchTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotDragSwitchTimer())); + connect(d->dragSwitchTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotDragSwitchTimer())); } Sidebar::~Sidebar() @@ -201,8 +201,8 @@ void Sidebar::appendTab(TQWidget *w, const TQPixmap &pic, const TQString &title) tab(d->tabs)->setAcceptDrops(true); tab(d->tabs)->installEventFilter(this); - connect(tab(d->tabs), TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(clicked(int))); + connect(tab(d->tabs), TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(clicked(int))); d->tabs++; } @@ -312,7 +312,7 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev) for (TQPtrListIterator<KMultiTabBarTab> it(*pTabs); it.current(); ++it) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(*it) ) + if ( obj == *it ) { if ( ev->type() == TQEvent::DragEnter) { diff --git a/digikam/libs/widgets/common/sidebar.h b/digikam/libs/widgets/common/sidebar.h index ef7f544..8d2dc51 100644 --- a/digikam/libs/widgets/common/sidebar.h +++ b/digikam/libs/widgets/common/sidebar.h @@ -51,7 +51,7 @@ class SidebarPriv; */ class DIGIKAM_EXPORT Sidebar : public KMultiTabBar { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/splashscreen.cpp b/digikam/libs/widgets/common/splashscreen.cpp index 20abac7..7a8cbba 100644 --- a/digikam/libs/widgets/common/splashscreen.cpp +++ b/digikam/libs/widgets/common/splashscreen.cpp @@ -72,8 +72,8 @@ SplashScreen::SplashScreen(const TQString& splash, WFlags f) TQTimer *timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(animate())); + connect(timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(animate())); timer->start(150); } diff --git a/digikam/libs/widgets/common/splashscreen.h b/digikam/libs/widgets/common/splashscreen.h index ef82cce..d2d4cf4 100644 --- a/digikam/libs/widgets/common/splashscreen.h +++ b/digikam/libs/widgets/common/splashscreen.h @@ -44,7 +44,7 @@ class SplashScreenPriv; class DIGIKAM_EXPORT SplashScreen : public KSplashScreen { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/squeezedcombobox.cpp b/digikam/libs/widgets/common/squeezedcombobox.cpp index 996b9cf..b70da09 100644 --- a/digikam/libs/widgets/common/squeezedcombobox.cpp +++ b/digikam/libs/widgets/common/squeezedcombobox.cpp @@ -75,11 +75,11 @@ SqueezedComboBox::SqueezedComboBox(TQWidget *parent, const char *name) d->tooltip = new SqueezedComboBoxTip(listBox()->viewport(), this); setMinimumWidth(100); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotTimeOut())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTimeOut())); - connect(this, TQT_SIGNAL(activated( int )), - this, TQT_SLOT(slotUpdateToolTip( int ))); + connect(this, TQ_SIGNAL(activated( int )), + this, TQ_SLOT(slotUpdateToolTip( int ))); } SqueezedComboBox::~SqueezedComboBox() @@ -97,7 +97,7 @@ TQSize SqueezedComboBox::sizeHint() const int maxW = count() ? 18 : 7 * fm.width(TQChar('x')) + 18; int maxH = TQMAX( fm.lineSpacing(), 14 ) + 2; - return style().tqsizeFromContents(TQStyle::CT_ComboBox, this, + return style().sizeFromContents(TQStyle::CT_ComboBox, this, TQSize(maxW, maxH)).expandedTo(TQApplication::globalStrut()); } diff --git a/digikam/libs/widgets/common/squeezedcombobox.h b/digikam/libs/widgets/common/squeezedcombobox.h index f6b0a4f..7baaeca 100644 --- a/digikam/libs/widgets/common/squeezedcombobox.h +++ b/digikam/libs/widgets/common/squeezedcombobox.h @@ -55,7 +55,7 @@ class SqueezedComboBoxPriv; */ class DIGIKAM_EXPORT SqueezedComboBox : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/statusled.cpp b/digikam/libs/widgets/common/statusled.cpp index 7d71c7f..e047505 100644 --- a/digikam/libs/widgets/common/statusled.cpp +++ b/digikam/libs/widgets/common/statusled.cpp @@ -43,7 +43,7 @@ StatusLed::StatusLed(TQWidget *parent) : TQLabel(parent) { setLedColor(Gray); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); } StatusLed::~StatusLed() diff --git a/digikam/libs/widgets/common/statusled.h b/digikam/libs/widgets/common/statusled.h index 9b55eda..2fd94cb 100644 --- a/digikam/libs/widgets/common/statusled.h +++ b/digikam/libs/widgets/common/statusled.h @@ -39,7 +39,7 @@ class StatusNavigateBarPriv; class DIGIKAM_EXPORT StatusLed : public TQLabel { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/statusnavigatebar.cpp b/digikam/libs/widgets/common/statusnavigatebar.cpp index c2a3d40..0ebcaf8 100644 --- a/digikam/libs/widgets/common/statusnavigatebar.cpp +++ b/digikam/libs/widgets/common/statusnavigatebar.cpp @@ -66,30 +66,30 @@ StatusNavigateBar::StatusNavigateBar(TQWidget *parent) : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new StatusNavigateBarPriv; - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); TQHBoxLayout *lay = new TQHBoxLayout(this); d->firstButton = new TQToolButton(this); - d->firstButton->setFocusPolicy(TQ_NoFocus); + d->firstButton->setFocusPolicy(TQWidget::NoFocus); d->firstButton->setAutoRaise(true); d->firstButton->setIconSet(SmallIconSet("go-first")); TQToolTip::add(d->firstButton, i18n("Go to the first item")); d->prevButton = new TQToolButton(this); - d->prevButton->setFocusPolicy(TQ_NoFocus); + d->prevButton->setFocusPolicy(TQWidget::NoFocus); d->prevButton->setAutoRaise(true); d->prevButton->setIconSet(SmallIconSet("back")); TQToolTip::add(d->prevButton, i18n("Go to the previous item")); d->nextButton = new TQToolButton(this); - d->nextButton->setFocusPolicy(TQ_NoFocus); + d->nextButton->setFocusPolicy(TQWidget::NoFocus); d->nextButton->setAutoRaise(true); d->nextButton->setIconSet(SmallIconSet("forward")); TQToolTip::add(d->nextButton, i18n("Go to the next item")); d->lastButton = new TQToolButton(this); - d->lastButton->setFocusPolicy(TQ_NoFocus); + d->lastButton->setFocusPolicy(TQWidget::NoFocus); d->lastButton->setAutoRaise(true); d->lastButton->setIconSet(SmallIconSet("go-last")); TQToolTip::add(d->lastButton, i18n("Go to the last item")); @@ -99,17 +99,17 @@ StatusNavigateBar::StatusNavigateBar(TQWidget *parent) lay->addWidget(d->nextButton); lay->addWidget(d->lastButton); - connect(d->firstButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalFirstItem())); + connect(d->firstButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalFirstItem())); - connect(d->prevButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalPrevItem())); + connect(d->prevButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalPrevItem())); - connect(d->nextButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalNextItem())); + connect(d->nextButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalNextItem())); - connect(d->lastButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalLastItem())); + connect(d->lastButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalLastItem())); } StatusNavigateBar::~StatusNavigateBar() diff --git a/digikam/libs/widgets/common/statusnavigatebar.h b/digikam/libs/widgets/common/statusnavigatebar.h index 1918687..7972f74 100644 --- a/digikam/libs/widgets/common/statusnavigatebar.h +++ b/digikam/libs/widgets/common/statusnavigatebar.h @@ -41,7 +41,7 @@ class StatusNavigateBarPriv; class DIGIKAM_EXPORT StatusNavigateBar : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/statusprogressbar.cpp b/digikam/libs/widgets/common/statusprogressbar.cpp index 54c7f3b..215f81f 100644 --- a/digikam/libs/widgets/common/statusprogressbar.cpp +++ b/digikam/libs/widgets/common/statusprogressbar.cpp @@ -77,7 +77,7 @@ StatusProgressBar::StatusProgressBar(TQWidget *parent) : TQWidgetStack(parent, 0, TQt::WDestructiveClose) { d = new StatusProgressBarPriv; - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); d->textLabel = new KSqueezedTextLabel(this); d->progressWidget = new TQWidget(this); @@ -85,7 +85,7 @@ StatusProgressBar::StatusProgressBar(TQWidget *parent) d->progressBar = new KProgress(d->progressWidget); setProgressTotalSteps(100); d->cancelButton = new TQPushButton(d->progressWidget); - d->cancelButton->setFocusPolicy(TQ_NoFocus); + d->cancelButton->setFocusPolicy(TQWidget::NoFocus); d->cancelButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); d->cancelButton->setPixmap(SmallIcon("cancel")); @@ -99,8 +99,8 @@ StatusProgressBar::StatusProgressBar(TQWidget *parent) addWidget(d->textLabel, StatusProgressBarPriv::TextLabel); addWidget(d->progressWidget, StatusProgressBarPriv::ProgressBar); - connect( d->cancelButton, TQT_SIGNAL( clicked() ), - this, TQT_SIGNAL( signalCancelButtonPressed() ) ); + connect( d->cancelButton, TQ_SIGNAL( clicked() ), + this, TQ_SIGNAL( signalCancelButtonPressed() ) ); progressBarMode(TextMode); } diff --git a/digikam/libs/widgets/common/statusprogressbar.h b/digikam/libs/widgets/common/statusprogressbar.h index 512f029..e227a6d 100644 --- a/digikam/libs/widgets/common/statusprogressbar.h +++ b/digikam/libs/widgets/common/statusprogressbar.h @@ -41,7 +41,7 @@ class StatusProgressBarPriv; class DIGIKAM_EXPORT StatusProgressBar : public TQWidgetStack { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/statuszoombar.cpp b/digikam/libs/widgets/common/statuszoombar.cpp index 2bc4e06..4430248 100644 --- a/digikam/libs/widgets/common/statuszoombar.cpp +++ b/digikam/libs/widgets/common/statuszoombar.cpp @@ -56,7 +56,7 @@ TQSliderReverseWheel::~TQSliderReverseWheel() void TQSliderReverseWheel::wheelEvent(TQWheelEvent * e) { - if ( e->orientation() != orientation() && !TQT_TQRECT_OBJECT(rect()).contains(e->pos()) ) + if ( e->orientation() != orientation() && !rect().contains(e->pos()) ) return; static float offset = 0; @@ -104,11 +104,11 @@ StatusZoomBar::StatusZoomBar(TQWidget *parent) : TQHBox(parent, 0, TQt::WDestructiveClose) { d = new StatusZoomBarPriv; - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); d->zoomMinusButton = new TQToolButton(this); d->zoomMinusButton->setAutoRaise(true); - d->zoomMinusButton->setFocusPolicy(TQ_NoFocus); + d->zoomMinusButton->setFocusPolicy(TQWidget::NoFocus); d->zoomMinusButton->setIconSet(SmallIconSet("zoom-out")); TQToolTip::add(d->zoomMinusButton, i18n("Zoom Out")); @@ -117,36 +117,36 @@ StatusZoomBar::StatusZoomBar(TQWidget *parent) d->zoomSlider->setMaxValue(ThumbnailSize::Huge); d->zoomSlider->setPageStep(ThumbnailSize::Step); d->zoomSlider->setValue(ThumbnailSize::Medium); - d->zoomSlider->setOrientation(Qt::Horizontal); + d->zoomSlider->setOrientation(TQt::Horizontal); d->zoomSlider->setLineStep(ThumbnailSize::Step); d->zoomSlider->setMaximumHeight(fontMetrics().height()+2); d->zoomSlider->setFixedWidth(120); - d->zoomSlider->setFocusPolicy(TQ_NoFocus); + d->zoomSlider->setFocusPolicy(TQWidget::NoFocus); d->zoomPlusButton = new TQToolButton(this); d->zoomPlusButton->setAutoRaise(true); d->zoomPlusButton->setIconSet(SmallIconSet("zoom-in")); - d->zoomPlusButton->setFocusPolicy(TQ_NoFocus); + d->zoomPlusButton->setFocusPolicy(TQWidget::NoFocus); TQToolTip::add(d->zoomPlusButton, i18n("Zoom In")); d->zoomTracker = new DTipTracker("", d->zoomSlider); // ------------------------------------------------------------- - connect(d->zoomMinusButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalZoomMinusClicked())); + connect(d->zoomMinusButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalZoomMinusClicked())); - connect(d->zoomPlusButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalZoomPlusClicked())); + connect(d->zoomPlusButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalZoomPlusClicked())); - connect(d->zoomSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SIGNAL(signalZoomSliderChanged(int))); + connect(d->zoomSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SIGNAL(signalZoomSliderChanged(int))); - connect(d->zoomSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotZoomSliderChanged(int))); + connect(d->zoomSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotZoomSliderChanged(int))); - connect(d->zoomSlider, TQT_SIGNAL(sliderReleased()), - this, TQT_SLOT(slotZoomSliderReleased())); + connect(d->zoomSlider, TQ_SIGNAL(sliderReleased()), + this, TQ_SLOT(slotZoomSliderReleased())); } StatusZoomBar::~StatusZoomBar() @@ -167,8 +167,8 @@ void StatusZoomBar::slotZoomSliderChanged(int) } d->zoomTimer = new TQTimer( this ); - connect(d->zoomTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotDelayedZoomSliderChanged()) ); + connect(d->zoomTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotDelayedZoomSliderChanged()) ); d->zoomTimer->start(300, true); } diff --git a/digikam/libs/widgets/common/statuszoombar.h b/digikam/libs/widgets/common/statuszoombar.h index fc86a81..adf6941 100644 --- a/digikam/libs/widgets/common/statuszoombar.h +++ b/digikam/libs/widgets/common/statuszoombar.h @@ -62,7 +62,7 @@ private: class DIGIKAM_EXPORT StatusZoomBar : public TQHBox { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp index cd2efd5..2ec738b 100644 --- a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp +++ b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp @@ -213,8 +213,8 @@ CIETongueWidget::CIETongueWidget(int w, int h, TQWidget *parent, cmsHPROFILE hMo d->hMonitorProfile, TYPE_RGB_8, INTENT_PERCEPTUAL, 0); - connect(d->blinkTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotBlinkTimerDone())); + connect(d->blinkTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotBlinkTimerDone())); } CIETongueWidget::~CIETongueWidget() @@ -724,7 +724,7 @@ void CIETongueWidget::paintEvent(TQPaintEvent*) int asize = 24; TQPixmap anim(asize, asize); TQPainter p2; - p2.begin(&anim, TQT_TQOBJECT(this)); + p2.begin(&anim, this); p2.fillRect(0, 0, asize, asize, palette().active().background()); p2.translate(asize/2, asize/2); diff --git a/digikam/libs/widgets/iccprofiles/cietonguewidget.h b/digikam/libs/widgets/iccprofiles/cietonguewidget.h index c91c0c6..9fc8503 100644 --- a/digikam/libs/widgets/iccprofiles/cietonguewidget.h +++ b/digikam/libs/widgets/iccprofiles/cietonguewidget.h @@ -57,7 +57,7 @@ class CIETongueWidgetPriv; class DIGIKAM_EXPORT CIETongueWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h b/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h index f93f592..89b1f4b 100644 --- a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h +++ b/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h @@ -43,7 +43,7 @@ class ICCProfileWidget; class DIGIKAM_EXPORT ICCPreviewWidget : public KPreviewWidgetBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/iccprofiles/iccprofilewidget.h b/digikam/libs/widgets/iccprofiles/iccprofilewidget.h index 4296246..d753f30 100644 --- a/digikam/libs/widgets/iccprofiles/iccprofilewidget.h +++ b/digikam/libs/widgets/iccprofiles/iccprofilewidget.h @@ -41,7 +41,7 @@ class ICCProfileWidgetPriv; class DIGIKAM_EXPORT ICCProfileWidget : public MetadataWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp index c8d3045..4ed7f25 100644 --- a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp @@ -253,7 +253,7 @@ void ImageGuideWidget::updatePixmap() else if (d->renderingPreviewMode == PreviewTargetImage || d->renderingPreviewMode == NoPreviewMode || (d->renderingPreviewMode == PreviewToggleOnMouseOver && d->onMouseMovePreviewToggled == true )) { - d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), d->rect.x(), d->rect.y(), + d->iface->paint(d->pixmap, d->rect.x(), d->rect.y(), d->rect.width(), d->rect.height(), d->underExposureIndicator, d->overExposureIndicator); @@ -278,7 +278,7 @@ void ImageGuideWidget::updatePixmap() p.drawPixmap(d->rect, d->iface->convertToPixmap(d->preview)); // Drawing the target image under the original. - d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), + d->iface->paint(d->pixmap, d->rect.x()+d->rect.width()/2, d->rect.y(), d->rect.width()/2, @@ -289,7 +289,7 @@ void ImageGuideWidget::updatePixmap() else { // Drawing the target image. - d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), + d->iface->paint(d->pixmap, d->rect.x(), d->rect.y(), d->rect.width(), @@ -344,7 +344,7 @@ void ImageGuideWidget::updatePixmap() p.drawPixmap(d->rect, d->iface->convertToPixmap(d->preview)); // Drawing the target image under the original. - d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), + d->iface->paint(d->pixmap, d->rect.x(), d->rect.y()+d->rect.height()/2, d->rect.width(), @@ -355,7 +355,7 @@ void ImageGuideWidget::updatePixmap() else { // Drawing the target image. - d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), + d->iface->paint(d->pixmap, d->rect.x(), d->rect.y(), d->rect.width(), @@ -496,7 +496,7 @@ void ImageGuideWidget::resizeEvent(TQResizeEvent* e) void ImageGuideWidget::mousePressEvent(TQMouseEvent* e) { - if ( !d->focus && e->button() == Qt::LeftButton && + if ( !d->focus && e->button() == TQt::LeftButton && d->rect.contains( e->x(), e->y() ) && d->spotVisible ) { d->focus = true; diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.h b/digikam/libs/widgets/imageplugins/imageguidewidget.h index 5cf7a11..48d6d24 100644 --- a/digikam/libs/widgets/imageplugins/imageguidewidget.h +++ b/digikam/libs/widgets/imageplugins/imageguidewidget.h @@ -46,7 +46,7 @@ class ImageGuideWidgetPriv; class DIGIKAM_EXPORT ImageGuideWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp index 4b6ab95..4551e09 100644 --- a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp @@ -179,24 +179,24 @@ ImagePanelWidget::ImagePanelWidget(uint w, uint h, const TQString& settingsSecti // ------------------------------------------------------------- - TQTimer::singleShot(0, this, TQT_SLOT(slotInitGui())); + TQTimer::singleShot(0, this, TQ_SLOT(slotInitGui())); // ------------------------------------------------------------- - connect(d->imageRegionWidget, TQT_SIGNAL(signalContentsMovedEvent(bool)), - this, TQT_SLOT(slotOriginalImageRegionChanged(bool))); + connect(d->imageRegionWidget, TQ_SIGNAL(signalContentsMovedEvent(bool)), + this, TQ_SLOT(slotOriginalImageRegionChanged(bool))); - connect(d->imagePanIconWidget, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), - this, TQT_SLOT(slotSetImageRegionPosition(const TQRect&, bool))); + connect(d->imagePanIconWidget, TQ_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQ_SLOT(slotSetImageRegionPosition(const TQRect&, bool))); - connect(d->imagePanIconWidget, TQT_SIGNAL(signalSelectionTakeFocus()), - this, TQT_SLOT(slotPanIconTakeFocus())); + connect(d->imagePanIconWidget, TQ_SIGNAL(signalSelectionTakeFocus()), + this, TQ_SLOT(slotPanIconTakeFocus())); - connect(d->separateView, TQT_SIGNAL(released(int)), - d->imagePanIconWidget, TQT_SLOT(slotSeparateViewToggled(int))); + connect(d->separateView, TQ_SIGNAL(released(int)), + d->imagePanIconWidget, TQ_SLOT(slotSeparateViewToggled(int))); - connect(d->separateView, TQT_SIGNAL(released(int)), - d->imageRegionWidget, TQT_SLOT(slotSeparateViewToggled(int))); + connect(d->separateView, TQ_SIGNAL(released(int)), + d->imageRegionWidget, TQ_SLOT(slotSeparateViewToggled(int))); } ImagePanelWidget::~ImagePanelWidget() diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.h b/digikam/libs/widgets/imageplugins/imagepanelwidget.h index 292ba74..32179da 100644 --- a/digikam/libs/widgets/imageplugins/imagepanelwidget.h +++ b/digikam/libs/widgets/imageplugins/imagepanelwidget.h @@ -47,7 +47,7 @@ class ImagePanIconWidget; class DIGIKAM_EXPORT ImagePanelWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp b/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp index 8fbeb17..3856422 100644 --- a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp @@ -104,7 +104,7 @@ void ImagePanIconWidget::updatePixmap() { // Drawing background and image. m_pixmap->fill(colorGroup().background()); - d->iface->paint(TQT_TQPAINTDEVICE(m_pixmap), m_rect.x(), m_rect.y(), m_rect.width(), m_rect.height()); + d->iface->paint(m_pixmap, m_rect.x(), m_rect.y(), m_rect.width(), m_rect.height()); TQPainter p(m_pixmap); diff --git a/digikam/libs/widgets/imageplugins/imagepaniconwidget.h b/digikam/libs/widgets/imageplugins/imagepaniconwidget.h index dbb3480..e7d6ffb 100644 --- a/digikam/libs/widgets/imageplugins/imagepaniconwidget.h +++ b/digikam/libs/widgets/imageplugins/imagepaniconwidget.h @@ -40,7 +40,7 @@ class ImagePanIconWidgetPriv; class ImagePanIconWidget : public PanIconWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp index 27444a0..cebf0f3 100644 --- a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp @@ -253,33 +253,33 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSec // ------------------------------------------------------------- setProgressVisible(false); - TQTimer::singleShot(0, this, TQT_SLOT(slotInitGui())); + TQTimer::singleShot(0, this, TQ_SLOT(slotInitGui())); // ------------------------------------------------------------- - connect(d->imageRegionWidget, TQT_SIGNAL(signalContentsMovedEvent(bool)), - this, TQT_SLOT(slotOriginalImageRegionChanged(bool))); + connect(d->imageRegionWidget, TQ_SIGNAL(signalContentsMovedEvent(bool)), + this, TQ_SLOT(slotOriginalImageRegionChanged(bool))); - connect(d->imagePanIconWidget, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), - this, TQT_SLOT(slotSetImageRegionPosition(const TQRect&, bool))); + connect(d->imagePanIconWidget, TQ_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQ_SLOT(slotSetImageRegionPosition(const TQRect&, bool))); - connect(d->imagePanIconWidget, TQT_SIGNAL(signalSelectionTakeFocus()), - this, TQT_SLOT(slotPanIconTakeFocus())); + connect(d->imagePanIconWidget, TQ_SIGNAL(signalSelectionTakeFocus()), + this, TQ_SLOT(slotPanIconTakeFocus())); - connect(d->separateView, TQT_SIGNAL(released(int)), - d->imageRegionWidget, TQT_SLOT(slotSeparateViewToggled(int))); + connect(d->separateView, TQ_SIGNAL(released(int)), + d->imageRegionWidget, TQ_SLOT(slotSeparateViewToggled(int))); - connect(d->separateView, TQT_SIGNAL(released(int)), - d->imagePanIconWidget, TQT_SLOT(slotSeparateViewToggled(int))); + connect(d->separateView, TQ_SIGNAL(released(int)), + d->imagePanIconWidget, TQ_SLOT(slotSeparateViewToggled(int))); - connect(d->zoomBar, TQT_SIGNAL(signalZoomMinusClicked()), - d->imageRegionWidget, TQT_SLOT(slotDecreaseZoom())); + connect(d->zoomBar, TQ_SIGNAL(signalZoomMinusClicked()), + d->imageRegionWidget, TQ_SLOT(slotDecreaseZoom())); - connect(d->zoomBar, TQT_SIGNAL(signalZoomPlusClicked()), - d->imageRegionWidget, TQT_SLOT(slotIncreaseZoom())); + connect(d->zoomBar, TQ_SIGNAL(signalZoomPlusClicked()), + d->imageRegionWidget, TQ_SLOT(slotIncreaseZoom())); - connect(d->zoomBar, TQT_SIGNAL(signalZoomSliderReleased(int)), - this, TQT_SLOT(slotZoomSliderChanged(int))); + connect(d->zoomBar, TQ_SIGNAL(signalZoomSliderReleased(int)), + this, TQ_SLOT(slotZoomSliderChanged(int))); } ImagePannelWidget::~ImagePannelWidget() diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.h b/digikam/libs/widgets/imageplugins/imagepannelwidget.h index a839372..a342988 100644 --- a/digikam/libs/widgets/imageplugins/imagepannelwidget.h +++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.h @@ -46,7 +46,7 @@ class ImageRegionWidget; class DIGIKAM_EXPORT ImagePannelWidget : public TQHBox { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp index db80604..c1392cc 100644 --- a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp @@ -95,8 +95,8 @@ ImageRegionWidget::ImageRegionWidget(int wp, int hp, TQWidget *parent, bool scro setHScrollBarMode( TQScrollView::AlwaysOff ); } - connect(this, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SLOT(slotZoomFactorChanged())); + connect(this, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SLOT(slotZoomFactorChanged())); } ImageRegionWidget::~ImageRegionWidget() diff --git a/digikam/libs/widgets/imageplugins/imageregionwidget.h b/digikam/libs/widgets/imageplugins/imageregionwidget.h index fbd70ba..8555703 100644 --- a/digikam/libs/widgets/imageplugins/imageregionwidget.h +++ b/digikam/libs/widgets/imageplugins/imageregionwidget.h @@ -41,7 +41,7 @@ class ImageRegionWidgetPriv; class DIGIKAM_EXPORT ImageRegionWidget : public PreviewWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/imageplugins/imagewidget.cpp b/digikam/libs/widgets/imageplugins/imagewidget.cpp index 909dba9..ab73bbf 100644 --- a/digikam/libs/widgets/imageplugins/imagewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagewidget.cpp @@ -217,29 +217,29 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent, // ------------------------------------------------------------- - connect(d->previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SIGNAL(signalResized())); + connect(d->previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SIGNAL(signalResized())); - connect(d->previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), - this, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & ))); + connect(d->previewWidget, TQ_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), + this, TQ_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & ))); - connect(d->previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotUpdateSpotInfo( const Digikam::DColor &, const TQPoint & ))); + connect(d->previewWidget, TQ_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotUpdateSpotInfo( const Digikam::DColor &, const TQPoint & ))); - connect(d->previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & ))); + connect(d->previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & ))); - connect(d->previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotUpdateSpotInfo( const Digikam::DColor &, const TQPoint & ))); + connect(d->previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotUpdateSpotInfo( const Digikam::DColor &, const TQPoint & ))); - connect(d->previewButtons, TQT_SIGNAL(released(int)), - d->previewWidget, TQT_SLOT(slotChangeRenderingPreviewMode(int))); + connect(d->previewButtons, TQ_SIGNAL(released(int)), + d->previewWidget, TQ_SLOT(slotChangeRenderingPreviewMode(int))); - connect(d->underExposureButton, TQT_SIGNAL(toggled(bool)), - d->previewWidget, TQT_SLOT(slotToggleUnderExposure(bool))); + connect(d->underExposureButton, TQ_SIGNAL(toggled(bool)), + d->previewWidget, TQ_SLOT(slotToggleUnderExposure(bool))); - connect(d->overExposureButton, TQT_SIGNAL(toggled(bool)), - d->previewWidget, TQT_SLOT(slotToggleOverExposure(bool))); + connect(d->overExposureButton, TQ_SIGNAL(toggled(bool)), + d->previewWidget, TQ_SLOT(slotToggleOverExposure(bool))); // ------------------------------------------------------------- diff --git a/digikam/libs/widgets/imageplugins/imagewidget.h b/digikam/libs/widgets/imageplugins/imagewidget.h index 0192bdf..ebdf92e 100644 --- a/digikam/libs/widgets/imageplugins/imagewidget.h +++ b/digikam/libs/widgets/imageplugins/imagewidget.h @@ -46,7 +46,7 @@ class ImageWidgetPriv; class DIGIKAM_EXPORT ImageWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/exifwidget.h b/digikam/libs/widgets/metadata/exifwidget.h index ead60bc..ba66d08 100644 --- a/digikam/libs/widgets/metadata/exifwidget.h +++ b/digikam/libs/widgets/metadata/exifwidget.h @@ -38,7 +38,7 @@ namespace Digikam class DIGIKAM_EXPORT ExifWidget : public MetadataWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/gpswidget.cpp b/digikam/libs/widgets/metadata/gpswidget.cpp index fcb1646..033423e 100644 --- a/digikam/libs/widgets/metadata/gpswidget.cpp +++ b/digikam/libs/widgets/metadata/gpswidget.cpp @@ -110,7 +110,7 @@ GPSWidget::GPSWidget(TQWidget* parent, const char* name) // -------------------------------------------------------- - TQGroupBox* box2 = new TQGroupBox( 0, Qt::Vertical, gpsInfo ); + TQGroupBox* box2 = new TQGroupBox( 0, TQt::Vertical, gpsInfo ); box2->setInsideMargin(0); box2->setInsideSpacing(0); box2->setFrameStyle( TQFrame::NoFrame ); @@ -138,8 +138,8 @@ GPSWidget::GPSWidget(TQWidget* parent, const char* name) // -------------------------------------------------------- - connect(d->detailsButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotGPSDetails())); + connect(d->detailsButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotGPSDetails())); setUserAreaWidget(gpsInfo); decodeMetadata(); diff --git a/digikam/libs/widgets/metadata/gpswidget.h b/digikam/libs/widgets/metadata/gpswidget.h index 2d1d92e..fd787d6 100644 --- a/digikam/libs/widgets/metadata/gpswidget.h +++ b/digikam/libs/widgets/metadata/gpswidget.h @@ -42,7 +42,7 @@ class WorldMapWidget; class DIGIKAM_EXPORT GPSWidget : public MetadataWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/iptcwidget.h b/digikam/libs/widgets/metadata/iptcwidget.h index df4fb36..58f1449 100644 --- a/digikam/libs/widgets/metadata/iptcwidget.h +++ b/digikam/libs/widgets/metadata/iptcwidget.h @@ -34,7 +34,7 @@ namespace Digikam class DIGIKAM_EXPORT IptcWidget : public MetadataWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/makernotewidget.h b/digikam/libs/widgets/metadata/makernotewidget.h index ae10381..f654959 100644 --- a/digikam/libs/widgets/metadata/makernotewidget.h +++ b/digikam/libs/widgets/metadata/makernotewidget.h @@ -35,7 +35,7 @@ namespace Digikam class DIGIKAM_EXPORT MakerNoteWidget : public MetadataWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/metadatalistview.cpp b/digikam/libs/widgets/metadata/metadatalistview.cpp index f2cd414..612eed1 100644 --- a/digikam/libs/widgets/metadata/metadatalistview.cpp +++ b/digikam/libs/widgets/metadata/metadatalistview.cpp @@ -59,8 +59,8 @@ MetadataListView::MetadataListView(TQWidget* parent) m_parent = dynamic_cast<MetadataWidget *>(parent); - connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); + connect(this, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem*))); } MetadataListView::~MetadataListView() @@ -185,7 +185,7 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQSt delete parentifDItem; setCurrentItemByKey(m_selectedItemKey); - TQTimer::singleShot( 0, this, TQT_SLOT( triggerUpdate() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( triggerUpdate() ) ); } void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQStringList& keysFilter, @@ -244,13 +244,13 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQSt } setCurrentItemByKey(m_selectedItemKey); - TQTimer::singleShot( 0, this, TQT_SLOT( triggerUpdate() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( triggerUpdate() ) ); } void MetadataListView::viewportResizeEvent(TQResizeEvent* e) { TQListView::viewportResizeEvent(e); - TQTimer::singleShot( 0, this, TQT_SLOT( triggerUpdate() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( triggerUpdate() ) ); } void MetadataListView::slotSearchTextChanged(const TQString& filter) diff --git a/digikam/libs/widgets/metadata/metadatalistview.h b/digikam/libs/widgets/metadata/metadatalistview.h index 92d6fb7..aefe649 100644 --- a/digikam/libs/widgets/metadata/metadatalistview.h +++ b/digikam/libs/widgets/metadata/metadatalistview.h @@ -42,7 +42,7 @@ namespace Digikam class DIGIKAM_EXPORT MetadataListView : public TQListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp index 525effd..d0bd5b1 100644 --- a/digikam/libs/widgets/metadata/metadatawidget.cpp +++ b/digikam/libs/widgets/metadata/metadatawidget.cpp @@ -158,23 +158,23 @@ MetadataWidget::MetadataWidget(TQWidget* parent, const char* name) // ----------------------------------------------------------------- - connect(d->levelButtons, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotModeChanged(int))); + connect(d->levelButtons, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotModeChanged(int))); - connect(copy2ClipBoard, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopy2Clipboard())); + connect(copy2ClipBoard, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopy2Clipboard())); - connect(printMetadata, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotPrintMetadata())); + connect(printMetadata, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotPrintMetadata())); - connect(saveMetadata, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSaveMetadataToFile())); + connect(saveMetadata, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSaveMetadataToFile())); - connect(d->searchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - d->view, TQT_SLOT(slotSearchTextChanged(const TQString&))); + connect(d->searchBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + d->view, TQ_SLOT(slotSearchTextChanged(const TQString&))); - connect(d->view, TQT_SIGNAL(signalTextFilterMatch(bool)), - d->searchBar, TQT_SLOT(slotSearchResult(bool))); + connect(d->view, TQ_SIGNAL(signalTextFilterMatch(bool)), + d->searchBar, TQ_SLOT(slotSearchResult(bool))); } MetadataWidget::~MetadataWidget() diff --git a/digikam/libs/widgets/metadata/metadatawidget.h b/digikam/libs/widgets/metadata/metadatawidget.h index c109338..5d2feb6 100644 --- a/digikam/libs/widgets/metadata/metadatawidget.h +++ b/digikam/libs/widgets/metadata/metadatawidget.h @@ -46,7 +46,7 @@ class MetadataWidgetPriv; class DIGIKAM_EXPORT MetadataWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/worldmapwidget.cpp b/digikam/libs/widgets/metadata/worldmapwidget.cpp index 17d07cc..811e914 100644 --- a/digikam/libs/widgets/metadata/worldmapwidget.cpp +++ b/digikam/libs/widgets/metadata/worldmapwidget.cpp @@ -176,7 +176,7 @@ void WorldMapWidget::drawContents(TQPainter *p, int x, int y, int w, int h) void WorldMapWidget::contentsMousePressEvent ( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { d->xMousePos = e->x(); d->yMousePos = e->y(); @@ -191,7 +191,7 @@ void WorldMapWidget::contentsMouseReleaseEvent ( TQMouseEvent * ) void WorldMapWidget::contentsMouseMoveEvent( TQMouseEvent * e ) { - if ( e->state() == Qt::LeftButton ) + if ( e->state() == TQt::LeftButton ) { uint newxpos = e->x(); uint newypos = e->y(); diff --git a/digikam/libs/widgets/metadata/worldmapwidget.h b/digikam/libs/widgets/metadata/worldmapwidget.h index 2bfa10f..bfb8ad8 100644 --- a/digikam/libs/widgets/metadata/worldmapwidget.h +++ b/digikam/libs/widgets/metadata/worldmapwidget.h @@ -39,7 +39,7 @@ class WorldMapWidgetPriv; class DIGIKAM_EXPORT WorldMapWidget : public TQScrollView { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/project/project.tdevelop b/digikam/project/project.tdevelop index c8bb52d..bdea137 100644 --- a/digikam/project/project.tdevelop +++ b/digikam/project/project.tdevelop @@ -7,7 +7,7 @@ <projectmanagement>KDevKDEAutoProject</projectmanagement> <primarylanguage>C++</primarylanguage> <keywords> - <keyword>Qt</keyword> + <keyword>TQt</keyword> <keyword>KDE</keyword> </keywords> <projectdirectory>./</projectdirectory> diff --git a/digikam/showfoto/setup/setup.cpp b/digikam/showfoto/setup/setup.cpp index 698fb20..85ec82d 100644 --- a/digikam/showfoto/setup/setup.cpp +++ b/digikam/showfoto/setup/setup.cpp @@ -115,8 +115,8 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page) BarIcon("slideshow", TDEIcon::SizeMedium)); d->slideshowPage = new Digikam::SetupSlideShow(d->page_slideshow); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(slotOkClicked()) ); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(slotOkClicked()) ); if (page != LastPageUsed) showPage((int) page); diff --git a/digikam/showfoto/setup/setup.h b/digikam/showfoto/setup/setup.h index f1fc4b4..8f97acb 100644 --- a/digikam/showfoto/setup/setup.h +++ b/digikam/showfoto/setup/setup.h @@ -45,7 +45,7 @@ class SetupPrivate; class Setup : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/showfoto/setup/setupeditor.cpp b/digikam/showfoto/setup/setupeditor.cpp index dcb51e0..19bab8f 100644 --- a/digikam/showfoto/setup/setupeditor.cpp +++ b/digikam/showfoto/setup/setupeditor.cpp @@ -184,8 +184,8 @@ SetupEditor::SetupEditor(TQWidget* parent ) // -------------------------------------------------------- - connect(d->themebackgroundColor, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotThemeBackgroundColor(bool))); + connect(d->themebackgroundColor, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotThemeBackgroundColor(bool))); readSettings(); } diff --git a/digikam/showfoto/setup/setupeditor.h b/digikam/showfoto/setup/setupeditor.h index fe3d35e..877af8d 100644 --- a/digikam/showfoto/setup/setupeditor.h +++ b/digikam/showfoto/setup/setupeditor.h @@ -35,7 +35,7 @@ class SetupEditorPriv; class SetupEditor : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/showfoto/setup/setuptooltip.cpp b/digikam/showfoto/setup/setuptooltip.cpp index 3fb1f3c..d3a0867 100644 --- a/digikam/showfoto/setup/setuptooltip.cpp +++ b/digikam/showfoto/setup/setuptooltip.cpp @@ -158,11 +158,11 @@ SetupToolTip::SetupToolTip(TQWidget* parent) // -------------------------------------------------------- - connect(d->showToolTipsBox, TQT_SIGNAL(toggled(bool)), - d->fileSettingBox, TQT_SLOT(setEnabled(bool))); + connect(d->showToolTipsBox, TQ_SIGNAL(toggled(bool)), + d->fileSettingBox, TQ_SLOT(setEnabled(bool))); - connect(d->showToolTipsBox, TQT_SIGNAL(toggled(bool)), - d->photoSettingBox, TQT_SLOT(setEnabled(bool))); + connect(d->showToolTipsBox, TQ_SIGNAL(toggled(bool)), + d->photoSettingBox, TQ_SLOT(setEnabled(bool))); // -------------------------------------------------------- diff --git a/digikam/showfoto/setup/setuptooltip.h b/digikam/showfoto/setup/setuptooltip.h index 2ec68df..ebd73f6 100644 --- a/digikam/showfoto/setup/setuptooltip.h +++ b/digikam/showfoto/setup/setuptooltip.h @@ -35,7 +35,7 @@ class SetupToolTipPriv; class SetupToolTip : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/showfoto/showfoto.cpp b/digikam/showfoto/showfoto.cpp index f3b61f2..4257583 100644 --- a/digikam/showfoto/showfoto.cpp +++ b/digikam/showfoto/showfoto.cpp @@ -204,7 +204,7 @@ ShowFoto::ShowFoto(const KURL::List& urlList) // Load image plugins to GUI - m_imagePluginLoader = new Digikam::ImagePluginLoader(TQT_TQOBJECT(this), d->splash); + m_imagePluginLoader = new Digikam::ImagePluginLoader(this, d->splash); loadImagePlugins(); // If plugin core is not available, plug BCG actions to collection instead. @@ -215,22 +215,22 @@ ShowFoto::ShowFoto(const KURL::List& urlList) d->BCGAction->setDelayed(false); TDEAction *incGammaAction = new TDEAction(i18n("Increase Gamma"), 0, ALT+Key_G, - TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()), + this, TQ_SLOT(slotChangeBCG()), actionCollection(), "gamma_plus"); TDEAction *decGammaAction = new TDEAction(i18n("Decrease Gamma"), 0, ALT+SHIFT+Key_G, - TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()), + this, TQ_SLOT(slotChangeBCG()), actionCollection(), "gamma_minus"); TDEAction *incBrightAction = new TDEAction(i18n("Increase Brightness"), 0, ALT+Key_B, - TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()), + this, TQ_SLOT(slotChangeBCG()), actionCollection(), "brightness_plus"); TDEAction *decBrightAction = new TDEAction(i18n("Decrease Brightness"), 0, ALT+SHIFT+Key_B, - TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()), + this, TQ_SLOT(slotChangeBCG()), actionCollection(), "brightness_minus"); TDEAction *incContrastAction = new TDEAction(i18n("Increase Contrast"), 0, ALT+Key_C, - TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()), + this, TQ_SLOT(slotChangeBCG()), actionCollection(), "contrast_plus"); TDEAction *decContrastAction = new TDEAction(i18n("Decrease Contrast"), 0, ALT+SHIFT+Key_C, - TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()), + this, TQ_SLOT(slotChangeBCG()), actionCollection(), "contrast_minus"); d->BCGAction->insert(incBrightAction); @@ -392,17 +392,17 @@ void ShowFoto::setupConnections() { setupStandardConnections(); - connect(d->thumbBar, TQT_SIGNAL(signalURLSelected(const KURL&)), - TQT_TQOBJECT(this), TQT_SLOT(slotOpenURL(const KURL&))); + connect(d->thumbBar, TQ_SIGNAL(signalURLSelected(const KURL&)), + this, TQ_SLOT(slotOpenURL(const KURL&))); - connect(d->thumbBar, TQT_SIGNAL(signalItemAdded()), - TQT_TQOBJECT(this), TQT_SLOT(slotUpdateItemInfo())); + connect(d->thumbBar, TQ_SIGNAL(signalItemAdded()), + this, TQ_SLOT(slotUpdateItemInfo())); - connect(this, TQT_SIGNAL(signalSelectionChanged(const TQRect &)), - d->rightSidebar, TQT_SLOT(slotImageSelectionChanged(const TQRect &))); + connect(this, TQ_SIGNAL(signalSelectionChanged(const TQRect &)), + d->rightSidebar, TQ_SLOT(slotImageSelectionChanged(const TQRect &))); - connect(this, TQT_SIGNAL(signalNoCurrentItem()), - d->rightSidebar, TQT_SLOT(slotNoCurrentItem())); + connect(this, TQ_SIGNAL(signalNoCurrentItem()), + d->rightSidebar, TQ_SLOT(slotNoCurrentItem())); } void ShowFoto::setupUserArea() @@ -430,10 +430,10 @@ void ShowFoto::setupUserArea() } else // Horizontal thumbbar layout { - m_splitter = new TQSplitter(Qt::Horizontal, widget); + m_splitter = new TQSplitter(TQt::Horizontal, widget); TQWidget* widget2 = new TQWidget(m_splitter); TQVBoxLayout *vlay = new TQVBoxLayout(widget2); - d->vSplitter = new TQSplitter(Qt::Vertical, widget2); + d->vSplitter = new TQSplitter(TQt::Vertical, widget2); m_stackView = new Digikam::EditorStackView(d->vSplitter); m_canvas = new Digikam::Canvas(m_stackView); d->thumbBar = new Digikam::ThumbBarView(d->vSplitter, Digikam::ThumbBarView::Horizontal); @@ -478,24 +478,24 @@ void ShowFoto::setupActions() // Extra 'File' menu actions --------------------------------------------- - d->fileOpenAction = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile()), + d->fileOpenAction = KStdAction::open(this, TQ_SLOT(slotOpenFile()), actionCollection(), "showfoto_open_file"); d->openFilesInFolderAction = new TDEAction(i18n("Open folder"), "folder_image", CTRL+SHIFT+Key_O, - TQT_TQOBJECT(this), - TQT_SLOT(slotOpenFilesInFolder()), + this, + TQ_SLOT(slotOpenFilesInFolder()), actionCollection(), "showfoto_open_folder"); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "showfoto_quit"); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection(), "showfoto_quit"); // Extra 'View' menu actions --------------------------------------------- d->showBarAction = new TDEToggleAction(i18n("Show Thumbnails"), 0, CTRL+Key_T, - TQT_TQOBJECT(this), TQT_SLOT(slotToggleShowBar()), + this, TQ_SLOT(slotToggleShowBar()), actionCollection(), "shofoto_showthumbs"); // --- Create the gui -------------------------------------------------------------- @@ -674,7 +674,7 @@ void ShowFoto::slotChangeBCG() { TQString name; if (sender()) - name = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(); + name = sender()->name(); if (name == "gamma_plus") { @@ -1114,8 +1114,8 @@ void ShowFoto::slotDeleteCurrentItem() else { TDEIO::Job* job = TDEIO::del( urlCurrent ); - connect( job, TQT_SIGNAL(result( TDEIO::Job* )), - TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrentItemResult( TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job* )), + this, TQ_SLOT(slotDeleteCurrentItemResult( TDEIO::Job*)) ); } } else @@ -1128,8 +1128,8 @@ void ShowFoto::slotDeleteCurrentItem() } TDEIO::Job* job = TDEIO::move( urlCurrent, dest ); - connect( job, TQT_SIGNAL(result( TDEIO::Job* )), - TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrentItemResult( TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job* )), + this, TQ_SLOT(slotDeleteCurrentItemResult( TDEIO::Job*)) ); } } diff --git a/digikam/showfoto/showfoto.h b/digikam/showfoto/showfoto.h index 142d270..8bd3618 100644 --- a/digikam/showfoto/showfoto.h +++ b/digikam/showfoto/showfoto.h @@ -52,7 +52,7 @@ class ShowFotoPriv; class ShowFoto : public Digikam::EditorWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/tdeioslave/digikamalbums.cpp b/digikam/tdeioslave/digikamalbums.cpp index 31568f0..c16080a 100644 --- a/digikam/tdeioslave/digikamalbums.cpp +++ b/digikam/tdeioslave/digikamalbums.cpp @@ -584,7 +584,7 @@ void tdeio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, // set modification time const TQString mtimeStr = metaData( "modified" ); if ( !mtimeStr.isEmpty() ) { - TQDateTime dt = TQDateTime::fromString( mtimeStr, Qt::ISODate ); + TQDateTime dt = TQDateTime::fromString( mtimeStr, TQt::ISODate ); if ( dt.isValid() ) { KDE_struct_stat dest_statbuf; if (KDE_stat( _dest.data(), &dest_statbuf ) == 0) { @@ -670,7 +670,7 @@ void tdeio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool // copy metadata of album to destination album m_sqlDB.execSql( TQString("UPDATE Albums SET date='%1', caption='%2', " "collection='%3', icon=%4 ") - .arg(srcAlbum.date.toString(Qt::ISODate), + .arg(srcAlbum.date.toString(TQt::ISODate), escapeString(srcAlbum.caption), escapeString(srcAlbum.collection), TQString::number(srcAlbum.icon)) + @@ -1124,7 +1124,7 @@ void tdeio_digikamalbums::mkdir( const KURL& url, int permissions ) m_sqlDB.execSql( TQString("REPLACE INTO Albums (url, date) " "VALUES('%1','%2')") .arg(escapeString(url.path()), - TQDate::currentDate().toString(Qt::ISODate)) ); + TQDate::currentDate().toString(TQt::ISODate)) ); if ( permissions != -1 ) { @@ -1365,7 +1365,7 @@ void tdeio_digikamalbums::buildAlbumList() ++it; info.url = *it; ++it; - info.date = TQDate::fromString(*it, Qt::ISODate); + info.date = TQDate::fromString(*it, TQt::ISODate); ++it; info.caption = *it; ++it; @@ -1403,7 +1403,7 @@ AlbumInfo tdeio_digikamalbums::findAlbum(const TQString& url, bool addIfNotExist m_sqlDB.execSql(TQString("INSERT INTO Albums (url, date) " "VALUES('%1', '%2')") .arg(escapeString(url), - fi.lastModified().date().toString(Qt::ISODate))); + fi.lastModified().date().toString(TQt::ISODate))); album.id = m_sqlDB.lastInsertedRow(); album.url = url; @@ -1519,7 +1519,7 @@ void tdeio_digikamalbums::addImage(int albumID, const TQString& filePath) "VALUES(%1, '%2', '%3', '%4')") .arg(TQString::number(albumID), escapeString(TQFileInfo(filePath).fileName()), - datetime.toString(Qt::ISODate), + datetime.toString(TQt::ISODate), escapeString(comment))); TQ_LLONG imageID = m_sqlDB.lastInsertedRow(); @@ -1861,7 +1861,7 @@ void tdeio_digikamalbums::scanOneAlbum(const TQString& url) m_sqlDB.execSql(TQString("INSERT INTO Albums (url, date) " "VALUES('%1', '%2')") .arg(escapeString(*it), - fi.lastModified().date().toString(Qt::ISODate))); + fi.lastModified().date().toString(TQt::ISODate))); scanAlbum(*it); } diff --git a/digikam/tdeioslave/digikamdates.cpp b/digikam/tdeioslave/digikamdates.cpp index a82e978..9e7f4e2 100644 --- a/digikam/tdeioslave/digikamdates.cpp +++ b/digikam/tdeioslave/digikamdates.cpp @@ -154,7 +154,7 @@ void tdeio_digikamdates::special(const TQByteArray& data) if ( !matchFilterList( regex, name ) ) continue; - dateTime = TQDateTime::fromString( dateStr, Qt::ISODate ); + dateTime = TQDateTime::fromString( dateStr, TQt::ISODate ); if ( !dateTime.isValid() ) continue; diff --git a/digikam/tdeioslave/digikamsearch.cpp b/digikam/tdeioslave/digikamsearch.cpp index 3952ae5..225a900 100644 --- a/digikam/tdeioslave/digikamsearch.cpp +++ b/digikam/tdeioslave/digikamsearch.cpp @@ -656,13 +656,13 @@ TQString tdeio_digikamsearch::subQuery(enum tdeio_digikamsearch::SKey key, // we need to split it into two rules if (key == IMAGEDATE && op == EQ) { - TQDate date = TQDate::fromString(val, Qt::ISODate); + TQDate date = TQDate::fromString(val, TQt::ISODate); if (!date.isValid()) return query; query = TQString(" (Images.datetime > '%1' AND Images.datetime < '%2') ") - .arg(date.addDays(-1).toString(Qt::ISODate)) - .arg(date.addDays( 1).toString(Qt::ISODate)); + .arg(date.addDays(-1).toString(TQt::ISODate)) + .arg(date.addDays( 1).toString(TQt::ISODate)); } return query; @@ -694,11 +694,11 @@ extern "C" TQString tdeio_digikamsearch::possibleDate(const TQString& str, bool& exact) const { - TQDate date = TQDate::fromString(str, Qt::ISODate); + TQDate date = TQDate::fromString(str, TQt::ISODate); if (date.isValid()) { exact = true; - return date.toString(Qt::ISODate); + return date.toString(TQt::ISODate); } exact = false; diff --git a/digikam/tdeioslave/digikamthumbnail.cpp b/digikam/tdeioslave/digikamthumbnail.cpp index f5d9dc8..3dd4df2 100644 --- a/digikam/tdeioslave/digikamthumbnail.cpp +++ b/digikam/tdeioslave/digikamthumbnail.cpp @@ -185,7 +185,7 @@ void tdeio_digikamthumbnailProtocol::get(const KURL& url) } if (TQMAX(img.width(),img.height()) != cachedSize_) - img = img.smoothScale(cachedSize_, cachedSize_, TQ_ScaleMin); + img = img.smoothScale(cachedSize_, cachedSize_, TQImage::ScaleMin); if (img.depth() != 32) img = img.convertDepth(32); @@ -206,7 +206,7 @@ void tdeio_digikamthumbnailProtocol::get(const KURL& url) } } - img = img.smoothScale(size, size, TQ_ScaleMin); + img = img.smoothScale(size, size, TQImage::ScaleMin); if (img.isNull()) { diff --git a/digikam/themedesigner/mainwindow.cpp b/digikam/themedesigner/mainwindow.cpp index 3b93fb2..f51a4f6 100644 --- a/digikam/themedesigner/mainwindow.cpp +++ b/digikam/themedesigner/mainwindow.cpp @@ -81,7 +81,7 @@ MainWindow::MainWindow() TQGridLayout* layout = new TQGridLayout(this); TQSplitter* splitter = new TQSplitter(this); - splitter->setOrientation( Qt::Horizontal ); + splitter->setOrientation( TQt::Horizontal ); splitter->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); m_folderView = new FolderView(splitter); @@ -180,21 +180,21 @@ MainWindow::MainWindow() m_endColorBtn->setColor(TQt::black); m_borderColorBtn->setColor(TQt::black); - connect(m_propertyCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPropertyChanged())); - connect(m_bevelCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotUpdateTheme())); - connect(m_gradientCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotUpdateTheme())); - - connect(m_begColorBtn, TQT_SIGNAL(changed(const TQColor&)), - this, TQT_SLOT(slotUpdateTheme())); - connect(m_endColorBtn, TQT_SIGNAL(changed(const TQColor&)), - this, TQT_SLOT(slotUpdateTheme())); - connect(m_addBorderCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotUpdateTheme())); - connect(m_borderColorBtn, TQT_SIGNAL(changed(const TQColor&)), - this, TQT_SLOT(slotUpdateTheme())); + connect(m_propertyCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPropertyChanged())); + connect(m_bevelCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotUpdateTheme())); + connect(m_gradientCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotUpdateTheme())); + + connect(m_begColorBtn, TQ_SIGNAL(changed(const TQColor&)), + this, TQ_SLOT(slotUpdateTheme())); + connect(m_endColorBtn, TQ_SIGNAL(changed(const TQColor&)), + this, TQ_SLOT(slotUpdateTheme())); + connect(m_addBorderCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotUpdateTheme())); + connect(m_borderColorBtn, TQ_SIGNAL(changed(const TQColor&)), + this, TQ_SLOT(slotUpdateTheme())); // Bottom button bar ------------------------------------------------------- @@ -218,12 +218,12 @@ MainWindow::MainWindow() layout->addMultiCellLayout(buttonLayout, 1, 1, 0, 1); - connect(loadButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotLoad())); - connect(saveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSave())); - connect(closeButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(close())); + connect(loadButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotLoad())); + connect(saveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSave())); + connect(closeButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(close())); // ------------------------------------------------------------------------ diff --git a/digikam/themedesigner/mainwindow.h b/digikam/themedesigner/mainwindow.h index cc50300..087dac2 100644 --- a/digikam/themedesigner/mainwindow.h +++ b/digikam/themedesigner/mainwindow.h @@ -45,7 +45,7 @@ class Theme; class MainWindow : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/themedesigner/themediconview.cpp b/digikam/themedesigner/themediconview.cpp index c573ded..ef5759e 100644 --- a/digikam/themedesigner/themediconview.cpp +++ b/digikam/themedesigner/themediconview.cpp @@ -76,8 +76,8 @@ ThemedIconView::ThemedIconView(TQWidget* parent) updateBannerRectPixmap(); updateItemRectsPixmap(); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); } ThemedIconView::~ThemedIconView() diff --git a/digikam/themedesigner/themediconview.h b/digikam/themedesigner/themediconview.h index 3196370..ef2e3e1 100644 --- a/digikam/themedesigner/themediconview.h +++ b/digikam/themedesigner/themediconview.h @@ -39,7 +39,7 @@ class ThemedIconViewPriv; class ThemedIconView : public IconView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/batch/batchalbumssyncmetadata.cpp b/digikam/utilities/batch/batchalbumssyncmetadata.cpp index 60fbae6..fba18d3 100644 --- a/digikam/utilities/batch/batchalbumssyncmetadata.cpp +++ b/digikam/utilities/batch/batchalbumssyncmetadata.cpp @@ -79,7 +79,7 @@ BatchAlbumsSyncMetadata::BatchAlbumsSyncMetadata(TQWidget* parent) setLabel(i18n("<b>Syncing the metadata of all images with the digiKam database. Please wait...</b>")); setButtonText(i18n("&Abort")); resize(600, 300); - TQTimer::singleShot(500, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(500, this, TQ_SLOT(slotStart())); } BatchAlbumsSyncMetadata::~BatchAlbumsSyncMetadata() @@ -92,11 +92,11 @@ void BatchAlbumsSyncMetadata::slotStart() setTitle(i18n("Parsing all albums")); setTotalSteps(d->palbumList.count()); - connect(d->imageInfoJob, TQT_SIGNAL(signalItemsInfo(const ImageInfoList&)), - this, TQT_SLOT(slotAlbumParsed(const ImageInfoList&))); + connect(d->imageInfoJob, TQ_SIGNAL(signalItemsInfo(const ImageInfoList&)), + this, TQ_SLOT(slotAlbumParsed(const ImageInfoList&))); - connect(d->imageInfoJob, TQT_SIGNAL(signalCompleted()), - this, TQT_SLOT(slotComplete())); + connect(d->imageInfoJob, TQ_SIGNAL(signalCompleted()), + this, TQ_SLOT(slotComplete())); d->albumsIt = d->palbumList.begin(); parseAlbum(); diff --git a/digikam/utilities/batch/batchalbumssyncmetadata.h b/digikam/utilities/batch/batchalbumssyncmetadata.h index 80db6dc..8363ce4 100644 --- a/digikam/utilities/batch/batchalbumssyncmetadata.h +++ b/digikam/utilities/batch/batchalbumssyncmetadata.h @@ -41,7 +41,7 @@ class BatchAlbumsSyncMetadataPriv; class BatchAlbumsSyncMetadata : public DProgressDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/batch/batchsyncmetadata.cpp b/digikam/utilities/batch/batchsyncmetadata.cpp index 831cdaf..50e2ad7 100644 --- a/digikam/utilities/batch/batchsyncmetadata.cpp +++ b/digikam/utilities/batch/batchsyncmetadata.cpp @@ -93,11 +93,11 @@ void BatchSyncMetadata::parseAlbum() { d->imageInfoJob->allItemsFromAlbum(d->album); - connect(d->imageInfoJob, TQT_SIGNAL(signalItemsInfo(const ImageInfoList&)), - this, TQT_SLOT(slotAlbumParsed(const ImageInfoList&))); + connect(d->imageInfoJob, TQ_SIGNAL(signalItemsInfo(const ImageInfoList&)), + this, TQ_SLOT(slotAlbumParsed(const ImageInfoList&))); - connect(d->imageInfoJob, TQT_SIGNAL(signalCompleted()), - this, TQT_SLOT(slotComplete())); + connect(d->imageInfoJob, TQ_SIGNAL(signalCompleted()), + this, TQ_SLOT(slotComplete())); } void BatchSyncMetadata::slotComplete() diff --git a/digikam/utilities/batch/batchsyncmetadata.h b/digikam/utilities/batch/batchsyncmetadata.h index c63e23b..c9b69ac 100644 --- a/digikam/utilities/batch/batchsyncmetadata.h +++ b/digikam/utilities/batch/batchsyncmetadata.h @@ -43,7 +43,7 @@ class BatchSyncMetadataPriv; class BatchSyncMetadata : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/batch/batchthumbsgenerator.cpp b/digikam/utilities/batch/batchthumbsgenerator.cpp index 783226f..f0bd010 100644 --- a/digikam/utilities/batch/batchthumbsgenerator.cpp +++ b/digikam/utilities/batch/batchthumbsgenerator.cpp @@ -82,7 +82,7 @@ BatchThumbsGenerator::BatchThumbsGenerator(TQWidget* parent) setCaption(i18n("Thumbnails processing")); setLabel(i18n("<b>Updating thumbnails database. Please wait...</b>")); setButtonText(i18n("&Abort")); - TQTimer::singleShot(500, this, TQT_SLOT(slotRebuildThumbs128())); + TQTimer::singleShot(500, this, TQ_SLOT(slotRebuildThumbs128())); resize(600, 300); } @@ -102,8 +102,8 @@ void BatchThumbsGenerator::slotRebuildThumbs128() setTitle(i18n("Processing small thumbs")); rebuildAllThumbs(128); - connect(this, TQT_SIGNAL(signalRebuildThumbsDone()), - this, TQT_SLOT(slotRebuildThumbs256())); + connect(this, TQ_SIGNAL(signalRebuildThumbsDone()), + this, TQ_SLOT(slotRebuildThumbs256())); } void BatchThumbsGenerator::slotRebuildThumbs256() @@ -111,11 +111,11 @@ void BatchThumbsGenerator::slotRebuildThumbs256() setTitle(i18n("Processing large thumbs")); rebuildAllThumbs(256); - disconnect(this, TQT_SIGNAL(signalRebuildThumbsDone()), - this, TQT_SLOT(slotRebuildThumbs256())); + disconnect(this, TQ_SIGNAL(signalRebuildThumbsDone()), + this, TQ_SLOT(slotRebuildThumbs256())); - connect(this, TQT_SIGNAL(signalRebuildThumbsDone()), - this, TQT_SLOT(slotRebuildAllThumbComplete())); + connect(this, TQ_SIGNAL(signalRebuildThumbsDone()), + this, TQ_SLOT(slotRebuildAllThumbComplete())); } void BatchThumbsGenerator::slotRebuildAllThumbComplete() @@ -189,14 +189,14 @@ void BatchThumbsGenerator::rebuildAllThumbs(int size) d->thumbJob = new ThumbnailJob(KURL::List(allPicturesPath), size, true, exifRotate); - connect(d->thumbJob, TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), - this, TQT_SLOT(slotRebuildThumbDone(const KURL&, const TQPixmap&))); + connect(d->thumbJob, TQ_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + this, TQ_SLOT(slotRebuildThumbDone(const KURL&, const TQPixmap&))); - connect(d->thumbJob, TQT_SIGNAL(signalFailed(const KURL&)), - this, TQT_SLOT(slotRebuildThumbDone(const KURL&))); + connect(d->thumbJob, TQ_SIGNAL(signalFailed(const KURL&)), + this, TQ_SLOT(slotRebuildThumbDone(const KURL&))); - connect(d->thumbJob, TQT_SIGNAL(signalCompleted()), - this, TQT_SIGNAL(signalRebuildThumbsDone())); + connect(d->thumbJob, TQ_SIGNAL(signalCompleted()), + this, TQ_SIGNAL(signalRebuildThumbsDone())); } void BatchThumbsGenerator::slotRebuildThumbDone(const KURL& url, const TQPixmap& pix) diff --git a/digikam/utilities/batch/batchthumbsgenerator.h b/digikam/utilities/batch/batchthumbsgenerator.h index 06f3f95..091c278 100644 --- a/digikam/utilities/batch/batchthumbsgenerator.h +++ b/digikam/utilities/batch/batchthumbsgenerator.h @@ -40,7 +40,7 @@ class BatchThumbsGeneratorPriv; class BatchThumbsGenerator : public DProgressDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/batch/imageinfoalbumsjob.cpp b/digikam/utilities/batch/imageinfoalbumsjob.cpp index 49bf3dc..4d0e3c5 100644 --- a/digikam/utilities/batch/imageinfoalbumsjob.cpp +++ b/digikam/utilities/batch/imageinfoalbumsjob.cpp @@ -59,11 +59,11 @@ ImageInfoAlbumsJob::ImageInfoAlbumsJob() { d = new ImageInfoAlbumsJobPriv; - connect(&d->imageInfoJob, TQT_SIGNAL(signalItemsInfo(const ImageInfoList&)), - this, TQT_SLOT(slotItemsInfo(const ImageInfoList&))); + connect(&d->imageInfoJob, TQ_SIGNAL(signalItemsInfo(const ImageInfoList&)), + this, TQ_SLOT(slotItemsInfo(const ImageInfoList&))); - connect(&d->imageInfoJob, TQT_SIGNAL(signalCompleted()), - this, TQT_SLOT(slotComplete())); + connect(&d->imageInfoJob, TQ_SIGNAL(signalCompleted()), + this, TQ_SLOT(slotComplete())); } ImageInfoAlbumsJob::~ImageInfoAlbumsJob() diff --git a/digikam/utilities/batch/imageinfoalbumsjob.h b/digikam/utilities/batch/imageinfoalbumsjob.h index c54af43..7b9f477 100644 --- a/digikam/utilities/batch/imageinfoalbumsjob.h +++ b/digikam/utilities/batch/imageinfoalbumsjob.h @@ -46,7 +46,7 @@ class ImageInfoAlbumsJobPriv; class ImageInfoAlbumsJob : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/batch/imageinfojob.cpp b/digikam/utilities/batch/imageinfojob.cpp index 9fc5bc3..5866069 100644 --- a/digikam/utilities/batch/imageinfojob.cpp +++ b/digikam/utilities/batch/imageinfojob.cpp @@ -98,11 +98,11 @@ void ImageInfoJob::allItemsFromAlbum(Album *album) d->job = new TDEIO::TransferJob(album->kurl(), TDEIO::CMD_SPECIAL, ba, TQByteArray(), false); - connect(d->job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotResult(TDEIO::Job*))); + connect(d->job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotResult(TDEIO::Job*))); - connect(d->job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(d->job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } void ImageInfoJob::stop() @@ -151,7 +151,7 @@ void ImageInfoJob::slotData(TDEIO::Job*, const TQByteArray& data) ds >> dims; ImageInfo* info = new ImageInfo(imageID, albumID, name, - TQDateTime::fromString(date, Qt::ISODate), + TQDateTime::fromString(date, TQt::ISODate), size, dims); itemsList.append(info); diff --git a/digikam/utilities/batch/imageinfojob.h b/digikam/utilities/batch/imageinfojob.h index 1509cd7..0227a62 100644 --- a/digikam/utilities/batch/imageinfojob.h +++ b/digikam/utilities/batch/imageinfojob.h @@ -47,7 +47,7 @@ class ImageInfoJobPriv; class ImageInfoJob : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/cameragui/albumselectdialog.cpp b/digikam/utilities/cameragui/albumselectdialog.cpp index ee3b5e8..486c471 100644 --- a/digikam/utilities/cameragui/albumselectdialog.cpp +++ b/digikam/utilities/cameragui/albumselectdialog.cpp @@ -173,23 +173,23 @@ AlbumSelectDialog::AlbumSelectDialog(TQWidget* parent, PAlbum* albumToSelect, // ------------------------------------------------------------- - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumAdded(Album*)), - this, TQT_SLOT(slotAlbumAdded(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumAdded(Album*)), + this, TQ_SLOT(slotAlbumAdded(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotAlbumDeleted(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotAlbumDeleted(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumsCleared()), - this, TQT_SLOT(slotAlbumsCleared())); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumsCleared()), + this, TQ_SLOT(slotAlbumsCleared())); - connect(d->folderView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(d->folderView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); - connect(d->folderView, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); + connect(d->folderView, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); - connect(d->searchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - this, TQT_SLOT(slotSearchTextChanged(const TQString&))); + connect(d->searchBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + this, TQ_SLOT(slotSearchTextChanged(const TQString&))); // ------------------------------------------------------------- @@ -276,9 +276,9 @@ void AlbumSelectDialog::slotContextMenu(TQListViewItem *, const TQPoint &, int) { TQPopupMenu popmenu(d->folderView); TDEAction *action = new TDEAction(i18n( "Create New Album" ), - "albumfolder-new", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotUser1() ), - TQT_TQOBJECT(&popmenu)); + "albumfolder-new", 0, this, + TQ_SLOT( slotUser1() ), + &popmenu); action->plug(&popmenu); popmenu.exec(TQCursor::pos()); } diff --git a/digikam/utilities/cameragui/albumselectdialog.h b/digikam/utilities/cameragui/albumselectdialog.h index 427a342..aea5331 100644 --- a/digikam/utilities/cameragui/albumselectdialog.h +++ b/digikam/utilities/cameragui/albumselectdialog.h @@ -42,7 +42,7 @@ class AlbumSelectDialogPrivate; class AlbumSelectDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/cameragui/animwidget.cpp b/digikam/utilities/cameragui/animwidget.cpp index 9d9f839..1d869cd 100644 --- a/digikam/utilities/cameragui/animwidget.cpp +++ b/digikam/utilities/cameragui/animwidget.cpp @@ -68,8 +68,8 @@ AnimWidget::AnimWidget(TQWidget* parent, int size) d->timer = new TQTimer(this); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotTimeout())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTimeout())); } AnimWidget::~AnimWidget() diff --git a/digikam/utilities/cameragui/animwidget.h b/digikam/utilities/cameragui/animwidget.h index c36e0dc..6a93f41 100644 --- a/digikam/utilities/cameragui/animwidget.h +++ b/digikam/utilities/cameragui/animwidget.h @@ -36,7 +36,7 @@ class AnimWidgetPriv; class AnimWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/cameragui/cameracontroller.cpp b/digikam/utilities/cameragui/cameracontroller.cpp index 947df78..34afa8a 100644 --- a/digikam/utilities/cameragui/cameracontroller.cpp +++ b/digikam/utilities/cameragui/cameracontroller.cpp @@ -308,7 +308,7 @@ void CameraThread::run() if (!thumbnail.isNull()) { - thumbnail = thumbnail.smoothScale(ThumbnailSize::Huge, ThumbnailSize::Huge, TQ_ScaleMin); + thumbnail = thumbnail.smoothScale(ThumbnailSize::Huge, ThumbnailSize::Huge, TQImage::ScaleMin); CameraEvent* event = new CameraEvent(CameraEvent::gp_thumbnailed); event->map.insert("folder", TQVariant(folder)); @@ -649,8 +649,8 @@ CameraController::CameraController(TQWidget* parent, const TQString& title, cons d->thread = new CameraThread(this); d->timer = new TQTimer(this); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotProcessNext())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotProcessNext())); d->timer->start(50, false); } diff --git a/digikam/utilities/cameragui/cameracontroller.h b/digikam/utilities/cameragui/cameracontroller.h index db31c50..45e7fed 100644 --- a/digikam/utilities/cameragui/cameracontroller.h +++ b/digikam/utilities/cameragui/cameracontroller.h @@ -43,7 +43,7 @@ class CameraControllerPriv; class CameraController : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/cameragui/camerafolderdialog.cpp b/digikam/utilities/cameragui/camerafolderdialog.cpp index 441492d..93feb0a 100644 --- a/digikam/utilities/cameragui/camerafolderdialog.cpp +++ b/digikam/utilities/cameragui/camerafolderdialog.cpp @@ -95,8 +95,8 @@ CameraFolderDialog::CameraFolderDialog(TQWidget *parent, CameraIconView *cameraV } } - connect(m_folderView, TQT_SIGNAL(signalFolderChanged(CameraFolderItem*)), - this, TQT_SLOT(slotFolderPathSelectionChanged(CameraFolderItem*))); + connect(m_folderView, TQ_SIGNAL(signalFolderChanged(CameraFolderItem*)), + this, TQ_SLOT(slotFolderPathSelectionChanged(CameraFolderItem*))); resize(500, 500); } diff --git a/digikam/utilities/cameragui/camerafolderdialog.h b/digikam/utilities/cameragui/camerafolderdialog.h index b31c4d5..efc7586 100644 --- a/digikam/utilities/cameragui/camerafolderdialog.h +++ b/digikam/utilities/cameragui/camerafolderdialog.h @@ -41,7 +41,7 @@ class CameraFolderItem; class CameraFolderDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/cameragui/camerafolderview.cpp b/digikam/utilities/cameragui/camerafolderview.cpp index bfa95e8..877c4b5 100644 --- a/digikam/utilities/cameragui/camerafolderview.cpp +++ b/digikam/utilities/cameragui/camerafolderview.cpp @@ -64,11 +64,11 @@ CameraFolderView::CameraFolderView(TQWidget* parent) setResizeMode( TQListView::AllColumns ); setSelectionMode(TQListView::Single); - connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListViewItem*))); + connect(this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListViewItem*))); - connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListViewItem*))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListViewItem*))); } CameraFolderView::~CameraFolderView() diff --git a/digikam/utilities/cameragui/camerafolderview.h b/digikam/utilities/cameragui/camerafolderview.h index 37df132..1b02fc9 100644 --- a/digikam/utilities/cameragui/camerafolderview.h +++ b/digikam/utilities/cameragui/camerafolderview.h @@ -42,7 +42,7 @@ class CameraFolderViewPriv; class CameraFolderView : public TQListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/cameragui/cameraiconitem.cpp b/digikam/utilities/cameragui/cameraiconitem.cpp index ec23e2c..c68f785 100644 --- a/digikam/utilities/cameragui/cameraiconitem.cpp +++ b/digikam/utilities/cameragui/cameraiconitem.cpp @@ -225,7 +225,7 @@ void CameraIconViewItem::calcRect(const TQString& itemName, const TQString& down { CameraIconView* view = (CameraIconView*)iconView(); int thumbSize = view->thumbnailSize().size(); - d->pixmap = TQPixmap(d->thumbnail.convertToImage().smoothScale(thumbSize, thumbSize, TQ_ScaleMin)); + d->pixmap = TQPixmap(d->thumbnail.convertToImage().smoothScale(thumbSize, thumbSize, TQImage::ScaleMin)); d->pixRect = TQRect(0,0,0,0); d->textRect = TQRect(0,0,0,0); d->extraRect = TQRect(0,0,0,0); diff --git a/digikam/utilities/cameragui/cameraiconview.cpp b/digikam/utilities/cameragui/cameraiconview.cpp index e0f76a5..ba49621 100644 --- a/digikam/utilities/cameragui/cameraiconview.cpp +++ b/digikam/utilities/cameragui/cameraiconview.cpp @@ -237,23 +237,23 @@ CameraIconView::CameraIconView(CameraUI* ui, TQWidget* parent) // ---------------------------------------------------------------- - connect(this, TQT_SIGNAL(signalSelectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(signalSelectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); - connect(this, TQT_SIGNAL(signalNewSelection(bool)), - this, TQT_SLOT(slotUpdateDownloadNames(bool))); + connect(this, TQ_SIGNAL(signalNewSelection(bool)), + this, TQ_SLOT(slotUpdateDownloadNames(bool))); - connect(this, TQT_SIGNAL(signalRightButtonClicked(IconItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(IconItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(signalRightButtonClicked(IconItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(IconItem*, const TQPoint&))); - connect(this, TQT_SIGNAL(signalRightButtonClicked(const TQPoint &)), - this, TQT_SLOT(slotRightButtonClicked(const TQPoint &))); + connect(this, TQ_SIGNAL(signalRightButtonClicked(const TQPoint &)), + this, TQ_SLOT(slotRightButtonClicked(const TQPoint &))); - connect(this, TQT_SIGNAL(signalDoubleClicked(IconItem*)), - this, TQT_SLOT(slotDoubleClicked(IconItem*))); + connect(this, TQ_SIGNAL(signalDoubleClicked(IconItem*)), + this, TQ_SLOT(slotDoubleClicked(IconItem*))); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); // ---------------------------------------------------------------- @@ -291,8 +291,8 @@ void CameraIconView::setRenameCustomizer(RenameCustomizer* renamer) { d->renamer = renamer; - connect(d->renamer, TQT_SIGNAL(signalChanged()), - this, TQT_SLOT(slotDownloadNameChanged())); + connect(d->renamer, TQ_SIGNAL(signalChanged()), + this, TQ_SLOT(slotDownloadNameChanged())); } void CameraIconView::addItem(const GPItemInfo& info) diff --git a/digikam/utilities/cameragui/cameraiconview.h b/digikam/utilities/cameragui/cameraiconview.h index 5c59e2e..f621fed 100644 --- a/digikam/utilities/cameragui/cameraiconview.h +++ b/digikam/utilities/cameragui/cameraiconview.h @@ -53,7 +53,7 @@ class CameraIconViewPriv; class CameraIconView : public IconView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp index 7920d13..8b531ea 100644 --- a/digikam/utilities/cameragui/cameraui.cpp +++ b/digikam/utilities/cameragui/cameraui.cpp @@ -375,7 +375,7 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle, TDEGlobal::dirs()->addResourceType("logo-digikam", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); TQString directory = TDEGlobal::dirs()->findResourceDir("logo-digikam", "logo-digikam.png"); pixmapLogo->setPixmap( TQPixmap( directory + "logo-digikam.png" ) ); - pixmapLogo->setFocusPolicy(TQ_NoFocus); + pixmapLogo->setFocusPolicy(TQWidget::NoFocus); d->anim = new AnimWidget(frame, pixmapLogo->height()-2); @@ -408,33 +408,33 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle, // ------------------------------------------------------------------------- d->imageMenu = new TQPopupMenu(this); - d->imageMenu->insertItem(i18n("Select &All"), d->view, TQT_SLOT(slotSelectAll()), CTRL+Key_A, 0); - d->imageMenu->insertItem(i18n("Select N&one"), d->view, TQT_SLOT(slotSelectNone()), CTRL+Key_U, 1); - d->imageMenu->insertItem(i18n("&Invert Selection"), d->view, TQT_SLOT(slotSelectInvert()), CTRL+Key_Asterisk, 2); + d->imageMenu->insertItem(i18n("Select &All"), d->view, TQ_SLOT(slotSelectAll()), CTRL+Key_A, 0); + d->imageMenu->insertItem(i18n("Select N&one"), d->view, TQ_SLOT(slotSelectNone()), CTRL+Key_U, 1); + d->imageMenu->insertItem(i18n("&Invert Selection"), d->view, TQ_SLOT(slotSelectInvert()), CTRL+Key_Asterisk, 2); d->imageMenu->insertSeparator(); - d->imageMenu->insertItem(i18n("Select &New Items"), d->view, TQT_SLOT(slotSelectNew()), 0, 3); + d->imageMenu->insertItem(i18n("Select &New Items"), d->view, TQ_SLOT(slotSelectNew()), 0, 3); d->imageMenu->insertSeparator(); - d->imageMenu->insertItem(i18n("Increase Thumbnail Size"), this, TQT_SLOT(slotIncreaseThumbSize()), CTRL+Key_Plus, 4); - d->imageMenu->insertItem(i18n("Decrease Thumbnail Size"), this, TQT_SLOT(slotDecreaseThumbSize()), CTRL+Key_Minus, 5); + d->imageMenu->insertItem(i18n("Increase Thumbnail Size"), this, TQ_SLOT(slotIncreaseThumbSize()), CTRL+Key_Plus, 4); + d->imageMenu->insertItem(i18n("Decrease Thumbnail Size"), this, TQ_SLOT(slotDecreaseThumbSize()), CTRL+Key_Minus, 5); d->imageMenu->insertSeparator(); - d->imageMenu->insertItem(i18n("Toggle Lock"), this, TQT_SLOT(slotToggleLock()), 0, 6); + d->imageMenu->insertItem(i18n("Toggle Lock"), this, TQ_SLOT(slotToggleLock()), 0, 6); actionButton(User3)->setPopup(d->imageMenu); // ------------------------------------------------------------------------- d->downloadMenu = new TQPopupMenu(this); d->downloadMenu->insertItem(i18n("Download Selected"), - this, TQT_SLOT(slotDownloadSelected()), 0, 0); + this, TQ_SLOT(slotDownloadSelected()), 0, 0); d->downloadMenu->insertItem(i18n("Download All"), - this, TQT_SLOT(slotDownloadAll()), 0, 1); + this, TQ_SLOT(slotDownloadAll()), 0, 1); d->downloadMenu->insertSeparator(); d->downloadMenu->insertItem(i18n("Download/Delete Selected"), - this, TQT_SLOT(slotDownloadAndDeleteSelected()), 0, 2); + this, TQ_SLOT(slotDownloadAndDeleteSelected()), 0, 2); d->downloadMenu->insertItem(i18n("Download/Delete All"), - this, TQT_SLOT(slotDownloadAndDeleteAll()), 0, 3); + this, TQ_SLOT(slotDownloadAndDeleteAll()), 0, 3); d->downloadMenu->insertSeparator(); d->downloadMenu->insertItem(i18n("Upload..."), - this, TQT_SLOT(slotUpload()), 0, 4); + this, TQ_SLOT(slotUpload()), 0, 4); d->downloadMenu->setItemEnabled(0, false); d->downloadMenu->setItemEnabled(2, false); actionButton(User2)->setPopup(d->downloadMenu); @@ -442,8 +442,8 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle, // ------------------------------------------------------------------------- d->deleteMenu = new TQPopupMenu(this); - d->deleteMenu->insertItem(i18n("Delete Selected"), this, TQT_SLOT(slotDeleteSelected()), 0, 0); - d->deleteMenu->insertItem(i18n("Delete All"), this, TQT_SLOT(slotDeleteAll()), 0, 1); + d->deleteMenu->insertItem(i18n("Delete Selected"), this, TQ_SLOT(slotDeleteSelected()), 0, 0); + d->deleteMenu->insertItem(i18n("Delete All"), this, TQ_SLOT(slotDeleteAll()), 0, 1); d->deleteMenu->setItemEnabled(0, false); actionButton(User1)->setPopup(d->deleteMenu); @@ -452,76 +452,76 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle, TQPushButton *helpButton = actionButton( Help ); d->helpMenu = new KHelpMenu(this, kapp->aboutData(), false); d->helpMenu->menu()->insertItem(SmallIcon("camera-photo"), i18n("Camera Information"), - this, TQT_SLOT(slotInformations()), 0, CAMERA_INFO_MENU_ID, 0); + this, TQ_SLOT(slotInformations()), 0, CAMERA_INFO_MENU_ID, 0); helpButton->setPopup( d->helpMenu->menu() ); // ------------------------------------------------------------------------- - connect(d->autoAlbumDateCheck, TQT_SIGNAL(toggled(bool)), - d->folderDateFormat, TQT_SLOT(setEnabled(bool))); + connect(d->autoAlbumDateCheck, TQ_SIGNAL(toggled(bool)), + d->folderDateFormat, TQ_SLOT(setEnabled(bool))); - connect(d->autoAlbumDateCheck, TQT_SIGNAL(toggled(bool)), - d->folderDateLabel, TQT_SLOT(setEnabled(bool))); + connect(d->autoAlbumDateCheck, TQ_SIGNAL(toggled(bool)), + d->folderDateLabel, TQ_SLOT(setEnabled(bool))); - connect(d->convertJpegCheck, TQT_SIGNAL(toggled(bool)), - d->losslessFormat, TQT_SLOT(setEnabled(bool))); + connect(d->convertJpegCheck, TQ_SIGNAL(toggled(bool)), + d->losslessFormat, TQ_SLOT(setEnabled(bool))); - connect(d->convertJpegCheck, TQT_SIGNAL(toggled(bool)), - d->formatLabel, TQT_SLOT(setEnabled(bool))); + connect(d->convertJpegCheck, TQ_SIGNAL(toggled(bool)), + d->formatLabel, TQ_SLOT(setEnabled(bool))); - connect(d->convertJpegCheck, TQT_SIGNAL(toggled(bool)), - d->view, TQT_SLOT(slotDownloadNameChanged())); + connect(d->convertJpegCheck, TQ_SIGNAL(toggled(bool)), + d->view, TQ_SLOT(slotDownloadNameChanged())); - connect(d->fixDateTimeCheck, TQT_SIGNAL(toggled(bool)), - d->dateTimeEdit, TQT_SLOT(setEnabled(bool))); + connect(d->fixDateTimeCheck, TQ_SIGNAL(toggled(bool)), + d->dateTimeEdit, TQ_SLOT(setEnabled(bool))); - connect(pixmapLogo, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(slotProcessURL(const TQString&))); + connect(pixmapLogo, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(slotProcessURL(const TQString&))); // ------------------------------------------------------------------------- - connect(d->view, TQT_SIGNAL(signalSelected(CameraIconViewItem*, bool)), - this, TQT_SLOT(slotItemsSelected(CameraIconViewItem*, bool))); + connect(d->view, TQ_SIGNAL(signalSelected(CameraIconViewItem*, bool)), + this, TQ_SLOT(slotItemsSelected(CameraIconViewItem*, bool))); - connect(d->view, TQT_SIGNAL(signalFileView(CameraIconViewItem*)), - this, TQT_SLOT(slotFileView(CameraIconViewItem*))); + connect(d->view, TQ_SIGNAL(signalFileView(CameraIconViewItem*)), + this, TQ_SLOT(slotFileView(CameraIconViewItem*))); - connect(d->view, TQT_SIGNAL(signalUpload(const KURL::List&)), - this, TQT_SLOT(slotUploadItems(const KURL::List&))); + connect(d->view, TQ_SIGNAL(signalUpload(const KURL::List&)), + this, TQ_SLOT(slotUploadItems(const KURL::List&))); - connect(d->view, TQT_SIGNAL(signalDownload()), - this, TQT_SLOT(slotDownloadSelected())); + connect(d->view, TQ_SIGNAL(signalDownload()), + this, TQ_SLOT(slotDownloadSelected())); - connect(d->view, TQT_SIGNAL(signalDownloadAndDelete()), - this, TQT_SLOT(slotDownloadAndDeleteSelected())); + connect(d->view, TQ_SIGNAL(signalDownloadAndDelete()), + this, TQ_SLOT(slotDownloadAndDeleteSelected())); - connect(d->view, TQT_SIGNAL(signalDelete()), - this, TQT_SLOT(slotDeleteSelected())); + connect(d->view, TQ_SIGNAL(signalDelete()), + this, TQ_SLOT(slotDeleteSelected())); - connect(d->view, TQT_SIGNAL(signalToggleLock()), - this, TQT_SLOT(slotToggleLock())); + connect(d->view, TQ_SIGNAL(signalToggleLock()), + this, TQ_SLOT(slotToggleLock())); - connect(d->view, TQT_SIGNAL(signalNewSelection(bool)), - this, TQT_SLOT(slotNewSelection(bool))); + connect(d->view, TQ_SIGNAL(signalNewSelection(bool)), + this, TQ_SLOT(slotNewSelection(bool))); // ------------------------------------------------------------------------- - connect(d->rightSidebar, TQT_SIGNAL(signalFirstItem()), - this, TQT_SLOT(slotFirstItem())); + connect(d->rightSidebar, TQ_SIGNAL(signalFirstItem()), + this, TQ_SLOT(slotFirstItem())); - connect(d->rightSidebar, TQT_SIGNAL(signalNextItem()), - this, TQT_SLOT(slotNextItem())); + connect(d->rightSidebar, TQ_SIGNAL(signalNextItem()), + this, TQ_SLOT(slotNextItem())); - connect(d->rightSidebar, TQT_SIGNAL(signalPrevItem()), - this, TQT_SLOT(slotPrevItem())); + connect(d->rightSidebar, TQ_SIGNAL(signalPrevItem()), + this, TQ_SLOT(slotPrevItem())); - connect(d->rightSidebar, TQT_SIGNAL(signalLastItem()), - this, TQT_SLOT(slotLastItem())); + connect(d->rightSidebar, TQ_SIGNAL(signalLastItem()), + this, TQ_SLOT(slotLastItem())); // ------------------------------------------------------------------------- - connect(d->cancelBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCancelButton())); + connect(d->cancelBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCancelButton())); // -- Read settings & Check free space availability on album root path ----- @@ -531,55 +531,55 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle, d->controller = new CameraController(this, d->cameraTitle, model, port, path); - connect(d->controller, TQT_SIGNAL(signalConnected(bool)), - this, TQT_SLOT(slotConnected(bool))); + connect(d->controller, TQ_SIGNAL(signalConnected(bool)), + this, TQ_SLOT(slotConnected(bool))); - connect(d->controller, TQT_SIGNAL(signalInfoMsg(const TQString&)), - d->status, TQT_SLOT(setText(const TQString&))); + connect(d->controller, TQ_SIGNAL(signalInfoMsg(const TQString&)), + d->status, TQ_SLOT(setText(const TQString&))); - connect(d->controller, TQT_SIGNAL(signalErrorMsg(const TQString&)), - this, TQT_SLOT(slotErrorMsg(const TQString&))); + connect(d->controller, TQ_SIGNAL(signalErrorMsg(const TQString&)), + this, TQ_SLOT(slotErrorMsg(const TQString&))); - connect(d->controller, TQT_SIGNAL(signalCameraInformations(const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(slotCameraInformations(const TQString&, const TQString&, const TQString&))); + connect(d->controller, TQ_SIGNAL(signalCameraInformations(const TQString&, const TQString&, const TQString&)), + this, TQ_SLOT(slotCameraInformations(const TQString&, const TQString&, const TQString&))); - connect(d->controller, TQT_SIGNAL(signalBusy(bool)), - this, TQT_SLOT(slotBusy(bool))); + connect(d->controller, TQ_SIGNAL(signalBusy(bool)), + this, TQ_SLOT(slotBusy(bool))); - connect(d->controller, TQT_SIGNAL(signalFolderList(const TQStringList&)), - this, TQT_SLOT(slotFolderList(const TQStringList&))); + connect(d->controller, TQ_SIGNAL(signalFolderList(const TQStringList&)), + this, TQ_SLOT(slotFolderList(const TQStringList&))); - connect(d->controller, TQT_SIGNAL(signalFileList(const GPItemInfoList&)), - this, TQT_SLOT(slotFileList(const GPItemInfoList&))); + connect(d->controller, TQ_SIGNAL(signalFileList(const GPItemInfoList&)), + this, TQ_SLOT(slotFileList(const GPItemInfoList&))); - connect(d->controller, TQT_SIGNAL(signalThumbnail(const TQString&, const TQString&, const TQImage&)), - this, TQT_SLOT(slotThumbnail(const TQString&, const TQString&, const TQImage&))); + connect(d->controller, TQ_SIGNAL(signalThumbnail(const TQString&, const TQString&, const TQImage&)), + this, TQ_SLOT(slotThumbnail(const TQString&, const TQString&, const TQImage&))); - connect(d->controller, TQT_SIGNAL(signalDownloaded(const TQString&, const TQString&, int)), - this, TQT_SLOT(slotDownloaded(const TQString&, const TQString&, int))); + connect(d->controller, TQ_SIGNAL(signalDownloaded(const TQString&, const TQString&, int)), + this, TQ_SLOT(slotDownloaded(const TQString&, const TQString&, int))); - connect(d->controller, TQT_SIGNAL(signalSkipped(const TQString&, const TQString&)), - this, TQT_SLOT(slotSkipped(const TQString&, const TQString&))); + connect(d->controller, TQ_SIGNAL(signalSkipped(const TQString&, const TQString&)), + this, TQ_SLOT(slotSkipped(const TQString&, const TQString&))); - connect(d->controller, TQT_SIGNAL(signalDeleted(const TQString&, const TQString&, bool)), - this, TQT_SLOT(slotDeleted(const TQString&, const TQString&, bool))); + connect(d->controller, TQ_SIGNAL(signalDeleted(const TQString&, const TQString&, bool)), + this, TQ_SLOT(slotDeleted(const TQString&, const TQString&, bool))); - connect(d->controller, TQT_SIGNAL(signalLocked(const TQString&, const TQString&, bool)), - this, TQT_SLOT(slotLocked(const TQString&, const TQString&, bool))); + connect(d->controller, TQ_SIGNAL(signalLocked(const TQString&, const TQString&, bool)), + this, TQ_SLOT(slotLocked(const TQString&, const TQString&, bool))); - connect(d->controller, TQT_SIGNAL(signalExifFromFile(const TQString&, const TQString&)), - this, TQT_SLOT(slotExifFromFile(const TQString&, const TQString&))); + connect(d->controller, TQ_SIGNAL(signalExifFromFile(const TQString&, const TQString&)), + this, TQ_SLOT(slotExifFromFile(const TQString&, const TQString&))); - connect(d->controller, TQT_SIGNAL(signalExifData(const TQByteArray&)), - this, TQT_SLOT(slotExifFromData(const TQByteArray&))); + connect(d->controller, TQ_SIGNAL(signalExifData(const TQByteArray&)), + this, TQ_SLOT(slotExifFromData(const TQByteArray&))); - connect(d->controller, TQT_SIGNAL(signalUploaded(const GPItemInfo&)), - this, TQT_SLOT(slotUploaded(const GPItemInfo&))); + connect(d->controller, TQ_SIGNAL(signalUploaded(const GPItemInfo&)), + this, TQ_SLOT(slotUploaded(const GPItemInfo&))); // ------------------------------------------------------------------------- d->view->setFocus(); - TQTimer::singleShot(0, d->controller, TQT_SLOT(slotConnect())); + TQTimer::singleShot(0, d->controller, TQ_SLOT(slotConnect())); } CameraUI::~CameraUI() @@ -679,7 +679,7 @@ void CameraUI::slotCancelButton() { d->status->setText(i18n("Cancelling current operation, please wait...")); d->progress->hide(); - TQTimer::singleShot(0, d->controller, TQT_SLOT(slotCancel())); + TQTimer::singleShot(0, d->controller, TQ_SLOT(slotCancel())); d->currentlyDeleting.clear(); } @@ -868,7 +868,7 @@ void CameraUI::slotConnected(bool val) i18n("Retry"), i18n("Abort")) == KMessageBox::Yes) - TQTimer::singleShot(0, d->controller, TQT_SLOT(slotConnect())); + TQTimer::singleShot(0, d->controller, TQ_SLOT(slotConnect())); else close(); } @@ -1142,13 +1142,13 @@ void CameraUI::slotDownload(bool onlySelected, bool deleteAfter, Album *album) switch(d->folderDateFormat->currentItem()) { case CameraUIPriv::TextDateFormat: - newDirName = dateTime.date().toString(Qt::TextDate); + newDirName = dateTime.date().toString(TQt::TextDate); break; case CameraUIPriv::LocalDateFormat: - newDirName = dateTime.date().toString(Qt::LocalDate); + newDirName = dateTime.date().toString(TQt::LocalDate); break; default: // IsoDateFormat - newDirName = dateTime.date().toString(Qt::ISODate); + newDirName = dateTime.date().toString(TQt::ISODate); break; } } @@ -1234,13 +1234,13 @@ void CameraUI::slotDownload(bool onlySelected, bool deleteAfter, Album *album) switch(d->folderDateFormat->currentItem()) { case CameraUIPriv::TextDateFormat: - dirName = dateTime.date().toString(Qt::TextDate); + dirName = dateTime.date().toString(TQt::TextDate); break; case CameraUIPriv::LocalDateFormat: - dirName = dateTime.date().toString(Qt::LocalDate); + dirName = dateTime.date().toString(TQt::LocalDate); break; default: // IsoDateFormat - dirName = dateTime.date().toString(Qt::ISODate); + dirName = dateTime.date().toString(TQt::ISODate); break; } // See B.K.O #136927 : we need to support file system which do not diff --git a/digikam/utilities/cameragui/cameraui.h b/digikam/utilities/cameragui/cameraui.h index 33ff973..df9c788 100644 --- a/digikam/utilities/cameragui/cameraui.h +++ b/digikam/utilities/cameragui/cameraui.h @@ -49,7 +49,7 @@ class CameraUIPriv; class CameraUI : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/cameragui/freespacewidget.cpp b/digikam/utilities/cameragui/freespacewidget.cpp index 4921c5a..0d7a26b 100644 --- a/digikam/utilities/cameragui/freespacewidget.cpp +++ b/digikam/utilities/cameragui/freespacewidget.cpp @@ -92,8 +92,8 @@ FreeSpaceWidget::FreeSpaceWidget(TQWidget* parent, int width) d->timer = new TQTimer(this); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotTimeout())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTimeout())); d->timer->start(10000); } @@ -229,9 +229,9 @@ void FreeSpaceWidget::slotTimeout() { TQString mountPoint = TDEIO::findPathMountPoint(AlbumSettings::instance()->getAlbumLibraryPath()); KDiskFreeSp *job = new KDiskFreeSp; - connect(job, TQT_SIGNAL(foundMountPoint(const unsigned long&, const unsigned long&, + connect(job, TQ_SIGNAL(foundMountPoint(const unsigned long&, const unsigned long&, const unsigned long&, const TQString&)), - this, TQT_SLOT(slotAvailableFreeSpace(const unsigned long&, const unsigned long&, + this, TQ_SLOT(slotAvailableFreeSpace(const unsigned long&, const unsigned long&, const unsigned long&, const TQString&))); job->readDF(mountPoint); } diff --git a/digikam/utilities/cameragui/freespacewidget.h b/digikam/utilities/cameragui/freespacewidget.h index 8da1722..2111791 100644 --- a/digikam/utilities/cameragui/freespacewidget.h +++ b/digikam/utilities/cameragui/freespacewidget.h @@ -36,7 +36,7 @@ class FreeSpaceWidgetPriv; class FreeSpaceWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/cameragui/renamecustomizer.cpp b/digikam/utilities/cameragui/renamecustomizer.cpp index 265cfcd..a906ccb 100644 --- a/digikam/utilities/cameragui/renamecustomizer.cpp +++ b/digikam/utilities/cameragui/renamecustomizer.cpp @@ -135,7 +135,7 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle setFrameStyle( TQFrame::NoFrame ); setRadioButtonExclusive(true); - setColumnLayout(0, Qt::Vertical); + setColumnLayout(0, TQt::Vertical); TQGridLayout* mainLayout = new TQGridLayout(layout(), 4, 1); // ---------------------------------------------------------------- @@ -148,7 +148,7 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle d->renameDefaultBox = new TQGroupBox( this ); d->renameDefaultBox->setFrameStyle(TQFrame::NoFrame|TQFrame::Plain); d->renameDefaultBox->setInsideMargin(0); - d->renameDefaultBox->setColumnLayout(0, Qt::Vertical); + d->renameDefaultBox->setColumnLayout(0, TQt::Vertical); d->renameDefaultCase = new TQLabel( i18n("Change case to:"), d->renameDefaultBox ); d->renameDefaultCase->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); @@ -178,7 +178,7 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle d->renameCustomBox = new TQGroupBox(this); d->renameCustomBox->setFrameStyle(TQFrame::NoFrame|TQFrame::Plain); d->renameCustomBox->setInsideMargin(0); - d->renameCustomBox->setColumnLayout(0, Qt::Vertical); + d->renameCustomBox->setColumnLayout(0, TQt::Vertical); TQGridLayout* renameCustomBoxLayout = new TQGridLayout(d->renameCustomBox->layout(), 6, 2, KDialogBase::spacingHint()); @@ -254,41 +254,41 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle // -- setup connections ------------------------------------------------- - connect(this, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(slotRadioButtonClicked(int))); + connect(this, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(slotRadioButtonClicked(int))); - connect(d->renameCustomPrefix, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotRenameOptionsChanged())); + connect(d->renameCustomPrefix, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotRenameOptionsChanged())); - connect(d->renameCustomSuffix, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotRenameOptionsChanged())); + connect(d->renameCustomSuffix, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotRenameOptionsChanged())); - connect(d->addDateTimeBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotRenameOptionsChanged())); + connect(d->addDateTimeBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotRenameOptionsChanged())); - connect(d->addCameraNameBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotRenameOptionsChanged())); + connect(d->addCameraNameBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotRenameOptionsChanged())); - connect(d->addSeqNumberBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotRenameOptionsChanged())); + connect(d->addSeqNumberBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotRenameOptionsChanged())); - connect(d->renameDefaultCaseType, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotRenameOptionsChanged())); + connect(d->renameDefaultCaseType, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotRenameOptionsChanged())); - connect(d->startIndexInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotRenameOptionsChanged())); + connect(d->startIndexInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotRenameOptionsChanged())); - connect(d->changedTimer, TQT_SIGNAL(timeout()), - this, TQT_SIGNAL(signalChanged())); + connect(d->changedTimer, TQ_SIGNAL(timeout()), + this, TQ_SIGNAL(signalChanged())); - connect(d->dateTimeButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDateTimeButtonClicked())); + connect(d->dateTimeButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDateTimeButtonClicked())); - connect(d->dateTimeFormat, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotDateTimeFormatChanged(int))); + connect(d->dateTimeFormat, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotDateTimeFormatChanged(int))); - connect(d->addDateTimeBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotDateTimeBoxToggled(bool))); + connect(d->addDateTimeBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotDateTimeBoxToggled(bool))); // -- initial values --------------------------------------------------- @@ -331,13 +331,13 @@ TQString RenameCustomizer::newName(const TQDateTime &dateTime, int index, const date = dateTime.toString("yyyyMMddThhmmss"); break; case RenameCustomizerPriv::TextDateFormat: - date = dateTime.toString(Qt::TextDate); + date = dateTime.toString(TQt::TextDate); break; case RenameCustomizerPriv::LocalDateFormat: - date = dateTime.toString(Qt::LocalDate); + date = dateTime.toString(TQt::LocalDate); break; case RenameCustomizerPriv::IsoDateFormat: - date = dateTime.toString(Qt::ISODate); + date = dateTime.toString(TQt::ISODate); break; case RenameCustomizerPriv::Advanced: date = dateTime.toString(d->dateTimeFormatString); diff --git a/digikam/utilities/cameragui/renamecustomizer.h b/digikam/utilities/cameragui/renamecustomizer.h index 43d1f5c..47ad925 100644 --- a/digikam/utilities/cameragui/renamecustomizer.h +++ b/digikam/utilities/cameragui/renamecustomizer.h @@ -39,7 +39,7 @@ class RenameCustomizerPriv; class RenameCustomizer : public TQButtonGroup { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/imageeditor/canvas/canvas.cpp b/digikam/utilities/imageeditor/canvas/canvas.cpp index 8154c09..89758c3 100644 --- a/digikam/utilities/imageeditor/canvas/canvas.cpp +++ b/digikam/utilities/imageeditor/canvas/canvas.cpp @@ -174,35 +174,35 @@ Canvas::Canvas(TQWidget *parent) // ------------------------------------------------------------ - connect(this, TQT_SIGNAL(signalZoomChanged(double)), - this, TQT_SLOT(slotZoomChanged(double))); + connect(this, TQ_SIGNAL(signalZoomChanged(double)), + this, TQ_SLOT(slotZoomChanged(double))); - connect(d->cornerButton, TQT_SIGNAL(pressed()), - this, TQT_SLOT(slotCornerButtonPressed())); + connect(d->cornerButton, TQ_SIGNAL(pressed()), + this, TQ_SLOT(slotCornerButtonPressed())); - connect(d->im, TQT_SIGNAL(signalModified()), - this, TQT_SLOT(slotModified())); + connect(d->im, TQ_SIGNAL(signalModified()), + this, TQ_SLOT(slotModified())); - connect(d->im, TQT_SIGNAL(signalUndoStateChanged(bool, bool, bool)), - this, TQT_SIGNAL(signalUndoStateChanged(bool, bool, bool))); + connect(d->im, TQ_SIGNAL(signalUndoStateChanged(bool, bool, bool)), + this, TQ_SIGNAL(signalUndoStateChanged(bool, bool, bool))); - connect(d->im, TQT_SIGNAL(signalLoadingStarted(const TQString&)), - this, TQT_SIGNAL(signalLoadingStarted(const TQString&))); + connect(d->im, TQ_SIGNAL(signalLoadingStarted(const TQString&)), + this, TQ_SIGNAL(signalLoadingStarted(const TQString&))); - connect(d->im, TQT_SIGNAL(signalImageLoaded(const TQString&, bool)), - this, TQT_SLOT(slotImageLoaded(const TQString&, bool))); + connect(d->im, TQ_SIGNAL(signalImageLoaded(const TQString&, bool)), + this, TQ_SLOT(slotImageLoaded(const TQString&, bool))); - connect(d->im, TQT_SIGNAL(signalImageSaved(const TQString&, bool)), - this, TQT_SLOT(slotImageSaved(const TQString&, bool))); + connect(d->im, TQ_SIGNAL(signalImageSaved(const TQString&, bool)), + this, TQ_SLOT(slotImageSaved(const TQString&, bool))); - connect(d->im, TQT_SIGNAL(signalLoadingProgress(const TQString&, float)), - this, TQT_SIGNAL(signalLoadingProgress(const TQString&, float))); + connect(d->im, TQ_SIGNAL(signalLoadingProgress(const TQString&, float)), + this, TQ_SIGNAL(signalLoadingProgress(const TQString&, float))); - connect(d->im, TQT_SIGNAL(signalSavingProgress(const TQString&, float)), - this, TQT_SIGNAL(signalSavingProgress(const TQString&, float))); + connect(d->im, TQ_SIGNAL(signalSavingProgress(const TQString&, float)), + this, TQ_SIGNAL(signalSavingProgress(const TQString&, float))); - connect(this, TQT_SIGNAL(signalSelected(bool)), - this, TQT_SLOT(slotSelected())); + connect(this, TQ_SIGNAL(signalSelected(bool)), + this, TQ_SLOT(slotSelected())); } Canvas::~Canvas() @@ -568,7 +568,7 @@ void Canvas::paintViewport(const TQRect& er, bool antialias) TQRect rr(d->rubber->normalize()); TQRect r(i, j, d->tileSize, d->tileSize); - d->im->paintOnDevice(TQT_TQPAINTDEVICE(pix), sx, sy, sw, sh, + d->im->paintOnDevice(pix, sx, sy, sw, sh, 0, 0, d->tileSize, d->tileSize, rr.x() - i - d->pixmapRect.x(), rr.y() - j - d->pixmapRect.y(), @@ -591,7 +591,7 @@ void Canvas::paintViewport(const TQRect& er, bool antialias) } else { - d->im->paintOnDevice(TQT_TQPAINTDEVICE(pix), sx, sy, sw, sh, + d->im->paintOnDevice(pix, sx, sy, sw, sh, 0, 0, d->tileSize, d->tileSize, antialias); } @@ -637,7 +637,7 @@ void Canvas::drawRubber() TQPoint pnt(r.x(), r.y()); - style().tqdrawPrimitive(TQStyle::PE_FocusRect, &p, + style().drawPrimitive(TQStyle::PE_FocusRect, &p, TQRect(pnt.x(), pnt.y(), r.width(), r.height()), colorGroup(), TQStyle::Style_Default, TQStyleOption(colorGroup().base())); @@ -646,12 +646,12 @@ void Canvas::drawRubber() void Canvas::contentsMousePressEvent(TQMouseEvent *e) { - if (!e || e->button() == Qt::RightButton) + if (!e || e->button() == TQt::RightButton) return; d->midButtonPressed = false; - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { if (d->ltActive || d->rtActive || d->lbActive || d->rbActive) @@ -695,7 +695,7 @@ void Canvas::contentsMousePressEvent(TQMouseEvent *e) return; } } - else if (e->button() == Qt::MidButton) + else if (e->button() == TQt::MidButton) { if (visibleWidth() < d->im->width() || visibleHeight() < d->im->height()) @@ -733,7 +733,7 @@ void Canvas::contentsMouseMoveEvent(TQMouseEvent *e) if (!e) return; - if (e->state() & Qt::MidButton) + if (e->state() & TQt::MidButton) { if (d->midButtonPressed) { @@ -746,7 +746,7 @@ void Canvas::contentsMouseMoveEvent(TQMouseEvent *e) if (!d->rubber) return; - if (e->state() != Qt::LeftButton && + if (e->state() != TQt::LeftButton && !(d->ltActive || d->rtActive || d->lbActive || d->rbActive)) return; @@ -865,12 +865,12 @@ void Canvas::contentsMouseReleaseEvent(TQMouseEvent *e) emit signalSelected(false); } - if (e->button() != Qt::LeftButton) + if (e->button() != TQt::LeftButton) { viewport()->unsetCursor(); } - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { emit signalRightButtonClicked(); } @@ -1349,11 +1349,11 @@ void Canvas::slotCornerButtonPressed() pan->setRegionSelection(r); pan->setMouseFocus(); - connect(pan, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), - this, TQT_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); + connect(pan, TQ_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQ_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); - connect(pan, TQT_SIGNAL(signalHiden()), - this, TQT_SLOT(slotPanIconHiden())); + connect(pan, TQ_SIGNAL(signalHiden()), + this, TQ_SLOT(slotPanIconHiden())); TQPoint g = mapToGlobal(viewport()->pos()); g.setX(g.x()+ viewport()->size().width()); diff --git a/digikam/utilities/imageeditor/canvas/canvas.h b/digikam/utilities/imageeditor/canvas/canvas.h index 101362e..c772098 100644 --- a/digikam/utilities/imageeditor/canvas/canvas.h +++ b/digikam/utilities/imageeditor/canvas/canvas.h @@ -55,7 +55,7 @@ class IOFileSettingsContainer; class DIGIKAM_EXPORT Canvas : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp index f81a70d..1403773 100644 --- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp +++ b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp @@ -84,7 +84,7 @@ ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview, TQLabel *embeddedProfileTitle = new TQLabel(i18n("Embedded color profile:"), page); TQLabel *embeddedProfileDesc = new TQLabel(TQString("<b>%1</b>").arg(m_iccTrans->getEmbeddedProfileDescriptor()), page); TQPushButton *embeddedProfInfo = new TQPushButton(i18n("Info..."), page); - KSeparator *line = new KSeparator(Qt::Horizontal, page); + KSeparator *line = new KSeparator(TQt::Horizontal, page); if (m_iccTrans->embeddedProfile().isEmpty()) { @@ -117,7 +117,7 @@ ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview, vlay->addWidget(logo); vlay->addWidget(message); - vlay->addWidget(new KSeparator(Qt::Horizontal, page)); + vlay->addWidget(new KSeparator(TQt::Horizontal, page)); vlay->addWidget(currentProfileTitle); vlay->addWidget(currentProfileDesc); @@ -144,14 +144,14 @@ ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview, // -------------------------------------------------------------------- - connect(currentProfInfo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCurrentProfInfo()) ); + connect(currentProfInfo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCurrentProfInfo()) ); - connect(embeddedProfInfo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEmbeddedProfInfo()) ); + connect(embeddedProfInfo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEmbeddedProfInfo()) ); - connect(this, TQT_SIGNAL(applyClicked()), - this, TQT_SLOT(slotApplyClicked())); + connect(this, TQ_SIGNAL(applyClicked()), + this, TQ_SLOT(slotApplyClicked())); } ColorCorrectionDlg::~ColorCorrectionDlg() diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h index 208bc4e..7cc4c19 100644 --- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h +++ b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h @@ -45,7 +45,7 @@ class DImg; class DIGIKAM_EXPORT ColorCorrectionDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/imageeditor/canvas/dimginterface.cpp b/digikam/utilities/imageeditor/canvas/dimginterface.cpp index f8a156b..8ce1c11 100644 --- a/digikam/utilities/imageeditor/canvas/dimginterface.cpp +++ b/digikam/utilities/imageeditor/canvas/dimginterface.cpp @@ -162,17 +162,17 @@ DImgInterface::DImgInterface() d->undoMan = new UndoManager(this); d->thread = new SharedLoadSaveThread; - connect( d->thread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg&)), - this, TQT_SLOT(slotImageLoaded(const LoadingDescription &, const DImg&)) ); + connect( d->thread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg&)), + this, TQ_SLOT(slotImageLoaded(const LoadingDescription &, const DImg&)) ); - connect( d->thread, TQT_SIGNAL(signalImageSaved(const TQString&, bool)), - this, TQT_SLOT(slotImageSaved(const TQString&, bool)) ); + connect( d->thread, TQ_SIGNAL(signalImageSaved(const TQString&, bool)), + this, TQ_SLOT(slotImageSaved(const TQString&, bool)) ); - connect( d->thread, TQT_SIGNAL(signalLoadingProgress(const LoadingDescription &, float)), - this, TQT_SLOT(slotLoadingProgress(const LoadingDescription &, float)) ); + connect( d->thread, TQ_SIGNAL(signalLoadingProgress(const LoadingDescription &, float)), + this, TQ_SLOT(slotLoadingProgress(const LoadingDescription &, float)) ); - connect( d->thread, TQT_SIGNAL(signalSavingProgress(const TQString&, float)), - this, TQT_SLOT(slotSavingProgress(const TQString&, float)) ); + connect( d->thread, TQ_SIGNAL(signalSavingProgress(const TQString&, float)), + this, TQ_SLOT(slotSavingProgress(const TQString&, float)) ); } DImgInterface::~DImgInterface() @@ -201,11 +201,11 @@ void DImgInterface::load(const TQString& filename, IOFileSettingsContainer *iofi RawImport *rawImport = new RawImport(KURL(d->filename), this); EditorToolIface::editorToolIface()->loadTool(rawImport); - connect(rawImport, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(slotUseRawImportSettings())); + connect(rawImport, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(slotUseRawImportSettings())); - connect(rawImport, TQT_SIGNAL(cancelClicked()), - this, TQT_SLOT(slotUseDefaultSettings())); + connect(rawImport, TQ_SIGNAL(cancelClicked()), + this, TQ_SLOT(slotUseDefaultSettings())); } else { @@ -637,7 +637,7 @@ void DImgInterface::saveAs(const TQString& fileName, IOFileSettingsContainer *io } // Update Exif thumbnail. - TQImage thumb = preview.smoothScale(160, 120, TQ_ScaleMin); + TQImage thumb = preview.smoothScale(160, 120, TQImage::ScaleMin); meta.setExifThumbnail(thumb); // Update Exif Image dimensions. diff --git a/digikam/utilities/imageeditor/canvas/dimginterface.h b/digikam/utilities/imageeditor/canvas/dimginterface.h index 8ca147c..9a41eb0 100644 --- a/digikam/utilities/imageeditor/canvas/dimginterface.h +++ b/digikam/utilities/imageeditor/canvas/dimginterface.h @@ -49,7 +49,7 @@ class DImgInterfacePrivate; class DIGIKAM_EXPORT DImgInterface : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/imageeditor/canvas/imageplugin.cpp b/digikam/utilities/imageeditor/canvas/imageplugin.cpp index c7ae00c..b330cb5 100644 --- a/digikam/utilities/imageeditor/canvas/imageplugin.cpp +++ b/digikam/utilities/imageeditor/canvas/imageplugin.cpp @@ -53,11 +53,11 @@ void ImagePlugin::loadTool(EditorTool* tool) { EditorToolIface::editorToolIface()->loadTool(tool); - connect(tool, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(slotToolDone())); + connect(tool, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(slotToolDone())); - connect(tool, TQT_SIGNAL(cancelClicked()), - this, TQT_SLOT(slotToolDone())); + connect(tool, TQ_SIGNAL(cancelClicked()), + this, TQ_SLOT(slotToolDone())); } void ImagePlugin::slotToolDone() diff --git a/digikam/utilities/imageeditor/canvas/imageplugin.h b/digikam/utilities/imageeditor/canvas/imageplugin.h index a9559e5..ef50625 100644 --- a/digikam/utilities/imageeditor/canvas/imageplugin.h +++ b/digikam/utilities/imageeditor/canvas/imageplugin.h @@ -46,7 +46,7 @@ class EditorTool; class DIGIKAM_EXPORT ImagePlugin : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/imageeditor/canvas/undoaction.cpp b/digikam/utilities/imageeditor/canvas/undoaction.cpp index dea1a94..bb4ff75 100644 --- a/digikam/utilities/imageeditor/canvas/undoaction.cpp +++ b/digikam/utilities/imageeditor/canvas/undoaction.cpp @@ -108,9 +108,9 @@ UndoActionFlip::UndoActionFlip(DImgInterface* iface, UndoActionFlip::Direction dir) : UndoAction(iface), m_dir(dir) { - if(m_dir ==Qt::Horizontal) + if(m_dir ==TQt::Horizontal) m_title = i18n("Flip Horizontal"); - else if(m_dir ==Qt::Vertical) + else if(m_dir ==TQt::Vertical) m_title = i18n("Flip Vertical"); } @@ -122,10 +122,10 @@ void UndoActionFlip::rollBack() { switch(m_dir) { - case Qt::Horizontal: + case TQt::Horizontal: m_iface->flipHoriz(false); return; - case Qt::Vertical: + case TQt::Vertical: m_iface->flipVert(false); return; default: diff --git a/digikam/utilities/imageeditor/editor/editorstackview.cpp b/digikam/utilities/imageeditor/editor/editorstackview.cpp index 27fc2ef..6155030 100644 --- a/digikam/utilities/imageeditor/editor/editorstackview.cpp +++ b/digikam/utilities/imageeditor/editor/editorstackview.cpp @@ -66,8 +66,8 @@ void EditorStackView::setCanvas(Canvas* canvas) d->canvas = canvas; addWidget(d->canvas, CanvasMode); - connect(d->canvas, TQT_SIGNAL(signalZoomChanged(double)), - this, TQT_SLOT(slotZoomChanged(double))); + connect(d->canvas, TQ_SIGNAL(signalZoomChanged(double)), + this, TQ_SLOT(slotZoomChanged(double))); } Canvas* EditorStackView::canvas() const @@ -88,8 +88,8 @@ void EditorStackView::setToolView(TQWidget* view) PreviewWidget *preview = previewWidget(); if (preview) { - connect(preview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SLOT(slotZoomChanged(double))); + connect(preview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SLOT(slotZoomChanged(double))); } } diff --git a/digikam/utilities/imageeditor/editor/editorstackview.h b/digikam/utilities/imageeditor/editor/editorstackview.h index 66eae76..e428fcd 100644 --- a/digikam/utilities/imageeditor/editor/editorstackview.h +++ b/digikam/utilities/imageeditor/editor/editorstackview.h @@ -41,7 +41,7 @@ class EditorStackViewPriv; class DIGIKAM_EXPORT EditorStackView : public TQWidgetStack { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/utilities/imageeditor/editor/editortool.cpp b/digikam/utilities/imageeditor/editor/editortool.cpp index 55c1789..b840e67 100644 --- a/digikam/utilities/imageeditor/editor/editortool.cpp +++ b/digikam/utilities/imageeditor/editor/editortool.cpp @@ -75,8 +75,8 @@ EditorTool::EditorTool(TQObject *parent) d = new EditorToolPriv; d->timer = new TQTimer(this); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotEffect())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotEffect())); } EditorTool::~EditorTool() @@ -86,7 +86,7 @@ EditorTool::~EditorTool() void EditorTool::init() { - TQTimer::singleShot(0, this, TQT_SLOT(slotInit())); + TQTimer::singleShot(0, this, TQ_SLOT(slotInit())); } TQPixmap EditorTool::toolIcon() const @@ -131,23 +131,23 @@ void EditorTool::setToolSettings(EditorToolSettings *settings) { d->settings = settings; - connect(d->settings, TQT_SIGNAL(signalOkClicked()), - this, TQT_SLOT(slotOk())); + connect(d->settings, TQ_SIGNAL(signalOkClicked()), + this, TQ_SLOT(slotOk())); - connect(d->settings, TQT_SIGNAL(signalCancelClicked()), - this, TQT_SLOT(slotCancel())); + connect(d->settings, TQ_SIGNAL(signalCancelClicked()), + this, TQ_SLOT(slotCancel())); - connect(d->settings, TQT_SIGNAL(signalDefaultClicked()), - this, TQT_SLOT(slotResetSettings())); + connect(d->settings, TQ_SIGNAL(signalDefaultClicked()), + this, TQ_SLOT(slotResetSettings())); - connect(d->settings, TQT_SIGNAL(signalSaveAsClicked()), - this, TQT_SLOT(slotSaveAsSettings())); + connect(d->settings, TQ_SIGNAL(signalSaveAsClicked()), + this, TQ_SLOT(slotSaveAsSettings())); - connect(d->settings, TQT_SIGNAL(signalLoadClicked()), - this, TQT_SLOT(slotLoadSettings())); + connect(d->settings, TQ_SIGNAL(signalLoadClicked()), + this, TQ_SLOT(slotLoadSettings())); - connect(d->settings, TQT_SIGNAL(signalTryClicked()), - this, TQT_SLOT(slotEffect())); + connect(d->settings, TQ_SIGNAL(signalTryClicked()), + this, TQ_SLOT(slotEffect())); // Will be unblocked in slotInit() // This will prevent signals emit during tool init. @@ -279,7 +279,7 @@ void EditorToolThreaded::slotResized() filter()->stopComputation(); } - TQTimer::singleShot(0, this, TQT_SLOT(slotEffect())); + TQTimer::singleShot(0, this, TQ_SLOT(slotEffect())); } void EditorToolThreaded::slotAbort() @@ -368,8 +368,8 @@ void EditorToolThreaded::setToolView(TQWidget *view) if (dynamic_cast<ImageWidget*>(view) || dynamic_cast<ImageGuideWidget*>(view) || dynamic_cast<ImagePanelWidget*>(view)) { - connect(view, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotResized())); + connect(view, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotResized())); } } diff --git a/digikam/utilities/imageeditor/editor/editortool.h b/digikam/utilities/imageeditor/editor/editortool.h index fac45b8..120ff9f 100644 --- a/digikam/utilities/imageeditor/editor/editortool.h +++ b/digikam/utilities/imageeditor/editor/editortool.h @@ -43,7 +43,7 @@ class EditorToolPriv; class DIGIKAM_EXPORT EditorTool : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -100,7 +100,7 @@ class EditorToolThreadedPriv; class DIGIKAM_EXPORT EditorToolThreaded : public EditorTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/imageeditor/editor/editortooliface.h b/digikam/utilities/imageeditor/editor/editortooliface.h index 69948d4..ce8708c 100644 --- a/digikam/utilities/imageeditor/editor/editortooliface.h +++ b/digikam/utilities/imageeditor/editor/editortooliface.h @@ -41,7 +41,7 @@ class EditorToolIfacePriv; class DIGIKAM_EXPORT EditorToolIface : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp index a929684..3ac45cc 100644 --- a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp +++ b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp @@ -217,29 +217,29 @@ EditorToolSettings::EditorToolSettings(int buttonMask, int toolMask, TQWidget *p // --------------------------------------------------------------- - connect(d->okBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalOkClicked())); + connect(d->okBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalOkClicked())); - connect(d->cancelBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalCancelClicked())); + connect(d->cancelBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalCancelClicked())); - connect(d->tryBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalTryClicked())); + connect(d->tryBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalTryClicked())); - connect(d->defaultBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalDefaultClicked())); + connect(d->defaultBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalDefaultClicked())); - connect(d->saveAsBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalSaveAsClicked())); + connect(d->saveAsBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalSaveAsClicked())); - connect(d->loadBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalLoadClicked())); + connect(d->loadBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalLoadClicked())); - connect(d->guideColorBt, TQT_SIGNAL(changed(const TQColor&)), - this, TQT_SIGNAL(signalColorGuideChanged())); + connect(d->guideColorBt, TQ_SIGNAL(changed(const TQColor&)), + this, TQ_SIGNAL(signalColorGuideChanged())); - connect(d->guideSize, TQT_SIGNAL(valueChanged(int)), - this, TQT_SIGNAL(signalColorGuideChanged())); + connect(d->guideSize, TQ_SIGNAL(valueChanged(int)), + this, TQ_SIGNAL(signalColorGuideChanged())); } EditorToolSettings::~EditorToolSettings() diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.h b/digikam/utilities/imageeditor/editor/editortoolsettings.h index 80f2580..062b2e3 100644 --- a/digikam/utilities/imageeditor/editor/editortoolsettings.h +++ b/digikam/utilities/imageeditor/editor/editortoolsettings.h @@ -41,7 +41,7 @@ class EditorToolSettingsPriv; class DIGIKAM_EXPORT EditorToolSettings : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp index 654b28e..eed7cfe 100644 --- a/digikam/utilities/imageeditor/editor/editorwindow.cpp +++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp @@ -183,104 +183,104 @@ void EditorWindow::setupStandardConnections() { // -- Canvas connections ------------------------------------------------ - connect(m_canvas, TQT_SIGNAL(signalToggleOffFitToWindow()), - TQT_TQOBJECT(this), TQT_SLOT(slotToggleOffFitToWindow())); + connect(m_canvas, TQ_SIGNAL(signalToggleOffFitToWindow()), + this, TQ_SLOT(slotToggleOffFitToWindow())); - connect(m_canvas, TQT_SIGNAL(signalShowNextImage()), - TQT_TQOBJECT(this), TQT_SLOT(slotForward())); + connect(m_canvas, TQ_SIGNAL(signalShowNextImage()), + this, TQ_SLOT(slotForward())); - connect(m_canvas, TQT_SIGNAL(signalShowPrevImage()), - TQT_TQOBJECT(this), TQT_SLOT(slotBackward())); + connect(m_canvas, TQ_SIGNAL(signalShowPrevImage()), + this, TQ_SLOT(slotBackward())); - connect(m_canvas, TQT_SIGNAL(signalRightButtonClicked()), - TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu())); + connect(m_canvas, TQ_SIGNAL(signalRightButtonClicked()), + this, TQ_SLOT(slotContextMenu())); - connect(m_stackView, TQT_SIGNAL(signalZoomChanged(bool, bool, double)), - TQT_TQOBJECT(this), TQT_SLOT(slotZoomChanged(bool, bool, double))); + connect(m_stackView, TQ_SIGNAL(signalZoomChanged(bool, bool, double)), + this, TQ_SLOT(slotZoomChanged(bool, bool, double))); - connect(m_canvas, TQT_SIGNAL(signalChanged()), - TQT_TQOBJECT(this), TQT_SLOT(slotChanged())); + connect(m_canvas, TQ_SIGNAL(signalChanged()), + this, TQ_SLOT(slotChanged())); - connect(m_canvas, TQT_SIGNAL(signalUndoStateChanged(bool, bool, bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotUndoStateChanged(bool, bool, bool))); + connect(m_canvas, TQ_SIGNAL(signalUndoStateChanged(bool, bool, bool)), + this, TQ_SLOT(slotUndoStateChanged(bool, bool, bool))); - connect(m_canvas, TQT_SIGNAL(signalSelected(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotSelected(bool))); + connect(m_canvas, TQ_SIGNAL(signalSelected(bool)), + this, TQ_SLOT(slotSelected(bool))); - connect(m_canvas, TQT_SIGNAL(signalPrepareToLoad()), - TQT_TQOBJECT(this), TQT_SLOT(slotPrepareToLoad())); + connect(m_canvas, TQ_SIGNAL(signalPrepareToLoad()), + this, TQ_SLOT(slotPrepareToLoad())); - connect(m_canvas, TQT_SIGNAL(signalLoadingStarted(const TQString &)), - TQT_TQOBJECT(this), TQT_SLOT(slotLoadingStarted(const TQString &))); + connect(m_canvas, TQ_SIGNAL(signalLoadingStarted(const TQString &)), + this, TQ_SLOT(slotLoadingStarted(const TQString &))); - connect(m_canvas, TQT_SIGNAL(signalLoadingFinished(const TQString &, bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotLoadingFinished(const TQString &, bool))); + connect(m_canvas, TQ_SIGNAL(signalLoadingFinished(const TQString &, bool)), + this, TQ_SLOT(slotLoadingFinished(const TQString &, bool))); - connect(m_canvas, TQT_SIGNAL(signalLoadingProgress(const TQString &, float)), - TQT_TQOBJECT(this), TQT_SLOT(slotLoadingProgress(const TQString &, float))); + connect(m_canvas, TQ_SIGNAL(signalLoadingProgress(const TQString &, float)), + this, TQ_SLOT(slotLoadingProgress(const TQString &, float))); - connect(m_canvas, TQT_SIGNAL(signalSavingStarted(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotSavingStarted(const TQString&))); + connect(m_canvas, TQ_SIGNAL(signalSavingStarted(const TQString&)), + this, TQ_SLOT(slotSavingStarted(const TQString&))); - connect(m_canvas, TQT_SIGNAL(signalSavingFinished(const TQString&, bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotSavingFinished(const TQString&, bool))); + connect(m_canvas, TQ_SIGNAL(signalSavingFinished(const TQString&, bool)), + this, TQ_SLOT(slotSavingFinished(const TQString&, bool))); - connect(m_canvas, TQT_SIGNAL(signalSavingProgress(const TQString&, float)), - TQT_TQOBJECT(this), TQT_SLOT(slotSavingProgress(const TQString&, float))); + connect(m_canvas, TQ_SIGNAL(signalSavingProgress(const TQString&, float)), + this, TQ_SLOT(slotSavingProgress(const TQString&, float))); - connect(m_canvas, TQT_SIGNAL(signalSelectionChanged(const TQRect&)), - TQT_TQOBJECT(this), TQT_SLOT(slotSelectionChanged(const TQRect&))); + connect(m_canvas, TQ_SIGNAL(signalSelectionChanged(const TQRect&)), + this, TQ_SLOT(slotSelectionChanged(const TQRect&))); // -- if rotating/flipping set the rotatedflipped flag to true ----------- - connect(d->rotateLeftAction, TQT_SIGNAL(activated()), - TQT_TQOBJECT(this), TQT_SLOT(slotRotatedOrFlipped())); + connect(d->rotateLeftAction, TQ_SIGNAL(activated()), + this, TQ_SLOT(slotRotatedOrFlipped())); - connect(d->rotateRightAction, TQT_SIGNAL(activated()), - TQT_TQOBJECT(this), TQT_SLOT(slotRotatedOrFlipped())); + connect(d->rotateRightAction, TQ_SIGNAL(activated()), + this, TQ_SLOT(slotRotatedOrFlipped())); - connect(d->flipHorizAction, TQT_SIGNAL(activated()), - TQT_TQOBJECT(this), TQT_SLOT(slotRotatedOrFlipped())); + connect(d->flipHorizAction, TQ_SIGNAL(activated()), + this, TQ_SLOT(slotRotatedOrFlipped())); - connect(d->flipVertAction, TQT_SIGNAL(activated()), - TQT_TQOBJECT(this), TQT_SLOT(slotRotatedOrFlipped())); + connect(d->flipVertAction, TQ_SIGNAL(activated()), + this, TQ_SLOT(slotRotatedOrFlipped())); // -- status bar connections -------------------------------------- - connect(m_nameLabel, TQT_SIGNAL(signalCancelButtonPressed()), - TQT_TQOBJECT(this), TQT_SLOT(slotNameLabelCancelButtonPressed())); + connect(m_nameLabel, TQ_SIGNAL(signalCancelButtonPressed()), + this, TQ_SLOT(slotNameLabelCancelButtonPressed())); - connect(m_nameLabel, TQT_SIGNAL(signalCancelButtonPressed()), - d->toolIface, TQT_SLOT(slotToolAborted())); + connect(m_nameLabel, TQ_SIGNAL(signalCancelButtonPressed()), + d->toolIface, TQ_SLOT(slotToolAborted())); } void EditorWindow::setupStandardActions() { // -- Standard 'File' menu actions --------------------------------------------- - m_backwardAction = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), + m_backwardAction = KStdAction::back(this, TQ_SLOT(slotBackward()), actionCollection(), "editorwindow_backward"); - m_forwardAction = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotForward()), + m_forwardAction = KStdAction::forward(this, TQ_SLOT(slotForward()), actionCollection(), "editorwindow_forward"); m_firstAction = new TDEAction(i18n("&First"), "go-first", TDEStdAccel::shortcut( TDEStdAccel::Home), - TQT_TQOBJECT(this), TQT_SLOT(slotFirst()), + this, TQ_SLOT(slotFirst()), actionCollection(), "editorwindow_first"); m_lastAction = new TDEAction(i18n("&Last"), "go-last", TDEStdAccel::shortcut( TDEStdAccel::End), - TQT_TQOBJECT(this), TQT_SLOT(slotLast()), + this, TQ_SLOT(slotLast()), actionCollection(), "editorwindow_last"); - m_saveAction = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotSave()), + m_saveAction = KStdAction::save(this, TQ_SLOT(slotSave()), actionCollection(), "editorwindow_save"); - m_saveAsAction = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), + m_saveAsAction = KStdAction::saveAs(this, TQ_SLOT(slotSaveAs()), actionCollection(), "editorwindow_saveas"); - m_revertAction = KStdAction::revert(TQT_TQOBJECT(this), TQT_SLOT(slotRevert()), + m_revertAction = KStdAction::revert(this, TQ_SLOT(slotRevert()), actionCollection(), "editorwindow_revert"); m_saveAction->setEnabled(false); @@ -289,86 +289,86 @@ void EditorWindow::setupStandardActions() d->filePrintAction = new TDEAction(i18n("Print Image..."), "document-print", CTRL+Key_P, - TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), + this, TQ_SLOT(slotFilePrint()), actionCollection(), "editorwindow_print"); m_fileDeleteAction = new TDEAction(i18n("Move to Trash"), "edittrash", Key_Delete, - TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrentItem()), + this, TQ_SLOT(slotDeleteCurrentItem()), actionCollection(), "editorwindow_delete"); - KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "editorwindow_close"); + KStdAction::close(this, TQ_SLOT(close()), actionCollection(), "editorwindow_close"); // -- Standard 'Edit' menu actions --------------------------------------------- - d->copyAction = KStdAction::copy(TQT_TQOBJECT(m_canvas), TQT_SLOT(slotCopy()), + d->copyAction = KStdAction::copy(m_canvas, TQ_SLOT(slotCopy()), actionCollection(), "editorwindow_copy"); d->copyAction->setEnabled(false); m_undoAction = new TDEToolBarPopupAction(i18n("Undo"), "edit-undo", TDEStdAccel::shortcut(TDEStdAccel::Undo), - TQT_TQOBJECT(m_canvas), TQT_SLOT(slotUndo()), + m_canvas, TQ_SLOT(slotUndo()), actionCollection(), "editorwindow_undo"); - connect(m_undoAction->popupMenu(), TQT_SIGNAL(aboutToShow()), - TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowUndoMenu())); + connect(m_undoAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotAboutToShowUndoMenu())); - connect(m_undoAction->popupMenu(), TQT_SIGNAL(activated(int)), - TQT_TQOBJECT(m_canvas), TQT_SLOT(slotUndo(int))); + connect(m_undoAction->popupMenu(), TQ_SIGNAL(activated(int)), + m_canvas, TQ_SLOT(slotUndo(int))); m_undoAction->setEnabled(false); m_redoAction = new TDEToolBarPopupAction(i18n("Redo"), "edit-redo", TDEStdAccel::shortcut(TDEStdAccel::Redo), - TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRedo()), + m_canvas, TQ_SLOT(slotRedo()), actionCollection(), "editorwindow_redo"); - connect(m_redoAction->popupMenu(), TQT_SIGNAL(aboutToShow()), - TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowRedoMenu())); + connect(m_redoAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotAboutToShowRedoMenu())); - connect(m_redoAction->popupMenu(), TQT_SIGNAL(activated(int)), - TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRedo(int))); + connect(m_redoAction->popupMenu(), TQ_SIGNAL(activated(int)), + m_canvas, TQ_SLOT(slotRedo(int))); m_redoAction->setEnabled(false); d->selectAllAction = new TDEAction(i18n("Select All"), 0, CTRL+Key_A, - TQT_TQOBJECT(m_canvas), - TQT_SLOT(slotSelectAll()), + m_canvas, + TQ_SLOT(slotSelectAll()), actionCollection(), "editorwindow_selectAll"); d->selectNoneAction = new TDEAction(i18n("Select None"), 0, CTRL+SHIFT+Key_A, - TQT_TQOBJECT(m_canvas), - TQT_SLOT(slotSelectNone()), + m_canvas, + TQ_SLOT(slotSelectNone()), actionCollection(), "editorwindow_selectNone"); // -- Standard 'View' menu actions --------------------------------------------- - d->zoomPlusAction = KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseZoom()), + d->zoomPlusAction = KStdAction::zoomIn(this, TQ_SLOT(slotIncreaseZoom()), actionCollection(), "editorwindow_zoomplus"); - d->zoomMinusAction = KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseZoom()), + d->zoomMinusAction = KStdAction::zoomOut(this, TQ_SLOT(slotDecreaseZoom()), actionCollection(), "editorwindow_zoomminus"); d->zoomTo100percents = new TDEAction(i18n("Zoom to 100%"), "zoom-original", ALT+CTRL+Key_0, // NOTE: Photoshop 7 use ALT+CTRL+0. - TQT_TQOBJECT(this), TQT_SLOT(slotZoomTo100Percents()), + this, TQ_SLOT(slotZoomTo100Percents()), actionCollection(), "editorwindow_zoomto100percents"); d->zoomFitToWindowAction = new TDEToggleAction(i18n("Fit to &Window"), "view_fit_window", CTRL+SHIFT+Key_E, // NOTE: Gimp 2 use CTRL+SHIFT+E. - TQT_TQOBJECT(this), TQT_SLOT(slotToggleFitToWindow()), + this, TQ_SLOT(slotToggleFitToWindow()), actionCollection(), "editorwindow_zoomfit2window"); d->zoomFitToSelectAction = new TDEAction(i18n("Fit to &Selection"), "zoom-fit-best", - ALT+CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotFitToSelect()), + ALT+CTRL+Key_S, this, TQ_SLOT(slotFitToSelect()), actionCollection(), "editorwindow_zoomfit2select"); d->zoomFitToSelectAction->setEnabled(false); d->zoomFitToSelectAction->setWhatsThis(i18n("This option can be used to zoom the image to the " @@ -376,7 +376,7 @@ void EditorWindow::setupStandardActions() d->zoomCombo = new KComboBox(true); d->zoomCombo->setDuplicatesEnabled(false); - d->zoomCombo->setFocusPolicy(TQ_ClickFocus); + d->zoomCombo->setFocusPolicy(TQWidget::ClickFocus); d->zoomCombo->setInsertionPolicy(TQComboBox::NoInsertion); d->zoomComboAction = new KWidgetAction(d->zoomCombo, i18n("Zoom"), 0, 0, 0, actionCollection(), "editorwindow_zoomto"); @@ -394,47 +394,47 @@ void EditorWindow::setupStandardActions() d->zoomCombo->insertItem(TQString("800%")); d->zoomCombo->insertItem(TQString("1200%")); - connect(d->zoomCombo, TQT_SIGNAL(activated(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotZoomSelected()) ); + connect(d->zoomCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotZoomSelected()) ); - connect(d->zoomCombo, TQT_SIGNAL(returnPressed(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotZoomTextChanged(const TQString &)) ); + connect(d->zoomCombo, TQ_SIGNAL(returnPressed(const TQString&)), + this, TQ_SLOT(slotZoomTextChanged(const TQString &)) ); // Do not use std KDE action for full screen because action text is too large for app. toolbar. m_fullScreenAction = new TDEToggleAction(i18n("Full Screen"), "view-fullscreen", - CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleFullScreen()), + CTRL+SHIFT+Key_F, this, + TQ_SLOT(slotToggleFullScreen()), actionCollection(), "editorwindow_fullscreen"); m_fullScreenAction->setWhatsThis(i18n("Toggle the window to full screen mode")); d->slideShowAction = new TDEAction(i18n("Slideshow"), "slideshow", Key_F9, - TQT_TQOBJECT(this), TQT_SLOT(slotToggleSlideShow()), + this, TQ_SLOT(slotToggleSlideShow()), actionCollection(),"editorwindow_slideshow"); d->viewUnderExpoAction = new TDEToggleAction(i18n("Under-Exposure Indicator"), "underexposure", - Key_F10, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleUnderExposureIndicator()), + Key_F10, this, + TQ_SLOT(slotToggleUnderExposureIndicator()), actionCollection(),"editorwindow_underexposure"); d->viewOverExpoAction = new TDEToggleAction(i18n("Over-Exposure Indicator"), "overexposure", - Key_F11, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleOverExposureIndicator()), + Key_F11, this, + TQ_SLOT(slotToggleOverExposureIndicator()), actionCollection(),"editorwindow_overexposure"); d->viewCMViewAction = new TDEToggleAction(i18n("Color Managed View"), "tv", - Key_F12, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleColorManagedView()), + Key_F12, this, + TQ_SLOT(slotToggleColorManagedView()), actionCollection(),"editorwindow_cmview"); // -- Standard 'Transform' menu actions --------------------------------------------- d->resizeAction = new TDEAction(i18n("&Resize..."), "resize_image", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotResize()), + this, TQ_SLOT(slotResize()), actionCollection(), "editorwindow_resize"); d->cropAction = new TDEAction(i18n("Crop"), "crop", CTRL+Key_X, - TQT_TQOBJECT(m_canvas), TQT_SLOT(slotCrop()), + m_canvas, TQ_SLOT(slotCrop()), actionCollection(), "editorwindow_crop"); d->cropAction->setEnabled(false); @@ -444,12 +444,12 @@ void EditorWindow::setupStandardActions() // -- Standard 'Flip' menu actions --------------------------------------------- d->flipHorizAction = new TDEAction(i18n("Flip Horizontally"), "mirror", CTRL+Key_Asterisk, - TQT_TQOBJECT(m_canvas), TQT_SLOT(slotFlipHoriz()), + m_canvas, TQ_SLOT(slotFlipHoriz()), actionCollection(), "editorwindow_flip_horiz"); d->flipHorizAction->setEnabled(false); d->flipVertAction = new TDEAction(i18n("Flip Vertically"), "flip", CTRL+Key_Slash, - TQT_TQOBJECT(m_canvas), TQT_SLOT(slotFlipVert()), + m_canvas, TQ_SLOT(slotFlipVert()), actionCollection(), "editorwindow_flip_vert"); d->flipVertAction->setEnabled(false); @@ -457,55 +457,55 @@ void EditorWindow::setupStandardActions() d->rotateLeftAction = new TDEAction(i18n("Rotate Left"), "object-rotate-left", SHIFT+CTRL+Key_Left, - TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRotate270()), + m_canvas, TQ_SLOT(slotRotate270()), actionCollection(), "editorwindow_rotate_left"); d->rotateLeftAction->setEnabled(false); d->rotateRightAction = new TDEAction(i18n("Rotate Right"), "object-rotate-right", SHIFT+CTRL+Key_Right, - TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRotate90()), + m_canvas, TQ_SLOT(slotRotate90()), actionCollection(), "editorwindow_rotate_right"); d->rotateRightAction->setEnabled(false); // -- Standard 'Configure' menu actions ---------------------------------------- - d->showMenuBarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection()); + d->showMenuBarAction = KStdAction::showMenubar(this, TQ_SLOT(slotShowMenuBar()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbars()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotSetup()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotEditKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(slotSetup()), actionCollection()); // ----------------------------------------------------------------------------------------- m_themeMenuAction = new TDESelectAction(i18n("&Themes"), 0, actionCollection(), "theme_menu"); m_themeMenuAction->setItems(ThemeEngine::instance()->themeNames()); - connect(m_themeMenuAction, TQT_SIGNAL(activated(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotChangeTheme(const TQString&))); + connect(m_themeMenuAction, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotChangeTheme(const TQString&))); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - TQT_TQOBJECT(this), TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); // -- Standard 'Help' menu actions --------------------------------------------- d->donateMoneyAction = new TDEAction(i18n("Donate..."), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotDonateMoney()), + this, TQ_SLOT(slotDonateMoney()), actionCollection(), "editorwindow_donatemoney"); d->contributeAction = new TDEAction(i18n("Contribute..."), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotContribute()), + this, TQ_SLOT(slotContribute()), actionCollection(), "editorwindow_contribute"); d->rawCameraListAction = new TDEAction(i18n("Supported RAW Cameras"), "kdcraw", 0, - TQT_TQOBJECT(this), - TQT_SLOT(slotRawCameraList()), + this, + TQ_SLOT(slotRawCameraList()), actionCollection(), "editorwindow_rawcameralist"); } @@ -516,47 +516,47 @@ void EditorWindow::setupStandardAccelerators() d->accelerators->insert("Exit fullscreen", i18n("Exit Fullscreen mode"), i18n("Exit out of the fullscreen mode"), - Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotEscapePressed()), + Key_Escape, this, TQ_SLOT(slotEscapePressed()), false, true); d->accelerators->insert("Next Image Key_Space", i18n("Next Image"), i18n("Load Next Image"), - Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotForward()), + Key_Space, this, TQ_SLOT(slotForward()), false, true); d->accelerators->insert("Previous Image SHIFT+Key_Space", i18n("Previous Image"), i18n("Load Previous Image"), - SHIFT+Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), + SHIFT+Key_Space, this, TQ_SLOT(slotBackward()), false, true); d->accelerators->insert("Previous Image Key_Backspace", i18n("Previous Image"), i18n("Load Previous Image"), - Key_Backspace, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), + Key_Backspace, this, TQ_SLOT(slotBackward()), false, true); d->accelerators->insert("Next Image Key_Next", i18n("Next Image"), i18n("Load Next Image"), - Key_Next, TQT_TQOBJECT(this), TQT_SLOT(slotForward()), + Key_Next, this, TQ_SLOT(slotForward()), false, true); d->accelerators->insert("Previous Image Key_Prior", i18n("Previous Image"), i18n("Load Previous Image"), - Key_Prior, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), + Key_Prior, this, TQ_SLOT(slotBackward()), false, true); d->accelerators->insert("Zoom Plus Key_Plus", i18n("Zoom In"), i18n("Zoom in on Image"), - Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseZoom()), + Key_Plus, this, TQ_SLOT(slotIncreaseZoom()), false, true); d->accelerators->insert("Zoom Plus Key_Minus", i18n("Zoom Out"), i18n("Zoom out of Image"), - Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseZoom()), + Key_Minus, this, TQ_SLOT(slotDecreaseZoom()), false, true); d->accelerators->insert("Redo CTRL+Key_Y", i18n("Redo"), i18n("Redo Last action"), - CTRL+Key_Y, TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRedo()), + CTRL+Key_Y, m_canvas, TQ_SLOT(slotRedo()), false, true); } @@ -594,14 +594,14 @@ void EditorWindow::setupStatusBar() d->cmViewIndicator->setToggleButton(true); statusBar()->addWidget(d->cmViewIndicator, 1); - connect(d->underExposureIndicator, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotToggleUnderExposureIndicator())); + connect(d->underExposureIndicator, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleUnderExposureIndicator())); - connect(d->overExposureIndicator, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotToggleOverExposureIndicator())); + connect(d->overExposureIndicator, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleOverExposureIndicator())); - connect(d->cmViewIndicator, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotToggleColorManagedView())); + connect(d->cmViewIndicator, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleColorManagedView())); } void EditorWindow::printImage(KURL url) @@ -702,8 +702,8 @@ void EditorWindow::slotConfToolbars() saveMainWindowSettings(TDEGlobal::config(), "ImageViewer Settings"); KEditToolbar dlg(factory(), this); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } @@ -795,7 +795,7 @@ void EditorWindow::plugActionAccel(TDEAction* action) action->whatsThis(), action->shortcut(), action, - TQT_SLOT(activate())); + TQ_SLOT(activate())); } void EditorWindow::unplugActionAccel(TDEAction* action) @@ -1054,7 +1054,7 @@ void EditorWindow::slotToggleFullScreen() if (obj) { - TDEToolBar* toolBar = static_cast<TDEToolBar*>(TQT_TQWIDGET(obj)); + TDEToolBar* toolBar = static_cast<TDEToolBar*>(obj); if (m_fullScreenAction->isPlugged(toolBar) && d->removeFullScreenButton) m_fullScreenAction->unplug(toolBar); @@ -1100,7 +1100,7 @@ void EditorWindow::slotToggleFullScreen() if (obj) { - TDEToolBar* toolBar = static_cast<TDEToolBar*>(TQT_TQWIDGET(obj)); + TDEToolBar* toolBar = static_cast<TDEToolBar*>(obj); if (d->fullScreenHideToolBar) { @@ -1254,7 +1254,7 @@ bool EditorWindow::waitForSavingToComplete() void EditorWindow::enter_loop() { TQWidget dummy(0, 0, WType_Dialog | WShowModal); - dummy.setFocusPolicy( TQ_NoFocus ); + dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); tqApp->enter_loop(); tqt_leave_modal(&dummy); @@ -1543,11 +1543,11 @@ bool EditorWindow::startingSaveAs(const KURL& url) false, options); - connect(&imageFileSaveDialog, TQT_SIGNAL(filterChanged(const TQString &)), - options, TQT_SLOT(slotImageFileFormatChanged(const TQString &))); + connect(&imageFileSaveDialog, TQ_SIGNAL(filterChanged(const TQString &)), + options, TQ_SLOT(slotImageFileFormatChanged(const TQString &))); - connect(&imageFileSaveDialog, TQT_SIGNAL(fileSelected(const TQString &)), - options, TQT_SLOT(slotImageFileSelected(const TQString &))); + connect(&imageFileSaveDialog, TQ_SIGNAL(fileSelected(const TQString &)), + options, TQ_SLOT(slotImageFileSelected(const TQString &))); ImageDialogPreview *preview = new ImageDialogPreview(&imageFileSaveDialog); imageFileSaveDialog.setPreviewWidget(preview); diff --git a/digikam/utilities/imageeditor/editor/editorwindow.h b/digikam/utilities/imageeditor/editor/editorwindow.h index e469dfc..cbb0622 100644 --- a/digikam/utilities/imageeditor/editor/editorwindow.h +++ b/digikam/utilities/imageeditor/editor/editorwindow.h @@ -65,7 +65,7 @@ class EditorWindowPriv; class DIGIKAM_EXPORT EditorWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/imageeditor/editor/imageiface.cpp b/digikam/utilities/imageeditor/editor/imageiface.cpp index aa842e0..56cb559 100644 --- a/digikam/utilities/imageeditor/editor/imageiface.cpp +++ b/digikam/utilities/imageeditor/editor/imageiface.cpp @@ -420,7 +420,7 @@ void ImageIface::paint(TQPaintDevice* device, int x, int y, int w, int h, pixImage = d->targetPreviewImage.convertToPixmap(); } - bitBlt(TQT_TQPAINTDEVICE(&d->qpix), 0, 0, TQT_TQPAINTDEVICE(&pixImage), 0, 0, w, h, TQt::CopyROP, false); + bitBlt(&d->qpix, 0, 0, static_cast<TQPaintDevice*>(&pixImage), 0, 0, w, h, TQt::CopyROP, false); // Show the Over/Under exposure pixels indicators @@ -434,11 +434,11 @@ void ImageIface::paint(TQPaintDevice* device, int x, int y, int w, int h, TQImage pureColorMask = d->targetPreviewImage.pureColorMask(&expoSettings); TQPixmap pixMask(pureColorMask); - bitBlt(TQT_TQPAINTDEVICE(&d->qpix), 0, 0, TQT_TQPAINTDEVICE(&pixMask), 0, 0, w, h, TQt::CopyROP, false); + bitBlt(&d->qpix, 0, 0, static_cast<TQPaintDevice*>(&pixMask), 0, 0, w, h, TQt::CopyROP, false); } } - bitBlt(TQT_TQPAINTDEVICE(device), x, y, TQT_TQPAINTDEVICE(&d->qpix), 0, 0, -1, -1, TQt::CopyROP, false); + bitBlt(device, x, y, static_cast<TQPaintDevice*>(&d->qpix), 0, 0, -1, -1, TQt::CopyROP, false); } } // namespace Digikam diff --git a/digikam/utilities/imageeditor/editor/imagewindow.cpp b/digikam/utilities/imageeditor/editor/imagewindow.cpp index 5b54935..2c10a6f 100644 --- a/digikam/utilities/imageeditor/editor/imagewindow.cpp +++ b/digikam/utilities/imageeditor/editor/imagewindow.cpp @@ -253,22 +253,22 @@ void ImageWindow::setupConnections() // To toggle properly keyboards shortcuts from comments & tags side bar tab. - connect(d->rightSidebar, TQT_SIGNAL(signalNextItem()), - TQT_TQOBJECT(this), TQT_SLOT(slotForward())); + connect(d->rightSidebar, TQ_SIGNAL(signalNextItem()), + this, TQ_SLOT(slotForward())); - connect(d->rightSidebar, TQT_SIGNAL(signalPrevItem()), - TQT_TQOBJECT(this), TQT_SLOT(slotBackward())); + connect(d->rightSidebar, TQ_SIGNAL(signalPrevItem()), + this, TQ_SLOT(slotBackward())); - connect(this, TQT_SIGNAL(signalSelectionChanged( const TQRect &)), - d->rightSidebar, TQT_SLOT(slotImageSelectionChanged( const TQRect &))); + connect(this, TQ_SIGNAL(signalSelectionChanged( const TQRect &)), + d->rightSidebar, TQ_SLOT(slotImageSelectionChanged( const TQRect &))); - connect(this, TQT_SIGNAL(signalNoCurrentItem()), - d->rightSidebar, TQT_SLOT(slotNoCurrentItem())); + connect(this, TQ_SIGNAL(signalNoCurrentItem()), + d->rightSidebar, TQ_SLOT(slotNoCurrentItem())); ImageAttributesWatch *watch = ImageAttributesWatch::instance(); - connect(watch, TQT_SIGNAL(signalFileMetadataChanged(const KURL &)), - TQT_TQOBJECT(this), TQT_SLOT(slotFileMetadataChanged(const KURL &))); + connect(watch, TQ_SIGNAL(signalFileMetadataChanged(const KURL &)), + this, TQ_SLOT(slotFileMetadataChanged(const KURL &))); } void ImageWindow::setupUserArea() @@ -312,22 +312,22 @@ void ImageWindow::setupActions() // -- Rating actions --------------------------------------------------------------- d->star0 = new TDEAction(i18n("Assign Rating \"No Stars\""), CTRL+Key_0, - TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingNoStar()), + this, TQ_SLOT(slotAssignRatingNoStar()), actionCollection(), "imageview_ratenostar"); d->star1 = new TDEAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1, - TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingOneStar()), + this, TQ_SLOT(slotAssignRatingOneStar()), actionCollection(), "imageview_rateonestar"); d->star2 = new TDEAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2, - TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingTwoStar()), + this, TQ_SLOT(slotAssignRatingTwoStar()), actionCollection(), "imageview_ratetwostar"); d->star3 = new TDEAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3, - TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingThreeStar()), + this, TQ_SLOT(slotAssignRatingThreeStar()), actionCollection(), "imageview_ratethreestar"); d->star4 = new TDEAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4, - TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingFourStar()), + this, TQ_SLOT(slotAssignRatingFourStar()), actionCollection(), "imageview_ratefourstar"); d->star5 = new TDEAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5, - TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingFiveStar()), + this, TQ_SLOT(slotAssignRatingFiveStar()), actionCollection(), "imageview_ratefivestar"); // -- Special Delete actions --------------------------------------------------------------- @@ -336,8 +336,8 @@ void ImageWindow::setupActions() d->fileDeletePermanentlyAction = new TDEAction(i18n("Delete File Permanently"), "edit-delete", SHIFT+Key_Delete, - TQT_TQOBJECT(this), - TQT_SLOT(slotDeleteCurrentItemPermanently()), + this, + TQ_SLOT(slotDeleteCurrentItemPermanently()), actionCollection(), "image_delete_permanently"); @@ -346,16 +346,16 @@ void ImageWindow::setupActions() d->fileDeletePermanentlyDirectlyAction = new TDEAction(i18n("Delete Permanently without Confirmation"), "edit-delete", 0, - TQT_TQOBJECT(this), - TQT_SLOT(slotDeleteCurrentItemPermanentlyDirectly()), + this, + TQ_SLOT(slotDeleteCurrentItemPermanentlyDirectly()), actionCollection(), "image_delete_permanently_directly"); d->fileTrashDirectlyAction = new TDEAction(i18n("Move to Trash without Confirmation"), "edittrash", 0, - TQT_TQOBJECT(this), - TQT_SLOT(slotTrashCurrentItemDirectly()), + this, + TQ_SLOT(slotTrashCurrentItemDirectly()), actionCollection(), "image_trash_directly"); @@ -455,7 +455,7 @@ void ImageWindow::loadCurrentList(const TQString& caption, bool allowSaving) m_undoAction->setEnabled(false); m_redoAction->setEnabled(false); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotLoadCurrent())); + TQTimer::singleShot(0, this, TQ_SLOT(slotLoadCurrent())); } void ImageWindow::slotLoadCurrent() @@ -568,11 +568,11 @@ void ImageWindow::slotContextMenu() m_contextMenu->insertItem(i18n("Assign Tag"), assignTagsMenu); int i = m_contextMenu->insertItem(i18n("Remove Tag"), removeTagsMenu); - connect(assignTagsMenu, TQT_SIGNAL(signalTagActivated(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotAssignTag(int))); + connect(assignTagsMenu, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotAssignTag(int))); - connect(removeTagsMenu, TQT_SIGNAL(signalTagActivated(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotRemoveTag(int))); + connect(removeTagsMenu, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotRemoveTag(int))); AlbumDB* db = AlbumManager::instance()->albumDB(); if (!db->hasTags( idList )) @@ -584,8 +584,8 @@ void ImageWindow::slotContextMenu() ratingMenu = new RatingPopupMenu(); - connect(ratingMenu, TQT_SIGNAL(activated(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotAssignRating(int))); + connect(ratingMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAssignRating(int))); m_contextMenu->insertItem(i18n("Assign Rating"), ratingMenu); } diff --git a/digikam/utilities/imageeditor/editor/imagewindow.h b/digikam/utilities/imageeditor/editor/imagewindow.h index d15e086..389518a 100644 --- a/digikam/utilities/imageeditor/editor/imagewindow.h +++ b/digikam/utilities/imageeditor/editor/imagewindow.h @@ -50,7 +50,7 @@ class SlideShowSettings; class ImageWindow : public EditorWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/imageeditor/rawimport/rawimport.cpp b/digikam/utilities/imageeditor/rawimport/rawimport.cpp index 7bc1e7a..a9254ce 100644 --- a/digikam/utilities/imageeditor/rawimport/rawimport.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawimport.cpp @@ -95,32 +95,32 @@ void RawImport::slotInit() // --------------------------------------------------------------- - connect(d->previewWidget, TQT_SIGNAL(signalLoadingStarted()), - this, TQT_SLOT(slotLoadingStarted())); + connect(d->previewWidget, TQ_SIGNAL(signalLoadingStarted()), + this, TQ_SLOT(slotLoadingStarted())); - connect(d->previewWidget, TQT_SIGNAL(signalDemosaicedImage()), - this, TQT_SLOT(slotDemosaicedImage())); + connect(d->previewWidget, TQ_SIGNAL(signalDemosaicedImage()), + this, TQ_SLOT(slotDemosaicedImage())); - connect(d->previewWidget, TQT_SIGNAL(signalLoadingStarted()), - this, TQT_SLOT(slotLoadingStarted())); + connect(d->previewWidget, TQ_SIGNAL(signalLoadingStarted()), + this, TQ_SLOT(slotLoadingStarted())); - connect(d->previewWidget, TQT_SIGNAL(signalLoadingProgress(float)), - this, TQT_SLOT(slotLoadingProgress(float))); + connect(d->previewWidget, TQ_SIGNAL(signalLoadingProgress(float)), + this, TQ_SLOT(slotLoadingProgress(float))); - connect(d->previewWidget, TQT_SIGNAL(signalLoadingFailed()), - this, TQT_SLOT(slotLoadingFailed())); + connect(d->previewWidget, TQ_SIGNAL(signalLoadingFailed()), + this, TQ_SLOT(slotLoadingFailed())); - connect(d->settingsBox, TQT_SIGNAL(signalDemosaicingChanged()), - this, TQT_SLOT(slotDemosaicingChanged())); + connect(d->settingsBox, TQ_SIGNAL(signalDemosaicingChanged()), + this, TQ_SLOT(slotDemosaicingChanged())); - connect(d->settingsBox, TQT_SIGNAL(signalPostProcessingChanged()), - this, TQT_SLOT(slotTimer())); + connect(d->settingsBox, TQ_SIGNAL(signalPostProcessingChanged()), + this, TQ_SLOT(slotTimer())); - connect(d->settingsBox, TQT_SIGNAL(signalUpdatePreview()), - this, TQT_SLOT(slotUpdatePreview())); + connect(d->settingsBox, TQ_SIGNAL(signalUpdatePreview()), + this, TQ_SLOT(slotUpdatePreview())); - connect(d->settingsBox, TQT_SIGNAL(signalAbortPreview()), - this, TQT_SLOT(slotAbort())); + connect(d->settingsBox, TQ_SIGNAL(signalAbortPreview()), + this, TQ_SLOT(slotAbort())); // --------------------------------------------------------------- diff --git a/digikam/utilities/imageeditor/rawimport/rawimport.h b/digikam/utilities/imageeditor/rawimport/rawimport.h index d3cec1d..85255bc 100644 --- a/digikam/utilities/imageeditor/rawimport/rawimport.h +++ b/digikam/utilities/imageeditor/rawimport/rawimport.h @@ -45,7 +45,7 @@ class RawImportPriv; class DIGIKAM_EXPORT RawImport : public EditorToolThreaded { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp index d4b409e..3207ba1 100644 --- a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp @@ -103,17 +103,17 @@ RawPreview::RawPreview(const KURL& url, TQWidget *parent) // ------------------------------------------------------------ - connect(d->thread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription&, const DImg&)), - this, TQT_SLOT(slotImageLoaded(const LoadingDescription&, const DImg&))); + connect(d->thread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription&, const DImg&)), + this, TQ_SLOT(slotImageLoaded(const LoadingDescription&, const DImg&))); - connect(d->thread, TQT_SIGNAL(signalLoadingProgress(const LoadingDescription&, float)), - this, TQT_SLOT(slotLoadingProgress(const LoadingDescription&, float))); + connect(d->thread, TQ_SIGNAL(signalLoadingProgress(const LoadingDescription&, float)), + this, TQ_SLOT(slotLoadingProgress(const LoadingDescription&, float))); - connect(d->cornerButton, TQT_SIGNAL(pressed()), - this, TQT_SLOT(slotCornerButtonPressed())); + connect(d->cornerButton, TQ_SIGNAL(pressed()), + this, TQ_SLOT(slotCornerButtonPressed())); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); // ------------------------------------------------------------ @@ -224,11 +224,11 @@ void RawPreview::slotCornerButtonPressed() pan->setRegionSelection(r); pan->setMouseFocus(); - connect(pan, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), - this, TQT_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); + connect(pan, TQ_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQ_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); - connect(pan, TQT_SIGNAL(signalHiden()), - this, TQT_SLOT(slotPanIconHiden())); + connect(pan, TQ_SIGNAL(signalHiden()), + this, TQ_SLOT(slotPanIconHiden())); TQPoint g = mapToGlobal(viewport()->pos()); g.setX(g.x()+ viewport()->size().width()); diff --git a/digikam/utilities/imageeditor/rawimport/rawpreview.h b/digikam/utilities/imageeditor/rawimport/rawpreview.h index 8dfd63e..6c7e537 100644 --- a/digikam/utilities/imageeditor/rawimport/rawpreview.h +++ b/digikam/utilities/imageeditor/rawimport/rawpreview.h @@ -49,7 +49,7 @@ class RawPreviewPriv; class DIGIKAM_EXPORT RawPreview : public PreviewWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp index 2618162..bf0ee67 100644 --- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp @@ -342,7 +342,7 @@ RawSettingsBox::RawSettingsBox(const KURL& url, TQWidget *parent) d->resetCurveBtn = new TQToolButton(d->curveBox); d->resetCurveBtn->setFixedSize(11, 11); d->resetCurveBtn->setIconSet(SmallIconSet("reload_page", 8)); - d->resetCurveBtn->setFocusPolicy(TQ_NoFocus); + d->resetCurveBtn->setFocusPolicy(TQWidget::NoFocus); d->resetCurveBtn->setAutoRaise(true); TQToolTip::add(d->resetCurveBtn, i18n("Reset curve to linear")); @@ -409,44 +409,44 @@ RawSettingsBox::RawSettingsBox(const KURL& url, TQWidget *parent) // --------------------------------------------------------------- - connect(d->channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(d->channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(d->scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(d->scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(d->colorsCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotColorsChanged(int))); + connect(d->colorsCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotColorsChanged(int))); - connect(d->resetCurveBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotResetCurve())); + connect(d->resetCurveBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotResetCurve())); - connect(d->updateBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalUpdatePreview())); + connect(d->updateBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalUpdatePreview())); - connect(d->abortBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalAbortPreview())); + connect(d->abortBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalAbortPreview())); - connect(d->decodingSettingsBox, TQT_SIGNAL(signalSettingsChanged()), - this, TQT_SIGNAL(signalDemosaicingChanged())); + connect(d->decodingSettingsBox, TQ_SIGNAL(signalSettingsChanged()), + this, TQ_SIGNAL(signalDemosaicingChanged())); - connect(d->curveWidget, TQT_SIGNAL(signalCurvesChanged()), - this, TQT_SIGNAL(signalPostProcessingChanged())); + connect(d->curveWidget, TQ_SIGNAL(signalCurvesChanged()), + this, TQ_SIGNAL(signalPostProcessingChanged())); - connect(d->brightnessInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SIGNAL(signalPostProcessingChanged())); + connect(d->brightnessInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SIGNAL(signalPostProcessingChanged())); - connect(d->contrastInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SIGNAL(signalPostProcessingChanged())); + connect(d->contrastInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SIGNAL(signalPostProcessingChanged())); - connect(d->gammaInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SIGNAL(signalPostProcessingChanged())); + connect(d->gammaInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SIGNAL(signalPostProcessingChanged())); - connect(d->saturationInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SIGNAL(signalPostProcessingChanged())); + connect(d->saturationInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SIGNAL(signalPostProcessingChanged())); - connect(d->fineExposureInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SIGNAL(signalPostProcessingChanged())); + connect(d->fineExposureInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SIGNAL(signalPostProcessingChanged())); } RawSettingsBox::~RawSettingsBox() diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.h b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.h index 679cebd..546ce1e 100644 --- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.h +++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.h @@ -42,7 +42,7 @@ class RawSettingsBoxPriv; class DIGIKAM_EXPORT RawSettingsBox : public EditorToolSettings { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/imageeditor/tools/imageprint.cpp b/digikam/utilities/imageeditor/tools/imageprint.cpp index 1803a4d..5cab236 100644 --- a/digikam/utilities/imageeditor/tools/imageprint.cpp +++ b/digikam/utilities/imageeditor/tools/imageprint.cpp @@ -140,9 +140,9 @@ bool ImagePrint::printImageWithTQt() // Black & white print ? if ( m_printer.option( "app-imageeditor-blackwhite" ) != f) { - image2Print = image2Print.convertDepth( 1, Qt::MonoOnly | - Qt::ThresholdDither | - Qt::AvoidDither ); + image2Print = image2Print.convertDepth( 1, TQt::MonoOnly | + TQt::ThresholdDither | + TQt::AvoidDither ); } TQPainter p; @@ -460,26 +460,26 @@ ImageEditorPrintDialogPage::ImageEditorPrintDialogPage(DImg& image, TQWidget *pa // ------------------------------------------------------------------------ - connect( d->colorManaged, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotAlertSettings( bool )) ); + connect( d->colorManaged, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotAlertSettings( bool )) ); - connect( d->cmPreferences, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSetupDlg()) ); + connect( d->cmPreferences, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSetupDlg()) ); - connect( d->scale, TQT_SIGNAL( toggled( bool )), - this, TQT_SLOT( toggleScaling( bool ))); + connect( d->scale, TQ_SIGNAL( toggled( bool )), + this, TQ_SLOT( toggleScaling( bool ))); - connect(d->width, TQT_SIGNAL( valueChanged( double )), - this, TQT_SLOT( slotWidthChanged( double ))); + connect(d->width, TQ_SIGNAL( valueChanged( double )), + this, TQ_SLOT( slotWidthChanged( double ))); - connect(d->height, TQT_SIGNAL( valueChanged( double )), - this, TQT_SLOT( slotHeightChanged( double ))); + connect(d->height, TQ_SIGNAL( valueChanged( double )), + this, TQ_SLOT( slotHeightChanged( double ))); - connect(d->keepRatio, TQT_SIGNAL( toggled( bool )), - this, TQT_SLOT( toggleRatio( bool ))); + connect(d->keepRatio, TQ_SIGNAL( toggled( bool )), + this, TQ_SLOT( toggleRatio( bool ))); - connect(d->units, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotUnitChanged(const TQString& ))); + connect(d->units, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotUnitChanged(const TQString& ))); } ImageEditorPrintDialogPage::~ImageEditorPrintDialogPage() diff --git a/digikam/utilities/imageeditor/tools/imageprint.h b/digikam/utilities/imageeditor/tools/imageprint.h index 5bf6251..6627670 100644 --- a/digikam/utilities/imageeditor/tools/imageprint.h +++ b/digikam/utilities/imageeditor/tools/imageprint.h @@ -72,7 +72,7 @@ class ImageEditorPrintDialogPagePrivate; class DIGIKAM_EXPORT ImageEditorPrintDialogPage : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/imageeditor/tools/imageresize.cpp b/digikam/utilities/imageeditor/tools/imageresize.cpp index a29efca..c779b71 100644 --- a/digikam/utilities/imageeditor/tools/imageresize.cpp +++ b/digikam/utilities/imageeditor/tools/imageresize.cpp @@ -255,27 +255,27 @@ ImageResize::ImageResize(TQWidget* parent) adjustSize(); disableResize(); - TQTimer::singleShot(0, this, TQT_SLOT(readUserSettings())); + TQTimer::singleShot(0, this, TQ_SLOT(readUserSettings())); // ------------------------------------------------------------- - connect(d->cimgLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(processCImgURL(const TQString&))); + connect(d->cimgLogoLabel, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(processCImgURL(const TQString&))); - connect(d->wInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotValuesChanged())); + connect(d->wInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotValuesChanged())); - connect(d->hInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotValuesChanged())); + connect(d->hInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotValuesChanged())); - connect(d->wpInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotValuesChanged())); + connect(d->wpInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotValuesChanged())); - connect(d->hpInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotValuesChanged())); + connect(d->hpInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotValuesChanged())); - connect(d->useGreycstorationBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotRestorationToggled(bool)) ); + connect(d->useGreycstorationBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotRestorationToggled(bool)) ); // ------------------------------------------------------------- @@ -403,7 +403,7 @@ void ImageResize::slotValuesChanged() d->wpInput->blockSignals(true); d->hpInput->blockSignals(true); - TQString s(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); + TQString s(sender()->name()); if (s == "d->wInput") { @@ -540,7 +540,7 @@ void ImageResize::slotOk() GreycstorationIface::Resize, d->wInput->value(), d->hInput->value(), - 0, TQT_TQOBJECT(this)); + 0, this); } else { diff --git a/digikam/utilities/imageeditor/tools/imageresize.h b/digikam/utilities/imageeditor/tools/imageresize.h index fb36f43..3f8b1c2 100644 --- a/digikam/utilities/imageeditor/tools/imageresize.h +++ b/digikam/utilities/imageeditor/tools/imageresize.h @@ -43,7 +43,7 @@ class ImageResizePriv; class DIGIKAM_EXPORT ImageResize : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/lighttable/lighttablebar.cpp b/digikam/utilities/lighttable/lighttablebar.cpp index d5e2166..cfb935a 100644 --- a/digikam/utilities/lighttable/lighttablebar.cpp +++ b/digikam/utilities/lighttable/lighttablebar.cpp @@ -111,7 +111,7 @@ LightTableBar::LightTableBar(TQWidget* parent, int orientation, bool exifRotate) ThemeEngine::instance()->textSpecialRegColor()); painter.end(); - if (orientation ==Qt::Vertical) + if (orientation ==TQt::Vertical) setMinimumWidth(d->ratingPixmap.width()*5 + 6 + 2*getMargin()); else setMinimumHeight(d->ratingPixmap.width()*5 + 6 + 2*getMargin()); @@ -120,14 +120,14 @@ LightTableBar::LightTableBar(TQWidget* parent, int orientation, bool exifRotate) ImageAttributesWatch *watch = ImageAttributesWatch::instance(); - connect(watch, TQT_SIGNAL(signalImageRatingChanged(TQ_LLONG)), - this, TQT_SLOT(slotImageRatingChanged(TQ_LLONG))); + connect(watch, TQ_SIGNAL(signalImageRatingChanged(TQ_LLONG)), + this, TQ_SLOT(slotImageRatingChanged(TQ_LLONG))); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); - connect(this, TQT_SIGNAL(signalItemSelected(ThumbBarItem*)), - this, TQT_SLOT(slotItemSelected(ThumbBarItem*))); + connect(this, TQ_SIGNAL(signalItemSelected(ThumbBarItem*)), + this, TQ_SLOT(slotItemSelected(ThumbBarItem*))); } LightTableBar::~LightTableBar() @@ -165,7 +165,7 @@ void LightTableBar::contentsMouseReleaseEvent(TQMouseEvent *e) RatingPopupMenu *ratingMenu = 0; - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { TDEPopupMenu popmenu(this); @@ -197,8 +197,8 @@ void LightTableBar::contentsMouseReleaseEvent(TQMouseEvent *e) ratingMenu = new RatingPopupMenu(); - connect(ratingMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAssignRating(int))); + connect(ratingMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAssignRating(int))); popmenu.insertItem(i18n("Assign Rating"), ratingMenu); } @@ -460,7 +460,7 @@ void LightTableBar::viewportPaintEvent(TQPaintEvent* e) int cy, cx, ts, y1, y2, x1, x2; TQPixmap tile; - if (getOrientation() ==Qt::Vertical) + if (getOrientation() ==TQt::Vertical) { cy = viewportToContents(er.topLeft()).y(); @@ -489,7 +489,7 @@ void LightTableBar::viewportPaintEvent(TQPaintEvent* e) for (ThumbBarItem *item = firstItem(); item; item = item->next()) { - if (getOrientation() ==Qt::Vertical) + if (getOrientation() ==TQt::Vertical) { if (y1 <= item->position() && item->position() <= y2) { @@ -515,7 +515,7 @@ void LightTableBar::viewportPaintEvent(TQPaintEvent* e) { TQPixmap pix; pix.convertFromImage(TQImage(item->pixmap()->convertToImage()). - smoothScale(getTileSize(), getTileSize(), TQ_ScaleMin)); + smoothScale(getTileSize(), getTileSize(), TQImage::ScaleMin)); int x = (tile.width() - pix.width())/2; int y = (tile.height() - pix.height())/2; bitBlt(&tile, x, y, &pix); @@ -571,7 +571,7 @@ void LightTableBar::viewportPaintEvent(TQPaintEvent* e) { TQPixmap pix; pix.convertFromImage(TQImage(item->pixmap()->convertToImage()). - smoothScale(getTileSize(), getTileSize(), TQ_ScaleMin)); + smoothScale(getTileSize(), getTileSize(), TQImage::ScaleMin)); int x = (tile.width() - pix.width())/2; int y = (tile.height()- pix.height())/2; bitBlt(&tile, x, y, &pix); @@ -603,7 +603,7 @@ void LightTableBar::viewportPaintEvent(TQPaintEvent* e) } } - if (getOrientation() ==Qt::Vertical) + if (getOrientation() ==TQt::Vertical) bitBlt(viewport(), 0, er.y(), &bgPix); else bitBlt(viewport(), er.x(), 0, &bgPix); diff --git a/digikam/utilities/lighttable/lighttablebar.h b/digikam/utilities/lighttable/lighttablebar.h index e6bc239..b64e93a 100644 --- a/digikam/utilities/lighttable/lighttablebar.h +++ b/digikam/utilities/lighttable/lighttablebar.h @@ -46,7 +46,7 @@ class LightTableBarPriv; class DIGIKAM_EXPORT LightTableBar : public ThumbBarView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/lighttable/lighttablepreview.cpp b/digikam/utilities/lighttable/lighttablepreview.cpp index 23d1cbc..100427e 100644 --- a/digikam/utilities/lighttable/lighttablepreview.cpp +++ b/digikam/utilities/lighttable/lighttablepreview.cpp @@ -150,14 +150,14 @@ LightTablePreview::LightTablePreview(TQWidget *parent) // ------------------------------------------------------------ - connect(d->cornerButton, TQT_SIGNAL(pressed()), - this, TQT_SLOT(slotCornerButtonPressed())); + connect(d->cornerButton, TQ_SIGNAL(pressed()), + this, TQ_SLOT(slotCornerButtonPressed())); - connect(this, TQT_SIGNAL(signalRightButtonClicked()), - this, TQT_SLOT(slotContextMenu())); + connect(this, TQ_SIGNAL(signalRightButtonClicked()), + this, TQ_SLOT(slotContextMenu())); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); // ------------------------------------------------------------ @@ -248,14 +248,14 @@ void LightTablePreview::setImagePath(const TQString& path) if (!d->previewThread) { d->previewThread = new PreviewLoadThread(); - connect(d->previewThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), - this, TQT_SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); + connect(d->previewThread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), + this, TQ_SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); } if (!d->previewPreloadThread) { d->previewPreloadThread = new PreviewLoadThread(); - connect(d->previewPreloadThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), - this, TQT_SLOT(slotNextPreload())); + connect(d->previewPreloadThread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), + this, TQ_SLOT(slotNextPreload())); } if (d->loadFullImageSize) @@ -405,11 +405,11 @@ void LightTablePreview::slotContextMenu() popmenu.insertItem(i18n("Assign Tag"), assignTagsMenu); int i = popmenu.insertItem(i18n("Remove Tag"), removeTagsMenu); - connect(assignTagsMenu, TQT_SIGNAL(signalTagActivated(int)), - this, TQT_SLOT(slotAssignTag(int))); + connect(assignTagsMenu, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotAssignTag(int))); - connect(removeTagsMenu, TQT_SIGNAL(signalTagActivated(int)), - this, TQT_SLOT(slotRemoveTag(int))); + connect(removeTagsMenu, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotRemoveTag(int))); AlbumDB* db = AlbumManager::instance()->albumDB(); if (!db->hasTags( idList )) @@ -421,8 +421,8 @@ void LightTablePreview::slotContextMenu() ratingMenu = new RatingPopupMenu(); - connect(ratingMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAssignRating(int))); + connect(ratingMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAssignRating(int))); popmenu.insertItem(i18n("Assign Rating"), ratingMenu); @@ -547,11 +547,11 @@ void LightTablePreview::slotCornerButtonPressed() pan->setRegionSelection(r); pan->setMouseFocus(); - connect(pan, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), - this, TQT_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); + connect(pan, TQ_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQ_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); - connect(pan, TQT_SIGNAL(signalHiden()), - this, TQT_SLOT(slotPanIconHiden())); + connect(pan, TQ_SIGNAL(signalHiden()), + this, TQ_SLOT(slotPanIconHiden())); TQPoint g = mapToGlobal(viewport()->pos()); g.setX(g.x()+ viewport()->size().width()); diff --git a/digikam/utilities/lighttable/lighttablepreview.h b/digikam/utilities/lighttable/lighttablepreview.h index 255602d..3549fa1 100644 --- a/digikam/utilities/lighttable/lighttablepreview.h +++ b/digikam/utilities/lighttable/lighttablepreview.h @@ -48,7 +48,7 @@ class LightTablePreviewPriv; class DIGIKAM_EXPORT LightTablePreview : public PreviewWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/utilities/lighttable/lighttableview.cpp b/digikam/utilities/lighttable/lighttableview.cpp index 70bd000..51f45ab 100644 --- a/digikam/utilities/lighttable/lighttableview.cpp +++ b/digikam/utilities/lighttable/lighttableview.cpp @@ -87,55 +87,55 @@ LightTableView::LightTableView(TQWidget *parent) // Left panel connections ------------------------------------------------ - connect(d->leftPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SIGNAL(signalLeftZoomFactorChanged(double))); + connect(d->leftPreview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SIGNAL(signalLeftZoomFactorChanged(double))); - connect(d->leftPreview, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotLeftContentsMoved(int, int))); + connect(d->leftPreview, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotLeftContentsMoved(int, int))); - connect(d->leftPreview, TQT_SIGNAL(signalSlideShow()), - this, TQT_SIGNAL(signalSlideShow())); + connect(d->leftPreview, TQ_SIGNAL(signalSlideShow()), + this, TQ_SIGNAL(signalSlideShow())); - connect(d->leftPreview, TQT_SIGNAL(signalDeleteItem(ImageInfo*)), - this, TQT_SIGNAL(signalDeleteItem(ImageInfo*))); + connect(d->leftPreview, TQ_SIGNAL(signalDeleteItem(ImageInfo*)), + this, TQ_SIGNAL(signalDeleteItem(ImageInfo*))); - connect(d->leftPreview, TQT_SIGNAL(signalEditItem(ImageInfo*)), - this, TQT_SIGNAL(signalEditItem(ImageInfo*))); + connect(d->leftPreview, TQ_SIGNAL(signalEditItem(ImageInfo*)), + this, TQ_SIGNAL(signalEditItem(ImageInfo*))); - connect(d->leftPreview, TQT_SIGNAL(signalDroppedItems(const ImageInfoList&)), - this, TQT_SIGNAL(signalLeftDroppedItems(const ImageInfoList&))); + connect(d->leftPreview, TQ_SIGNAL(signalDroppedItems(const ImageInfoList&)), + this, TQ_SIGNAL(signalLeftDroppedItems(const ImageInfoList&))); - connect(d->leftPreview, TQT_SIGNAL(signalPreviewLoaded(bool)), - this, TQT_SLOT(slotLeftPreviewLoaded(bool))); + connect(d->leftPreview, TQ_SIGNAL(signalPreviewLoaded(bool)), + this, TQ_SLOT(slotLeftPreviewLoaded(bool))); - connect(d->leftPreview, TQT_SIGNAL(signalLeftButtonClicked()), - this, TQT_SIGNAL(signalLeftPanelLeftButtonClicked())); + connect(d->leftPreview, TQ_SIGNAL(signalLeftButtonClicked()), + this, TQ_SIGNAL(signalLeftPanelLeftButtonClicked())); // Right panel connections ------------------------------------------------ - connect(d->rightPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SIGNAL(signalRightZoomFactorChanged(double))); + connect(d->rightPreview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SIGNAL(signalRightZoomFactorChanged(double))); - connect(d->rightPreview, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotRightContentsMoved(int, int))); + connect(d->rightPreview, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotRightContentsMoved(int, int))); - connect(d->rightPreview, TQT_SIGNAL(signalDeleteItem(ImageInfo*)), - this, TQT_SIGNAL(signalDeleteItem(ImageInfo*))); + connect(d->rightPreview, TQ_SIGNAL(signalDeleteItem(ImageInfo*)), + this, TQ_SIGNAL(signalDeleteItem(ImageInfo*))); - connect(d->rightPreview, TQT_SIGNAL(signalEditItem(ImageInfo*)), - this, TQT_SIGNAL(signalEditItem(ImageInfo*))); + connect(d->rightPreview, TQ_SIGNAL(signalEditItem(ImageInfo*)), + this, TQ_SIGNAL(signalEditItem(ImageInfo*))); - connect(d->rightPreview, TQT_SIGNAL(signalDroppedItems(const ImageInfoList&)), - this, TQT_SIGNAL(signalRightDroppedItems(const ImageInfoList&))); + connect(d->rightPreview, TQ_SIGNAL(signalDroppedItems(const ImageInfoList&)), + this, TQ_SIGNAL(signalRightDroppedItems(const ImageInfoList&))); - connect(d->rightPreview, TQT_SIGNAL(signalSlideShow()), - this, TQT_SIGNAL(signalSlideShow())); + connect(d->rightPreview, TQ_SIGNAL(signalSlideShow()), + this, TQ_SIGNAL(signalSlideShow())); - connect(d->rightPreview, TQT_SIGNAL(signalPreviewLoaded(bool)), - this, TQT_SLOT(slotRightPreviewLoaded(bool))); + connect(d->rightPreview, TQ_SIGNAL(signalPreviewLoaded(bool)), + this, TQ_SLOT(slotRightPreviewLoaded(bool))); - connect(d->rightPreview, TQT_SIGNAL(signalLeftButtonClicked()), - this, TQT_SIGNAL(signalRightPanelLeftButtonClicked())); + connect(d->rightPreview, TQ_SIGNAL(signalLeftButtonClicked()), + this, TQ_SIGNAL(signalRightPanelLeftButtonClicked())); } LightTableView::~LightTableView() @@ -324,21 +324,21 @@ void LightTableView::slotLeftContentsMoved(int x, int y) { if (d->syncPreview && !d->leftLoading) { - disconnect(d->rightPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SIGNAL(signalRightZoomFactorChanged(double))); + disconnect(d->rightPreview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SIGNAL(signalRightZoomFactorChanged(double))); - disconnect(d->rightPreview, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotRightContentsMoved(int, int))); + disconnect(d->rightPreview, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotRightContentsMoved(int, int))); setRightZoomFactor(d->leftPreview->zoomFactor()); emit signalRightZoomFactorChanged(d->leftPreview->zoomFactor()); d->rightPreview->setContentsPos(x, y); - connect(d->rightPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SIGNAL(signalRightZoomFactorChanged(double))); + connect(d->rightPreview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SIGNAL(signalRightZoomFactorChanged(double))); - connect(d->rightPreview, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotRightContentsMoved(int, int))); + connect(d->rightPreview, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotRightContentsMoved(int, int))); } } @@ -346,22 +346,22 @@ void LightTableView::slotRightContentsMoved(int x, int y) { if (d->syncPreview && !d->rightLoading) { - disconnect(d->leftPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SIGNAL(signalLeftZoomFactorChanged(double))); + disconnect(d->leftPreview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SIGNAL(signalLeftZoomFactorChanged(double))); - disconnect(d->leftPreview, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotLeftContentsMoved(int, int))); + disconnect(d->leftPreview, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotLeftContentsMoved(int, int))); setLeftZoomFactor(d->rightPreview->zoomFactor()); emit signalLeftZoomFactorChanged(d->rightPreview->zoomFactor()); d->leftPreview->setContentsPos(x, y); - connect(d->leftPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SIGNAL(signalLeftZoomFactorChanged(double))); + connect(d->leftPreview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SIGNAL(signalLeftZoomFactorChanged(double))); - connect(d->leftPreview, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotLeftContentsMoved(int, int))); + connect(d->leftPreview, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotLeftContentsMoved(int, int))); } } diff --git a/digikam/utilities/lighttable/lighttableview.h b/digikam/utilities/lighttable/lighttableview.h index 1f93702..273b707 100644 --- a/digikam/utilities/lighttable/lighttableview.h +++ b/digikam/utilities/lighttable/lighttableview.h @@ -43,7 +43,7 @@ class LightTableViewPriv; class DIGIKAM_EXPORT LightTableView : public TQFrame { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp index 0b77be1..58409ae 100644 --- a/digikam/utilities/lighttable/lighttablewindow.cpp +++ b/digikam/utilities/lighttable/lighttablewindow.cpp @@ -182,7 +182,7 @@ void LightTableWindow::closeEvent(TQCloseEvent* e) void LightTableWindow::setupUserArea() { TQWidget* mainW = new TQWidget(this); - d->hSplitter = new TQSplitter(Qt::Horizontal, mainW); + d->hSplitter = new TQSplitter(TQt::Horizontal, mainW); TQHBoxLayout *hlay = new TQHBoxLayout(mainW); d->leftSidebar = new ImagePropertiesSideBarDB(mainW, "LightTable Left Sidebar", d->hSplitter, @@ -190,7 +190,7 @@ void LightTableWindow::setupUserArea() TQWidget* centralW = new TQWidget(d->hSplitter); TQVBoxLayout *vlay = new TQVBoxLayout(centralW); - d->vSplitter = new TQSplitter(Qt::Vertical, centralW); + d->vSplitter = new TQSplitter(TQt::Vertical, centralW); d->barView = new LightTableBar(d->vSplitter, ThumbBarView::Horizontal, AlbumSettings::instance()->getExifRotate()); d->previewView = new LightTableView(d->vSplitter); @@ -236,210 +236,210 @@ void LightTableWindow::setupStatusBar() void LightTableWindow::setupConnections() { - connect(d->statusProgressBar, TQT_SIGNAL(signalCancelButtonPressed()), - TQT_TQOBJECT(this), TQT_SLOT(slotProgressBarCancelButtonPressed())); + connect(d->statusProgressBar, TQ_SIGNAL(signalCancelButtonPressed()), + this, TQ_SLOT(slotProgressBarCancelButtonPressed())); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - TQT_TQOBJECT(this), TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); // Thumbs bar connections --------------------------------------- - connect(d->barView, TQT_SIGNAL(signalSetItemOnLeftPanel(ImageInfo*)), - TQT_TQOBJECT(this), TQT_SLOT(slotSetItemOnLeftPanel(ImageInfo*))); + connect(d->barView, TQ_SIGNAL(signalSetItemOnLeftPanel(ImageInfo*)), + this, TQ_SLOT(slotSetItemOnLeftPanel(ImageInfo*))); - connect(d->barView, TQT_SIGNAL(signalSetItemOnRightPanel(ImageInfo*)), - TQT_TQOBJECT(this), TQT_SLOT(slotSetItemOnRightPanel(ImageInfo*))); + connect(d->barView, TQ_SIGNAL(signalSetItemOnRightPanel(ImageInfo*)), + this, TQ_SLOT(slotSetItemOnRightPanel(ImageInfo*))); - connect(d->barView, TQT_SIGNAL(signalRemoveItem(ImageInfo*)), - TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem(ImageInfo*))); + connect(d->barView, TQ_SIGNAL(signalRemoveItem(ImageInfo*)), + this, TQ_SLOT(slotRemoveItem(ImageInfo*))); - connect(d->barView, TQT_SIGNAL(signalEditItem(ImageInfo*)), - TQT_TQOBJECT(this), TQT_SLOT(slotEditItem(ImageInfo*))); + connect(d->barView, TQ_SIGNAL(signalEditItem(ImageInfo*)), + this, TQ_SLOT(slotEditItem(ImageInfo*))); - connect(d->barView, TQT_SIGNAL(signalClearAll()), - TQT_TQOBJECT(this), TQT_SLOT(slotClearItemsList())); + connect(d->barView, TQ_SIGNAL(signalClearAll()), + this, TQ_SLOT(slotClearItemsList())); - connect(d->barView, TQT_SIGNAL(signalLightTableBarItemSelected(ImageInfo*)), - TQT_TQOBJECT(this), TQT_SLOT(slotItemSelected(ImageInfo*))); + connect(d->barView, TQ_SIGNAL(signalLightTableBarItemSelected(ImageInfo*)), + this, TQ_SLOT(slotItemSelected(ImageInfo*))); - connect(d->barView, TQT_SIGNAL(signalDroppedItems(const ImageInfoList&)), - TQT_TQOBJECT(this), TQT_SLOT(slotThumbbarDroppedItems(const ImageInfoList&))); + connect(d->barView, TQ_SIGNAL(signalDroppedItems(const ImageInfoList&)), + this, TQ_SLOT(slotThumbbarDroppedItems(const ImageInfoList&))); // Zoom bars connections ----------------------------------------- - connect(d->leftZoomBar, TQT_SIGNAL(signalZoomMinusClicked()), - d->previewView, TQT_SLOT(slotDecreaseLeftZoom())); + connect(d->leftZoomBar, TQ_SIGNAL(signalZoomMinusClicked()), + d->previewView, TQ_SLOT(slotDecreaseLeftZoom())); - connect(d->leftZoomBar, TQT_SIGNAL(signalZoomPlusClicked()), - d->previewView, TQT_SLOT(slotIncreaseLeftZoom())); + connect(d->leftZoomBar, TQ_SIGNAL(signalZoomPlusClicked()), + d->previewView, TQ_SLOT(slotIncreaseLeftZoom())); - connect(d->leftZoomBar, TQT_SIGNAL(signalZoomSliderChanged(int)), - d->previewView, TQT_SLOT(slotLeftZoomSliderChanged(int))); + connect(d->leftZoomBar, TQ_SIGNAL(signalZoomSliderChanged(int)), + d->previewView, TQ_SLOT(slotLeftZoomSliderChanged(int))); - connect(d->rightZoomBar, TQT_SIGNAL(signalZoomMinusClicked()), - d->previewView, TQT_SLOT(slotDecreaseRightZoom())); + connect(d->rightZoomBar, TQ_SIGNAL(signalZoomMinusClicked()), + d->previewView, TQ_SLOT(slotDecreaseRightZoom())); - connect(d->rightZoomBar, TQT_SIGNAL(signalZoomPlusClicked()), - d->previewView, TQT_SLOT(slotIncreaseRightZoom())); + connect(d->rightZoomBar, TQ_SIGNAL(signalZoomPlusClicked()), + d->previewView, TQ_SLOT(slotIncreaseRightZoom())); - connect(d->rightZoomBar, TQT_SIGNAL(signalZoomSliderChanged(int)), - d->previewView, TQT_SLOT(slotRightZoomSliderChanged(int))); + connect(d->rightZoomBar, TQ_SIGNAL(signalZoomSliderChanged(int)), + d->previewView, TQ_SLOT(slotRightZoomSliderChanged(int))); // View connections --------------------------------------------- - connect(d->previewView, TQT_SIGNAL(signalLeftZoomFactorChanged(double)), - TQT_TQOBJECT(this), TQT_SLOT(slotLeftZoomFactorChanged(double))); + connect(d->previewView, TQ_SIGNAL(signalLeftZoomFactorChanged(double)), + this, TQ_SLOT(slotLeftZoomFactorChanged(double))); - connect(d->previewView, TQT_SIGNAL(signalRightZoomFactorChanged(double)), - TQT_TQOBJECT(this), TQT_SLOT(slotRightZoomFactorChanged(double))); + connect(d->previewView, TQ_SIGNAL(signalRightZoomFactorChanged(double)), + this, TQ_SLOT(slotRightZoomFactorChanged(double))); - connect(d->previewView, TQT_SIGNAL(signalEditItem(ImageInfo*)), - TQT_TQOBJECT(this), TQT_SLOT(slotEditItem(ImageInfo*))); + connect(d->previewView, TQ_SIGNAL(signalEditItem(ImageInfo*)), + this, TQ_SLOT(slotEditItem(ImageInfo*))); - connect(d->previewView, TQT_SIGNAL(signalDeleteItem(ImageInfo*)), - TQT_TQOBJECT(this), TQT_SLOT(slotDeleteItem(ImageInfo*))); + connect(d->previewView, TQ_SIGNAL(signalDeleteItem(ImageInfo*)), + this, TQ_SLOT(slotDeleteItem(ImageInfo*))); - connect(d->previewView, TQT_SIGNAL(signalSlideShow()), - TQT_TQOBJECT(this), TQT_SLOT(slotToggleSlideShow())); + connect(d->previewView, TQ_SIGNAL(signalSlideShow()), + this, TQ_SLOT(slotToggleSlideShow())); - connect(d->previewView, TQT_SIGNAL(signalLeftDroppedItems(const ImageInfoList&)), - TQT_TQOBJECT(this), TQT_SLOT(slotLeftDroppedItems(const ImageInfoList&))); + connect(d->previewView, TQ_SIGNAL(signalLeftDroppedItems(const ImageInfoList&)), + this, TQ_SLOT(slotLeftDroppedItems(const ImageInfoList&))); - connect(d->previewView, TQT_SIGNAL(signalRightDroppedItems(const ImageInfoList&)), - TQT_TQOBJECT(this), TQT_SLOT(slotRightDroppedItems(const ImageInfoList&))); + connect(d->previewView, TQ_SIGNAL(signalRightDroppedItems(const ImageInfoList&)), + this, TQ_SLOT(slotRightDroppedItems(const ImageInfoList&))); - connect(d->previewView, TQT_SIGNAL(signalToggleOnSyncPreview(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotToggleOnSyncPreview(bool))); + connect(d->previewView, TQ_SIGNAL(signalToggleOnSyncPreview(bool)), + this, TQ_SLOT(slotToggleOnSyncPreview(bool))); - connect(d->previewView, TQT_SIGNAL(signalLeftPreviewLoaded(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotLeftPreviewLoaded(bool))); + connect(d->previewView, TQ_SIGNAL(signalLeftPreviewLoaded(bool)), + this, TQ_SLOT(slotLeftPreviewLoaded(bool))); - connect(d->previewView, TQT_SIGNAL(signalRightPreviewLoaded(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotRightPreviewLoaded(bool))); + connect(d->previewView, TQ_SIGNAL(signalRightPreviewLoaded(bool)), + this, TQ_SLOT(slotRightPreviewLoaded(bool))); - connect(d->previewView, TQT_SIGNAL(signalLeftPanelLeftButtonClicked()), - TQT_TQOBJECT(this), TQT_SLOT(slotLeftPanelLeftButtonClicked())); + connect(d->previewView, TQ_SIGNAL(signalLeftPanelLeftButtonClicked()), + this, TQ_SLOT(slotLeftPanelLeftButtonClicked())); - connect(d->previewView, TQT_SIGNAL(signalRightPanelLeftButtonClicked()), - TQT_TQOBJECT(this), TQT_SLOT(slotRightPanelLeftButtonClicked())); + connect(d->previewView, TQ_SIGNAL(signalRightPanelLeftButtonClicked()), + this, TQ_SLOT(slotRightPanelLeftButtonClicked())); } void LightTableWindow::setupActions() { // -- Standard 'File' menu actions --------------------------------------------- - d->backwardAction = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), + d->backwardAction = KStdAction::back(this, TQ_SLOT(slotBackward()), actionCollection(), "lighttable_backward"); d->backwardAction->setEnabled(false); - d->forwardAction = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotForward()), + d->forwardAction = KStdAction::forward(this, TQ_SLOT(slotForward()), actionCollection(), "lighttable_forward"); d->forwardAction->setEnabled(false); d->firstAction = new TDEAction(i18n("&First"), "go-first", TDEStdAccel::shortcut( TDEStdAccel::Home), - TQT_TQOBJECT(this), TQT_SLOT(slotFirst()), + this, TQ_SLOT(slotFirst()), actionCollection(), "lighttable_first"); d->firstAction->setEnabled(false); d->lastAction = new TDEAction(i18n("&Last"), "go-last", TDEStdAccel::shortcut( TDEStdAccel::End), - TQT_TQOBJECT(this), TQT_SLOT(slotLast()), + this, TQ_SLOT(slotLast()), actionCollection(), "lighttable_last"); d->lastAction->setEnabled(false); d->setItemLeftAction = new TDEAction(i18n("On Left"), "go-previous", - CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotSetItemLeft()), + CTRL+Key_L, this, TQ_SLOT(slotSetItemLeft()), actionCollection(), "lighttable_setitemleft"); d->setItemLeftAction->setEnabled(false); d->setItemLeftAction->setWhatsThis(i18n("Show item on left panel")); d->setItemRightAction = new TDEAction(i18n("On Right"), "go-next", - CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotSetItemRight()), + CTRL+Key_R, this, TQ_SLOT(slotSetItemRight()), actionCollection(), "lighttable_setitemright"); d->setItemRightAction->setEnabled(false); d->setItemRightAction->setWhatsThis(i18n("Show item on right panel")); d->editItemAction = new TDEAction(i18n("Edit"), "editimage", - Key_F4, TQT_TQOBJECT(this), TQT_SLOT(slotEditItem()), + Key_F4, this, TQ_SLOT(slotEditItem()), actionCollection(), "lighttable_edititem"); d->editItemAction->setEnabled(false); d->removeItemAction = new TDEAction(i18n("Remove item from LightTable"), "window-close", - CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), + CTRL+Key_K, this, TQ_SLOT(slotRemoveItem()), actionCollection(), "lighttable_removeitem"); d->removeItemAction->setEnabled(false); d->clearListAction = new TDEAction(i18n("Remove all items from LightTable"), "editshred", - CTRL+SHIFT+Key_K, TQT_TQOBJECT(this), TQT_SLOT(slotClearItemsList()), + CTRL+SHIFT+Key_K, this, TQ_SLOT(slotClearItemsList()), actionCollection(), "lighttable_clearlist"); d->clearListAction->setEnabled(false); d->fileDeleteAction = new TDEAction(i18n("Move to Trash"), "edittrash", Key_Delete, - TQT_TQOBJECT(this), TQT_SLOT(slotDeleteItem()), + this, TQ_SLOT(slotDeleteItem()), actionCollection(), "lighttable_filedelete"); d->fileDeleteAction->setEnabled(false); - KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "lighttable_close"); + KStdAction::close(this, TQ_SLOT(close()), actionCollection(), "lighttable_close"); // -- Standard 'View' menu actions --------------------------------------------- d->syncPreviewAction = new TDEToggleAction(i18n("Synchronize"), "goto", - CTRL+SHIFT+Key_Y, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleSyncPreview()), + CTRL+SHIFT+Key_Y, this, + TQ_SLOT(slotToggleSyncPreview()), actionCollection(), "lighttable_syncpreview"); d->syncPreviewAction->setEnabled(false); d->syncPreviewAction->setWhatsThis(i18n("Synchronize preview from left and right panels")); d->navigateByPairAction = new TDEToggleAction(i18n("By Pair"), "preferences-system", - CTRL+SHIFT+Key_P, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleNavigateByPair()), + CTRL+SHIFT+Key_P, this, + TQ_SLOT(slotToggleNavigateByPair()), actionCollection(), "lighttable_navigatebypair"); d->navigateByPairAction->setEnabled(false); d->navigateByPairAction->setWhatsThis(i18n("Navigate by pair with all items")); - d->zoomPlusAction = KStdAction::zoomIn(TQT_TQOBJECT(d->previewView), TQT_SLOT(slotIncreaseZoom()), + d->zoomPlusAction = KStdAction::zoomIn(d->previewView, TQ_SLOT(slotIncreaseZoom()), actionCollection(), "lighttable_zoomplus"); d->zoomPlusAction->setEnabled(false); - d->zoomMinusAction = KStdAction::zoomOut(TQT_TQOBJECT(d->previewView), TQT_SLOT(slotDecreaseZoom()), + d->zoomMinusAction = KStdAction::zoomOut(d->previewView, TQ_SLOT(slotDecreaseZoom()), actionCollection(), "lighttable_zoomminus"); d->zoomMinusAction->setEnabled(false); d->zoomTo100percents = new TDEAction(i18n("Zoom to 100%"), "zoom-original", ALT+CTRL+Key_0, // NOTE: Photoshop 7 use ALT+CTRL+0. - TQT_TQOBJECT(this), TQT_SLOT(slotZoomTo100Percents()), + this, TQ_SLOT(slotZoomTo100Percents()), actionCollection(), "lighttable_zoomto100percents"); d->zoomFitToWindowAction = new TDEAction(i18n("Fit to &Window"), "view_fit_window", - CTRL+SHIFT+Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotFitToWindow()), + CTRL+SHIFT+Key_E, this, TQ_SLOT(slotFitToWindow()), actionCollection(), "lighttable_zoomfit2window"); // Do not use std KDE action for full screen because action text is too large for app. toolbar. d->fullScreenAction = new TDEToggleAction(i18n("Full Screen"), "view-fullscreen", - CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleFullScreen()), + CTRL+SHIFT+Key_F, this, + TQ_SLOT(slotToggleFullScreen()), actionCollection(), "lighttable_fullscreen"); d->fullScreenAction->setWhatsThis(i18n("Toggle the window to full screen mode")); d->slideShowAction = new TDEAction(i18n("Slideshow"), "slideshow", Key_F9, - TQT_TQOBJECT(this), TQT_SLOT(slotToggleSlideShow()), + this, TQ_SLOT(slotToggleSlideShow()), actionCollection(),"lighttable_slideshow"); // -- Standard 'Configure' menu actions ---------------------------------------- - d->showMenuBarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection()); + d->showMenuBarAction = KStdAction::showMenubar(this, TQ_SLOT(slotShowMenuBar()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbars()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotSetup()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotEditKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(slotSetup()), actionCollection()); // ----------------------------------------------------------------------------------------- d->themeMenuAction = new TDESelectAction(i18n("&Themes"), 0, actionCollection(), "theme_menu"); - connect(d->themeMenuAction, TQT_SIGNAL(activated(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotChangeTheme(const TQString&))); + connect(d->themeMenuAction, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotChangeTheme(const TQString&))); d->themeMenuAction->setItems(ThemeEngine::instance()->themeNames()); slotThemeChanged(); @@ -449,21 +449,21 @@ void LightTableWindow::setupActions() d->donateMoneyAction = new TDEAction(i18n("Donate..."), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotDonateMoney()), + this, TQ_SLOT(slotDonateMoney()), actionCollection(), "lighttable_donatemoney"); d->contributeAction = new TDEAction(i18n("Contribute..."), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotContribute()), + this, TQ_SLOT(slotContribute()), actionCollection(), "lighttable_contribute"); d->rawCameraListAction = new TDEAction(i18n("Supported RAW Cameras"), "kdcraw", 0, - TQT_TQOBJECT(this), - TQT_SLOT(slotRawCameraList()), + this, + TQ_SLOT(slotRawCameraList()), actionCollection(), "lighttable_rawcameralist"); @@ -477,22 +477,22 @@ void LightTableWindow::setupActions() // -- Rating actions --------------------------------------------------------------- d->star0 = new TDEAction(i18n("Assign Rating \"No Stars\""), CTRL+Key_0, - TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingNoStar()), + d->barView, TQ_SLOT(slotAssignRatingNoStar()), actionCollection(), "lighttable_ratenostar"); d->star1 = new TDEAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1, - TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingOneStar()), + d->barView, TQ_SLOT(slotAssignRatingOneStar()), actionCollection(), "lighttable_rateonestar"); d->star2 = new TDEAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2, - TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingTwoStar()), + d->barView, TQ_SLOT(slotAssignRatingTwoStar()), actionCollection(), "lighttable_ratetwostar"); d->star3 = new TDEAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3, - TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingThreeStar()), + d->barView, TQ_SLOT(slotAssignRatingThreeStar()), actionCollection(), "lighttable_ratethreestar"); d->star4 = new TDEAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4, - TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingFourStar()), + d->barView, TQ_SLOT(slotAssignRatingFourStar()), actionCollection(), "lighttable_ratefourstar"); d->star5 = new TDEAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5, - TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingFiveStar()), + d->barView, TQ_SLOT(slotAssignRatingFiveStar()), actionCollection(), "lighttable_ratefivestar"); // --------------------------------------------------------------------------------- @@ -508,42 +508,42 @@ void LightTableWindow::setupAccelerators() d->accelerators->insert("Exit fullscreen", i18n("Exit Fullscreen mode"), i18n("Exit fullscreen viewing mode"), - Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotEscapePressed()), + Key_Escape, this, TQ_SLOT(slotEscapePressed()), false, true); d->accelerators->insert("Next Image Key_Space", i18n("Next Image"), i18n("Load Next Image"), - Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotForward()), + Key_Space, this, TQ_SLOT(slotForward()), false, true); d->accelerators->insert("Previous Image SHIFT+Key_Space", i18n("Previous Image"), i18n("Load Previous Image"), - SHIFT+Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), + SHIFT+Key_Space, this, TQ_SLOT(slotBackward()), false, true); d->accelerators->insert("Previous Image Key_Backspace", i18n("Previous Image"), i18n("Load Previous Image"), - Key_Backspace, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), + Key_Backspace, this, TQ_SLOT(slotBackward()), false, true); d->accelerators->insert("Next Image Key_Next", i18n("Next Image"), i18n("Load Next Image"), - Key_Next, TQT_TQOBJECT(this), TQT_SLOT(slotForward()), + Key_Next, this, TQ_SLOT(slotForward()), false, true); d->accelerators->insert("Previous Image Key_Prior", i18n("Previous Image"), i18n("Load Previous Image"), - Key_Prior, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), + Key_Prior, this, TQ_SLOT(slotBackward()), false, true); d->accelerators->insert("Zoom Plus Key_Plus", i18n("Zoom in"), i18n("Zoom in on image"), - Key_Plus, TQT_TQOBJECT(d->previewView), TQT_SLOT(slotIncreaseZoom()), + Key_Plus, d->previewView, TQ_SLOT(slotIncreaseZoom()), false, true); d->accelerators->insert("Zoom Plus Key_Minus", i18n("Zoom out"), i18n("Zoom out from image"), - Key_Minus, TQT_TQOBJECT(d->previewView), TQT_SLOT(slotDecreaseZoom()), + Key_Minus, d->previewView, TQ_SLOT(slotDecreaseZoom()), false, true); } @@ -1349,7 +1349,7 @@ void LightTableWindow::slotToggleFullScreen() if (obj) { - TDEToolBar* toolBar = static_cast<TDEToolBar*>(TQT_TQWIDGET(obj)); + TDEToolBar* toolBar = static_cast<TDEToolBar*>(obj); if (d->fullScreenAction->isPlugged(toolBar) && d->removeFullScreenButton) d->fullScreenAction->unplug(toolBar); @@ -1389,7 +1389,7 @@ void LightTableWindow::slotToggleFullScreen() if (obj) { - TDEToolBar* toolBar = static_cast<TDEToolBar*>(TQT_TQWIDGET(obj)); + TDEToolBar* toolBar = static_cast<TDEToolBar*>(obj); if (d->fullScreenHideToolBar) { @@ -1481,7 +1481,7 @@ void LightTableWindow::plugActionAccel(TDEAction* action) action->whatsThis(), action->shortcut(), action, - TQT_SLOT(activate())); + TQ_SLOT(activate())); } void LightTableWindow::unplugActionAccel(TDEAction* action) @@ -1511,8 +1511,8 @@ void LightTableWindow::slotConfToolbars() saveMainWindowSettings(TDEGlobal::config(), "LightTable Settings"); KEditToolbar dlg(factory(), this); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } diff --git a/digikam/utilities/lighttable/lighttablewindow.h b/digikam/utilities/lighttable/lighttablewindow.h index d30f49f..f080e2d 100644 --- a/digikam/utilities/lighttable/lighttablewindow.h +++ b/digikam/utilities/lighttable/lighttablewindow.h @@ -48,7 +48,7 @@ class LightTableWindowPriv; class LightTableWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/setup/cameraselection.cpp b/digikam/utilities/setup/cameraselection.cpp index 2274d87..2cf2635 100644 --- a/digikam/utilities/setup/cameraselection.cpp +++ b/digikam/utilities/setup/cameraselection.cpp @@ -174,7 +174,7 @@ CameraSelection::CameraSelection( TQWidget* parent ) // -------------------------------------------------------------- - TQGroupBox* box2 = new TQGroupBox( 0, Qt::Vertical, plainPage() ); + TQGroupBox* box2 = new TQGroupBox( 0, TQt::Vertical, plainPage() ); box2->setFrameStyle( TQFrame::NoFrame ); TQGridLayout* box2Layout = new TQGridLayout( box2->layout(), 1, 5 ); @@ -218,29 +218,29 @@ CameraSelection::CameraSelection( TQWidget* parent ) // Connections -------------------------------------------------- - disconnect(link, TQT_SIGNAL(linkClicked(const TQString &)), - link, TQT_SLOT(openLink(const TQString &))); + disconnect(link, TQ_SIGNAL(linkClicked(const TQString &)), + link, TQ_SLOT(openLink(const TQString &))); - connect(link, TQT_SIGNAL(linkClicked(const TQString &)), - this, TQT_SLOT(slotUMSCameraLinkUsed())); + connect(link, TQ_SIGNAL(linkClicked(const TQString &)), + this, TQ_SLOT(slotUMSCameraLinkUsed())); - disconnect(link2, TQT_SIGNAL(linkClicked(const TQString &)), - link2, TQT_SLOT(openLink(const TQString &))); + disconnect(link2, TQ_SIGNAL(linkClicked(const TQString &)), + link2, TQ_SLOT(openLink(const TQString &))); - connect(link2, TQT_SIGNAL(linkClicked(const TQString &)), - this, TQT_SLOT(slotPTPCameraLinkUsed())); + connect(link2, TQ_SIGNAL(linkClicked(const TQString &)), + this, TQ_SLOT(slotPTPCameraLinkUsed())); - connect(d->listView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem *))); + connect(d->listView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem *))); - connect(d->portButtonGroup, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(slotPortChanged())); + connect(d->portButtonGroup, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(slotPortChanged())); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(slotOkClicked())); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(slotOkClicked())); - connect(d->searchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - this, TQT_SLOT(slotSearchTextChanged(const TQString&))); + connect(d->searchBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + this, TQ_SLOT(slotSearchTextChanged(const TQString&))); // Initialize -------------------------------------------------- diff --git a/digikam/utilities/setup/cameraselection.h b/digikam/utilities/setup/cameraselection.h index ab51067..0458f13 100644 --- a/digikam/utilities/setup/cameraselection.h +++ b/digikam/utilities/setup/cameraselection.h @@ -43,7 +43,7 @@ class CameraSelectionPriv; class CameraSelection : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/setup/setup.cpp b/digikam/utilities/setup/setup.cpp index 7450d60..bd47796 100644 --- a/digikam/utilities/setup/setup.cpp +++ b/digikam/utilities/setup/setup.cpp @@ -199,8 +199,8 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page) BarIcon("misc", TDEIcon::SizeMedium)); d->miscPage = new SetupMisc(d->page_misc); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(slotOkClicked()) ); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(slotOkClicked()) ); if (page != LastPageUsed) showPage((int) page); diff --git a/digikam/utilities/setup/setup.h b/digikam/utilities/setup/setup.h index 27885bd..ce5e57b 100644 --- a/digikam/utilities/setup/setup.h +++ b/digikam/utilities/setup/setup.h @@ -37,7 +37,7 @@ class SetupPrivate; class Setup : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/setup/setupcamera.cpp b/digikam/utilities/setup/setupcamera.cpp index 214a1df..1b8d0bb 100644 --- a/digikam/utilities/setup/setupcamera.cpp +++ b/digikam/utilities/setup/setupcamera.cpp @@ -135,23 +135,23 @@ SetupCamera::SetupCamera( TQWidget* parent ) // ------------------------------------------------------------- - connect(gphotoLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(processGphotoURL(const TQString&))); + connect(gphotoLogoLabel, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(processGphotoURL(const TQString&))); - connect(d->listView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(d->listView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); - connect(d->addButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddCamera())); + connect(d->addButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddCamera())); - connect(d->removeButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveCamera())); + connect(d->removeButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveCamera())); - connect(d->editButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEditCamera())); + connect(d->editButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEditCamera())); - connect(d->autoDetectButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAutoDetectCamera())); + connect(d->autoDetectButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAutoDetectCamera())); // Add cameras -------------------------------------- @@ -166,7 +166,7 @@ SetupCamera::SetupCamera( TQWidget* parent ) { new TQListViewItem(d->listView, ctype->title(), ctype->model(), ctype->port(), ctype->path(), - ctype->lastAccess().toString(Qt::ISODate)); + ctype->lastAccess().toString(TQt::ISODate)); } } } @@ -200,9 +200,9 @@ void SetupCamera::slotAddCamera() { CameraSelection *select = new CameraSelection; - connect(select, TQT_SIGNAL(signalOkClicked(const TQString&, const TQString&, + connect(select, TQ_SIGNAL(signalOkClicked(const TQString&, const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(slotAddedCamera(const TQString&, const TQString&, + this, TQ_SLOT(slotAddedCamera(const TQString&, const TQString&, const TQString&, const TQString&))); select->show(); @@ -224,9 +224,9 @@ void SetupCamera::slotEditCamera() CameraSelection *select = new CameraSelection; select->setCamera(item->text(0), item->text(1), item->text(2), item->text(3)); - connect(select, TQT_SIGNAL(signalOkClicked(const TQString&, const TQString&, + connect(select, TQ_SIGNAL(signalOkClicked(const TQString&, const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(slotEditedCamera(const TQString&, const TQString&, + this, TQ_SLOT(slotEditedCamera(const TQString&, const TQString&, const TQString&, const TQString&))); select->show(); @@ -261,7 +261,7 @@ void SetupCamera::slotAutoDetectCamera() KMessageBox::information(this, i18n("Found camera '%1' (%2) and added it to the list.") .arg(model).arg(port)); new TQListViewItem(d->listView, model, model, port, "/", - TQDateTime::currentDateTime().toString(Qt::ISODate)); + TQDateTime::currentDateTime().toString(TQt::ISODate)); } } @@ -269,7 +269,7 @@ void SetupCamera::slotAddedCamera(const TQString& title, const TQString& model, const TQString& port, const TQString& path) { new TQListViewItem(d->listView, title, model, port, path, - TQDateTime::currentDateTime().toString(Qt::ISODate)); + TQDateTime::currentDateTime().toString(TQt::ISODate)); } void SetupCamera::slotEditedCamera(const TQString& title, const TQString& model, @@ -300,7 +300,7 @@ void SetupCamera::applySettings() TQDateTime lastAccess = TQDateTime::currentDateTime(); if (!item->text(4).isEmpty()) - lastAccess = TQDateTime::fromString(item->text(4), Qt::ISODate); + lastAccess = TQDateTime::fromString(item->text(4), TQt::ISODate); CameraType *ctype = new CameraType(item->text(0), item->text(1), item->text(2), item->text(3), lastAccess); diff --git a/digikam/utilities/setup/setupcamera.h b/digikam/utilities/setup/setupcamera.h index 58c0d2d..f0df8a7 100644 --- a/digikam/utilities/setup/setupcamera.h +++ b/digikam/utilities/setup/setupcamera.h @@ -36,7 +36,7 @@ class SetupCameraPriv; class SetupCamera : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/setup/setupcollections.cpp b/digikam/utilities/setup/setupcollections.cpp index d63db17..10a25c3 100644 --- a/digikam/utilities/setup/setupcollections.cpp +++ b/digikam/utilities/setup/setupcollections.cpp @@ -114,14 +114,14 @@ SetupCollections::SetupCollections(TQWidget* parent ) // -------------------------------------------------------- - connect(d->albumCollectionBox, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotCollectionSelectionChanged())); + connect(d->albumCollectionBox, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotCollectionSelectionChanged())); - connect(d->addCollectionButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddCollection())); + connect(d->addCollectionButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddCollection())); - connect(d->delCollectionButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDelCollection())); + connect(d->delCollectionButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDelCollection())); // -------------------------------------------------------- diff --git a/digikam/utilities/setup/setupcollections.h b/digikam/utilities/setup/setupcollections.h index 7fe6b3f..c65b93e 100644 --- a/digikam/utilities/setup/setupcollections.h +++ b/digikam/utilities/setup/setupcollections.h @@ -35,7 +35,7 @@ class SetupCollectionsPriv; class SetupCollections : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/setup/setupdcraw.cpp b/digikam/utilities/setup/setupdcraw.cpp index 929e1d4..57f9cb2 100644 --- a/digikam/utilities/setup/setupdcraw.cpp +++ b/digikam/utilities/setup/setupdcraw.cpp @@ -82,8 +82,8 @@ SetupDcraw::SetupDcraw(TQWidget* parent ) layout->addWidget(d->dcrawSettings); layout->addStretch(); - connect(d->dcrawSettings, TQT_SIGNAL(signalSixteenBitsImageToggled(bool)), - this, TQT_SLOT(slotSixteenBitsImageToggled(bool))); + connect(d->dcrawSettings, TQ_SIGNAL(signalSixteenBitsImageToggled(bool)), + this, TQ_SLOT(slotSixteenBitsImageToggled(bool))); readSettings(); } diff --git a/digikam/utilities/setup/setupdcraw.h b/digikam/utilities/setup/setupdcraw.h index 24fb583..835199f 100644 --- a/digikam/utilities/setup/setupdcraw.h +++ b/digikam/utilities/setup/setupdcraw.h @@ -39,7 +39,7 @@ class SetupDcrawPriv; class DIGIKAM_EXPORT SetupDcraw : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/setup/setupeditor.cpp b/digikam/utilities/setup/setupeditor.cpp index 56f72e1..337b565 100644 --- a/digikam/utilities/setup/setupeditor.cpp +++ b/digikam/utilities/setup/setupeditor.cpp @@ -130,8 +130,8 @@ SetupEditor::SetupEditor(TQWidget* parent ) // -------------------------------------------------------- - connect(d->themebackgroundColor, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotThemeBackgroundColor(bool))); + connect(d->themebackgroundColor, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotThemeBackgroundColor(bool))); readSettings(); } diff --git a/digikam/utilities/setup/setupeditor.h b/digikam/utilities/setup/setupeditor.h index 9df9487..bc7793a 100644 --- a/digikam/utilities/setup/setupeditor.h +++ b/digikam/utilities/setup/setupeditor.h @@ -35,7 +35,7 @@ class SetupEditorPriv; class SetupEditor : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/setup/setupgeneral.cpp b/digikam/utilities/setup/setupgeneral.cpp index b6fd47b..2a8db22 100644 --- a/digikam/utilities/setup/setupgeneral.cpp +++ b/digikam/utilities/setup/setupgeneral.cpp @@ -119,11 +119,11 @@ SetupGeneral::SetupGeneral(TQWidget* parent, KDialogBase* dialog ) "<p>Write access is required for this path and do not use a " "remote path here, like an NFS mounted file system.")); - connect(d->albumPathEdit, TQT_SIGNAL(urlSelected(const TQString &)), - this, TQT_SLOT(slotChangeAlbumPath(const TQString &))); + connect(d->albumPathEdit, TQ_SIGNAL(urlSelected(const TQString &)), + this, TQ_SLOT(slotChangeAlbumPath(const TQString &))); - connect(d->albumPathEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotPathEdited(const TQString&)) ); + connect(d->albumPathEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotPathEdited(const TQString&)) ); layout->addWidget(albumPathBox); @@ -166,7 +166,7 @@ SetupGeneral::SetupGeneral(TQWidget* parent, KDialogBase* dialog ) // -------------------------------------------------------- TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), parent); - interfaceOptionsGroup->setColumnLayout(0, Qt::Vertical ); + interfaceOptionsGroup->setColumnLayout(0, TQt::Vertical ); interfaceOptionsGroup->layout()->setMargin(KDialog::marginHint()); TQGridLayout* ifaceSettingsLayout = new TQGridLayout(interfaceOptionsGroup->layout(), 3, 4, KDialog::spacingHint()); diff --git a/digikam/utilities/setup/setupgeneral.h b/digikam/utilities/setup/setupgeneral.h index b6fa69c..768c415 100644 --- a/digikam/utilities/setup/setupgeneral.h +++ b/digikam/utilities/setup/setupgeneral.h @@ -38,7 +38,7 @@ class SetupGeneralPriv; class SetupGeneral : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/setup/setupicc.cpp b/digikam/utilities/setup/setupicc.cpp index ecfa711..b08750c 100644 --- a/digikam/utilities/setup/setupicc.cpp +++ b/digikam/utilities/setup/setupicc.cpp @@ -154,7 +154,7 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog ) // -------------------------------------------------------- - TQGroupBox *colorPolicy = new TQGroupBox(0, Qt::Horizontal, i18n("Color Management Policy"), parent); + TQGroupBox *colorPolicy = new TQGroupBox(0, TQt::Horizontal, i18n("Color Management Policy"), parent); TQGridLayout* grid = new TQGridLayout( colorPolicy->layout(), 1, 2, KDialog::spacingHint()); d->enableColorManagement = new TQCheckBox(colorPolicy); @@ -171,7 +171,7 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog ) TQToolTip::add(lcmsLogoLabel, i18n("Visit Little CMS project website")); d->behaviourGB = new TQVGroupBox(i18n("Behavior"), colorPolicy); - TQButtonGroup *behaviourOptions = new TQButtonGroup(2, Qt::Vertical, d->behaviourGB); + TQButtonGroup *behaviourOptions = new TQButtonGroup(2, TQt::Vertical, d->behaviourGB); behaviourOptions->setFrameStyle( TQFrame::NoFrame ); behaviourOptions->setInsideMargin(0); @@ -210,7 +210,7 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog ) // -------------------------------------------------------- - d->profilesGB = new TQGroupBox(0, Qt::Horizontal, i18n("ICC Profiles Settings"), parent); + d->profilesGB = new TQGroupBox(0, TQt::Horizontal, i18n("ICC Profiles Settings"), parent); TQGridLayout* grid2 = new TQGridLayout( d->profilesGB->layout(), 4, 3, KDialog::spacingHint()); grid2->setColStretch(2, 10); @@ -339,29 +339,29 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog ) // -------------------------------------------------------- - connect(d->managedView, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggleManagedView(bool))); + connect(d->managedView, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleManagedView(bool))); - connect(lcmsLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(processLCMSURL(const TQString&))); + connect(lcmsLogoLabel, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(processLCMSURL(const TQString&))); - connect(d->enableColorManagement, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggledWidgets(bool))); + connect(d->enableColorManagement, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggledWidgets(bool))); - connect(d->infoProofProfiles, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClickedProof()) ); + connect(d->infoProofProfiles, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClickedProof()) ); - connect(d->infoInProfiles, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClickedIn()) ); + connect(d->infoInProfiles, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClickedIn()) ); - connect(d->infoMonitorProfiles, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClickedMonitor()) ); + connect(d->infoMonitorProfiles, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClickedMonitor()) ); - connect(d->infoWorkProfiles, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClickedWork())); + connect(d->infoWorkProfiles, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClickedWork())); - connect(d->defaultPathKU, TQT_SIGNAL(urlSelected(const TQString&)), - this, TQT_SLOT(slotFillCombos(const TQString&))); + connect(d->defaultPathKU, TQ_SIGNAL(urlSelected(const TQString&)), + this, TQ_SLOT(slotFillCombos(const TQString&))); // -------------------------------------------------------- diff --git a/digikam/utilities/setup/setupicc.h b/digikam/utilities/setup/setupicc.h index 7821f7a..8eaaece 100644 --- a/digikam/utilities/setup/setupicc.h +++ b/digikam/utilities/setup/setupicc.h @@ -44,7 +44,7 @@ class SetupICCPriv; class DIGIKAM_EXPORT SetupICC : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/setup/setupidentity.cpp b/digikam/utilities/setup/setupidentity.cpp index a27c116..ecbfdfb 100644 --- a/digikam/utilities/setup/setupidentity.cpp +++ b/digikam/utilities/setup/setupidentity.cpp @@ -76,9 +76,9 @@ SetupIdentity::SetupIdentity(TQWidget* parent ) // IPTC only accept printable Ascii char. TQRegExp asciiRx("[\x20-\x7F]+$"); - TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, this); - TQGroupBox *photographerIdGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Photographer and Copyright Information"), parent); + TQGroupBox *photographerIdGroup = new TQGroupBox(0, TQt::Horizontal, i18n("Photographer and Copyright Information"), parent); TQGridLayout* grid = new TQGridLayout( photographerIdGroup->layout(), 1, 1, KDialog::spacingHint()); TQLabel *label1 = new TQLabel(i18n("Author:"), photographerIdGroup); @@ -108,7 +108,7 @@ SetupIdentity::SetupIdentity(TQWidget* parent ) // -------------------------------------------------------- - TQGroupBox *creditsGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Credit and Copyright"), parent); + TQGroupBox *creditsGroup = new TQGroupBox(0, TQt::Horizontal, i18n("Credit and Copyright"), parent); TQGridLayout* grid2 = new TQGridLayout( creditsGroup->layout(), 2, 1, KDialog::spacingHint()); TQLabel *label3 = new TQLabel(i18n("Credit:"), creditsGroup); diff --git a/digikam/utilities/setup/setupidentity.h b/digikam/utilities/setup/setupidentity.h index 29439be..ae26dc7 100644 --- a/digikam/utilities/setup/setupidentity.h +++ b/digikam/utilities/setup/setupidentity.h @@ -35,7 +35,7 @@ class SetupIdentityPriv; class SetupIdentity : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/setup/setupiofiles.cpp b/digikam/utilities/setup/setupiofiles.cpp index c8b9891..6cdf23d 100644 --- a/digikam/utilities/setup/setupiofiles.cpp +++ b/digikam/utilities/setup/setupiofiles.cpp @@ -77,21 +77,21 @@ SetupIOFiles::SetupIOFiles(TQWidget* parent ) //-- JPEG Settings ------------------------------------------------------ d->JPEGOptions = new JPEGSettings(parent); - KSeparator *line1 = new KSeparator(Qt::Horizontal, parent); + KSeparator *line1 = new KSeparator(TQt::Horizontal, parent); vbox->addWidget(d->JPEGOptions); vbox->addWidget(line1); //-- PNG Settings ------------------------------------------------------- d->PNGOptions = new PNGSettings(parent); - KSeparator *line2 = new KSeparator(Qt::Horizontal, parent); + KSeparator *line2 = new KSeparator(TQt::Horizontal, parent); vbox->addWidget(d->PNGOptions); vbox->addWidget(line2); //-- TIFF Settings ------------------------------------------------------ d->TIFFOptions = new TIFFSettings(parent); - KSeparator *line3 = new KSeparator(Qt::Horizontal, parent); + KSeparator *line3 = new KSeparator(TQt::Horizontal, parent); vbox->addWidget(d->TIFFOptions); vbox->addWidget(line3); diff --git a/digikam/utilities/setup/setupiofiles.h b/digikam/utilities/setup/setupiofiles.h index 271435a..060dbba 100644 --- a/digikam/utilities/setup/setupiofiles.h +++ b/digikam/utilities/setup/setupiofiles.h @@ -39,7 +39,7 @@ class SetupIOFilesPriv; class DIGIKAM_EXPORT SetupIOFiles : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/setup/setuplighttable.h b/digikam/utilities/setup/setuplighttable.h index 3087d49..20af9a6 100644 --- a/digikam/utilities/setup/setuplighttable.h +++ b/digikam/utilities/setup/setuplighttable.h @@ -35,7 +35,7 @@ class SetupLightTablePriv; class SetupLightTable : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/setup/setupmetadata.cpp b/digikam/utilities/setup/setupmetadata.cpp index 3357b1c..e4f74ed 100644 --- a/digikam/utilities/setup/setupmetadata.cpp +++ b/digikam/utilities/setup/setupmetadata.cpp @@ -93,7 +93,7 @@ SetupMetadata::SetupMetadata(TQWidget* parent ) // -------------------------------------------------------- - TQGroupBox *ExifGroup = new TQGroupBox(1, Qt::Horizontal, i18n("EXIF Actions"), parent); + TQGroupBox *ExifGroup = new TQGroupBox(1, TQt::Horizontal, i18n("EXIF Actions"), parent); d->ExifRotateBox = new TQCheckBox(ExifGroup); d->ExifRotateBox->setText(i18n("Show images/thumbs &rotated according to orientation tag")); @@ -103,7 +103,7 @@ SetupMetadata::SetupMetadata(TQWidget* parent ) // -------------------------------------------------------- - TQGroupBox *IptcGroup = new TQGroupBox(1, Qt::Horizontal, i18n("IPTC Actions"), parent); + TQGroupBox *IptcGroup = new TQGroupBox(1, TQt::Horizontal, i18n("IPTC Actions"), parent); d->saveTagsIptcBox = new TQCheckBox(IptcGroup); d->saveTagsIptcBox->setText(i18n("&Save image tags as \"Keywords\" tag")); @@ -124,7 +124,7 @@ SetupMetadata::SetupMetadata(TQWidget* parent ) // -------------------------------------------------------- - TQGroupBox *commonGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Common Metadata Actions"), parent); + TQGroupBox *commonGroup = new TQGroupBox(1, TQt::Horizontal, i18n("Common Metadata Actions"), parent); d->saveCommentsBox = new TQCheckBox(commonGroup); d->saveCommentsBox->setText(i18n("&Save image captions as embedded text")); @@ -172,11 +172,11 @@ SetupMetadata::SetupMetadata(TQWidget* parent ) // -------------------------------------------------------- - connect(exiv2LogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(processExiv2URL(const TQString&))); + connect(exiv2LogoLabel, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(processExiv2URL(const TQString&))); - connect(d->ExifRotateBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotExifAutoRotateToggled(bool))); + connect(d->ExifRotateBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotExifAutoRotateToggled(bool))); } SetupMetadata::~SetupMetadata() diff --git a/digikam/utilities/setup/setupmetadata.h b/digikam/utilities/setup/setupmetadata.h index 683bb80..4551106 100644 --- a/digikam/utilities/setup/setupmetadata.h +++ b/digikam/utilities/setup/setupmetadata.h @@ -36,7 +36,7 @@ class SetupMetadataPriv; class SetupMetadata : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/setup/setupmime.cpp b/digikam/utilities/setup/setupmime.cpp index 594dece..6ac069e 100644 --- a/digikam/utilities/setup/setupmime.cpp +++ b/digikam/utilities/setup/setupmime.cpp @@ -84,7 +84,7 @@ SetupMime::SetupMime(TQWidget* parent ) // -------------------------------------------------------- - TQGroupBox *imageFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Image Files"), parent); + TQGroupBox *imageFileFilterBox = new TQGroupBox(0, TQt::Horizontal, i18n("Image Files"), parent); TQGridLayout* grid1 = new TQGridLayout(imageFileFilterBox->layout(), 1, 1, KDialog::spacingHint()); TQLabel *logoLabel1 = new TQLabel(imageFileFilterBox); @@ -115,7 +115,7 @@ SetupMime::SetupMime(TQWidget* parent ) // -------------------------------------------------------- - TQGroupBox *movieFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Movie Files"), parent); + TQGroupBox *movieFileFilterBox = new TQGroupBox(0, TQt::Horizontal, i18n("Movie Files"), parent); TQGridLayout* grid2 = new TQGridLayout(movieFileFilterBox->layout(), 1, 1, KDialog::spacingHint()); TQLabel *logoLabel2 = new TQLabel(movieFileFilterBox); @@ -146,7 +146,7 @@ SetupMime::SetupMime(TQWidget* parent ) // -------------------------------------------------------- - TQGroupBox *audioFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Audio Files"), parent); + TQGroupBox *audioFileFilterBox = new TQGroupBox(0, TQt::Horizontal, i18n("Audio Files"), parent); TQGridLayout* grid3 = new TQGridLayout(audioFileFilterBox->layout(), 1, 1, KDialog::spacingHint()); TQLabel *logoLabel3 = new TQLabel(audioFileFilterBox); @@ -177,7 +177,7 @@ SetupMime::SetupMime(TQWidget* parent ) // -------------------------------------------------------- - TQGroupBox *rawFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("RAW Files"), parent); + TQGroupBox *rawFileFilterBox = new TQGroupBox(0, TQt::Horizontal, i18n("RAW Files"), parent); TQGridLayout* grid4 = new TQGridLayout(rawFileFilterBox->layout(), 1, 1, KDialog::spacingHint()); TQLabel *logoLabel4 = new TQLabel(rawFileFilterBox); @@ -208,17 +208,17 @@ SetupMime::SetupMime(TQWidget* parent ) // -------------------------------------------------------- - connect(d->revertImageFileFilterBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRevertImageFileFilter())); + connect(d->revertImageFileFilterBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRevertImageFileFilter())); - connect(d->revertMovieFileFilterBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRevertMovieFileFilter())); + connect(d->revertMovieFileFilterBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRevertMovieFileFilter())); - connect(d->revertAudioFileFilterBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRevertAudioFileFilter())); + connect(d->revertAudioFileFilterBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRevertAudioFileFilter())); - connect(d->revertRawFileFilterBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRevertRawFileFilter())); + connect(d->revertRawFileFilterBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRevertRawFileFilter())); // -------------------------------------------------------- diff --git a/digikam/utilities/setup/setupmime.h b/digikam/utilities/setup/setupmime.h index f6cbb71..3bff152 100644 --- a/digikam/utilities/setup/setupmime.h +++ b/digikam/utilities/setup/setupmime.h @@ -35,7 +35,7 @@ class SetupMimePriv; class SetupMime : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/setup/setupplugins.h b/digikam/utilities/setup/setupplugins.h index cdd74c6..31b7112 100644 --- a/digikam/utilities/setup/setupplugins.h +++ b/digikam/utilities/setup/setupplugins.h @@ -35,7 +35,7 @@ class SetupPluginsPriv; class SetupPlugins : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/setup/setupslideshow.h b/digikam/utilities/setup/setupslideshow.h index 5f498a0..9ba6803 100644 --- a/digikam/utilities/setup/setupslideshow.h +++ b/digikam/utilities/setup/setupslideshow.h @@ -39,7 +39,7 @@ class SetupSlideShowPriv; class DIGIKAM_EXPORT SetupSlideShow : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/setup/setuptooltip.cpp b/digikam/utilities/setup/setuptooltip.cpp index d4f00dd..2a5c62c 100644 --- a/digikam/utilities/setup/setuptooltip.cpp +++ b/digikam/utilities/setup/setuptooltip.cpp @@ -187,14 +187,14 @@ SetupToolTip::SetupToolTip(TQWidget* parent) // -------------------------------------------------------- - connect(d->showToolTipsBox, TQT_SIGNAL(toggled(bool)), - d->fileSettingBox, TQT_SLOT(setEnabled(bool))); + connect(d->showToolTipsBox, TQ_SIGNAL(toggled(bool)), + d->fileSettingBox, TQ_SLOT(setEnabled(bool))); - connect(d->showToolTipsBox, TQT_SIGNAL(toggled(bool)), - d->photoSettingBox, TQT_SLOT(setEnabled(bool))); + connect(d->showToolTipsBox, TQ_SIGNAL(toggled(bool)), + d->photoSettingBox, TQ_SLOT(setEnabled(bool))); - connect(d->showToolTipsBox, TQT_SIGNAL(toggled(bool)), - d->digikamSettingBox, TQT_SLOT(setEnabled(bool))); + connect(d->showToolTipsBox, TQ_SIGNAL(toggled(bool)), + d->digikamSettingBox, TQ_SLOT(setEnabled(bool))); // -------------------------------------------------------- diff --git a/digikam/utilities/setup/setuptooltip.h b/digikam/utilities/setup/setuptooltip.h index e0c9e71..8474de7 100644 --- a/digikam/utilities/setup/setuptooltip.h +++ b/digikam/utilities/setup/setuptooltip.h @@ -35,7 +35,7 @@ class SetupToolTipPriv; class SetupToolTip : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/slideshow/slideshow.cpp b/digikam/utilities/slideshow/slideshow.cpp index 31c6cf2..33cf9ed 100644 --- a/digikam/utilities/slideshow/slideshow.cpp +++ b/digikam/utilities/slideshow/slideshow.cpp @@ -128,20 +128,20 @@ SlideShow::SlideShow(const SlideShowSettings& settings) if (!d->settings.loop) d->toolBar->setEnabledPrev(false); - connect(d->toolBar, TQT_SIGNAL(signalPause()), - this, TQT_SLOT(slotPause())); + connect(d->toolBar, TQ_SIGNAL(signalPause()), + this, TQ_SLOT(slotPause())); - connect(d->toolBar, TQT_SIGNAL(signalPlay()), - this, TQT_SLOT(slotPlay())); + connect(d->toolBar, TQ_SIGNAL(signalPlay()), + this, TQ_SLOT(slotPlay())); - connect(d->toolBar, TQT_SIGNAL(signalNext()), - this, TQT_SLOT(slotNext())); + connect(d->toolBar, TQ_SIGNAL(signalNext()), + this, TQ_SLOT(slotNext())); - connect(d->toolBar, TQT_SIGNAL(signalPrev()), - this, TQT_SLOT(slotPrev())); + connect(d->toolBar, TQ_SIGNAL(signalPrev()), + this, TQ_SLOT(slotPrev())); - connect(d->toolBar, TQT_SIGNAL(signalClose()), - this, TQT_SLOT(slotClose())); + connect(d->toolBar, TQ_SIGNAL(signalClose()), + this, TQ_SLOT(slotClose())); // --------------------------------------------------------------- @@ -150,14 +150,14 @@ SlideShow::SlideShow(const SlideShowSettings& settings) d->timer = new TQTimer(this); d->mouseMoveTimer = new TQTimer(this); - connect(d->previewThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), - this, TQT_SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); + connect(d->previewThread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), + this, TQ_SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); - connect(d->mouseMoveTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotMouseMoveTimeOut())); + connect(d->mouseMoveTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotMouseMoveTimeOut())); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotTimeOut())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTimeOut())); d->timer->start(10, true); @@ -534,7 +534,7 @@ void SlideShow::printComments(TQPainter &p, int &offset, const TQString& comment void SlideShow::paintEvent(TQPaintEvent *) { - bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&d->pixmap), + bitBlt(this, 0, 0, static_cast<TQPaintDevice*>(&d->pixmap), 0, 0, d->pixmap.width(), d->pixmap.height(), TQt::CopyROP, true); } @@ -598,14 +598,14 @@ void SlideShow::mousePressEvent(TQMouseEvent *e) if (d->endOfShow) close(); - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { d->timer->stop(); d->pause = true; d->toolBar->setPaused(true); slotNext(); } - else if (e->button() == Qt::RightButton && d->fileIndex-1 >= 0) + else if (e->button() == TQt::RightButton && d->fileIndex-1 >= 0) { d->timer->stop(); d->pause = true; diff --git a/digikam/utilities/slideshow/slideshow.h b/digikam/utilities/slideshow/slideshow.h index 36cc5e5..dc15ce1 100644 --- a/digikam/utilities/slideshow/slideshow.h +++ b/digikam/utilities/slideshow/slideshow.h @@ -42,7 +42,7 @@ class SlideShowPriv; class DIGIKAM_EXPORT SlideShow : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/slideshow/toolbar.cpp b/digikam/utilities/slideshow/toolbar.cpp index 9f7023a..dbecd4a 100644 --- a/digikam/utilities/slideshow/toolbar.cpp +++ b/digikam/utilities/slideshow/toolbar.cpp @@ -90,23 +90,23 @@ ToolBar::ToolBar(TQWidget* parent) adjustSize(); setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); - connect(d->playBtn, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotPlayBtnToggled())); + connect(d->playBtn, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotPlayBtnToggled())); - connect(d->nextBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNexPrevClicked())); + connect(d->nextBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNexPrevClicked())); - connect(d->prevBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNexPrevClicked())); + connect(d->prevBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNexPrevClicked())); - connect(d->nextBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalNext())); + connect(d->nextBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalNext())); - connect(d->prevBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalPrev())); + connect(d->prevBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalPrev())); - connect(d->stopBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalClose())); + connect(d->stopBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalClose())); } ToolBar::~ToolBar() diff --git a/digikam/utilities/slideshow/toolbar.h b/digikam/utilities/slideshow/toolbar.h index ced8479..97262c1 100644 --- a/digikam/utilities/slideshow/toolbar.h +++ b/digikam/utilities/slideshow/toolbar.h @@ -40,7 +40,7 @@ class ToolBarPriv; class DIGIKAM_EXPORT ToolBar : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/doc/digikam/Shortcuts b/doc/digikam/Shortcuts index 5d083a4..1cf3197 100644 --- a/doc/digikam/Shortcuts +++ b/doc/digikam/Shortcuts @@ -7,9 +7,9 @@ m_autoCorrectionAction = new KAction(i18n("Auto-Correction..."), "autocorrection m_invertAction = new KAction(i18n("Invert"), "invertimage", ./imageplugins/imageplugin_core.cpp: CTRL+Key_I, // NOTE: Photoshop 7 use CTRL+I. ./digikam/digikamapp.cpp: m_accelerators->insert("Copy Album Items Selection CTRL+Key_C", i18n("Copy Album Items Selection"), -./digikam/digikamapp.cpp: CTRL+Key_C, this, SIGNAL(signalCopyAlbumItemsSelection()), +./digikam/digikamapp.cpp: CTRL+Key_C, this, TQ_SIGNAL(signalCopyAlbumItemsSelection()), ./digikam/digikamapp.cpp: m_accelerators->insert("Paste Album Items Selection CTRL+Key_V", i18n("Paste Album Items Selection"), -./digikam/digikamapp.cpp: CTRL+Key_V, this, SIGNAL(signalPasteAlbumItemsSelection()), +./digikam/digikamapp.cpp: CTRL+Key_V, this, TQ_SIGNAL(signalPasteAlbumItemsSelection()), ./digikam/digikamapp.cpp: CTRL+Key_I, ./digikam/digikamapp.cpp: CTRL+Key_A, ./digikam/digikamapp.cpp: CTRL+Key_U, @@ -26,25 +26,25 @@ m_invertAction = new KAction(i18n("Invert"), "invertimage", ./showfoto/showfoto.cpp: CTRL+SHIFT+Key_O, ./showfoto/showfoto.cpp: CTRL+Key_T, ./utilities/imageeditor/editor/editorwindow.cpp: CTRL+Key_P, -./utilities/imageeditor/editor/editorwindow.cpp: CTRL+SHIFT+Key_A, this, SLOT(slotToggleAutoZoom()), +./utilities/imageeditor/editor/editorwindow.cpp: CTRL+SHIFT+Key_A, this, TQ_SLOT(slotToggleAutoZoom()), ./utilities/imageeditor/editor/editorwindow.cpp: CTRL+SHIFT+Key_F, this, ./utilities/imageeditor/editor/editorwindow.cpp: CTRL+Key_X, ./utilities/imageeditor/editor/editorwindow.cpp: d->flipHorzAction = new KAction(i18n("Horizontally"), 0, CTRL+Key_Asterisk, ./utilities/imageeditor/editor/editorwindow.cpp: d->flipVertAction = new KAction(i18n("Vertically"), 0, CTRL+Key_Slash, -./utilities/imageeditor/editor/editorwindow.cpp: 0, CTRL+Key_9, m_canvas, SLOT(slotRotate90()), -./utilities/imageeditor/editor/editorwindow.cpp: 0, CTRL+Key_8, m_canvas, SLOT(slotRotate180()), -./utilities/imageeditor/editor/editorwindow.cpp: 0, CTRL+Key_7, m_canvas, SLOT(slotRotate270()), +./utilities/imageeditor/editor/editorwindow.cpp: 0, CTRL+Key_9, m_canvas, TQ_SLOT(slotRotate90()), +./utilities/imageeditor/editor/editorwindow.cpp: 0, CTRL+Key_8, m_canvas, TQ_SLOT(slotRotate180()), +./utilities/imageeditor/editor/editorwindow.cpp: 0, CTRL+Key_7, m_canvas, TQ_SLOT(slotRotate270()), ./utilities/imageeditor/editor/imagewindow.cpp: d->star0 = new KAction(i18n("Assign Rating \"No Star\""), CTRL+Key_0, ./utilities/imageeditor/editor/imagewindow.cpp: d->star1 = new KAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1, ./utilities/imageeditor/editor/imagewindow.cpp: d->star2 = new KAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2, ./utilities/imageeditor/editor/imagewindow.cpp: d->star3 = new KAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3, ./utilities/imageeditor/editor/imagewindow.cpp: d->star4 = new KAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4, ./utilities/imageeditor/editor/imagewindow.cpp: d->star5 = new KAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5, -./utilities/cameragui/cameraui.cpp: d->imageMenu->insertItem(i18n("Select &All"), d->view, SLOT(slotSelectAll()), CTRL+Key_A, 0); -./utilities/cameragui/cameraui.cpp: d->imageMenu->insertItem(i18n("Select N&one"), d->view, SLOT(slotSelectNone()), CTRL+Key_U, 1); -./utilities/cameragui/cameraui.cpp: d->imageMenu->insertItem(i18n("&Invert Selection"), d->view, SLOT(slotSelectInvert()), CTRL+Key_Asterisk, 2); -./utilities/cameragui/cameraui.cpp: d->imageMenu->insertItem(i18n("Increase Thumbs"), this, SLOT(slotIncreaseThumbSize()), CTRL+Key_Plus, 4); -./utilities/cameragui/cameraui.cpp: d->imageMenu->insertItem(i18n("Decrease Thumbs"), this, SLOT(slotDecreaseThumbSize()), CTRL+Key_Minus, 5); +./utilities/cameragui/cameraui.cpp: d->imageMenu->insertItem(i18n("Select &All"), d->view, TQ_SLOT(slotSelectAll()), CTRL+Key_A, 0); +./utilities/cameragui/cameraui.cpp: d->imageMenu->insertItem(i18n("Select N&one"), d->view, TQ_SLOT(slotSelectNone()), CTRL+Key_U, 1); +./utilities/cameragui/cameraui.cpp: d->imageMenu->insertItem(i18n("&Invert Selection"), d->view, TQ_SLOT(slotSelectInvert()), CTRL+Key_Asterisk, 2); +./utilities/cameragui/cameraui.cpp: d->imageMenu->insertItem(i18n("Increase Thumbs"), this, TQ_SLOT(slotIncreaseThumbSize()), CTRL+Key_Plus, 4); +./utilities/cameragui/cameraui.cpp: d->imageMenu->insertItem(i18n("Decrease Thumbs"), this, TQ_SLOT(slotDecreaseThumbSize()), CTRL+Key_Minus, 5); ./ChangeLog: rotate an image in editor, use CTRL+7, CTRL+8, CTRL+9 to prevent ./ChangeLog: - 2 keyboard shorcuts can be used to change thumbs size : CTRL+ ./ChangeLog: CTRL+0/1/2/3/4/5 from Image Editor diff --git a/po/el/digikam.po b/po/el/digikam.po index be0092b..cbf2993 100644 --- a/po/el/digikam.po +++ b/po/el/digikam.po @@ -4,20 +4,22 @@ # # Spiros Georgaras <sng@hellug.gr>, 2007. # Toussis Manolis <manolis@koppermind.homelinux.org>, 2007. +# funky 01 <funkybomber@gmail.com>, 2022, 2023. msgid "" msgstr "" "Project-Id-Version: digikam\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2021-07-07 18:26+0000\n" -"PO-Revision-Date: 2007-10-11 23:50+0300\n" -"Last-Translator: Spiros Georgaras <sng@hellug.gr>\n" -"Language-Team: Greek <i18ngr@lists.hellug.gr>\n" +"PO-Revision-Date: 2023-01-01 09:21+0000\n" +"Last-Translator: funky 01 <funkybomber@gmail.com>\n" +"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/" +"applications/digikam/el/>\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Weblate 4.14.2\n" #. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" @@ -177,9 +179,8 @@ msgstr "Άλμπουμ:" #: digikam/albumfiletip.cpp:529 libs/imageproperties/imagedescedittab.cpp:159 #: utilities/lighttable/lighttablebar.cpp:856 -#, fuzzy msgid "Caption:" -msgstr "Περιστροφή:" +msgstr "Λεζάντα:" #: digikam/albumfiletip.cpp:539 utilities/lighttable/lighttablebar.cpp:866 msgid "Tags:" @@ -220,14 +221,13 @@ msgid "Delete Album" msgstr "Διαγραφή άλμπουμ" #: digikam/albumfolderview.cpp:736 -#, fuzzy msgid "" "The album library has not been set correctly.\n" "Select \"Configure Digikam\" from the Settings menu and choose a folder to " "use for the album library." msgstr "" "Η βιβλιοθήκη άλμπουμ δεν έχει οριστεί σωστά.\n" -"Επιλέξτε τη \"Ρύθμιση του Digikam\" από το μονού ρυθμίσεων και επιλέξτε ένα " +"Επιλέξτε τη \"Ρύθμιση του Digikam\" από το μενού ρυθμίσεων και επιλέξτε ένα " "φάκελο για τη βιβλιοθήκη άλμπουμ." #: digikam/albumfolderview.cpp:873 digikam/timelineview.cpp:626 @@ -283,14 +283,13 @@ msgid "Download && Delete from camera" msgstr "Λήψη & διαγραφή από τη φωτογραφική" #: digikam/albumfolderview.cpp:1363 -#, fuzzy msgid "" "The album library has not been set correctly.\n" "Select \"Configure digiKam\" from the Settings menu and choose a folder to " "use for the album library." msgstr "" "Η βιβλιοθήκη άλμπουμ δεν έχει οριστεί σωστά.\n" -"Επιλέξτε τη \"Ρύθμιση του Digikam\" από το μονού ρυθμίσεων και επιλέξτε ένα " +"Επιλέξτε τη \"Ρύθμιση του digiKam\" από το μενού ρυθμίσεων και επιλέξτε ένα " "φάκελο για τη βιβλιοθήκη άλμπουμ." #: digikam/albumfolderview.cpp:1386 @@ -324,9 +323,8 @@ msgid "Album" msgstr "Άλμπουμ" #: digikam/albumiconview.cpp:586 -#, fuzzy msgid "Date" -msgstr "Ημερομηνίες" +msgstr "Ημερομηνία" #: digikam/albumiconview.cpp:589 digikam/searchwidgets.cpp:77 msgid "Tag" @@ -349,7 +347,7 @@ msgstr "Εισαγωγή στον φωτεινό πίνακα" #: digikam/albumiconview.cpp:623 msgid "Go To" -msgstr "" +msgstr "Μετάβαση σε" #: digikam/albumiconview.cpp:630 digikam/imagepreviewview.cpp:377 #: utilities/lighttable/lighttablepreview.cpp:387 @@ -441,9 +439,8 @@ msgid "Failed to revise Exif orientation for file %1." msgstr "Αποτυχία διόρθωσης του προσανατολισμού Exif στο αρχείο %1." #: digikam/albumiconview.cpp:1901 -#, fuzzy msgid "Failed to revise Exif orientation these files:" -msgstr "Αποτυχία διόρθωσης του προσανατολισμού Exif στο αρχείο %1." +msgstr "Αποτυχία διόρθωσης του προσανατολισμού Exif στα αρχεία:" #: digikam/albumiconview.cpp:2238 msgid "Removing image tags. Please wait..." @@ -467,51 +464,45 @@ msgstr "" #: digikam/albumiconviewfilter.cpp:86 msgid "Text quick filter (search)" -msgstr "" +msgstr "Γρήγορο φίλτρο κειμένου (αναζήτηση)" #: digikam/albumiconviewfilter.cpp:87 msgid "" "Enter search patterns to quickly filter this view on file names, captions " "(comments), and tags" msgstr "" +"Εισάγετε μοτίβο αναζήτησης για να φιλτράρετε γρήγορα την απεικόνιση σε " +"ονόματα αρχείου, λεζάντες (σχόλια), και ετικέτες" #: digikam/albumiconviewfilter.cpp:157 -#, fuzzy msgid "<br><nobr><i>Text</i></nobr>" -msgstr "<nobr><b>Βάθος Bit</b></nobr>:" +msgstr "<br><nobr><i>Κείμενο</i></nobr>" #: digikam/albumiconviewfilter.cpp:160 -#, fuzzy msgid "<br><nobr><i>Mime Type</i></nobr>" -msgstr "<nobr><b>Νέο όνομα</b></nobr>:" +msgstr "<br><nobr><i>Τύπος Mime</i></nobr>" #: digikam/albumiconviewfilter.cpp:163 -#, fuzzy msgid "<br/><nobr><i>Rating</i></nobr>" -msgstr "<nobr><b>Νέο όνομα</b></nobr>:" +msgstr "<br/><nobr><i>Αξιολόγηση</i></nobr>" #: digikam/albumiconviewfilter.cpp:166 -#, fuzzy msgid "<br><nobr><i>Tags</i></nobr>" -msgstr "<nobr><b>Νέο όνομα</b></nobr>:" +msgstr "<br><nobr><i>Ετικέτες</i></nobr>" #: digikam/albumiconviewfilter.cpp:169 -#, fuzzy msgid "<nobr><b>Active filters:</b></nobr>" -msgstr "<nobr><b>Ισορροπία λευκού</b></nobr>:" +msgstr "<nobr><b>Ενεργά φίλτρα:</b></nobr>" #: digikam/albumiconviewfilter.cpp:171 -#, fuzzy msgid "<nobr><b>Active filter:</b></nobr>" -msgstr "<nobr><b>Ισορροπία λευκού</b></nobr>:" +msgstr "<nobr><b>Ενεργό φίλτρο:</b></nobr>" #: digikam/albumiconviewfilter.cpp:177 -#, fuzzy msgid "No active filter" -msgstr "Φίλτρο θορύβου:" +msgstr "Χωρίς ενεργό φίλτρο" #: digikam/albummanager.cpp:321 -#, fuzzy msgid "" "Your locale has changed since this album was last opened.\n" "Old Locale : %1, New Locale : %2\n" @@ -524,8 +515,8 @@ msgstr "" "Παλιά γλώσσα : %1, Νέα γλώσσα : %2\n" "Αυτό μπορεί να προκαλέσει μη αναμενόμενα προβλήματα. Αν είστε σίγουροι ότι " "θέλετε να συνεχίσετε, κάντε κλικ στο 'Ναι' για να εργαστείτε με αυτό το " -"άλμπουμ. Σε άλλη περίπτωση, κάντε κλικ στο 'Όχι' και διορθώστε την επιλογή " -"της τοπικής σας γλώσσας πριν την επανεκκίνηση του digiKam" +"άλμπουμ. Διαφορετικά, κάντε κλικ στο 'Όχι' και διορθώστε την επιλογή της " +"τοπικής σας γλώσσας πριν την επανεκκίνηση του digiKam" #: digikam/albummanager.cpp:341 msgid "" @@ -671,9 +662,8 @@ msgid "Co&llection:" msgstr "Συ&λλογή:" #: digikam/albumpropsedit.cpp:157 -#, fuzzy msgid "Ca&ption:" -msgstr "Συσχέτιση:" +msgstr "Λεζάντα:" #: digikam/albumpropsedit.cpp:168 msgid "Album &date:" @@ -770,9 +760,9 @@ msgid "Using Dcraw program version %1" msgstr "Χρήση προγράμματος Dcraw έκδοση %1" #: digikam/daboutdata.h:95 -#, fuzzy, c-format +#, c-format msgid "Using LibRaw version %1" -msgstr "Χρήση βιβλιοθήκης PNG έκδοση %1" +msgstr "Χρήση του LibRaw έκδοση %1" #: digikam/daboutdata.h:98 #, c-format @@ -789,12 +779,11 @@ msgstr "TDE προβολέας φωτογραφιών και επεξεργασ #: digikam/daboutdata.h:115 msgid "A Color Theme Designer for digiKam" -msgstr "Ένας σχεδιαστής θεμάτων για το digiKam." +msgstr "Ένας σχεδιαστής χρωματικών θεμάτων για το digiKam" #: digikam/daboutdata.h:120 -#, fuzzy msgid "(c) 2002-2009, digiKam developers team" -msgstr "(c) 2002-2007, Η ομάδα προγραμματιστών του Digikam" +msgstr "(c) 2002-2009, Η ομάδα προγραμματιστών του digiKam" #: digikam/daboutdata.h:131 msgid "Main developer and coordinator" @@ -821,14 +810,12 @@ msgid "Developer" msgstr "Προγραμματιστής" #: digikam/daboutdata.h:156 -#, fuzzy msgid "Developer (2002-2005)" -msgstr "Προγραμματιστής" +msgstr "Προγραμματιστής (2002-2005)" #: digikam/daboutdata.h:161 digikam/daboutdata.h:166 -#, fuzzy msgid "Developer (2004-2005)" -msgstr "Προγραμματιστής" +msgstr "Προγραμματιστής (2004-2005)" #: digikam/daboutdata.h:176 digikam/daboutdata.h:181 msgid "Bug reports and patches" @@ -904,7 +891,7 @@ msgstr "Αναφορά σφαλμάτων, διορθώσεις και εικο #: digikam/datefolderview.cpp:194 msgid "My Calendar" -msgstr "" +msgstr "Το Ημερολόγιό Μου" #: digikam/digikamapp.cpp:127 #, fuzzy @@ -1042,23 +1029,27 @@ msgstr "Κατά ημερομηνία" #: digikam/digikamapp.cpp:574 msgid "Include Album Sub-Tree" -msgstr "" +msgstr "Συμπεριέλαβε το Υπο-Δέντρο του Άλμπουμ" #: digikam/digikamapp.cpp:580 msgid "" "Activate this option to recursively show all sub-albums below the current " "album." msgstr "" +"Ενεργοποίηση αυτής της επιλογής για αναδρομική εμφάνιση όλων των υπο-άλμπουμ " +"κάτω από το τρέχον άλμπουμ." #: digikam/digikamapp.cpp:586 msgid "Include Tag Sub-Tree" -msgstr "" +msgstr "Συμπεριέλαβε Ετικέτα Υπο-Δέντρου" #: digikam/digikamapp.cpp:592 msgid "" "Activate this option to show all images marked by the given tag and its all " "its sub-tags." msgstr "" +"Ενεργοποίησε αυτή την επιλογή για εμφάνιση όλων των εικόνων που είναι " +"μαρκαρισμένες με την δοθείσα ετικέτα και όλες τις υπο-ετικέτες." #: digikam/digikamapp.cpp:606 msgid "Add Images..." @@ -1198,33 +1189,28 @@ msgid "Flipped Horizontally" msgstr "Αναστράφηκε οριζόν" #: digikam/digikamapp.cpp:798 -#, fuzzy msgid "Rotated Upside Down" -msgstr "Κατακόρυφη περιστροφή" +msgstr "Περιστραμμένο Ανάποδα" #: digikam/digikamapp.cpp:804 msgid "Flipped Vertically" msgstr "Κατακόρυφη αναστροφή" #: digikam/digikamapp.cpp:810 -#, fuzzy msgid "Rotated Right / Horiz. Flipped" -msgstr "Περιστροφή 90 μοίρες / Οριζ. αναστροφή" +msgstr "Περιστραμμένο Δεξιά / Ανεστραμμένο Οριζοντίως" #: digikam/digikamapp.cpp:816 -#, fuzzy msgid "Rotated Right" -msgstr "Περιστροφή δεξιά" +msgstr "Περιστραμμένο Δεξιά" #: digikam/digikamapp.cpp:822 -#, fuzzy msgid "Rotated Right / Vert. Flipped" -msgstr "Περιστροφή 90 μοίρες / Καθ. αναστροφή" +msgstr "Περιστραμμένο Δεξιά / Ανεστραμμένο Καθέτως" #: digikam/digikamapp.cpp:828 -#, fuzzy msgid "Rotated Left" -msgstr "Περιστροφή αριστερά" +msgstr "Περιστραμμένο Αριστερά" #: digikam/digikamapp.cpp:887 utilities/imageeditor/editor/editorwindow.cpp:343 msgid "Select None" @@ -1247,9 +1233,9 @@ msgstr "Σμίκρυνση" #: digikam/digikamapp.cpp:929 utilities/imageeditor/editor/editorwindow.cpp:359 #: utilities/lighttable/lighttablewindow.cpp:410 -#, fuzzy, c-format +#, c-format msgid "Zoom to 100%" -msgstr "Εστίαση 1:1" +msgstr "Εστίαση στο 100%" #: digikam/digikamapp.cpp:937 utilities/imageeditor/editor/editorwindow.cpp:365 #: utilities/lighttable/lighttablepreview.cpp:380 @@ -1259,18 +1245,15 @@ msgstr "Προσαρμογή στο &παράθυρο" #: digikam/digikamapp.cpp:946 utilities/imageeditor/editor/editorwindow.cpp:404 #: utilities/lighttable/lighttablewindow.cpp:420 -#, fuzzy msgid "Full Screen" -msgstr "Πλήρες κείμενο" +msgstr "Πλήρες Οθόνη" #: digikam/digikamapp.cpp:953 -#, fuzzy msgid "Switch the window to full screen mode" -msgstr "Α&πόκρυψη γραμμής επισκοπήσεων σε λειτουργία πλήρους οθόνης" +msgstr "Αλλαγή του παράθυρου σε λειτουργία πλήρους οθόνης" #: digikam/digikamapp.cpp:955 utilities/imageeditor/editor/editorwindow.cpp:410 #: utilities/lighttable/lighttablewindow.cpp:426 -#, fuzzy msgid "Slideshow" msgstr "Προβολή σλάιντ" @@ -1283,15 +1266,13 @@ msgid "Selection" msgstr "Επιλογή" #: digikam/digikamapp.cpp:972 -#, fuzzy msgid "With All Sub-Albums" -msgstr "Με όλα τα υποάλμπουμ" +msgstr "Με όλα τα υπο-άλμπουμ" #: digikam/digikamapp.cpp:984 utilities/imageeditor/editor/editorwindow.cpp:504 #: utilities/lighttable/lighttablewindow.cpp:462 -#, fuzzy msgid "Supported RAW Cameras" -msgstr "Προσαρτημένη φωτογραφική μηχανή" +msgstr "Φωτογραφικές μηχανές RAW που υποστηρίζονται" #: digikam/digikamapp.cpp:992 msgid "Kipi Plugins Handbook" @@ -1300,19 +1281,17 @@ msgstr "Εγχειρίδιο πρόσθετων Kipi" #: digikam/digikamapp.cpp:1005 #: utilities/imageeditor/editor/editorwindow.cpp:492 #: utilities/lighttable/lighttablewindow.cpp:450 -#, fuzzy msgid "Donate..." -msgstr "Προσφορά χρημάτων..." +msgstr "Δωρεές..." #: digikam/digikamapp.cpp:1013 #: utilities/imageeditor/editor/editorwindow.cpp:498 #: utilities/lighttable/lighttablewindow.cpp:456 msgid "Contribute..." -msgstr "" +msgstr "Συνεισφέρετε..." #: digikam/digikamapp.cpp:1023 utilities/imageeditor/editor/imagewindow.cpp:314 #: utilities/lighttable/lighttablewindow.cpp:479 -#, fuzzy msgid "Assign Rating \"No Stars\"" msgstr "Ορισμός βαθμολογίας \"Κανένα αστέρι\"" @@ -1342,9 +1321,8 @@ msgid "Assign Rating \"Five Stars\"" msgstr "Ορισμός βαθμολογίας \"Πέντε αστέρια\"" #: digikam/digikamapp.cpp:1046 libs/widgets/common/searchtextbar.h:81 -#, fuzzy msgid "Search..." -msgstr "Στρέβλωση..." +msgstr "Αναζήτηση..." #: digikam/digikamapp.cpp:1051 msgid "Advanced Search..." @@ -1360,9 +1338,8 @@ msgid "Scan for New Images" msgstr "Αναζήτηση νέων εικόνων" #: digikam/digikamapp.cpp:1062 -#, fuzzy msgid "Rebuild All Thumbnails..." -msgstr "Επανακατασκευή όλων των επισκοπήσεων..." +msgstr "Επανακατασκευή όλων των επισκοπήσεων εικόνων..." #: digikam/digikamapp.cpp:1066 msgid "Update Metadata Database..." @@ -1395,9 +1372,8 @@ msgid "Images found in %1" msgstr "Βρέθηκαν εικόνες στο %1" #: digikam/digikamapp.cpp:1556 -#, fuzzy msgid "No media devices found" -msgstr "Δε βρέθηκαν καταχωρήσεις βιβλίου διευθύνσεων" +msgstr "Δε βρέθηκαν συσκευές πολυμέσων" #: digikam/digikamapp.cpp:1705 libs/greycstoration/greycstorationwidget.cpp:138 #: showfoto/setup/setup.cpp:94 @@ -3922,14 +3898,12 @@ msgstr "Σκίτσο με κάρβουνο..." #: imageplugins/colorfx/colorfxtool.cpp:83 #: imageplugins/colorfx/imageeffect_colorfx.cpp:81 -#, fuzzy msgid "Color Effects" -msgstr "Εφέ χρωμάτων" +msgstr "Εφέ Χρωμάτων" #: imageplugins/colorfx/colorfxtool.cpp:91 -#, fuzzy msgid "<p>This is the color effects preview" -msgstr "<p>Αυτή είναι η προεπισκόπηση του χρωματικού εφέ" +msgstr "<p>Αυτή είναι η προεπισκόπηση των χρωματικών εφέ" #: imageplugins/colorfx/colorfxtool.cpp:110 #: imageplugins/colorfx/imageeffect_colorfx.cpp:116 @@ -3989,7 +3963,7 @@ msgstr "Ηλιακή έκθεση" #: imageplugins/colorfx/imageeffect_colorfx.cpp:175 #: imageplugins/colorfx/imageeffect_colorfx.cpp:398 msgid "Vivid" -msgstr "Vivid" +msgstr "Ζωηρό" #: imageplugins/colorfx/colorfxtool.cpp:166 #: imageplugins/colorfx/colorfxtool.cpp:412 @@ -4056,23 +4030,20 @@ msgid "Apply Color Special Effects to Photograph" msgstr "Εφαρμογή ειδικών εφέ χρωμάτων στη φωτογραφία" #: imageplugins/colorfx/imageeffect_colorfx.cpp:83 -#, fuzzy msgid "A digiKam plugin to apply special color effects to an image." msgstr "" "Ένα πρόσθετο του digiKam για την εφαρμογή ειδικών χρωματικών εφέ σε μια " "εικόνα." #: imageplugins/colorfx/imageeffect_colorfx.cpp:89 -#, fuzzy msgid "Original Author" -msgstr "Αρχική" +msgstr "Αρχικός Συγγραφέας" #: imageplugins/colorfx/imageeffect_colorfx.cpp:92 msgid "Maintainer" msgstr "Συντηρητής" #: imageplugins/colorfx/imageeffect_colorfx.cpp:100 -#, fuzzy msgid "<p>This is the color effect preview" msgstr "<p>Αυτή είναι η προεπισκόπηση του χρωματικού εφέ" @@ -4081,9 +4052,8 @@ msgid "Color Effects..." msgstr "Εφέ χρωμάτων..." #: imageplugins/coreplugin/autocorrectiontool.cpp:79 -#, fuzzy msgid "Auto-Correction" -msgstr "Αυτόματη διόρθωση..." +msgstr "Αυτόματη διόρθωση" #: imageplugins/coreplugin/autocorrectiontool.cpp:86 #: imageplugins/coreplugin/imageeffect_autocorrection.cpp:83 @@ -10165,7 +10135,6 @@ msgid "Show camera flash settings" msgstr "Εμφάνιση ρυθμίσεων φλας" #: showfoto/setup/setuptooltip.cpp:149 utilities/setup/setuptooltip.cpp:160 -#, fuzzy msgid "" "<p>Set this option to display the camera flash settings used to take the " "image." @@ -10238,9 +10207,8 @@ msgid "Delete File" msgstr "Διαγραφή αρχείου" #: showfoto/showfoto.cpp:792 utilities/imageeditor/editor/imagewindow.cpp:719 -#, fuzzy msgid " (%2 of %3)" -msgstr "%1 (%2 από %3)" +msgstr " (%2 από %3)" #: showfoto/showfoto.cpp:904 msgid "There are no images in this folder." @@ -10322,7 +10290,7 @@ msgstr "Αδυναμία δημιουργίας εικόνας επισκόπη #: themedesigner/main.cpp:46 msgid "Document to open." -msgstr "" +msgstr "Έγγραφο προς άνοιγμα." #: themedesigner/main.cpp:53 themedesigner/mainwindow.cpp:69 msgid "digiKam Theme Designer" @@ -10337,26 +10305,23 @@ msgid "July 2007 - 10 Items" msgstr "Ιούλιος 2007 - 10 αντικείμενα" #: themedesigner/themediconitem.cpp:153 -#, fuzzy msgid "Photo caption" -msgstr "Σχόλια φωτογραφίας" +msgstr "Λεζάντα φωτογραφίας" #: themedesigner/themediconitem.cpp:170 msgid "Events, Places, Vacation" msgstr "Γεγονότα, τοποθεσίες, διακοπές" #: utilities/batch/batchalbumssyncmetadata.cpp:78 -#, fuzzy msgid "Sync All Images' Metadata" -msgstr "Συγχρονισμός μεταδεδομένων όλων των εικόνων" +msgstr "Συγχρονισμός των μεταδεδομένων όλων των εικόνων" #: utilities/batch/batchalbumssyncmetadata.cpp:79 -#, fuzzy msgid "" "<b>Syncing the metadata of all images with the digiKam database. Please " "wait...</b>" msgstr "" -"<b>Συγχρονισμός μεταδεδομένων όλων των εικόνων με τη βάση δεδομένων του " +"<b>Συγχρονισμός των μεταδεδομένων όλων των εικόνων με τη βάση δεδομένων του " "digiKam. Παρακαλώ περιμένετε...</b>" #: utilities/batch/batchalbumssyncmetadata.cpp:92 @@ -10364,13 +10329,12 @@ msgid "Parsing all albums" msgstr "Ανάλυση όλων των άλμπουμ" #: utilities/batch/batchalbumssyncmetadata.cpp:111 -#, fuzzy msgid "" "<b>The metadata of all images has been synchronized with the digiKam " "database.</b>" msgstr "" -"<b>Ο συγχρονισμός μεταδεδομένων όλων των εικόνων με τη βάση δεδομένων του " -"digiKam ολοκληρώθηκε</b>" +"<b>Ο συγχρονισμός των μεταδεδομένων όλων των εικόνων με τη βάση δεδομένων " +"του digiKam ολοκληρώθηκε.</b>" #: utilities/batch/batchalbumssyncmetadata.cpp:112 #: utilities/batch/batchthumbsgenerator.cpp:126 @@ -10379,10 +10343,9 @@ msgid "Duration: %1" msgstr "Διάρκεια: %1" #: utilities/batch/batchsyncmetadata.cpp:118 -#, fuzzy msgid "Synchonizing images' Metadata with database. Please wait..." msgstr "" -"Συγχρονισμός μεταδεδομένων των εικόνων με τη βάση δεδομένων. Παρακαλώ " +"Συγχρονισμός των μεταδεδομένων των εικόνων με τη βάση δεδομένων. Παρακαλώ " "περιμένετε..." #: utilities/batch/batchthumbsgenerator.cpp:82 @@ -10390,10 +10353,10 @@ msgid "Thumbnails processing" msgstr "Επεξεργασία επισκοπήσεων" #: utilities/batch/batchthumbsgenerator.cpp:83 -#, fuzzy msgid "<b>Updating thumbnails database. Please wait...</b>" msgstr "" -"<b>Ενημέρωση εικόνων επισκόπησης σε εξέλιξη. Παρακαλώ περιμένετε...</b>" +"<b>Ενημέρωση της βάσης δεδομένων εικόνων επισκόπησης. Παρακαλώ περιμένετε..." +"</b>" #: utilities/batch/batchthumbsgenerator.cpp:102 msgid "Processing small thumbs" @@ -10404,9 +10367,9 @@ msgid "Processing large thumbs" msgstr "Επεξεργασία μεγάλων επισκοπήσεων" #: utilities/batch/batchthumbsgenerator.cpp:125 -#, fuzzy msgid "<b>The thumbnails database has been updated.</b>" -msgstr "<b>Η ενημέρωση των εικόνων επισκόπησης ολοκληρώθηκε</b>" +msgstr "" +"<b>Η ενημέρωση της βάσης δεδομένων εικόνων επισκόπησης ολοκληρώθηκε.</b>" #: utilities/cameragui/albumselectdialog.cpp:87 msgid "Select Album" @@ -10454,11 +10417,11 @@ msgstr "Κατάλογος φακέλων..." #: utilities/cameragui/cameracontroller.cpp:265 msgid "The folders have been listed." -msgstr "" +msgstr "Οι φάκελοι έχουν μπει στην λίστα." #: utilities/cameragui/cameracontroller.cpp:273 msgid "The files in %1 have been listed." -msgstr "" +msgstr "Τα αρχεία στο %1 έχουν μπει στην λίστα." #: utilities/cameragui/cameracontroller.cpp:279 #, c-format @@ -10470,14 +10433,12 @@ msgid "Listing files in %1 is complete" msgstr "Εμφάνιση φακέλων του %1 δεν είναι ολοκληρωμένη" #: utilities/cameragui/cameracontroller.cpp:304 -#, fuzzy msgid "Getting thumbnails..." -msgstr "Ανάκτηση εικόνας επισκόπησης σε εξέλιξη..." +msgstr "Ανάκτηση εικόνων επισκόπησης σε εξέλιξη..." #: utilities/cameragui/cameracontroller.cpp:327 -#, fuzzy msgid "Getting EXIF information for %1/%2..." -msgstr "Ανάκτηση πληροφοριών EXIF για %1..." +msgstr "Ανάκτηση πληροφοριών EXIF για %1/%2..." #: utilities/cameragui/cameracontroller.cpp:366 msgid "Downloading file %1..." diff --git a/po/es/digikam.po b/po/es/digikam.po index e5f88aa..2b15554 100644 --- a/po/es/digikam.po +++ b/po/es/digikam.po @@ -8,20 +8,22 @@ # Pablo de Vicente <p.devicente@oan.es>, 2007. # Alberto Garcia <info@trebol-a.com>, 2007. # Pablo Pita Leira <pablo.pita@gmail.com>, 2007, 2008. +# Eduardo Herrera <edhu21@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: digikam\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-07 18:26+0000\n" -"PO-Revision-Date: 2008-12-25 19:34+0100\n" -"Last-Translator: Pablo Pita Leira <pablo.pita@gmail.com>\n" -"Language-Team: <kde-l10n-es@kde.org>\n" -"Language: \n" +"PO-Revision-Date: 2023-03-22 00:18+0000\n" +"Last-Translator: Eduardo Herrera <edhu21@gmail.com>\n" +"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/digikam/es/>\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.16.1\n" #. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" @@ -2969,9 +2971,8 @@ msgstr "Ajustar curvas..." #: imageplugins/adjustlevels/adjustlevels.cpp:82 #: imageplugins/adjustlevels/adjustlevels.cpp:102 -#, fuzzy msgid "Adjust Color Levels" -msgstr "Ajustar niveles" +msgstr "Ajustar niveles de color" #: imageplugins/adjustlevels/adjustlevels.cpp:104 msgid "An image-histogram-levels adjustment plugin for digiKam." @@ -3457,16 +3458,19 @@ msgid "Blur Effects" msgstr "Efectos de desenfoque" #: imageplugins/blurfx/imageeffect_blurfx.cpp:57 +#, fuzzy msgid "Apply Blurring Special Effect to Photograph" -msgstr "" +msgstr "Aplicar efecto especial de desenfoque a la fotografía" #: imageplugins/blurfx/imageeffect_blurfx.cpp:66 msgid "A digiKam image plugin to apply blurring special effect to an image." msgstr "" +"Un complemento de imagen de digiKam para aplicar un efecto especial de " +"desenfoque a una imagen." #: imageplugins/blurfx/imageeffect_blurfx.cpp:77 msgid "Blurring algorithms" -msgstr "" +msgstr "Algoritmos de desenfoque" #: imageplugins/blurfx/imageplugin_blurfx.cpp:48 msgid "Blur Effects..." @@ -3665,11 +3669,13 @@ msgstr "<p>Indique aquí el color de la segunda línea." #: imageplugins/border/imageeffect_border.cpp:60 msgid "Add Border Around Photograph" -msgstr "" +msgstr "Agregar borde alrededor de la fotografía" #: imageplugins/border/imageeffect_border.cpp:72 msgid "A digiKam image plugin to add a border around an image." msgstr "" +"Un complemento de imagen de digiKam para agregar un borde alrededor de una " +"imagen." #: imageplugins/border/imageplugin_border.cpp:48 msgid "Add Border..." @@ -3679,7 +3685,7 @@ msgstr "Añadir borde..." #: imageplugins/channelmixer/channelmixer.cpp:100 #, fuzzy msgid "Color Channel Mixer" -msgstr "Mezclador de canales" +msgstr "Mezclador de canales de color" #: imageplugins/channelmixer/channelmixer.cpp:102 #, fuzzy @@ -3865,8 +3871,9 @@ msgid "Charcoal Drawing" msgstr "Dibujo al carboncillo..." #: imageplugins/charcoal/imageeffect_charcoal.cpp:65 +#, fuzzy msgid "A digiKam charcoal drawing image effect plugin." -msgstr "" +msgstr "Un complemento de efecto de imagen de dibujo al carbón digiKam." #: imageplugins/charcoal/imageplugin_charcoal.cpp:50 msgid "Charcoal Drawing..." @@ -4000,16 +4007,18 @@ msgstr "ColorFX" #: imageplugins/colorfx/imageeffect_colorfx.cpp:73 msgid "Apply Color Special Effects to Photograph" -msgstr "" +msgstr "Aplicar efectos especiales de color a la fotografía" #: imageplugins/colorfx/imageeffect_colorfx.cpp:83 +#, fuzzy msgid "A digiKam plugin to apply special color effects to an image." msgstr "" +"Un complemento de digiKam para aplicar efectos de color especiales a una " +"imagen." #: imageplugins/colorfx/imageeffect_colorfx.cpp:89 -#, fuzzy msgid "Original Author" -msgstr "Original" +msgstr "Autor original" #: imageplugins/colorfx/imageeffect_colorfx.cpp:92 #, fuzzy @@ -5210,8 +5219,9 @@ msgid "Brightness Contrast Gamma Adjustments" msgstr "Brillo/Contraste/Gamma" #: imageplugins/coreplugin/imageeffect_blur.cpp:54 +#, fuzzy msgid "Apply Gaussian Blur on Photograph" -msgstr "" +msgstr "Aplicar desenfoque gaussiano en la fotografía" #: imageplugins/coreplugin/imageeffect_bwsepia.cpp:155 #, fuzzy @@ -6145,8 +6155,11 @@ msgstr "" "mosaico y neón." #: imageplugins/distortionfx/imageeffect_distortionfx.cpp:74 +#, fuzzy msgid "A digiKam image plugin to apply distortion effects to an image." msgstr "" +"Un complemento de imagen de digiKam para aplicar efectos de distorsión a una " +"imagen." #: imageplugins/distortionfx/imageeffect_distortionfx.cpp:84 #, fuzzy diff --git a/po/nl/digikam.po b/po/nl/digikam.po index 8e39938..8a9b19f 100644 --- a/po/nl/digikam.po +++ b/po/nl/digikam.po @@ -16,20 +16,22 @@ # Freek de Kruijf <f.de.kruijf@hetnet.nl>, 2006, 2009. # Rinse de Vries <rinsedevries@home.nl>, 2007. # Kristof Bal <kristof.bal@gmail.com>, 2008. +# Heimen Stoffels <vistausss@outlook.com>, 2023. msgid "" msgstr "" "Project-Id-Version: digikam\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-07 18:26+0000\n" -"PO-Revision-Date: 2009-02-03 00:18+0100\n" -"Last-Translator: Freek de Kruijf <f.de.kruijf@hetnet.nl>\n" -"Language-Team: Dutch <kde-i18n-nl@kde.org>\n" +"PO-Revision-Date: 2023-04-09 19:15+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"applications/digikam/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.16.1\n" #. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" @@ -2404,7 +2406,6 @@ msgid "Week #%1 - %2 %3" msgstr "Week #%1 - %2 %3" #: digikam/welcomepageview.cpp:112 -#, fuzzy msgid "" "_: %1: digiKam version; %2: help:// URL; %3: homepage URL; %4: prior digiKam " "version; %5: prior KDE version; %6: generated list of new features; %7: " @@ -2931,9 +2932,8 @@ msgstr "" "geselecteerde kanaal worden teruggezet naar hun standaardwaarden." #: imageplugins/adjustcurves/adjustcurves.cpp:475 -#, fuzzy msgid "Adjust Curve" -msgstr "Curves aanpassen" +msgstr "Curve aanpassen" #: imageplugins/adjustcurves/adjustcurves.cpp:640 #: imageplugins/adjustcurves/adjustcurvestool.cpp:624 @@ -3999,22 +3999,19 @@ msgid "Apply Color Special Effects to Photograph" msgstr "Speciale kleureffecten op foto toepassen" #: imageplugins/colorfx/imageeffect_colorfx.cpp:83 -#, fuzzy msgid "A digiKam plugin to apply special color effects to an image." msgstr "" -"Een digiKam-plugin voor het toepassen van kleureffecten op een afbeelding." +"Een digiKam-plug-in voor het toepassen van kleureffecten op een afbeelding." #: imageplugins/colorfx/imageeffect_colorfx.cpp:89 -#, fuzzy msgid "Original Author" -msgstr "Voor" +msgstr "Oorspronkelijke maker" #: imageplugins/colorfx/imageeffect_colorfx.cpp:92 msgid "Maintainer" msgstr "Onderhouder" #: imageplugins/colorfx/imageeffect_colorfx.cpp:100 -#, fuzzy msgid "<p>This is the color effect preview" msgstr "<p>Dit is een voorbeeld van het kleureffect" @@ -4724,9 +4721,8 @@ msgid "HSL Adjustments" msgstr "HSL aanpassen" #: imageplugins/coreplugin/hsl/imageeffect_hsl.cpp:72 -#, fuzzy msgid "Hue/Saturation/Lightness" -msgstr "Tint/verzadiging/lichtheid..." +msgstr "Tint/Verzadiging/Helderheid" #: imageplugins/coreplugin/iccprooftool.cpp:103 #: imageplugins/coreplugin/imageeffect_iccproof.cpp:93 @@ -5459,9 +5455,8 @@ msgstr "" "beeldverhouding." #: imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp:71 -#, fuzzy msgid "&Max. Aspect" -msgstr "Max. verhouding" +msgstr "&Max. verhouding" #: imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp:81 #: imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp:86 @@ -6133,7 +6128,6 @@ msgid "Distortion algorithms" msgstr "Vervormingsalgoritmen" #: imageplugins/distortionfx/imageeffect_distortionfx.cpp:119 -#, fuzzy msgid "" "<p>Here, select the type of effect to apply to the image.<p><b>Fish Eyes</" "b>: warps the photograph around a 3D spherical shape to reproduce the common " @@ -6394,7 +6388,6 @@ msgid "Free Rotation algorithm" msgstr "Algoritme van vrije rotatie" #: imageplugins/freerotation/imageeffect_freerotation.cpp:87 -#, fuzzy msgid "" "<p>This is the free image operation preview. If you move the mouse cursor on " "this preview, a vertical and horizontal dashed line will be drawn to guide " @@ -7525,7 +7518,6 @@ msgid "Shear algorithm" msgstr "Shear-algoritme" #: imageplugins/sheartool/imageeffect_sheartool.cpp:87 -#, fuzzy msgid "" "<p>This is the shearing image operation preview. If you move the mouse " "cursor on this preview, a vertical and horizontal dashed line will be drawn " @@ -8250,7 +8242,6 @@ msgstr "<p>Dit is een voorbeeld van het filtereffect." #: libs/dialogs/imageguidedlg.cpp:241 #: libs/widgets/imageplugins/imagepannelwidget.cpp:214 -#, fuzzy msgid "" "<p>This is the percentage of the task which has been completed up to this " "point." @@ -13195,7 +13186,7 @@ msgid "Tra&nsform" msgstr "&Transformeren" #: libs/dialogs/deletedialogbase.ui:16 -#, fuzzy, no-c-format +#, no-c-format msgid "DeleteDialogBase" msgstr "Bestand verwijderen" @@ -13231,7 +13222,7 @@ msgid "Placeholder for number of files, not in GUI" msgstr "Plek voor aantal bestanden, niet in GUI" #: libs/dialogs/deletedialogbase.ui:108 -#, fuzzy, no-c-format +#, no-c-format msgid "AlignVCenter|AlignRight" msgstr "Middenrechts" @@ -13250,7 +13241,7 @@ msgstr "" "de prullenbak" #: libs/dialogs/deletedialogbase.ui:140 -#, fuzzy, no-c-format +#, no-c-format msgid "" "<qt><p>If this box is checked, files will be <b>permanently removed</b> " "instead of being placed in the Trash Bin.</p>\n" diff --git a/po/ru/digikam.po b/po/ru/digikam.po index 622c6b3..09ae16d 100644 --- a/po/ru/digikam.po +++ b/po/ru/digikam.po @@ -6,21 +6,22 @@ # translation of digikam.po to # blu.256 <mavridisf@gmail.com>, 2021. # Alexander Golubev <fatzer2@gmail.com>, 2021. +# Andrei Stepanov <adem4ik@gmail.com>, 2023, 2024. msgid "" msgstr "" "Project-Id-Version: digikam\n" "POT-Creation-Date: 2021-07-07 18:26+0000\n" -"PO-Revision-Date: 2021-02-02 08:00+0000\n" -"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n" +"PO-Revision-Date: 2024-04-21 17:50+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/applications/digikam/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 4.4.2\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" @@ -263,7 +264,7 @@ msgstr "&Переместить сюда" #: libs/imageproperties/talbumlistview.cpp:384 #: utilities/cameragui/cameraiconview.cpp:757 msgid "C&ancel" -msgstr "&Отменить" +msgstr "От&мена" #: digikam/albumfolderview.cpp:1163 digikam/albumfolderview.cpp:1199 #: digikam/albumiconview.cpp:673 @@ -1945,12 +1946,11 @@ msgstr "Это имя уже занято" #: digikam/searchfolderview.cpp:320 msgid "Are you sure you want to delete the selected search \"%1\"?" -msgstr "" +msgstr "Уверены, что хотите удалить выбранный поиск «%1»?" #: digikam/searchfolderview.cpp:324 -#, fuzzy msgid "Delete Search?" -msgstr "Удалить поисковый запрос" +msgstr "Удалить поиск?" #: digikam/searchfolderview.cpp:402 msgid "New Simple Search..." @@ -1982,20 +1982,19 @@ msgstr "Поиск:" #: digikam/searchquickdialog.cpp:85 msgid "Enter here your search criteria" -msgstr "" +msgstr "Введите сюда ваш критерий поиска" #: digikam/searchquickdialog.cpp:86 msgid "<p>Enter your search criteria to find items in the album library" msgstr "<p>Введите критерии поиска по библиотеке альбомов" #: digikam/searchquickdialog.cpp:90 -#, fuzzy msgid "" "<p>Here you can see the items found in album library, using the current " "search criteria" msgstr "" -"<p>Здесь вы можете найти то что вас интересует в библиотеке альбомов с " -"текущими параметрами поиска" +"<p>Здесь вы можете обнаружить объекты из библиотеки альбомов с текущими " +"параметрами поиска" #: digikam/searchquickdialog.cpp:93 msgid "Save search as:" @@ -6782,9 +6781,9 @@ msgid "" "calculated dynamically and adjusted to any changing environment (e.g. widget " "dimensions, paper size)." msgstr "" -"Здесь вы можете выбрать будет ли размер шрифта фиксированным, или будет " -"ли он вычисляться динамически и подстраиваться под текущее окружение " -"(например, размер виджетов или размер бумаги)." +"Здесь вы можете выбрать будет ли размер шрифта фиксированным, или будет ли " +"он вычисляться динамически и подстраиваться под текущее окружение (например, " +"размер виджетов или размер бумаги)." #: imageplugins/inserttext/fontchooserwidget.cpp:265 msgid "Here you can choose the font size to be used." @@ -8086,7 +8085,7 @@ msgstr "Баланс белого..." #: utilities/batch/batchalbumssyncmetadata.cpp:80 #: utilities/batch/batchthumbsgenerator.cpp:84 msgid "&Abort" -msgstr "&Остановить" +msgstr "&Прервать" #: libs/dialogs/ctrlpaneldlg.cpp:101 libs/dialogs/imagedlgbase.cpp:103 #: libs/dialogs/imageguidedlg.cpp:136 @@ -10720,11 +10719,11 @@ msgstr "Повторить" #: utilities/cameragui/cameraui.cpp:869 #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:251 msgid "Abort" -msgstr "Остановить" +msgstr "Прервать" #: utilities/cameragui/cameraui.cpp:1028 msgid "Select Image to Upload" -msgstr "Выделить изображения для загрузки в камеру" +msgstr "Выделить изображения для отправки" #: utilities/cameragui/cameraui.cpp:1063 msgid "" @@ -10835,13 +10834,13 @@ msgstr "" #: utilities/cameragui/gpcamera.cpp:980 utilities/cameragui/gpcamera.cpp:981 #: utilities/cameragui/gpcamera.cpp:982 msgid "yes" -msgstr "Доступно" +msgstr "да" #: utilities/cameragui/gpcamera.cpp:978 utilities/cameragui/gpcamera.cpp:979 #: utilities/cameragui/gpcamera.cpp:980 utilities/cameragui/gpcamera.cpp:981 #: utilities/cameragui/gpcamera.cpp:982 msgid "no" -msgstr "Недоступно" +msgstr "нет" #: utilities/cameragui/gpcamera.cpp:1045 msgid "" diff --git a/po/uk/digikam.po b/po/uk/digikam.po index 50fc5dc..cc0c554 100644 --- a/po/uk/digikam.po +++ b/po/uk/digikam.po @@ -1,12 +1,12 @@ # Translation of digikam.po to Ukrainian # # Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>, 2006, 2007. -# Roman Savochenko <roman@oscada.org>, 2021, 2022. +# Roman Savochenko <roman@oscada.org>, 2021, 2022, 2023. msgid "" msgstr "" "Project-Id-Version: digikam\n" "POT-Creation-Date: 2021-07-07 18:26+0000\n" -"PO-Revision-Date: 2022-05-04 07:21+0000\n" +"PO-Revision-Date: 2023-10-15 19:13+0000\n" "Last-Translator: Roman Savochenko <roman@oscada.org>\n" "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" "projects/applications/digikam/uk/>\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 4.12.1\n" +"X-Generator: Weblate 4.17\n" #. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" @@ -1782,16 +1782,16 @@ msgstr "" "даних?\n" "<p>У базі даних є %n альбоми, яких немає на диску. Ці альбоми має бути " "видалено із бази даних, однак ви можете втратити інформацію оскільки всі " -"зображення асоційовані із цими альбомами буде видалено із бази даних " -"також.<p>digiKam не може продовжити без видалення елементів із бази даних " -"оскільки всі перегляди залежать від інформації у базі даних. Ви дійсно " -"бажаєте їх видалення із бази даних?\n" +"зображення асоційовані із цими альбомами буде видалено із бази даних також." +"<p>digiKam не може продовжити без видалення елементів із бази даних оскільки " +"всі перегляди залежать від інформації у базі даних. Ви дійсно бажаєте їх " +"видалення із бази даних?\n" "<p>У базі даних є %n альбомів, яких немає на диску. Ці альбоми має бути " "видалено із бази даних, однак ви можете втратити інформацію оскільки всі " -"зображення асоційовані із цими альбомами буде видалено із бази даних " -"також.<p>digiKam не може продовжити без видалення елементів із бази даних " -"оскільки всі перегляди залежать від інформації у базі даних. Ви дійсно " -"бажаєте їх видалення із бази даних?" +"зображення асоційовані із цими альбомами буде видалено із бази даних також." +"<p>digiKam не може продовжити без видалення елементів із бази даних оскільки " +"всі перегляди залежать від інформації у базі даних. Ви дійсно бажаєте їх " +"видалення із бази даних?" #: digikam/scanlib.cpp:173 msgid "Albums are Missing" @@ -1995,8 +1995,8 @@ msgid "" "<p>Here you can see the items found in album library, using the current " "search criteria" msgstr "" -"<p>Тут ви можете побачите елементи, які знайдено у бібліотеці альбомів за " -"поточних параметрів." +"<p>Тут можете побачите елементи, які знайдено у бібліотеці альбомів за " +"поточних параметрів" #: digikam/searchquickdialog.cpp:93 msgid "Save search as:" @@ -3836,7 +3836,7 @@ msgstr "Ефекти Кольорів" #: imageplugins/colorfx/colorfxtool.cpp:91 msgid "<p>This is the color effects preview" -msgstr "<p>Це попередній перегляд ефектів кольору." +msgstr "<p>Це попередній перегляд ефектів кольору" #: imageplugins/colorfx/colorfxtool.cpp:110 #: imageplugins/colorfx/imageeffect_colorfx.cpp:116 @@ -3920,11 +3920,11 @@ msgid "" "photograph to reproduce a fluorescent light effect.<p><b>Find Edges</b>: " "detects the edges in a photograph and their strength." msgstr "" -"<p>Оберіть тип ефекту для застосування тут до зображення.<p><b>Вигоряння</b>:" -" симуляція вигоряння світлини.<p><b>Чіткість</b>: симуляція кольорів слайд " -"стрічки Velvia(tm).<p><b>Неон</b>: фарбування країв світлини для зменшення " -"ефекту флюоресценції світла.<p><b>Пошук Країв</b>: визначає краї на світлині " -"та їх силу." +"<p>Оберіть тип ефекту для застосування тут до зображення.<p><b>Вигоряння</" +"b>: симуляція вигоряння світлини.<p><b>Чіткість</b>: симуляція кольорів " +"слайд стрічки Velvia(tm).<p><b>Неон</b>: фарбування країв світлини для " +"зменшення ефекту флюоресценції світла.<p><b>Пошук Країв</b>: визначає краї " +"на світлині та їх силу." #: imageplugins/colorfx/colorfxtool.cpp:182 #: imageplugins/colorfx/imageeffect_colorfx.cpp:192 @@ -4340,8 +4340,8 @@ msgid "" "<b>Kodak Tmax 100</b>:<p>Simulate the Kodak Tmax black and white film at 100 " "ISO</p>" msgstr "" -"<b>Kodak Tmax 100</b>:<p>Симуляція Kodak Tmax чорно-білої плівки на 100 " -"ISO</p>" +"<b>Kodak Tmax 100</b>:<p>Симуляція Kodak Tmax чорно-білої плівки на 100 ISO</" +"p>" #: imageplugins/coreplugin/bwsepiatool.cpp:331 #: imageplugins/coreplugin/imageeffect_bwsepia.cpp:329 @@ -4354,8 +4354,8 @@ msgid "" "<b>Kodak Tmax 400</b>:<p>Simulate the Kodak Tmax black and white film at 400 " "ISO</p>" msgstr "" -"<b>Kodak Tmax 400</b>:<p>Симуляція Kodak Tmax чорно-білої плівки на 400 " -"ISO</p>" +"<b>Kodak Tmax 400</b>:<p>Симуляція Kodak Tmax чорно-білої плівки на 400 ISO</" +"p>" #: imageplugins/coreplugin/bwsepiatool.cpp:336 #: imageplugins/coreplugin/imageeffect_bwsepia.cpp:334 @@ -4858,22 +4858,22 @@ msgstr "" "можливого відображення вихідним пристроєм, інтенція зображення підлаштує усі " "кольори у зображені під потрапляння до діапазону відображення та так, щоб " "співвідношення між кольорами зберігалося як це лише можливо.<br>Ця інтенція " -"найбільш підходить для відображення світлин та зображень, та вона є " -"типовою.</li><li> Абсолютна Колориметрична інтенція приводить будь які " -"кольори, які потрапили поза діапазону відображення вихідного пристрою, до " -"підлаштування до найближчого кольору відображення, тоді як решта кольорів " -"залишаються незмінними.<br>Ця інтенція зберігає білу точку та найбільш " -"підходить до плям кольорів (Пантон, TruMatch, кольори логотипу, ...).</" -"li><li>Відносна Колориметрична інтенція визначена так, щоб будь які кольори, " -"які потрапили поза діапазону можливого відображення пристроєм, були " -"підлаштовані до найближчого кольору відображення, тоді як інші кольори " -"залишаються незмінними. Доводяча інтенція не зберігає білої точки.</" -"li><li>Насичуюча інтенція зберігає насичення кольорів за рахунок можливої " -"вартості відтінку та яскравості.<br>Імплементація цієї інтенції залишається " -"дещо проблематичною, та ICC все ще працює над методами досягнення бажаних " -"ефектів.<br>Ця інтенція найбільш підходить для бізнес графіки як діаграми, " -"де найбільш важливо щоб кольори були досить яскраві та контрастні до інших " -"аніж специфічність кольору.</li></ul>" +"найбільш підходить для відображення світлин та зображень, та вона є типовою." +"</li><li> Абсолютна Колориметрична інтенція приводить будь які кольори, які " +"потрапили поза діапазону відображення вихідного пристрою, до підлаштування " +"до найближчого кольору відображення, тоді як решта кольорів залишаються " +"незмінними.<br>Ця інтенція зберігає білу точку та найбільш підходить до плям " +"кольорів (Пантон, TruMatch, кольори логотипу, ...).</li><li>Відносна " +"Колориметрична інтенція визначена так, щоб будь які кольори, які потрапили " +"поза діапазону можливого відображення пристроєм, були підлаштовані до " +"найближчого кольору відображення, тоді як інші кольори залишаються " +"незмінними. Доводяча інтенція не зберігає білої точки.</li><li>Насичуюча " +"інтенція зберігає насичення кольорів за рахунок можливої вартості відтінку " +"та яскравості.<br>Імплементація цієї інтенції залишається дещо " +"проблематичною, та ICC все ще працює над методами досягнення бажаних ефектів." +"<br>Ця інтенція найбільш підходить для бізнес графіки як діаграми, де " +"найбільш важливо щоб кольори були досить яскраві та контрастні до інших аніж " +"специфічність кольору.</li></ul>" #: imageplugins/coreplugin/iccprooftool.cpp:276 #: imageplugins/coreplugin/imageeffect_iccproof.cpp:262 @@ -4982,8 +4982,8 @@ msgstr "Профіль Доведення" #: imageplugins/coreplugin/imageeffect_iccproof.cpp:360 msgid "<p>Set here all parameters relevant to Proofing Color Profiles.</p>" msgstr "" -"<p>Встановіть тут всі параметри відповідно до Профілів Доведення " -"Кольорів.</p>" +"<p>Встановіть тут всі параметри відповідно до Профілів Доведення Кольорів.</" +"p>" #: imageplugins/coreplugin/iccprooftool.cpp:384 #: imageplugins/coreplugin/imageeffect_iccproof.cpp:371 @@ -5363,7 +5363,7 @@ msgstr "Чорно-біле..." #: imageplugins/coreplugin/imageplugin_core.cpp:127 msgid "Aspect Ratio Crop..." -msgstr "Обрізання країв у співвідношенні..." +msgstr "Обрізати краї у співвідношенні..." #: imageplugins/coreplugin/imageplugin_core.cpp:232 msgid "Red-Eye Correction Tool" @@ -5447,9 +5447,9 @@ msgstr "" "розмір.<p>Ви можете нижче подивитися перелік відповідностей традиційних " "розмірів фотопаперу та співвідношення кадрування:<p><b>2:3</b>: 10x15см, " "20x30см, 30x45см, 4x6\", 8x12\", 12x18\", 16x24\", 20x30\"<p><b>3:4</b>: " -"6x8см, 15x20см, 18x24см, 30x40см, 3.75x5\", 4.5x6\", 6x8\", 7.5x10\", 9x12\"" -"<p><b>4:5</b>: 20x25см, 40x50см, 8x10\", 16x20\"<p><b>5:7</b>: 15x21см, " -"30x42см, 5x7\"<p><b>7:10</b>: 21x30см, 42x60см, 3.5x5\"<p><b>Золоте " +"6x8см, 15x20см, 18x24см, 30x40см, 3.75x5\", 4.5x6\", 6x8\", 7.5x10\", " +"9x12\"<p><b>4:5</b>: 20x25см, 40x50см, 8x10\", 16x20\"<p><b>5:7</b>: " +"15x21см, 30x42см, 5x7\"<p><b>7:10</b>: 21x30см, 42x60см, 3.5x5\"<p><b>Золоте " "Співвідношення</b> це 1:1.618. Композиції, що дотримуються цього правила " "вважаються візуально гармонійними, але можуть бути неадаптованими до друку " "на стандартному фотопапері." @@ -5675,7 +5675,7 @@ msgstr "Обрізання за співвідношенням" #: imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp:110 msgid "Max. Aspect" -msgstr "Макс. співвідн." +msgstr "Макс. Співвідн." #: imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp:125 msgid "Ratio:" @@ -6027,26 +6027,25 @@ msgid "" "splits the photograph into square blocks and moves them randomly inside the " "image.<p>" msgstr "" -"<p>Тут, оберіть тип ефекту для застосування до зображення.<p><b>Рибі Очі</b>:" -" огортає світлину довкола тривимірної сфери для відтворення загального " +"<p>Тут, оберіть тип ефекту для застосування до зображення.<p><b>Рибі Очі</" +"b>: огортає світлину довкола тривимірної сфери для відтворення загального " "ефекту світлини 'Рибі Очі'.<p><b>Вертіння</b>: вертить світлину для " "відтворення шаблону Вертіння.<p><b>Циліндр Гор.</b>: огортає світлину " "довкола горизонтального циліндру.<p><b>Циліндр Верт.</b>: огортає світлину " "довкола вертикального циліндру.<p><b>Циліндр Г/В.</b>: огортає світлину " -"довкола двох циліндрів, вертикального та " -"горизонтального.<p><b>Карикатура</b>: спотворює світлину інвертованим " -"ефектом 'Рибі Очі'.<p><b>Багато Кутів</b>: розколює світлину як шаблон " -"багатьох кутів.<p><b>Горизонтальні Хвилі</b>: викривляє світлину " -"горизонтальними хвилями.<p><b>Вертикальні Хвилі</b>: викривляє світлину " -"вертикальними хвилями.<p><b>Блокові Хвилі 1</b>: ділить зображення на " -"клітинки та робить її вигляд так як наче на нього дивляться через скляні " -"блоки.<p><b>Блокові Хвилі 2</b>: схоже на Блокові Хвилі 1, але з іншою " -"версією викривлення скляних блоків.<p><b>Кругові Хвилі 1</b>: викривляє " -"світлину круговими хвилями.<p><b>Кругові Хвилі 2</b>: інший варіант ефекту " -"Кругові Хвилі.<p><b>Полярні Координати</b>: конвертує світлину із " -"прямокутних у полярні координати.<p><b>Неполярні Координати</b>: інверсія " -"ефекту Полярні Координати.<p><b>Плитка</b>: ділить світлину на квадратні " -"блоки та пересуває їх випадковим чином всередині зображення.<p>" +"довкола двох циліндрів, вертикального та горизонтального.<p><b>Карикатура</" +"b>: спотворює світлину інвертованим ефектом 'Рибі Очі'.<p><b>Багато Кутів</" +"b>: розколює світлину як шаблон багатьох кутів.<p><b>Горизонтальні Хвилі</" +"b>: викривляє світлину горизонтальними хвилями.<p><b>Вертикальні Хвилі</b>: " +"викривляє світлину вертикальними хвилями.<p><b>Блокові Хвилі 1</b>: ділить " +"зображення на клітинки та робить її вигляд так як наче на нього дивляться " +"через скляні блоки.<p><b>Блокові Хвилі 2</b>: схоже на Блокові Хвилі 1, але " +"з іншою версією викривлення скляних блоків.<p><b>Кругові Хвилі 1</b>: " +"викривляє світлину круговими хвилями.<p><b>Кругові Хвилі 2</b>: інший " +"варіант ефекту Кругові Хвилі.<p><b>Полярні Координати</b>: конвертує " +"світлину із прямокутних у полярні координати.<p><b>Неполярні Координати</b>: " +"інверсія ефекту Полярні Координати.<p><b>Плитка</b>: ділить світлину на " +"квадратні блоки та пересуває їх випадковим чином всередині зображення.<p>" #: imageplugins/distortionfx/distortionfxtool.cpp:151 #: imageplugins/distortionfx/imageeffect_distortionfx.cpp:157 @@ -6089,26 +6088,25 @@ msgid "" "splits the photograph into square blocks and moves them randomly inside the " "image.<p>" msgstr "" -"<p>Тут, оберіть тип ефекту для застосування до зображення.<p><b>Рибі Очі</b>:" -" огортає світлину довкола тривимірної сфери для відтворення загального " +"<p>Тут, оберіть тип ефекту для застосування до зображення.<p><b>Рибі Очі</" +"b>: огортає світлину довкола тривимірної сфери для відтворення загального " "ефекту світлини 'Рибі Очі'.<p><b>Вертіння</b>: вертить світлину для " "відтворення шаблону Вертіння.<p><b>Циліндр Гор.</b>: огортає світлину " "довкола горизонтального циліндру.<p><b>Циліндр Верт.</b>: огортає світлину " "довкола вертикального циліндру.<p><b>Циліндр Г/В.</b>: огортає світлину " -"довкола двох циліндрів, вертикального та " -"горизонтального.<p><b>Карикатура</b>: спотворює світлину інвертованим " -"ефектом 'Рибі Очі'.<p><b>Багато Кутів</b>: розколює світлину як шаблон " -"багатьох кутів.<p><b>Горизонтальні ХвиліQt</b>: викривляє світлину " -"горизонтальними хвилями.<p><b>Вертикальні Хвилі</b>: викривляє світлину " -"вертикальними хвилями.<p><b>Блокові Хвилі 1</b>: ділить зображення на " -"клітинки та робить її вигляд так як наче на нього дивляться через скляні " -"блоки.<p><b>Блокові Хвилі 2</b>: схоже на Блокові Хвилі 1, але з іншою " -"версією викривлення скляних блоків.<p><b>Кругові Хвилі 1</b>: викривляє " -"світлину круговими хвилями.<p><b>Кругові Хвилі 2</b>: інший варіант ефекту " -"Кругові Хвилі.<p><b>Полярні Координати</b>: конвертує світлину із " -"прямокутних у полярні координати.<p><b>Неполярні Координати</b>: інверсія " -"ефекту Полярні Координати.<p><b>Плитка</b>: ділить світлину на квадратні " -"блоки та пересуває їх випадковим чином всередині зображення.<p>" +"довкола двох циліндрів, вертикального та горизонтального.<p><b>Карикатура</" +"b>: спотворює світлину інвертованим ефектом 'Рибі Очі'.<p><b>Багато Кутів</" +"b>: розколює світлину як шаблон багатьох кутів.<p><b>Горизонтальні ХвиліQt</" +"b>: викривляє світлину горизонтальними хвилями.<p><b>Вертикальні Хвилі</b>: " +"викривляє світлину вертикальними хвилями.<p><b>Блокові Хвилі 1</b>: ділить " +"зображення на клітинки та робить її вигляд так як наче на нього дивляться " +"через скляні блоки.<p><b>Блокові Хвилі 2</b>: схоже на Блокові Хвилі 1, але " +"з іншою версією викривлення скляних блоків.<p><b>Кругові Хвилі 1</b>: " +"викривляє світлину круговими хвилями.<p><b>Кругові Хвилі 2</b>: інший " +"варіант ефекту Кругові Хвилі.<p><b>Полярні Координати</b>: конвертує " +"світлину із прямокутних у полярні координати.<p><b>Неполярні Координати</b>: " +"інверсія ефекту Полярні Координати.<p><b>Плитка</b>: ділить світлину на " +"квадратні блоки та пересуває їх випадковим чином всередині зображення.<p>" #: imageplugins/distortionfx/imageplugin_distortionfx.cpp:50 msgid "Distortion Effects..." @@ -6188,7 +6186,7 @@ msgstr "Додати зернистість фотоплівки…" #: imageplugins/freerotation/imageeffect_freerotation.cpp:70 #: imageplugins/freerotation/imageeffect_freerotation.cpp:293 msgid "Free Rotation" -msgstr "Довільний поворот" +msgstr "Довільне Повернення" #: imageplugins/freerotation/freerotationtool.cpp:75 msgid "" @@ -6319,7 +6317,8 @@ msgstr "" #: imageplugins/freerotation/imageeffect_freerotation.cpp:72 msgid "A digiKam image plugin to process free image rotation." -msgstr "digiKam втулок зображень для опрацювання вільного обертання зображення." +msgstr "" +"digiKam втулок зображень для опрацювання вільного обертання зображення." #: imageplugins/freerotation/imageeffect_freerotation.cpp:82 msgid "Free Rotation algorithm" @@ -6340,7 +6339,7 @@ msgstr "" #: imageplugins/freerotation/imageplugin_freerotation.cpp:48 msgid "Free Rotation..." -msgstr "Довільний поворот…" +msgstr "Довільно Повернути…" #: imageplugins/hotpixels/blackframelistview.cpp:43 msgid "Preview" @@ -6424,8 +6423,8 @@ msgid "" "A digiKam image plugin for fixing dots produced by hot/stuck/dead pixels " "from a CCD." msgstr "" -"Втулок зображень digiKam для виправлення крапок продукованих " -"гарячими/залиплими/мертвими пікселями із CCD." +"Втулок зображень digiKam для виправлення крапок продукованих гарячими/" +"залиплими/мертвими пікселями із CCD." #: imageplugins/hotpixels/imageplugin_hotpixels.cpp:50 msgid "Hot Pixels..." @@ -6561,9 +6560,9 @@ msgid "" "Medium Artefact</b>: inpaint medium image artefact.<p><b>Remove Large " "Artefact</b>: inpaint image artefact like unwanted object.<p>" msgstr "" -"<p>Оберіть передвстановлення фільтру для використання у відновленні " -"світлини:<p><b>Жодного</b>: Найбільш загальні значення. Встановлює значення " -"по замовченню.<p><b>Видалити Малий Артефакт</b>: вмальовує малий артифакт " +"<p>Оберіть передвстановлення фільтру для використання у відновленні світлини:" +"<p><b>Жодного</b>: Найбільш загальні значення. Встановлює значення по " +"замовченню.<p><b>Видалити Малий Артефакт</b>: вмальовує малий артифакт " "зображення на кшталт глюка зображення.<p><b>Видалити Помірний Артефакт</b>: " "вмальовує середній артифакт зображення.<p><b>Видалити Великий Артефакт</b>: " "вмальовує артифакт зображення на кшталт непотрібного об'єкту.<p>" @@ -6839,11 +6838,12 @@ msgid "" "A digiKam image plugin to reduce spherical aberration caused by a lens to an " "image." msgstr "" +"Втулок зображень digiKam для зменшення сферичної аберації викликаної " +"об'єктивом на зображення." #: imageplugins/lensdistortion/imageeffect_lensdistortion.cpp:88 -#, fuzzy msgid "Lens distortion correction algorithm." -msgstr "&Гама-корекція..." +msgstr "Алгоритм корекції викривлення об'єктиву." #: imageplugins/lensdistortion/imageeffect_lensdistortion.cpp:100 #: imageplugins/lensdistortion/lensdistortiontool.cpp:94 @@ -6851,6 +6851,8 @@ msgid "" "<p>You can see here a thumbnail preview of the distortion correction applied " "to a cross pattern." msgstr "" +"<p>Тут ви можете бачити ескіз попереднього перегляду корекції викривлення, " +"застосованої до перехресного візерунка." #: imageplugins/lensdistortion/imageeffect_lensdistortion.cpp:106 #: imageplugins/lensdistortion/lensdistortiontool.cpp:99 @@ -6866,6 +6868,9 @@ msgid "" "lens barrel distortion, while positive values correct lens pincushion " "distortion." msgstr "" +"<p>Це значення контролює обсяг викривлення. Негативні значення коригують " +"викривлення об'єктиву бочкою, тоді як позитивні коригують викривлення " +"подушкою." #: imageplugins/lensdistortion/imageeffect_lensdistortion.cpp:119 #: imageplugins/lensdistortion/lensdistortiontool.cpp:110 @@ -6878,6 +6883,8 @@ msgid "" "<p>This value controls in the same manner as the Main control, but has more " "effect at the edges of the image than at the center." msgstr "" +"<p>Це значення контролює у той самий спосіб як Загальний контроль, але має " +"більший ефект на краях зображення аніж у центрі." #: imageplugins/lensdistortion/imageeffect_lensdistortion.cpp:132 #: imageplugins/lensdistortion/lensdistortiontool.cpp:121 @@ -6887,7 +6894,7 @@ msgstr "Масштаб:" #: imageplugins/lensdistortion/imageeffect_lensdistortion.cpp:137 #: imageplugins/lensdistortion/lensdistortiontool.cpp:127 msgid "<p>This value rescales the overall image size." -msgstr "" +msgstr "<p>Це значення перемасштабує загальний розмір зображення." #: imageplugins/lensdistortion/imageeffect_lensdistortion.cpp:144 #: imageplugins/lensdistortion/lensdistortiontool.cpp:131 @@ -6897,7 +6904,7 @@ msgstr "Підсвічування:" #: imageplugins/lensdistortion/imageeffect_lensdistortion.cpp:149 #: imageplugins/lensdistortion/lensdistortiontool.cpp:137 msgid "<p>This value adjusts the brightness in image corners." -msgstr "" +msgstr "<p>Це значення підлаштовує яскравість у кутах зображення." #: imageplugins/lensdistortion/imageeffect_lensdistortion.cpp:304 #: imageplugins/lensdistortion/lensdistortiontool.cpp:76 @@ -6906,9 +6913,8 @@ msgid "Lens Distortion" msgstr "Викривлення оптики" #: imageplugins/lensdistortion/imageplugin_lensdistortion.cpp:47 -#, fuzzy msgid "Lens Distortion..." -msgstr "Автоматичне виправлення..." +msgstr "Викривлення Об'єктиву..." #: imageplugins/noisereduction/imageeffect_noisereduction.cpp:65 #: imageplugins/noisereduction/imageeffect_noisereduction.cpp:72 @@ -6920,11 +6926,11 @@ msgstr "Вилучення шумів" #: imageplugins/noisereduction/imageeffect_noisereduction.cpp:74 msgid "A noise reduction image filter plugin for digiKam." -msgstr "" +msgstr "Втулок фільтру зображень digiKam зі зменшення шуму." #: imageplugins/noisereduction/imageeffect_noisereduction.cpp:83 msgid "Noise Reduction algorithm. Developer" -msgstr "" +msgstr "Алгоритм Зменшення Шуму. Розробник" #: imageplugins/noisereduction/imageeffect_noisereduction.cpp:94 #: imageplugins/noisereduction/noisereductiontool.cpp:196 @@ -6941,6 +6947,13 @@ msgid "" "it must be about the same size as the noise granularity or somewhat more. If " "it is set higher than necessary, then it can cause unwanted blur." msgstr "" +"<p><b>Радіус</b>: контролює обрання розміру ковзаючого вікна фільтру. Більше " +"значення не збільшує обсяг часу необхідний для фільтрації кожного пікселю " +"зображення, але може призводити до розмивання. Це вікно пересувається через " +"зображення та колір на ньому згладжується для видалення недосконалостей. У " +"будь якому разі, у розмірі воно має бути близько зернистості шуму або дещо " +"більше. Якщо встановити більше ніж необхідно, то це може призвести до " +"небажаного розмивання." #: imageplugins/noisereduction/imageeffect_noisereduction.cpp:120 #: imageplugins/noisereduction/noisereductiontool.cpp:117 @@ -6952,11 +6965,17 @@ msgid "" "\"noisy\", \"smooth\", and \"blur\" is very small. Adjust it as carefully as " "you would adjust the focus of a camera." msgstr "" +"<p><b>Поріг</b>: використовуйте повзунок для грубого та обертач для точного " +"налаштування контролю чутливості виявлення країв. Це значення має бути " +"встановлено таким чином, щоб краї та деталі було ясно видно і шум " +"згладжувався. Налаштування має бути обережним оскільки межа між \"зашумлений" +"\", \"згладжений\" та \"розмитий\" дуже мала. Налаштуйте це так само " +"обережно як ви-б налаштовували фокус камери." #: imageplugins/noisereduction/imageeffect_noisereduction.cpp:133 #: imageplugins/noisereduction/noisereductiontool.cpp:127 msgid "Texture:" -msgstr "" +msgstr "Текстура:" #: imageplugins/noisereduction/imageeffect_noisereduction.cpp:138 #: imageplugins/noisereduction/noisereductiontool.cpp:133 @@ -6966,6 +6985,10 @@ msgid "" "texture are blurred out, when increased then texture is amplified, but also " "noise will increase. It has almost no effect on image edges." msgstr "" +"<p><b>Текстура</b>: цей елемент керування встановлює точність текстури. Це " +"значення може бути використане для отримання більшої або меншої точності " +"текстури. Зменшення розмиває шум та текстуру, тоді як збільшення підсилює " +"текстуру, а також збільшує шум. Фактично не має ефекту на краї зображення." #: imageplugins/noisereduction/imageeffect_noisereduction.cpp:153 #: imageplugins/noisereduction/noisereductiontool.cpp:146 @@ -6975,11 +6998,15 @@ msgid "" "noise may appear. Set it near to maximum, if you want to remove very weak " "noise or JPEG-artifacts, without losing detail." msgstr "" +"<p><b>Різкість</b>: Це значення покращує частотну характеристику фільтра. " +"Коли дуже сильне, то може бути видалено не лише шуми, або може з'явитися " +"стрибкоподібний шум. Встановіть близько до максимуму, якщо бажаєте видалити " +"дуже слабкий шум або артефакти JPEG без втрати деталей." #: imageplugins/noisereduction/imageeffect_noisereduction.cpp:164 #: imageplugins/noisereduction/noisereductiontool.cpp:154 msgid "Edge Lookahead:" -msgstr "" +msgstr "Випередження Краю:" #: imageplugins/noisereduction/imageeffect_noisereduction.cpp:169 #: imageplugins/noisereduction/noisereductiontool.cpp:160 @@ -6990,11 +7017,17 @@ msgid "" "changed this setting. When this value is too high, the adaptive filter can " "no longer accurately track image details, and noise or blurring can occur." msgstr "" +"<p><b>Край</b>: Це значення визначає відстань у пікселях на яку фільтр " +"випереджає огляд щодо країв. Збільшення значення видаляє стрибкоподібний " +"шум. Ви можете врешті переналаштувати фільтр <b>Край</b> зі зміною цього " +"встановлення. Коли це значення надто велике, адаптивний фільтр може не " +"продовжувати акуратно відстежувати деталі зображення та може виникати шум " +"або розмивання." #: imageplugins/noisereduction/imageeffect_noisereduction.cpp:181 #: imageplugins/noisereduction/noisereductiontool.cpp:169 msgid "Erosion:" -msgstr "" +msgstr "Ерозія:" #: imageplugins/noisereduction/imageeffect_noisereduction.cpp:186 #: imageplugins/noisereduction/noisereductiontool.cpp:175 @@ -7002,6 +7035,8 @@ msgid "" "<p><b>Erosion</b>: Use this to increase edge noise erosion and spike noise " "erosion (noise is removed by erosion)." msgstr "" +"<p><b>Ерозія</b>: Використати для збільшення краєвої шумової ерозії та " +"пікової шумової ерозії (шум видаляється ерозією)." #: imageplugins/noisereduction/imageeffect_noisereduction.cpp:199 #: imageplugins/noisereduction/noisereductiontool.cpp:269 @@ -7022,6 +7057,11 @@ msgid "" "settings do not influence the main smoothing process controlled by the " "<b>Details</b> settings." msgstr "" +"<p><b>Освітлення</b>: цей елемент керування встановлює допуск на яскравість " +"зображення. Рекомендується використовувати налаштування допуску <b>Колір</b> " +"або <b>Яскравість</b> для здійснення корекції зображення, не обох одночасно. " +"Ці налаштування не впливають на основний процес згладжування, що " +"контролюється налаштуваннями <b>Деталі</b>." #: imageplugins/noisereduction/imageeffect_noisereduction.cpp:222 #: imageplugins/noisereduction/noisereductiontool.cpp:223 @@ -7032,6 +7072,11 @@ msgid "" "influence the main smoothing process controlled by the <b>Details</b> " "settings." msgstr "" +"<p><b>Колір</b>: цей елемент керування встановлює допуск на колір " +"зображення. Рекомендується використовувати налаштування допуску <b>Колір</b> " +"або <b>Яскравість</b> для здійснення корекції зображення, не обох одночасно. " +"Ці налаштування не впливають на основний процес згладжування, що " +"контролюється налаштуваннями <b>Деталі</b>." #: imageplugins/noisereduction/imageeffect_noisereduction.cpp:238 #: imageplugins/noisereduction/noisereductiontool.cpp:237 @@ -7040,12 +7085,15 @@ msgid "" "value can be used to increase the tolerance values for darker areas (which " "commonly are noisier). This results in more blur for shadow areas." msgstr "" +"<p><b>Гама</b>: цей елемент керування встановлює допуск на гаму зображення. " +"Це значення може бути використане для збільшення значень допуску до темніших " +"областей (які загалом більш зашумлені). Призводить до більшого розмивання " +"тіньових областей." #: imageplugins/noisereduction/imageeffect_noisereduction.cpp:247 #: imageplugins/noisereduction/noisereductiontool.cpp:243 -#, fuzzy msgid "Damping:" -msgstr "Сигма, розмір:" +msgstr "Амортизування:" #: imageplugins/noisereduction/imageeffect_noisereduction.cpp:252 #: imageplugins/noisereduction/noisereductiontool.cpp:249 @@ -7057,6 +7105,12 @@ msgid "" "occur. It can suppress spike noise when increased, and this is the preferred " "method to remove it." msgstr "" +"<p><b>Амортизування</b>: цей елемент керування встановлює регулювання " +"амортизування тремтіння фази. Це значення визначає як часто адаптивний " +"фільтр-радіус реагує на варіації освітлення. Зі збільшенням краї стають " +"гладшими; за дуже високого значення може виникнути розмивання. За мінімуму " +"може виникнути шум та тремтіння фази. Може придушувати піковий шум зі " +"збільшенням, і це є рекомендованим методом для їх видалення." #: imageplugins/noisereduction/imageeffect_noisereduction.cpp:482 #: imageplugins/noisereduction/noisereductiontool.cpp:467 @@ -7092,22 +7146,22 @@ msgstr "Вилучення шумів…" #: imageplugins/oilpaint/imageeffect_oilpaint.cpp:58 msgid "Apply Oil Paint Effect" -msgstr "" +msgstr "Застосувати Ефект Малювання Олією" #: imageplugins/oilpaint/imageeffect_oilpaint.cpp:65 #: imageplugins/oilpaint/imageeffect_oilpaint.cpp:196 #: imageplugins/oilpaint/oilpainttool.cpp:68 #: imageplugins/oilpaint/oilpainttool.cpp:204 msgid "Oil Paint" -msgstr "Олійна фарба" +msgstr "Малювання Олією" #: imageplugins/oilpaint/imageeffect_oilpaint.cpp:67 msgid "An oil painting image effect plugin for digiKam." -msgstr "" +msgstr "Втулок digiKam для ефекту малювання зображення олією." #: imageplugins/oilpaint/imageeffect_oilpaint.cpp:77 msgid "Oil paint algorithm" -msgstr "" +msgstr "Алгоритм малювання олією" #: imageplugins/oilpaint/imageeffect_oilpaint.cpp:90 #: imageplugins/oilpaint/oilpainttool.cpp:80 @@ -7116,26 +7170,22 @@ msgstr "Розмір пензля:" #: imageplugins/oilpaint/imageeffect_oilpaint.cpp:93 #: imageplugins/oilpaint/oilpainttool.cpp:84 -#, fuzzy msgid "<p>Set here the brush size to use for simulating the oil painting." -msgstr "" -"Дія яку зробити коли курсор мишки знаходиться у верхньому лівому куті екрану " -"впродовж 15 секунд." +msgstr "<p>Встановити тут розмір пензля із симулювання малювання олією." #: imageplugins/oilpaint/imageeffect_oilpaint.cpp:104 #: imageplugins/oilpaint/oilpainttool.cpp:93 msgid "" "<p>This value controls the smoothing effect of the brush under the canvas." -msgstr "" +msgstr "<p>Це значення контролює ефект згладжування пензля під канвою." #: imageplugins/oilpaint/imageplugin_oilpaint.cpp:48 msgid "Oil Paint..." -msgstr "Малювання олією…" +msgstr "Малювання Олією…" #: imageplugins/perspective/imageeffect_perspective.cpp:64 -#, fuzzy msgid "Adjust Photograph Perspective" -msgstr "Властивості фотографії" +msgstr "Налаштувати Перспективу Фотографії" #: imageplugins/perspective/imageeffect_perspective.cpp:72 #: imageplugins/perspective/perspectivetool.cpp:74 @@ -7144,7 +7194,7 @@ msgstr "Перспектива" #: imageplugins/perspective/imageeffect_perspective.cpp:74 msgid "A digiKam image plugin to process image perspective adjustment." -msgstr "" +msgstr "Втулок digiKam для здійснення налаштування перспективи зображення." #: imageplugins/perspective/imageeffect_perspective.cpp:96 #: imageplugins/perspective/perspectivetool.cpp:84 @@ -7152,6 +7202,9 @@ msgid "" "<p>This is the perspective transformation operation preview. You can use the " "mouse for dragging the corner to adjust the perspective transformation area." msgstr "" +"<p>Це попередній перегляд операції трансформації перспективи. Можете " +"використати мишу для перетягнення куту задля налаштування області " +"трансформації перспективи." #: imageplugins/perspective/imageeffect_perspective.cpp:126 #: imageplugins/perspective/perspectivetool.cpp:112 @@ -7181,7 +7234,7 @@ msgstr " Нижній правий:" #: imageplugins/perspective/imageeffect_perspective.cpp:151 #: imageplugins/perspective/perspectivetool.cpp:126 msgid "Draw preview while moving" -msgstr "Малювати результат синхронно" +msgstr "Малювати попередній перегляд синхронно" #: imageplugins/perspective/imageeffect_perspective.cpp:155 #: imageplugins/perspective/perspectivetool.cpp:130 @@ -7216,29 +7269,28 @@ msgstr "<p>Вкажіть товщину напрямних переривчас #: imageplugins/perspective/imageplugin_perspective.cpp:47 msgid "Perspective Adjustment..." -msgstr "Налаштування перспективи…" +msgstr "Налаштувати Перспективу…" #: imageplugins/perspective/perspectivewidget.cpp:205 msgid "Perspective Adjustment" -msgstr "Налаштування перспективи" +msgstr "Налаштування Перспективи" #: imageplugins/raindrop/imageeffect_raindrop.cpp:57 -#, fuzzy msgid "Add Raindrops to Photograph" -msgstr "Застосувати Гаусове розмивання до фотографії" +msgstr "Додати Краплі Дощу на Фотографію" #: imageplugins/raindrop/imageeffect_raindrop.cpp:64 #: imageplugins/raindrop/raindroptool.cpp:67 msgid "Raindrops" -msgstr "Дощові краплі" +msgstr "Дощові Краплі" #: imageplugins/raindrop/imageeffect_raindrop.cpp:66 msgid "A digiKam image plugin to add raindrops to an image." -msgstr "" +msgstr "Втулок digiKam для додання крапель дощу на зображення." #: imageplugins/raindrop/imageeffect_raindrop.cpp:76 msgid "Raindrops algorithm" -msgstr "" +msgstr "Алгоритм крапель дощу" #: imageplugins/raindrop/imageeffect_raindrop.cpp:84 #: imageplugins/raindrop/raindroptool.cpp:71 @@ -7248,6 +7300,10 @@ msgid "" "filter. You can use this method to disable the Raindrops effect on a human " "face, for example." msgstr "" +"<p>Це попередній перегляд ефекту крапель дощу.<p>Примітка: якщо ви маєте " +"попередньо обрану область у редакторі, то вона буде скасована фільтром. " +"Можете використати цей метод для виключення ефекту Крапель Дощу на обличчі " +"людини, до прикладу." #: imageplugins/raindrop/imageeffect_raindrop.cpp:94 #: imageplugins/raindrop/raindroptool.cpp:87 @@ -7256,9 +7312,8 @@ msgstr "Розмір краплі:" #: imageplugins/raindrop/imageeffect_raindrop.cpp:99 #: imageplugins/raindrop/raindroptool.cpp:92 -#, fuzzy msgid "<p>Set here the raindrops' size." -msgstr "<p>Вкажіть товщину напрямних переривистих ліній." +msgstr "<p>Встановити тут розмір крапель дощу." #: imageplugins/raindrop/imageeffect_raindrop.cpp:106 #: imageplugins/raindrop/raindroptool.cpp:96 @@ -7268,17 +7323,18 @@ msgstr "Кількість:" #: imageplugins/raindrop/imageeffect_raindrop.cpp:111 #: imageplugins/raindrop/raindroptool.cpp:101 msgid "<p>This value controls the maximum number of raindrops." -msgstr "" +msgstr "<p>Це значення контролює максимальну кількість крапель дощу." #: imageplugins/raindrop/imageeffect_raindrop.cpp:118 #: imageplugins/raindrop/raindroptool.cpp:105 msgid "Fish eyes:" -msgstr "Коефіцієнт «риб’ячого ока»:" +msgstr "Риб'ячі очі:" #: imageplugins/raindrop/imageeffect_raindrop.cpp:123 #: imageplugins/raindrop/raindroptool.cpp:110 msgid "<p>This value is the fish-eye-effect optical distortion coefficient." msgstr "" +"<p>Це значення є коефіцієнтом оптичного викривлення ефекту риб'ячого ока." #: imageplugins/raindrop/imageeffect_raindrop.cpp:254 #: imageplugins/raindrop/raindroptool.cpp:250 @@ -7291,28 +7347,27 @@ msgstr "Краплі дощу…" #: imageplugins/restoration/imageeffect_restoration.cpp:63 #: imageplugins/restoration/imageeffect_restoration.cpp:72 -#, fuzzy msgid "Photograph Restoration" -msgstr "Інформація про фотографію" +msgstr "Реставрація Фотографій" #: imageplugins/restoration/imageeffect_restoration.cpp:74 msgid "A digiKam image plugin to restore a photograph." -msgstr "" +msgstr "Втулок зображень digiKam для реставрації фотографій." #: imageplugins/restoration/imageeffect_restoration.cpp:111 #: imageplugins/restoration/restorationtool.cpp:102 msgid "Reduce Uniform Noise" -msgstr "Прибрати однорідний шум" +msgstr "Прибрати Однорідний Шум" #: imageplugins/restoration/imageeffect_restoration.cpp:112 #: imageplugins/restoration/restorationtool.cpp:103 msgid "Reduce JPEG Artefacts" -msgstr "" +msgstr "Зменшення Артефактів JPEG" #: imageplugins/restoration/imageeffect_restoration.cpp:113 #: imageplugins/restoration/restorationtool.cpp:104 msgid "Reduce Texturing" -msgstr "Прибрати текстуризацію" +msgstr "Прибрати Текстуризацію" #: imageplugins/restoration/imageeffect_restoration.cpp:114 #: imageplugins/restoration/restorationtool.cpp:105 @@ -7324,6 +7379,13 @@ msgid "" "<p><b>Reduce Texturing</b>: reduce image artifacts like paper texture or " "Moire patterns of a scanned image.<p>" msgstr "" +"<p>Оберіть попередні налаштування фільтра для відновлення фотографії:" +"<p><b>Немає</b>: Найбільш загальні значення. Встановлює параметри у типове." +"<p><b>Зменшити Однорідний Шум</b>: зменшення малих артефактів зображення як " +"то шум сенсору.<p><b>Зменшення JPEG Артефактів</b>: зменшення великих " +"артефактів зображення на кшталт мозаїки стиснення JPEG.<p><b>Зменшити " +"Текстуризацію</b>: зменшення артефактів зображення на кшталт текстури паперу " +"або Муарових візерунків сканованого зображення.<p>" #: imageplugins/restoration/imageeffect_restoration.cpp:293 #: imageplugins/restoration/restorationtool.cpp:70 @@ -7372,24 +7434,23 @@ msgstr "Інструмент зсування" #: imageplugins/sheartool/imageeffect_sheartool.cpp:73 msgid "A digiKam image plugin to shear an image." -msgstr "" +msgstr "Втулок зображень digiKam для зсування зображення." #: imageplugins/sheartool/imageeffect_sheartool.cpp:82 msgid "Shear algorithm" -msgstr "" +msgstr "Алгоритм зсування" #: imageplugins/sheartool/imageeffect_sheartool.cpp:87 -#, fuzzy msgid "" "<p>This is the shearing image operation preview. If you move the mouse " "cursor on this preview, a vertical and horizontal dashed line will be drawn " "to guide you in adjusting the shearing correction. Release the left mouse " "button to freeze the dashed line's position." msgstr "" -"<p>Це попередній перегляд ефекту застосування фільтра. Якщо ви пересунете " +"<p>Це попередній перегляд операції зсування зображення. Якщо ви пересунете " "курсор у цю ділянку, то з'явиться вертикальна і горизонтальна пунктирна " -"лінія для допомоги в коригування параметрів фільтра. Натисніть на ліву " -"кнопку мишки, щоб зафіксувати позицію пунктирної лінії." +"лінія для допомоги в коригування зсування. Відпустіть ліву кнопку миші для " +"фіксації позиції пунктирної лінії." #: imageplugins/sheartool/imageeffect_sheartool.cpp:118 #: imageplugins/sheartool/sheartool.cpp:104 @@ -7399,12 +7460,12 @@ msgstr "Головний горизонтальний кут:" #: imageplugins/sheartool/imageeffect_sheartool.cpp:122 #: imageplugins/sheartool/sheartool.cpp:108 msgid "<p>The main horizontal shearing angle, in degrees." -msgstr "" +msgstr "<p>Головний горизонтальний кут зсування, у градусах." #: imageplugins/sheartool/imageeffect_sheartool.cpp:126 #: imageplugins/sheartool/sheartool.cpp:110 msgid "Fine horizontal angle:" -msgstr "Додатковий горизонтальний кут:" +msgstr "Уточнювальний горизонтальний кут:" #: imageplugins/sheartool/imageeffect_sheartool.cpp:130 #: imageplugins/sheartool/sheartool.cpp:114 @@ -7412,6 +7473,8 @@ msgid "" "<p>This value in degrees will be added to main horizontal angle value to set " "fine adjustments." msgstr "" +"<p>Це значення в градусах буде додано до головного значення горизонтального " +"кута для встановлення точного налаштування." #: imageplugins/sheartool/imageeffect_sheartool.cpp:135 #: imageplugins/sheartool/sheartool.cpp:117 @@ -7421,12 +7484,12 @@ msgstr "Головний вертикальний кут:" #: imageplugins/sheartool/imageeffect_sheartool.cpp:139 #: imageplugins/sheartool/sheartool.cpp:121 msgid "<p>The main vertical shearing angle, in degrees." -msgstr "" +msgstr "<p>Головний вертикальний кут зсування, у градусах." #: imageplugins/sheartool/imageeffect_sheartool.cpp:143 #: imageplugins/sheartool/sheartool.cpp:123 msgid "Fine vertical angle:" -msgstr "Додатковий вертикальний кут:" +msgstr "Уточнювальний вертикальний кут:" #: imageplugins/sheartool/imageeffect_sheartool.cpp:147 #: imageplugins/sheartool/sheartool.cpp:127 @@ -7434,6 +7497,8 @@ msgid "" "<p>This value in degrees will be added to main vertical angle value to set " "fine adjustments." msgstr "" +"<p>Це значення в градусах буде додано до головного значення вертикального " +"кута для встановлення точного налаштування." #: imageplugins/sheartool/imageeffect_sheartool.cpp:153 #: imageplugins/sheartool/sheartool.cpp:131 @@ -7441,41 +7506,43 @@ msgid "" "<p>Enable this option to apply the anti-aliasing filter to the sheared " "image. To smooth the target image, it will be blurred a little." msgstr "" +"<p>Увімкніть цей параметр для застосування згладжувального фільтру до " +"зсунутого зображення. Щоб згладити цільове зображення, воно буде трохи " +"розмите." #: imageplugins/sheartool/imageplugin_sheartool.cpp:47 msgid "Shear..." -msgstr "Зсування…" +msgstr "Посунути…" #: imageplugins/sheartool/sheartool.cpp:73 -#, fuzzy msgid "" "<p>This is the shear operation preview. If you move the mouse cursor on this " "preview, a vertical and horizontal dashed line will be drawn to guide you in " "adjusting the shear correction. Release the left mouse button to freeze the " "dashed line's position." msgstr "" -"<p>Це попередній перегляд ефекту застосування фільтра. Якщо ви пересунете " -"курсор у цю ділянку, то з'явиться вертикальна і горизонтальна пунктирна " -"лінія для допомоги в коригування параметрів фільтра. Натисніть на ліву " -"кнопку мишки, щоб зафіксувати позицію пунктирної лінії." +"<p>Це попередній перегляд операції зсування. Якщо ви пересунете курсор у цю " +"ділянку, то з'явиться вертикальна і горизонтальна пунктирна лінія для " +"допомоги в коригуванні зсування. Відпустіть ліву кнопку миші для фіксації " +"позиції пунктирної лінії." #: imageplugins/superimpose/imageeffect_superimpose.cpp:75 msgid "Template Superimpose to Photograph" -msgstr "" +msgstr "Шаблон Накладання на Фотографію" #: imageplugins/superimpose/imageeffect_superimpose.cpp:83 #: imageplugins/superimpose/superimposetool.cpp:81 msgid "Template Superimpose" -msgstr "" +msgstr "Шаблон Накладання" #: imageplugins/superimpose/imageeffect_superimpose.cpp:85 msgid "A digiKam image plugin to superimpose a template onto a photograph." -msgstr "" +msgstr "Втулок зображень digiKam для накладання шаблону на фотографію." #: imageplugins/superimpose/imageeffect_superimpose.cpp:109 #: imageplugins/superimpose/superimposetool.cpp:91 msgid "<p>This is the preview of the template superimposed onto the image." -msgstr "" +msgstr "<p>Це попередній перегляд накладання шаблону на зображення." #: imageplugins/superimpose/imageeffect_superimpose.cpp:121 #: imageplugins/superimpose/superimposetool.cpp:103 @@ -7494,36 +7561,36 @@ msgstr "Зменшити" #: imageplugins/superimpose/imageeffect_superimpose.cpp:151 #: imageplugins/superimpose/superimposetool.cpp:140 msgid "Root Directory..." -msgstr "" +msgstr "Коренева Директорія..." #: imageplugins/superimpose/imageeffect_superimpose.cpp:152 #: imageplugins/superimpose/superimposetool.cpp:141 msgid "<p>Set here the current templates' root directory." -msgstr "" +msgstr "<p>Встановити тут кореневу директорію поточного шаблону." #: imageplugins/superimpose/imageeffect_superimpose.cpp:240 #: imageplugins/superimpose/superimposetool.cpp:233 msgid "Select Template Root Directory to Use" -msgstr "" +msgstr "Оберіть Кореневу Директорію для Використання" #: imageplugins/superimpose/imageeffect_superimpose.cpp:269 #: imageplugins/superimpose/superimposetool.cpp:262 msgid "Super Impose" -msgstr "" +msgstr "Накласти" #: imageplugins/superimpose/imageplugin_superimpose.cpp:49 msgid "Template Superimpose..." -msgstr "" +msgstr "Накласти Шаблон..." #: imageplugins/texture/imageeffect_texture.cpp:58 #: imageplugins/texture/imageeffect_texture.cpp:65 -#, fuzzy msgid "Apply Texture" -msgstr "Природа" +msgstr "Застосувати Текстуру" #: imageplugins/texture/imageeffect_texture.cpp:67 msgid "A digiKam image plugin to apply a decorative texture to an image." msgstr "" +"Втулок зображень digiKam для застосування текстури декорації до зображення." #: imageplugins/texture/imageeffect_texture.cpp:90 #: imageplugins/texture/texturetool.cpp:81 @@ -7578,17 +7645,17 @@ msgstr "Джинса" #: imageplugins/texture/imageeffect_texture.cpp:100 #: imageplugins/texture/texturetool.cpp:91 msgid "Cell Wood" -msgstr "Розпил дерева" +msgstr "Розпил Дерева" #: imageplugins/texture/imageeffect_texture.cpp:101 #: imageplugins/texture/texturetool.cpp:92 msgid "Metal Wire" -msgstr "Металевий дріт" +msgstr "Металевий Дріт" #: imageplugins/texture/imageeffect_texture.cpp:102 #: imageplugins/texture/texturetool.cpp:93 msgid "Modern" -msgstr "Модерн" +msgstr "Сучасне" #: imageplugins/texture/imageeffect_texture.cpp:103 #: imageplugins/texture/texturetool.cpp:94 @@ -7607,9 +7674,8 @@ msgstr "Камінь" #: imageplugins/texture/imageeffect_texture.cpp:106 #: imageplugins/texture/texturetool.cpp:98 -#, fuzzy msgid "<p>Set here the texture type to apply to the image." -msgstr "<p>Вкажіть товщину напрямних переривистих ліній." +msgstr "<p>Вкажіть тут тип текстури для застосування до зображення." #: imageplugins/texture/imageeffect_texture.cpp:113 #: imageplugins/texture/texturetool.cpp:102 @@ -7618,9 +7684,10 @@ msgstr "Рельєфність:" #: imageplugins/texture/imageeffect_texture.cpp:118 #: imageplugins/texture/texturetool.cpp:107 -#, fuzzy msgid "<p>Set here the relief gain used to merge texture and image." -msgstr "<p>Вкажіть товщину напрямних переривистих ліній." +msgstr "" +"<p>Вкажіть тут силу рельєфу використаного для поєднання текстури із " +"зображенням." #: imageplugins/texture/imageeffect_texture.cpp:211 #: imageplugins/texture/texturetool.cpp:68 @@ -7630,46 +7697,41 @@ msgstr "Текстура" #: imageplugins/texture/imageplugin_texture.cpp:48 msgid "Apply Texture..." -msgstr "Застосувати текстуру…" +msgstr "Застосувати Текстуру…" #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:83 #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:95 -#, fuzzy msgid "White Color Balance Correction" -msgstr "Автокомпенсація кольорів" +msgstr "Корекція Балансу Білого" #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:97 msgid "A digiKam image plugin to correct white color balance." -msgstr "" +msgstr "Втулок зображень digiKam для корекції балансу білого." #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:106 -#, fuzzy msgid "White color balance correction algorithm" -msgstr "Автокомпенсація кольорів" +msgstr "Алгоритм корекції балансу білого" #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:114 #: imageplugins/whitebalance/whitebalancetool.cpp:105 -#, fuzzy msgid "" "<p>You can see here the image's white-balance adjustments preview. You can " "pick color on image to see the color level corresponding on histogram." msgstr "" -"Клацніть тут, щоб вибрати той елемент робочого столу TDE, колір якого ви " -"хочете змінити. Ви або можете вибрати \"графічний елемент\" тут, або можете " -"клацнути мишкою на відповідному елементі в вікні попереднього перегляду." +"<p>Ви можете бачити тут попередній перегляд налаштувань балансу білого " +"зображення. Можете отримати колір на зображені для перегляду відповідності " +"рівня кольору на гістограмі." #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:176 #: imageplugins/whitebalance/whitebalancetool.cpp:170 -#, fuzzy msgid "" "<p>Here you can see the target preview image histogram drawing of the " "selected image channel. This one is re-computed at any filter settings " "changes." msgstr "" -"Це - попередній перегляд для установок кольору, які почнуть діяти після " -"того, як Ви натиснете \"Застосувати\" або \"Гаразд\". Ви можете клацнути " -"мишкою на різних частинах вікна попереднього перегляду. Назва графічного " -"об'єкту \"Об'єкт кольору\" зміниться на назву відповідної частини вікна." +"<p>Тут ви можете бачити креслення гістограми зображення цільового " +"попереднього перегляду обраного каналу зображення. Цей параметр обчислюється " +"повторно після будь яких змін налаштувань фільтра." #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:190 #: imageplugins/whitebalance/whitebalancetool.cpp:187 @@ -7677,6 +7739,8 @@ msgid "" "<qt><a href='http://en.wikipedia.org/wiki/Color_temperature'>Color " "Temperature</a> (K): </qt>" msgstr "" +"<qt><a href='http://en.wikipedia.org/wiki/Color_temperature'>Температура " +"Кольору</a> (K): </qt>" #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:192 #: imageplugins/whitebalance/whitebalancetool.cpp:189 @@ -7686,12 +7750,12 @@ msgstr "Налаштування:" #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:196 #: imageplugins/whitebalance/whitebalancetool.cpp:194 msgid "<p>Set here the white balance color temperature in Kelvin." -msgstr "" +msgstr "<p>Встановіть тут температуру кольору балансу білого у Кельвінах." #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:198 #: imageplugins/whitebalance/whitebalancetool.cpp:196 msgid "Preset:" -msgstr "Шаблон:" +msgstr "Предвстановлене:" #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:200 #: imageplugins/whitebalance/whitebalancetool.cpp:198 @@ -7721,7 +7785,7 @@ msgstr "Світанок" #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:205 #: imageplugins/whitebalance/whitebalancetool.cpp:203 msgid "Studio Lamp" -msgstr "Студійна лампа" +msgstr "Студійна Лампа" #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:206 #: imageplugins/whitebalance/whitebalancetool.cpp:204 @@ -7751,7 +7815,7 @@ msgstr "Сонце" #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:211 #: imageplugins/whitebalance/whitebalancetool.cpp:209 msgid "Xenon Lamp" -msgstr "Ксенонова лампа" +msgstr "Ксенонова Лампа" #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:212 #: imageplugins/whitebalance/whitebalancetool.cpp:210 @@ -7774,6 +7838,19 @@ msgid "" "arc (6420K).<p><b>Daylight D65</b>: overcast sky light (6500K).<p><b>None</" "b>: no preset value." msgstr "" +"<p>Оберіть предвстановлену температуру балансу білого для використання тут:" +"<p><b>Свічка</b>: світло свічки (1850K).<p><b>Лампа 40Вт</b>: лампа " +"розжарювання 40 Вт (2680K).<p><b>Лампа 100Вт</b>: лампа розжарювання 100 Вт " +"(2800K).<p><b>Лампа 200Вт</b>: лампа розжарювання 200 Вт (3000K)." +"<p><b>Світанок</b>: світло світанку або заходу сонця (3200K).<p><b>Студійна " +"Лампа</b>: вольфрамова лампа використовувана в фотостудіях або освітлені " +"протягом години від сутінок/світанку (3400K).<p><b>Місячне світло</b>: " +"місячне світло (4100K).<p><b>Нейтральне</b>: нейтральна температура кольору " +"(4750K).<p><b>Денне світло D50</b>: сонячне денне світло біля півдня (5000K)." +"<p><b>Фотоспалах</b>: електронний фотоспалах (5500K).<p><b>Сонце</b>: " +"ефективна сонячна температура (5770K).<p><b>Хінонова Лампа</b>: хінонова " +"лампа або світлова дуга (6420K).<p><b>Денне світло D65</b>: освітлення під " +"хмарним небом (6500K).<p><b>Жодного</b>: немає предвстановленого значення." #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:236 #: imageplugins/whitebalance/whitebalancetool.cpp:235 @@ -7786,6 +7863,9 @@ msgid "" "<p>With this button, you can pick the color from original image used to set " "white color balance temperature and green component." msgstr "" +"<p>Цією кнопкою ви можете отримати колір із оригінального зображення " +"використаного для встановлення температури балансу білого та зеленого " +"компоненту." #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:245 #: imageplugins/whitebalance/whitebalancetool.cpp:244 @@ -7794,9 +7874,8 @@ msgstr "Чорна точка:" #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:249 #: imageplugins/whitebalance/whitebalancetool.cpp:249 -#, fuzzy msgid "<p>Set here the black level value." -msgstr "<p>Вкажіть товщину напрямних переривистих ліній." +msgstr "<p>Встановіть тут значення рівня чорного." #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:251 #: imageplugins/whitebalance/whitebalancetool.cpp:251 @@ -7805,29 +7884,26 @@ msgstr "Тіні:" #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:255 #: imageplugins/whitebalance/whitebalancetool.cpp:256 -#, fuzzy msgid "<p>Set here the shadows noise suppresion level." -msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +msgstr "<p>Встановіть тут рівень придушення шуму тіней." #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:261 #: imageplugins/whitebalance/whitebalancetool.cpp:263 -#, fuzzy msgid "<p>Set here the saturation value." -msgstr "<p>Вкажіть товщину напрямних переривистих ліній." +msgstr "<p>Встановіть тут значення насичення." #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:267 #: imageplugins/whitebalance/whitebalancetool.cpp:270 -#, fuzzy msgid "<p>Set here the gamma correction value." -msgstr "<p>Вкажіть товщину напрямних переривистих ліній." +msgstr "<p>Встановіть тут значення корекції гами." #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:273 #: imageplugins/whitebalance/whitebalancetool.cpp:277 msgid "" "<p>Set here the green component to set magenta color cast removal level." msgstr "" +"<p>Встановіть тут зелений компонент для визначення рівня видалення " +"пурпурового кольору." #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:280 #: imageplugins/whitebalance/whitebalancetool.cpp:284 @@ -7835,6 +7911,8 @@ msgid "" "<qt><a href='http://en.wikipedia.org/wiki/Exposure_value'>Exposure " "Compensation</a> (E.V): </qt>" msgstr "" +"<qt><a href='http://en.wikipedia.org/wiki/Exposure_value'>Компенсація " +"Експозиції</a> (E.V): </qt>" #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:285 #: imageplugins/whitebalance/whitebalancetool.cpp:289 @@ -7847,17 +7925,18 @@ msgid "" "<p>With this button, you can automatically adjust Exposure and Black Point " "values." msgstr "" +"<p>Цією кнопкою ви можете автоматично підлаштувати значення Експозиції та " +"Точки Чорного." #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:291 #: imageplugins/whitebalance/whitebalancetool.cpp:296 -#, fuzzy msgid "<p>Set here the main exposure compensation value in E.V." -msgstr "<p>Вкажіть товщину напрямних переривистих ліній." +msgstr "<p>Вкажіть тут значення головної компенсації експозиції у E.V." #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:293 #: imageplugins/whitebalance/whitebalancetool.cpp:298 msgid "Fine:" -msgstr "Додаткове:" +msgstr "Уточнювальне:" #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:297 #: imageplugins/whitebalance/whitebalancetool.cpp:303 @@ -7865,54 +7944,55 @@ msgid "" "<p>This value in E.V will be added to main exposure compensation value to " "set fine exposure adjustment." msgstr "" +"<p>Це значення у E.V буде додано до значення головної компенсації експозиції " +"для встановлення точного підлаштування." #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:685 #: imageplugins/whitebalance/whitebalancetool.cpp:97 #: imageplugins/whitebalance/whitebalancetool.cpp:690 msgid "White Balance" -msgstr "Баланс білого" +msgstr "Баланс Білого" #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:773 #: imageplugins/whitebalance/whitebalancetool.cpp:783 msgid "White Color Balance Settings File to Load" -msgstr "Файл параметрів балансу білого кольору, який слід завантажити" +msgstr "Файл Параметрів Балансу Білого до Завантаження" #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:786 #: imageplugins/whitebalance/whitebalancetool.cpp:796 msgid "\"%1\" is not a White Color Balance settings text file." -msgstr "«%1» не є текстовим файлом налаштувань балансу білого кольору." +msgstr "\"%1\" не є текстовим файлом налаштувань Балансу Білого." #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:806 #: imageplugins/whitebalance/whitebalancetool.cpp:816 msgid "Cannot load settings from the White Color Balance text file." -msgstr "" -"Не вдалося завантажити параметри з текстового файла балансу білого кольору." +msgstr "Не можу завантажити параметри із текстового файлу Балансу Білого." #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:816 #: imageplugins/whitebalance/whitebalancetool.cpp:825 msgid "White Color Balance Settings File to Save" -msgstr "Файл параметрів балансу білого кольору, який слід зберегти" +msgstr "Файл параметрів Балансу Білого до Збереження" #: imageplugins/whitebalance/imageeffect_whitebalance.cpp:836 #: imageplugins/whitebalance/whitebalancetool.cpp:845 msgid "Cannot save settings to the White Color Balance text file." -msgstr "Не вдалося зберегти текстовий файл параметрів балансу білого кольору." +msgstr "Не можу зберегти текстовий файл параметрів Балансу Білого." #: imageplugins/whitebalance/imageplugin_whitebalance.cpp:48 msgid "White Balance..." -msgstr "Баланс білого…" +msgstr "Баланс Білого…" #: libs/dialogs/ctrlpaneldlg.cpp:100 libs/dialogs/imageguidedlg.cpp:135 #: utilities/batch/batchalbumssyncmetadata.cpp:80 #: utilities/batch/batchthumbsgenerator.cpp:84 msgid "&Abort" -msgstr "П&ерервати" +msgstr "Пере&рвати" #: libs/dialogs/ctrlpaneldlg.cpp:101 libs/dialogs/imagedlgbase.cpp:103 #: libs/dialogs/imageguidedlg.cpp:136 #: utilities/imageeditor/tools/imageresize.cpp:151 msgid "&Save As..." -msgstr "&Зберегти як..." +msgstr "&Зберегти Як..." #: libs/dialogs/ctrlpaneldlg.cpp:102 libs/dialogs/imagedlgbase.cpp:104 #: libs/dialogs/imageguidedlg.cpp:137 @@ -7934,19 +8014,18 @@ msgstr "<p>Перервати відтворення поточного зобр #: libs/dialogs/imageguidedlg.cpp:152 #: utilities/imageeditor/tools/imageresize.cpp:159 msgid "<p>Load all filter parameters from settings text file." -msgstr "<p>Завантажити всі параметри фільтра з текстового файла параметрів." +msgstr "<p>Завантажити всі параметри фільтра з текстового файлу параметрів." #: libs/dialogs/ctrlpaneldlg.cpp:118 libs/dialogs/imagedlgbase.cpp:117 #: libs/dialogs/imageguidedlg.cpp:153 #: utilities/imageeditor/tools/imageresize.cpp:160 msgid "<p>Save all filter parameters to settings text file." -msgstr "<p>Зберегти всі параметри фільтра до текстового файла параметрів." +msgstr "<p>Зберегти всі параметри фільтра до текстового файлу параметрів." #: libs/dialogs/ctrlpaneldlg.cpp:186 libs/dialogs/imagedlgbase.cpp:222 #: libs/dialogs/imageguidedlg.cpp:337 -#, fuzzy msgid "digiKam Handbook" -msgstr "Підручник для втулок" +msgstr "Підручник digiKam" #: libs/dialogs/deletedialog.cpp:115 msgid "" @@ -7956,9 +8035,8 @@ msgstr "" "qt>" #: libs/dialogs/deletedialog.cpp:122 -#, fuzzy msgid "<qt>These items will be moved to Trash.</qt>" -msgstr "<qt>Ці елементи будуть пересунуті у смітник.</qt>" +msgstr "<qt>Ці елементи буде пересунуто до Смітника.</qt>" #: libs/dialogs/deletedialog.cpp:126 #, c-format @@ -7977,9 +8055,8 @@ msgstr "" "<qt>Ці альбоми будуть <b>назавжди видалені</b> з вашого жорсткого диска.</qt>" #: libs/dialogs/deletedialog.cpp:142 -#, fuzzy msgid "<qt>These albums will be moved to Trash.</qt>" -msgstr "<qt>Ці альбоми будуть пересунуті у смітник.</qt>" +msgstr "<qt>Ці альбоми буде пересунуто до Смітника.</qt>" #: libs/dialogs/deletedialog.cpp:146 libs/dialogs/deletedialog.cpp:172 #, c-format @@ -7998,33 +8075,33 @@ msgid "" "deleted permanently as well.</qt>" msgstr "" "<qt>Ці альбоми буде <b>назавжди видалено</b> з вашого жорсткого диска." -"<br>Примітка: <b>всі підальбоми</b> включаються в цей список і їх також буде " -"назавжди видалено.</qt>" +"<br>Примітка: <b>всі підальбоми</b> включаються в цей список та їх також " +"буде назавжди видалено.</qt>" #: libs/dialogs/deletedialog.cpp:165 -#, fuzzy msgid "" "<qt>These albums will be moved to Trash.<br>Note that <b>all subalbums</b> " "are included in this list and will be moved to Trash as well.</qt>" msgstr "" -"<qt>Ці альбоми буде пересунуто в смітник.<br>Примітка: <b>всі підальбоми</b> " -"включаються в цей список і їх також буде пересунуто в смітник.</qt>" +"<qt>Ці альбоми буде пересунуто до Смітника.<br>Примітка: <b>всі підальбоми</" +"b> включаються до цього переліку та їх також буде пересунуто до Смітника.</" +"qt>" #: libs/dialogs/deletedialog.cpp:185 libs/dialogs/deletedialog.cpp:299 msgid "About to delete selected files" -msgstr "Зараз вибрані файли буде видалено" +msgstr "Збираєтеся видалити обрані файли" #: libs/dialogs/deletedialog.cpp:192 msgid "&Move to Trash" -msgstr "&Пересунути до смітника" +msgstr "&Пересунути до Смітника" #: libs/dialogs/deletedialog.cpp:304 msgid "About to delete selected albums" -msgstr "Зараз вибрані альбоми буде видалено" +msgstr "Збираєтеся видалити обрані альбоми" #: libs/dialogs/iccprofileinfodlg.cpp:39 msgid "Color Profile Info" -msgstr "Інформація профілю кольорів" +msgstr "Інформація Профілю Кольорів" #: libs/dialogs/imagedialog.cpp:171 #: libs/imageproperties/cameraitempropertiestab.cpp:461 @@ -8037,32 +8114,28 @@ msgid "Aperture:" msgstr "Апертура:" #: libs/dialogs/imagedialog.cpp:202 -#, fuzzy msgid "Focal:" -msgstr "&Заголовок:" +msgstr "Фокус:" #: libs/dialogs/imagedialog.cpp:203 -#, fuzzy msgid "Exposure:" -msgstr "<b>Експозиція</b>:" +msgstr "Експозиція:" #: libs/dialogs/imagedialog.cpp:284 libs/dialogs/imagedialog.cpp:293 -#, fuzzy msgid "" "\n" "%1|Camera RAW files" msgstr "" "\n" -"%1|Файли RAW" +"%1|Файли RAW Камери" #: libs/dialogs/imagedialog.cpp:308 -#, fuzzy msgid "Select an Image" -msgstr "Виберіть зображення для додавання" +msgstr "Оберіть Зображення" #: libs/dialogs/imagedialog.cpp:316 msgid "Select Images" -msgstr "Вибрати зображення" +msgstr "Оберіть Зображення" #: libs/dialogs/imagedlgbase.cpp:240 libs/dialogs/imageguidedlg.cpp:252 #: libs/widgets/imageplugins/imagepannelwidget.cpp:250 @@ -8088,27 +8161,30 @@ msgstr "<p>Це попередній перегляд ефекту застос #: libs/dialogs/imageguidedlg.cpp:241 #: libs/widgets/imageplugins/imagepannelwidget.cpp:214 -#, fuzzy msgid "" "<p>This is the percentage of the task which has been completed up to this " "point." -msgstr "<p>Інформація про завершення цього завдання у відсотках." +msgstr "<p>Це відсоток виконання завдання на цей момент." #: libs/dialogs/rawcameradlg.cpp:77 msgid "List of supported RAW cameras" -msgstr "Список підтримуваних фотоапаратів з цифровими негативами" +msgstr "Перелік підтримуваних камер із цифровими негативами" #: libs/dialogs/rawcameradlg.cpp:107 msgid "" "<p>Using KDcraw library version %1<p>Using Dcraw program version %2<p>%3 " "models in the list" msgstr "" +"<p>Використання бібліотеки KDcraw версії %1<p>Використання програми Dcraw " +"версії %2<p>%3 моделей у переліку" #: libs/dialogs/rawcameradlg.cpp:112 msgid "" "<p>Using KDcraw library version %1<p>Using LibRaw version %2<p>%3 models in " "the list" msgstr "" +"<p>Використання бібліотеки KDcraw версії %1<p>Використання LibRaw версії " +"%2<p>%3 моделей у переліку" #: libs/dimg/loaders/jp2ksettings.cpp:74 msgid "Lossless JPEG 2000 files" @@ -8146,7 +8222,6 @@ msgid "JPEG quality:" msgstr "Якість JPEG:" #: libs/dimg/loaders/jpegsettings.cpp:84 -#, fuzzy msgid "" "<p>The JPEG image quality:<p><b>1</b>: low quality (high compression and " "small file size)<p><b>50</b>: medium quality<p><b>75</b>: good quality " @@ -8154,10 +8229,10 @@ msgid "" "size)<p><b>Note: JPEG always uses lossy compression.</b>" msgstr "" "<p>Якість зображень JPEG:<p><b>1</b>: низька якість (значне стискання і " -"малий розмір файла)<p><b>50</b>: середня якість<p><b>75</b>: добра якість " +"малий розмір файлу)<p><b>50</b>: середня якість<p><b>75</b>: добра якість " "(типова)<p><b>100</b>: висока якість (без стискання - великий розмір " -"файла)<p><b>Примітка: JPEG вживає алгоритм стискання, при якому зображення " -"втрачає дані.</b>" +"файлу)<p><b>Примітка: JPEG завжди вживає алгоритм стискання, при якому " +"зображення втрачає дані.</b>" #: libs/dimg/loaders/jpegsettings.cpp:93 msgid "" @@ -8192,6 +8267,16 @@ msgid "" "with soft edges but tends to alter colors<p><b>Note: JPEG always uses lossy " "compression.</b>" msgstr "" +"<p>Рівень Субдискретизація колірності JPEG \n" +"(колір зберігається із меншою роздільною здатністю ніж освітленість):" +"<p><b>Жодного</b>=найкраще: використовує рейтинг 4:4:4. Субдискретизація " +"колірності взагалі не використовується. Це зберігає краї та контрастність " +"кольорів, допоки не додається додаткова компресія<p><b>Середній</b>: " +"використовує рейтинг 4:2:2. Середня компресія: зменшує роздільну здатність " +"кольорів на третину із малою візуальню відмінністю<p><b>Високий</b>: " +"використовує рейтинг 4:1:1. Високе стискання: підходить для зображень із " +"м’якими краями, але має тенденцію змінювати кольори<p><b>Примітка: JPEG " +"завжди використовує стискання із втратою даних.</b>" #: libs/dimg/loaders/pngsettings.cpp:72 msgid "PNG compression:" @@ -8228,13 +8313,15 @@ msgstr "" #: libs/greycstoration/greycstorationwidget.cpp:140 msgid "Detail preservation:" -msgstr "Рівень деталізації:" +msgstr "Збереження деталей:" #: libs/greycstoration/greycstorationwidget.cpp:144 msgid "" "<p>Preservation of details to set the sharpening level of the small features " "in the target image. Higher values leave details sharp." msgstr "" +"<p>Збереження деталей встановлює рівен різкості малих властивостей на " +"цільовому зображені. Вищі значення залишають даталі більш різкими." #: libs/greycstoration/greycstorationwidget.cpp:150 msgid "Anisotropy:" @@ -8245,6 +8332,8 @@ msgid "" "<p>Anisotropic (directional) modifier of the details. Keep it small for " "Gaussian noise." msgstr "" +"<p>Анізотропічний (спрямований) модифікатор деталізації. Зберігайте малим " +"для Гаусового шуму." #: libs/greycstoration/greycstorationwidget.cpp:159 msgid "Smoothing:" @@ -8256,6 +8345,9 @@ msgid "" "and the Anisotropy Factor the direction, the Smoothing Factor sets the " "overall effect." msgstr "" +"<p>Загальна потужність згладжування: Якщо Деталізуючий Фактор встановлює " +"відносне згладжування та Анізотропний Фактор напрямок, то Згладжувальний " +"Фактор встановлює загальний ефект." #: libs/greycstoration/greycstorationwidget.cpp:169 msgid "Regularity:" @@ -8266,15 +8358,16 @@ msgid "" "<p>This value controls the evenness of smoothing to the image. Do not use a " "high value here, or the target image will be completely blurred." msgstr "" +"<p>Це значення контролює плавність згладжування до зображення. Не " +"використовуйте великих значень тут, інакше зображення буде цілком розмите." #: libs/greycstoration/greycstorationwidget.cpp:179 msgid "Iterations:" -msgstr "Кількість ітерацій:" +msgstr "Ітерацій:" #: libs/greycstoration/greycstorationwidget.cpp:182 -#, fuzzy msgid "<p>Sets the number of times the filter is applied to the image." -msgstr "<p>Вкажіть товщину напрямних переривистих ліній." +msgstr "<p>Встановлює кількість разів застосування фільтру до зображення." #: libs/greycstoration/greycstorationwidget.cpp:187 msgid "Noise:" @@ -8282,62 +8375,56 @@ msgstr "Шум:" #: libs/greycstoration/greycstorationwidget.cpp:191 msgid "<p>Sets the noise scale." -msgstr "" +msgstr "<p>Встановлює масштаб шуму." #: libs/greycstoration/greycstorationwidget.cpp:200 #: utilities/setup/setupicc.cpp:296 msgid "Advanced Settings" -msgstr "Додаткові параметри" +msgstr "Додаткові Параметри" #: libs/greycstoration/greycstorationwidget.cpp:202 msgid "Angular step:" -msgstr "Крок зміни кута:" +msgstr "Кутовий крок:" #: libs/greycstoration/greycstorationwidget.cpp:206 msgid "" "<p>Set here the angular integration step (in degrees) analogous to " "anisotropy." msgstr "" +"<p>Встановіть тут кутовий інтеграційний крок (у градусах) аналогічно " +"анізотропії." #: libs/greycstoration/greycstorationwidget.cpp:211 msgid "Integral step:" -msgstr "Крок інтегрування:" +msgstr "Інтегральний крок:" #: libs/greycstoration/greycstorationwidget.cpp:215 -#, fuzzy msgid "<p>Set here the spatial integral step." -msgstr "<p>Вкажіть товщину напрямних переривистих ліній." +msgstr "<p>Встановіть тут просторовий інтегральний крок." #: libs/greycstoration/greycstorationwidget.cpp:219 msgid "Gaussian:" -msgstr "Гаусіан:" +msgstr "Гаусовість:" #: libs/greycstoration/greycstorationwidget.cpp:223 -#, fuzzy msgid "<p>Set here the precision of the Gaussian function." -msgstr "" -"Дія яку зробити коли курсор мишки знаходиться у верхньому лівому куті екрану " -"впродовж 15 секунд." +msgstr "<p>Встановіть тут точність Гаусової функції." #: libs/greycstoration/greycstorationwidget.cpp:227 msgid "Tile size:" msgstr "Розмір плитки:" #: libs/greycstoration/greycstorationwidget.cpp:230 -#, fuzzy msgid "<p>Sets the tile size." -msgstr "<p>Вкажіть товщину напрямних переривистих ліній." +msgstr "<p>Встановлює розмір плитки." #: libs/greycstoration/greycstorationwidget.cpp:234 msgid "Tile border:" msgstr "Рамка плитки:" #: libs/greycstoration/greycstorationwidget.cpp:237 -#, fuzzy msgid "<p>Sets the size of each tile border." -msgstr "" -"Дія яку зробити коли курсор мишки знаходиться у верхньому лівому куті екрану " -"впродовж 15 секунд." +msgstr "<p>Встановлює розмір кожної рамки плитки." #: libs/greycstoration/greycstorationwidget.cpp:241 msgid "Interpolation:" @@ -8345,29 +8432,28 @@ msgstr "Інтерполяція:" #: libs/greycstoration/greycstorationwidget.cpp:243 msgid "Nearest Neighbor" -msgstr "Найближча суміжна" +msgstr "Найближча Сусідня" #: libs/greycstoration/greycstorationwidget.cpp:245 msgid "Runge-Kutta" msgstr "Рунґе-Кутта" #: libs/greycstoration/greycstorationwidget.cpp:246 -#, fuzzy msgid "<p>Select the right interpolation method for the desired image quality." -msgstr "<p>Ввімкніть цей параметр, щоб показувати рейтинг зображення." +msgstr "" +"<p>Оберіть правильний метод інтерполяції для бажаної якості зображення." #: libs/greycstoration/greycstorationwidget.cpp:251 msgid "Fast approximation" msgstr "Швидка апроксимація" #: libs/greycstoration/greycstorationwidget.cpp:252 -#, fuzzy msgid "<p>Enable fast approximation when rendering images." -msgstr "Увімкніть цей параметр, щоб показувати цитати меншим шрифтом." +msgstr "<p>Увімкнути швидку апроксимацію при вимальовувані зображень." #: libs/imageproperties/cameraitempropertiestab.cpp:182 msgid "<big><b>Camera File Properties</b></big>" -msgstr "<big><b>Властивості файла камери</b></big>" +msgstr "<big><b>Властивості Файлу Камери</b></big>" #: libs/imageproperties/cameraitempropertiestab.cpp:183 #: libs/imageproperties/imagepropertiestab.cpp:198 @@ -8408,7 +8494,7 @@ msgstr "<b>Розміри</b>:" #: libs/imageproperties/cameraitempropertiestab.cpp:191 msgid "<nobr><b>New Name</b></nobr>:" -msgstr "<nobr><b>Нова назва</b></nobr>:" +msgstr "<nobr><b>Нова Назва</b></nobr>:" #: libs/imageproperties/cameraitempropertiestab.cpp:192 msgid "<b>Downloaded</b>:" @@ -8417,7 +8503,7 @@ msgstr "<b>Звантажено</b>:" #: libs/imageproperties/cameraitempropertiestab.cpp:195 #: libs/imageproperties/imagepropertiestab.cpp:214 msgid "<big><b>Photograph Properties</b></big>" -msgstr "<big><b>Властивості фотографії</b></big>" +msgstr "<big><b>Властивості Фотографії</b></big>" #: libs/imageproperties/cameraitempropertiestab.cpp:196 #: libs/imageproperties/imagepropertiestab.cpp:215 @@ -8482,9 +8568,8 @@ msgid "Date:" msgstr "Дата:" #: libs/imageproperties/imagedescedittab.cpp:175 -#, fuzzy msgid "Enter new tag here..." -msgstr "Введіть нову назву альбому:" +msgstr "Введіть тут новий ярлик..." #: libs/imageproperties/imagedescedittab.cpp:176 msgid "" @@ -8492,6 +8577,9 @@ msgid "" "a hierarchy of tags. ',' can be used here to create more than one hierarchy " "at the same time." msgstr "" +"Введіть тут текст використовуваний для створення нових міток. '/' може бути " +"використано тут для створення ієрархії міток. ',' може бути використано тут " +"для створення більш ніж однієї ієрархії одночасно." #: libs/imageproperties/imagedescedittab.cpp:188 msgid "Tags already assigned" @@ -8499,7 +8587,7 @@ msgstr "Мітки вже призначено" #: libs/imageproperties/imagedescedittab.cpp:196 msgid "Recent Tags" -msgstr "Недавні мітки" +msgstr "Недавні Мітки" #: libs/imageproperties/imagedescedittab.cpp:211 msgid "Revert all changes" @@ -8568,33 +8656,31 @@ msgid "" "_n: <qt><p>You have edited the metadata of the image: </p><ul>\n" "<qt><p>You have edited the metadata of %n images: </p><ul>" msgstr "" -"<qt><p>Ви змінили метадані зображення. \n" -"<qt><p>Ви змінили метадані %n зображень. \n" -"<qt><p>Ви змінили метадані %n зображень." +"<qt><p>Ви змінили метадані зображення. </p><ul>\n" +"<qt><p>Ви змінили метадані %n зображень. </p><ul>\n" +"<qt><p>Ви змінили метадані %n зображень. </p><ul>" #: libs/imageproperties/imagedescedittab.cpp:433 -#, fuzzy msgid "<li>comment</li>" msgstr "<li>коментар</li>" #: libs/imageproperties/imagedescedittab.cpp:435 msgid "<li>date</li>" -msgstr "<i>дата</i>" +msgstr "<li>дата</li>" #: libs/imageproperties/imagedescedittab.cpp:437 msgid "<li>rating</li>" -msgstr "<i>оцінка</i>" +msgstr "<li>оцінка</li>" #: libs/imageproperties/imagedescedittab.cpp:439 msgid "<li>tags</li>" -msgstr "<i>мітки</i>" +msgstr "<li>мітки</li>" #: libs/imageproperties/imagedescedittab.cpp:450 msgid "Always apply changes without confirmation" msgstr "Завжди застосовувати зміни без підтвердження" #: libs/imageproperties/imagedescedittab.cpp:474 -#, fuzzy msgid "Applying changes to images. Please wait..." msgstr "Застосування змін до зображень. Будь ласка, зачекайте..." @@ -8608,40 +8694,40 @@ msgstr "Запис метаданих у файли. Будь ласка, зач #: libs/imageproperties/imagedescedittab.cpp:1035 msgid "No AddressBook Entries Found" -msgstr "Не знайдено записів в адресній книзі" +msgstr "Не Знайдено Записів у АдреснійКнизі" #: libs/imageproperties/imagedescedittab.cpp:1046 msgid "Read metadata from file to database" -msgstr "Зчитати метадані з файла в базу даних" +msgstr "Зчитати метадані з файлу до бази даних" #: libs/imageproperties/imagedescedittab.cpp:1047 #: libs/imageproperties/imagedescedittab.cpp:1060 msgid "Write metadata to each file" -msgstr "Записати метадані у кожний файл" +msgstr "Записати метадані до кожного файлу" #: libs/imageproperties/imagedescedittab.cpp:1059 msgid "Read metadata from each file to database" -msgstr "Зчитати метадані з кожного файла у базу даних" +msgstr "Зчитати метадані з кожного файлу до бази даних" #: libs/imageproperties/imagedescedittab.cpp:1104 msgid "" "You are currently viewing items in the tag '%1' that you are about to " "delete. You will need to apply change first if you want to delete the tag." msgstr "" -"Ви переглядаєте елементи в мітці \"%1\", яку ви збираєтесь видалити. Якщо ви " -"хочете видалити мітку, то спочатку треба застосувати зміни." +"Ви переглядаєте елементи в мітці \"%1\", яку ви збираєтесь видалити. Вам " +"потрібно буде спочатку застосувати зміни, якщо ви бажаєте видалити тег." #: libs/imageproperties/imagedescedittab.cpp:1492 msgid "No Recently Assigned Tags" -msgstr "Немає недавно призначених міток" +msgstr "Відсутні Нещодавно Призначені Мітки" #: libs/imageproperties/imagedescedittab.cpp:1629 msgid "Found Tags" -msgstr "Знайдені мітки" +msgstr "Знайдені Мітки" #: libs/imageproperties/imagedescedittab.cpp:1726 msgid "Assigned Tags" -msgstr "Призначені мітки" +msgstr "Призначені Мітки" #: libs/imageproperties/imagepropertiescolorstab.cpp:175 #: libs/imageproperties/imagepropertiessidebar.cpp:71 @@ -8650,7 +8736,6 @@ msgid "Colors" msgstr "Кольори" #: libs/imageproperties/imagepropertiescolorstab.cpp:176 -#, fuzzy msgid "" "<p>Select the histogram channel to display here:<p><b>Luminosity</b>: " "Display luminosity (perceived brightness) values.<p><b>Red</b>: Display the " @@ -8660,13 +8745,13 @@ msgid "" "is supported by some image formats such as PNG or TIFF.<p><b>Colors</b>: " "Display all color channel values at the same time." msgstr "" -"<p>Виберіть який канал гістограми показати:<p><b>Яскравість світла</b>: " -"Показати значення яскравості світла (сприйняття яскравості).<p><b>Червоний</" -"b>: Показати червоний канал зображення.<p><b>Зелений</b>: Показати зелений " -"канал зображення.<p><b>Синій</b>: Показати синій канал зображення." -"<p><b>Альфа</b>: Показати альфа-канал зображення. Цей канал відповідає " -"значенню прозорості і підтримується деякими форматами зображень, такими як " -"PNG і TIFF.<p><b>Кольори</b>: Показати одночасно всі канали кольорів." +"<p>Оберіть який канал гістограми показати:<p><b>Освітлення</b>: Показати " +"значення яскравості світла (сприйняття яскравості).<p><b>Червоний</b>: " +"Показати червоний канал зображення.<p><b>Зелений</b>: Показати зелений канал " +"зображення.<p><b>Синій</b>: Показати синій канал зображення.<p><b>Альфа</b>: " +"Показати альфа-канал зображення. Цей канал відповідає значенню прозорості і " +"підтримується деякими форматами зображень, такими як PNG і TIFF." +"<p><b>Кольори</b>: Показати значення одночасно всіх канали кольорів." #: libs/imageproperties/imagepropertiescolorstab.cpp:212 #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:213 @@ -8675,31 +8760,27 @@ msgstr "Кольори:" #: libs/imageproperties/imagepropertiescolorstab.cpp:219 #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:220 -#, fuzzy msgid "" "<p>Select the main color displayed with Colors Channel mode here:<p><b>Red</" "b>: Draw the red image channel in the foreground.<p><b>Green</b>: Draw the " "green image channel in the foreground.<p><b>Blue</b>: Draw the blue image " "channel in the foreground.<p>" msgstr "" -"<p>Виберіть який канал гістограми показати:<p><b>Яскравість світла</b>: " -"Показати значення яскравості світла (сприйняття яскравості).<p><b>Червоний</" -"b>: Показати червоний канал зображення.<p><b>Зелений</b>: Показати зелений " -"канал зображення.<p><b>Синій</b>: Показати синій канал зображення." -"<p><b>Альфа</b>: Показати альфа-канал зображення. Цей канал відповідає " -"значенню прозорості і підтримується деякими форматами зображень, такими як " -"PNG і TIFF.<p><b>Кольори</b>: Показати одночасно всі канали кольорів." +"<p>Оберіть головний колір відображуваний тут із режимом Канал Кольорів:" +"<p><b>Червоний</b>: Вимальовувати червоний канал зображення на передньому " +"плані.<p><b>Зелений</b>: Вимальовувати зелений канал зображення на " +"передньому плані.<p><b>Синій</b>: Вимальовувати синій канал зображення на " +"передньому плані.<p>" #: libs/imageproperties/imagepropertiescolorstab.cpp:229 -#, fuzzy msgid "" "<p>Select from which region the histogram will be computed here:<p><b>Full " "Image</b>: Compute histogram using the full image.<p><b>Selection</b>: " "Compute histogram using the current image selection." msgstr "" -"<p>Виберіть ділянку, з якої буде вираховуватись гістограма:<p><b>Ціле " -"зображення</b>: Вираховувати гістограму з усього зображення.<p><b>Вибрана " -"ділянка</b>: Вираховувати гістограму з вибраної ділянки зображення." +"<p>Оберіть ділянку, з якої буде вираховуватись гістограма:<p><b>Ціле " +"зображення</b>: Вираховувати гістограму з усього зображення.<p><b>Обрання</" +"b>: Вираховувати гістограму із обраної ділянки зображення." #: libs/imageproperties/imagepropertiescolorstab.cpp:235 msgid "<p>Full Image" @@ -8707,7 +8788,7 @@ msgstr "<p>Ціле зображення" #: libs/imageproperties/imagepropertiescolorstab.cpp:243 msgid "<p>Selection" -msgstr "<p>Вибрана ділянка" +msgstr "<p>Обрання" #: libs/imageproperties/imagepropertiescolorstab.cpp:254 msgid "<p>This is the histogram drawing of the selected image channel" @@ -8718,14 +8799,12 @@ msgid "Range:" msgstr "Діапазон:" #: libs/imageproperties/imagepropertiescolorstab.cpp:268 -#, fuzzy msgid "<p>Select the minimal intensity value of the histogram selection here." -msgstr "<p>Вкажіть мінімальну інтенсивність вибраного на гістограмі." +msgstr "<p>Вкажіть значення мінімальної інтенсивності обраної на гістограмі." #: libs/imageproperties/imagepropertiescolorstab.cpp:272 -#, fuzzy msgid "<p>Select the maximal intensity value of the histogram selection here." -msgstr "<p>Вкажіть максимальну інтенсивність вибраного на гістограмі." +msgstr "<p>Вкажіть значення максимальної інтенсивності обраної на гістограмі." #: libs/imageproperties/imagepropertiescolorstab.cpp:280 msgid "Statistics" @@ -8752,12 +8831,11 @@ msgstr "Кількість:" #: libs/imageproperties/imagepropertiescolorstab.cpp:295 #: libs/widgets/common/histogramwidget.cpp:947 msgid "Mean:" -msgstr "Середнє:" +msgstr "Посереднє:" #: libs/imageproperties/imagepropertiescolorstab.cpp:300 -#, fuzzy msgid "Std. deviation:" -msgstr "Стандартне відхилення:" +msgstr "Станд. відхилення:" #: libs/imageproperties/imagepropertiescolorstab.cpp:305 #: libs/widgets/common/histogramwidget.cpp:963 @@ -8774,7 +8852,7 @@ msgstr "Глибина кольору:" #: libs/imageproperties/imagepropertiescolorstab.cpp:320 msgid "Alpha Channel:" -msgstr "Альфа-канал:" +msgstr "Альфа-Канал:" #: libs/imageproperties/imagepropertiescolorstab.cpp:337 msgid "Histogram" @@ -8807,13 +8885,12 @@ msgid "Metadata" msgstr "Метадані" #: libs/imageproperties/imagepropertiessidebardb.cpp:91 -#, fuzzy msgid "Captions/Tags" -msgstr "Коментарі/мітки" +msgstr "Заголовки/Мітки" #: libs/imageproperties/imagepropertiestab.cpp:197 msgid "<big><b>File Properties</b></big>" -msgstr "<big><b>Властивості файла</b></big>" +msgstr "<big><b>Властивості Файлу</b></big>" #: libs/imageproperties/imagepropertiestab.cpp:200 msgid "<b>Modified</b>:" @@ -8829,25 +8906,23 @@ msgstr "<b>Права доступу</b>:" #: libs/imageproperties/imagepropertiestab.cpp:206 msgid "<big><b>Image Properties</b></big>" -msgstr "<big><b>Властивості зображення</b></big>" +msgstr "<big><b>Властивості Зображення</b></big>" #: libs/imageproperties/imagepropertiestab.cpp:209 msgid "<b>Compression</b>:" msgstr "<b>Стискання</b>:" #: libs/imageproperties/imagepropertiestab.cpp:210 -#, fuzzy msgid "<nobr><b>Bit depth</b></nobr>:" -msgstr "<nobr><b>Глибина бітів</b></nobr>:" +msgstr "<nobr><b>Бітова глибина</b></nobr>:" #: libs/imageproperties/imagepropertiestab.cpp:211 -#, fuzzy msgid "<nobr><b>Color mode</b></nobr>:" msgstr "<nobr><b>Режим кольору</b></nobr>:" #: libs/imageproperties/imagepropertiestab.cpp:452 msgid "Uncalibrated" -msgstr "Некалібрована" +msgstr "Некаліброване" #: libs/imageproperties/imagepropertiestab.cpp:467 #, c-format @@ -8859,9 +8934,8 @@ msgid "%1 bpp" msgstr "%1 біт/піксель" #: libs/imageproperties/talbumlistview.cpp:393 -#, fuzzy msgid "Assign tag to images. Please wait..." -msgstr "Призначення мітки зображенням. Будь ласка, зачекайте..." +msgstr "Призначити мітку до зображень. Будь ласка, зачекайте..." #: libs/widgets/common/curveswidget.cpp:342 #: libs/widgets/common/histogramwidget.cpp:435 @@ -8901,11 +8975,11 @@ msgstr "x:%1" #: libs/widgets/common/dlogoaction.cpp:66 utilities/cameragui/cameraui.cpp:374 msgid "Visit digiKam project website" -msgstr "Відвідайте веб-сайт проекту digiKam" +msgstr "Відвідайте веб-сайт проєкту digiKam" #: libs/widgets/common/filesaveoptionsbox.cpp:94 msgid "No options available" -msgstr "Без параметрів" +msgstr "Немає параметрів" #: libs/widgets/common/histogramwidget.cpp:955 msgid "Std dev.:" @@ -8933,7 +9007,7 @@ msgstr "Перейти до останнього елемента" #: libs/widgets/iccprofiles/cietonguewidget.cpp:765 msgid "No profile available..." -msgstr "Нема наявного профілю..." +msgstr "Немає профілю..." #: libs/widgets/iccprofiles/iccprofilewidget.cpp:129 msgid "Name" @@ -8961,7 +9035,7 @@ msgstr "Виробник" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:136 msgid "Raw information about the ICC profile manufacturer" -msgstr "Необроблена інформація про виробника в профілі ICC" +msgstr "Необроблена інформація щодо виробника профілю ICC" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:137 #: utilities/setup/setupcamera.cpp:88 @@ -8970,7 +9044,7 @@ msgstr "Модель" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:138 msgid "Raw information about the ICC profile model" -msgstr "Необроблена інформація про модель в профілі ICC" +msgstr "Необроблена інформація щодо моделі профілю ICC" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:139 msgid "Copyright" @@ -8978,7 +9052,7 @@ msgstr "Авторські права" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:140 msgid "Raw information about the ICC profile copyright" -msgstr "Необроблена інформація про авторські права в профілі ICC" +msgstr "Необроблена інформація щодо авторських прав профілю ICC" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:141 msgid "Profile ID" @@ -8990,43 +9064,43 @@ msgstr "Номер ІД профілю ICC" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:143 msgid "Color Space" -msgstr "Простір кольорів" +msgstr "Простір Кольорів" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:144 msgid "The color space used by the ICC profile" -msgstr "Простір кольорів, який вживається профілем ICC" +msgstr "Простір кольорів використаний профілем ICC" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:145 msgid "Connection Space" -msgstr "Простір з'єднання" +msgstr "Простір З'єднання" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:146 msgid "The connection space used by the ICC profile" -msgstr "Простір з'єднання, який вживається профілем ICC" +msgstr "Простір з'єднання використаний профілем ICC" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:147 msgid "Device Class" -msgstr "Клас пристрою" +msgstr "Клас Пристрою" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:148 msgid "The ICC profile device class" -msgstr "Клас пристрою в профілі ICC" +msgstr "Клас пристрою профілю ICC" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:149 msgid "Rendering Intent" -msgstr "Відтворення кольорів" +msgstr "Мета Вимальовування" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:150 msgid "The ICC profile rendering intent" -msgstr "Відтворення кольорів профілю ICC" +msgstr "Мета вимальовування профілю ICC" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:151 msgid "Profile Version" -msgstr "Версія профілю" +msgstr "Версія Профілю" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:152 msgid "The ICC version used to record the profile" -msgstr "Версія ICC, якій відповідає даний профіль" +msgstr "Версія ICC використана для запису профілю" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:153 msgid "CMM Flags" @@ -9034,7 +9108,7 @@ msgstr "Прапорці CMM" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:154 msgid "The ICC profile color management flags" -msgstr "Прапорці керування кольором в профілі ICC" +msgstr "Прапорці керування кольором профілю ICC" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:166 msgid "" @@ -9049,10 +9123,20 @@ msgid "" "create this profile. The yellow line represents the amount that each point " "is corrected by the profile, and the direction of this correction." msgstr "" +"<p>Ця область містить CIE або діаграму кольоровості. CIE діаграма це " +"позначення всіх кольорів які бачить персона із нормальним зором. Вона " +"представлена кольоровою областю у вигляді вітрил. Додатково ви можете бачити " +"трикутник, накладений на діаграму білим обведенням. Цей трикутник позначає " +"зовнішні границі простору кольору цього пристрою який характеризується " +"дослідженим профілем. Це називається гамою пристрою.<p>Додатково на діаграмі " +"є чорні крапки та жовті лінії. Кожна чорна крапка позначає одну з точок " +"вимірювання використаних для створення цього профілю. Жовта лінія позначає " +"кількість корекції кожної точки за допомогою профілю та напрямок цієї " +"корекції." #: libs/widgets/iccprofiles/iccprofilewidget.cpp:201 msgid "ICC Color Profile Information" -msgstr "Інформація про профіль кольору ICC" +msgstr "Інформація Профілю Кольору ICC" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:289 #: libs/widgets/iccprofiles/iccprofilewidget.cpp:322 @@ -9120,7 +9204,7 @@ msgstr "Абстракція" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:373 msgid "Named color" -msgstr "Колір з назвою" +msgstr "Названий колір" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:385 msgid "Perceptual" @@ -9128,7 +9212,7 @@ msgstr "Перцепційний" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:388 msgid "Relative Colorimetric" -msgstr "Відносний вимір кольору" +msgstr "Відносний Вимір Кольору" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:391 msgid "Saturation" @@ -9136,11 +9220,11 @@ msgstr "Насиченість" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:394 msgid "Absolute Colorimetric" -msgstr "Абсолютний вимір кольору" +msgstr "Абсолютний Вимір Кольору" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:434 msgid "ICC color profile File to Save" -msgstr "Зберегти файл профілю кольору ICC" +msgstr "Файл профілю кольору ICC до Збереження" #: libs/widgets/imageplugins/imageguidewidget.cpp:245 #: libs/widgets/imageplugins/imageguidewidget.cpp:330 @@ -9148,7 +9232,7 @@ msgstr "Зберегти файл профілю кольору ICC" #: libs/widgets/imageplugins/imageregionwidget.cpp:233 #: libs/widgets/imageplugins/imageregionwidget.cpp:268 msgid "Original" -msgstr "Джерело" +msgstr "Оригінал" #: libs/widgets/imageplugins/imageguidewidget.cpp:263 #: libs/widgets/imageplugins/imageguidewidget.cpp:321 @@ -9160,16 +9244,14 @@ msgstr "Ціль" #: libs/widgets/imageplugins/imagepanelwidget.cpp:96 #: libs/widgets/imageplugins/imagepannelwidget.cpp:128 -#, fuzzy msgid "" "<p>Here you can see the original clip image which will be used for the " "preview computation.<p>Click and drag the mouse cursor in the image to " "change the clip focus." msgstr "" -"Це - попередній перегляд для установок кольору, які почнуть діяти після " -"того, як Ви натиснете \"Застосувати\" або \"Гаразд\". Ви можете клацнути " -"мишкою на різних частинах вікна попереднього перегляду. Назва графічного " -"об'єкту \"Об'єкт кольору\" зміниться на назву відповідної частини вікна." +"<p>Тут ви можете бачити скорочення оригінального зображення, яке буде " +"використано для розрахунку попереднього перегляду.<p>Клацніть та потягніть " +"курсор миші на зображені для зміни фокусу скорочення." #: libs/widgets/imageplugins/imagepanelwidget.cpp:119 #: libs/widgets/imageplugins/imagepannelwidget.cpp:159 @@ -9178,6 +9260,9 @@ msgid "" "horizontally, displaying the original and target image at the same time. The " "target is duplicated from the original below the red dashed line." msgstr "" +"<p>Із увімкненням цього параметру ви поділите область попереднього перегляду " +"горизонтально, відображення оригінального та цільового зображення одночасно. " +"Ціль дублює оригінал під червоною штриховою лінією." #: libs/widgets/imageplugins/imagepanelwidget.cpp:130 #: libs/widgets/imageplugins/imagepannelwidget.cpp:170 @@ -9186,6 +9271,9 @@ msgid "" "displaying the original and target image at the same time. The target is " "duplicated from the original to the right of the red dashed line." msgstr "" +"<p>Із увімкненням цього параметру ви поділите область попереднього перегляду " +"вертикально, відображення оригінального та цільового зображення одночасно. " +"Ціль дублює оригінал праворуч від червоної штрихової лінії." #: libs/widgets/imageplugins/imagepanelwidget.cpp:145 #: libs/widgets/imageplugins/imagepannelwidget.cpp:185 @@ -9194,6 +9282,9 @@ msgid "" "horizontally, displaying the original and target image at the same time. The " "original is above the red dashed line, the target below it." msgstr "" +"<p>Із увімкненням цього параметру ви поділите область попереднього перегляду " +"горизонтально, відображення оригінального та цільового зображення одночасно. " +"Оригінал над червоною штриховою лінією, ціль під нею." #: libs/widgets/imageplugins/imagepanelwidget.cpp:156 #: libs/widgets/imageplugins/imagepannelwidget.cpp:196 @@ -9202,121 +9293,105 @@ msgid "" "displaying the original and target image at the same time. The original is " "to the left of the red dashed line, the target to the right of it." msgstr "" +"<p>Із увімкненням цього параметру ви поділите область попереднього перегляду " +"вертикально, відображення оригінального та цільового зображення одночасно. " +"Оригінал ліворуч від червоної штрихової лінії, ціль праворуч від неї." #: libs/widgets/imageplugins/imagepanelwidget.cpp:168 #: libs/widgets/imageplugins/imagepannelwidget.cpp:208 -#, fuzzy msgid "<p>If you enable this option, the preview area will not be separated." msgstr "" -"Якщо ви виберете цей параметр, то вибрана фраза буде недоступною для виклику " -"через скорочення клавіатури." +"<p>Із увімкненням цього параметру попередній перегляд не буде поділено." #: libs/widgets/imageplugins/imagepanelwidget.cpp:330 #: libs/widgets/imageplugins/imagepannelwidget.cpp:472 msgid "<nobr>(%1,%2)(%3x%4)</nobr>" -msgstr "" +msgstr "<nobr>(%1,%2)(%3x%4)</nobr>" #: libs/widgets/imageplugins/imagepannelwidget.cpp:140 -#, fuzzy msgid "<p>Here set the zoom factor of the preview area." -msgstr "<p>Вкажіть товщину напрямних переривистих ліній." +msgstr "<p>Тут встановити фактор збільшення області перегляду." #: libs/widgets/imageplugins/imagepannelwidget.cpp:241 #: utilities/imageeditor/editor/editortoolsettings.cpp:125 -#, fuzzy msgid "" "<p>Here you can see the original image panel which can help you to select " "the clip preview.<p>Click and drag the mouse cursor in the red rectangle to " "change the clip focus." msgstr "" -"Це - попередній перегляд для установок кольору, які почнуть діяти після " -"того, як Ви натиснете \"Застосувати\" або \"Гаразд\". Ви можете клацнути " -"мишкою на різних частинах вікна попереднього перегляду. Назва графічного " -"об'єкту \"Об'єкт кольору\" зміниться на назву відповідної частини вікна." +"<p>Тут ви можете бачити панель оригінального зображення яке може допомогти " +"вам обрати попередній перегляд кліпами.<p>Клацніть та потягніть курсор миші " +"у червоному прямокутнику для зміни фокусу кліпу." #: libs/widgets/imageplugins/imagewidget.cpp:105 -#, fuzzy msgid "<p>If you enable this option, you will see the original image." -msgstr "" -"Якщо цей параметр ввімкнено, в програмах TDE буде відображено маленькі " -"піктограми на важливих кнопках." +msgstr "<p>Із увімкненням цього параметру ви побачите оригінальне зображення." #: libs/widgets/imageplugins/imagewidget.cpp:114 -#, fuzzy msgid "" "<p>If you enable this option, the preview area will split vertically. A " "contiguous area of the image will be shown, with one half from the original " "image, the other half from the target image." msgstr "" -"Якщо цей параметр увімкнено, то вибране зображення буде розміщено в центрі " -"вибраної ділянки. Якщо зображення більше за ділянку, то буде видно тільки " -"середину зображення, яка вмістилась." +"<p>За увімкнення цього параметру область попереднього перегляду буде " +"поділено вертикально. Суміжна область зображення буде відображати половину " +"оригінального зображення, інша половина буде відображати цільове." #: libs/widgets/imageplugins/imagewidget.cpp:126 -#, fuzzy msgid "" "<p>If you enable this option, the preview area will split horizontally. A " "contiguous area of the image will be shown, with one half from the original " "image, the other half from the target image." msgstr "" -"Якщо цей параметр увімкнено, то вибране зображення буде розміщено в центрі " -"вибраної ділянки. Якщо зображення більше за ділянку, то буде видно тільки " -"середину зображення, яка вмістилась." +"<p>За увімкнення цього параметру область попереднього перегляду буде " +"поділено горизонтально. Суміжна область зображення буде відображати половину " +"оригінального зображення, інша половина буде відображати цільове." #: libs/widgets/imageplugins/imagewidget.cpp:138 -#, fuzzy msgid "" "<p>If you enable this option, the preview area will split vertically. The " "same part of the original and the target image will be shown side by side." msgstr "" -"Якщо цей параметр увімкнено, то вибране зображення буде розміщено в центрі " -"вибраної ділянки. Якщо зображення більше за ділянку, то буде видно тільки " -"середину зображення, яка вмістилась." +"<p>За увімкнення цього параметру область попереднього перегляду буде " +"поділено вертикально. Ту саму частину оригінального та цільового зображення " +"буде відображено бік обіч." #: libs/widgets/imageplugins/imagewidget.cpp:149 -#, fuzzy msgid "" "<p>If you enable this option, the preview area will split horizontally. The " "same part of the original and the target image will be shown side by side." msgstr "" -"Якщо цей параметр увімкнено, то вибране зображення буде розміщено в центрі " -"вибраної ділянки. Якщо зображення більше за ділянку, то буде видно тільки " -"середину зображення, яка вмістилась." +"<p>За увімкнення цього параметру область попереднього перегляду буде " +"поділено горизонтально. Ту саму частину оригінального та цільового " +"зображення буде відображено бік обіч." #: libs/widgets/imageplugins/imagewidget.cpp:160 -#, fuzzy msgid "<p>If you enable this option, you will see the target image." -msgstr "" -"Якщо цей параметр ввімкнено, в програмах TDE буде відображено маленькі " -"піктограми на важливих кнопках." +msgstr "<p>Із увімкненням цього параметру ви побачите цільове зображення." #: libs/widgets/imageplugins/imagewidget.cpp:169 -#, fuzzy msgid "" "<p>If you enable this option, you will see the original image when the mouse " "is over image area, else the target image." msgstr "" -"Якщо цей параметр увімкнено, то вибране зображення буде розміщено в центрі " -"вибраної ділянки. Якщо зображення більше за ділянку, то буде видно тільки " -"середину зображення, яка вмістилась." +"<p>Із увімкненням цього параметру ви побачите оригінальне зображення за " +"мишею над областю зображення, інакше цільове." #: libs/widgets/imageplugins/imagewidget.cpp:183 -#, fuzzy msgid "" "<p>Set this option to display black overlaid on the preview. This will help " "you to avoid under-exposing the image." msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +"<p>Встановіть цей параметр для накладення чорного на попередньому перегляді. " +"Це допоможе запобігти недоекспонуванню зображення." #: libs/widgets/imageplugins/imagewidget.cpp:191 -#, fuzzy msgid "" "<p>Set this option on display white overlaid on the preview. This will help " "you to avoid over-exposing the image." msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +"<p>Встановіть цей параметр для накладення білого на попередньому перегляді. " +"Це допоможе запобігти переекспонуванню зображення." #: libs/widgets/imageplugins/imagewidget.cpp:317 msgid "(%1,%2) RGBA:%3,%4,%5,%6" @@ -9337,21 +9412,21 @@ msgstr "Опис відсутній" #: libs/widgets/metadata/gpswidget.cpp:335 #: libs/widgets/metadata/makernotewidget.cpp:205 msgid "EXIF File to Save" -msgstr "Зберегти файл EXIF" +msgstr "Файл EXIF до Збереження" #: libs/widgets/metadata/exifwidget.cpp:181 #: libs/widgets/metadata/gpswidget.cpp:336 #: libs/widgets/metadata/makernotewidget.cpp:206 msgid "EXIF binary Files (*.exif)" -msgstr "Двійкові файли EXIF (*.exif)" +msgstr "Двійкові Файли EXIF (*.exif)" #: libs/widgets/metadata/gpswidget.cpp:120 msgid "More Info..." -msgstr "Більше інформації..." +msgstr "Більше Інфо..." #: libs/widgets/metadata/gpswidget.cpp:220 msgid "Global Positioning System Information" -msgstr "Інформація системи глобального розміщення" +msgstr "Інформація Системи Глобального Позиціювання" #: libs/widgets/metadata/iptcwidget.cpp:83 msgid "IPTC Records" @@ -9359,7 +9434,7 @@ msgstr "Записи IPTC" #: libs/widgets/metadata/iptcwidget.cpp:161 msgid "IPTC File to Save" -msgstr "Зберегти файл IPTC" +msgstr "Файл IPTC до Збереження" #: libs/widgets/metadata/iptcwidget.cpp:162 msgid "IPTC binary Files (*.iptc)" @@ -9375,20 +9450,20 @@ msgstr "Сумісність" #: libs/widgets/metadata/mdkeylistviewitem.cpp:51 msgid "Image Information" -msgstr "Інформація про зображення" +msgstr "Інформація Зображення" #: libs/widgets/metadata/mdkeylistviewitem.cpp:52 #: showfoto/setup/setuptooltip.cpp:127 utilities/setup/setuptooltip.cpp:138 msgid "Photograph Information" -msgstr "Інформація про фотографію" +msgstr "Інформація Фотографії" #: libs/widgets/metadata/mdkeylistviewitem.cpp:53 msgid "Global Positioning System" -msgstr "Система глобального розміщення (GPS)" +msgstr "Система глобального Позиціювання (GPS)" #: libs/widgets/metadata/mdkeylistviewitem.cpp:54 msgid "Embedded Thumbnail" -msgstr "Вбудована мініатюра" +msgstr "Вбудована Мініатюра" #: libs/widgets/metadata/mdkeylistviewitem.cpp:57 msgid "IIM Envelope" @@ -9404,58 +9479,52 @@ msgstr "<b>Заголовок: </b><p>%1<p><b>Значення: </b><p>%2<p><b> #: libs/widgets/metadata/metadatawidget.cpp:113 msgid "Switch the tags view to a simple human-readable list" -msgstr "" +msgstr "Перемкнути перегляд міток у простий людиночитабельний перелік" #: libs/widgets/metadata/metadatawidget.cpp:114 msgid "Simple list" -msgstr "" +msgstr "Простий перелік" #: libs/widgets/metadata/metadatawidget.cpp:120 msgid "Switch the tags view to a full list" -msgstr "" +msgstr "Перемкнути перегляд міток у повний перелік" #: libs/widgets/metadata/metadatawidget.cpp:121 -#, fuzzy msgid "Full list" -msgstr "Повний текст" +msgstr "Повний перелік" #: libs/widgets/metadata/metadatawidget.cpp:130 -#, fuzzy msgid "Save metadata to a binary file" -msgstr "Зберегти метадані у двійковий файл" +msgstr "Зберегти метадані до двійкового файлу" #: libs/widgets/metadata/metadatawidget.cpp:131 -#, fuzzy msgid "Save metadata" -msgstr "Метадані" +msgstr "Зберегти метадані" #: libs/widgets/metadata/metadatawidget.cpp:136 -#, fuzzy msgid "Print metadata to printer" msgstr "Надрукувати метадані на принтері" #: libs/widgets/metadata/metadatawidget.cpp:137 -#, fuzzy msgid "Print metadata" -msgstr "Надрукувати метадані на принтері" +msgstr "Друкувати метадані" #: libs/widgets/metadata/metadatawidget.cpp:142 #: libs/widgets/metadata/metadatawidget.cpp:143 -#, fuzzy msgid "Copy metadata to clipboard" -msgstr "Скопіювати метадані у кишеню" +msgstr "Скопіювати метадані до кишені" #: libs/widgets/metadata/metadatawidget.cpp:274 msgid "File name: %1 (%2)" -msgstr "Назва файла: %1 (%2)" +msgstr "Назва файлу: %1 (%2)" #: libs/widgets/metadata/metadatawidget.cpp:303 msgid "<p><big><big><b>File name: %1 (%2)</b></big></big>" -msgstr "<p><big><big><b>Назва файла: %1 (%2)</b></big></big>" +msgstr "<p><big><big><b>Назва файлу: %1 (%2)</b></big></big>" #: showfoto/main.cpp:47 msgid "File(s) or folder(s) to open" -msgstr "Файли і теки, які слід відкрити" +msgstr "Файл(и) або тека(и) до відкриття" #: showfoto/main.cpp:58 msgid "showFoto" @@ -9463,59 +9532,54 @@ msgstr "showFoto" #: showfoto/setup/setup.cpp:98 utilities/setup/setup.cpp:158 msgid "Tool Tip" -msgstr "Підказки" +msgstr "Вигулькна Підказка" #: showfoto/setup/setup.cpp:98 -#, fuzzy msgid "Thumbbar Items Tool Tip Settings" -msgstr "Параметри підказок для елементів альбому" +msgstr "Налаштування Вигулькних Підказок Елементів Панелі Мініатюр" #: showfoto/setup/setup.cpp:102 utilities/setup/setup.cpp:178 msgid "RAW decoding" -msgstr "" +msgstr "Декодування RAW" #: showfoto/setup/setup.cpp:102 utilities/setup/setup.cpp:178 -#, fuzzy msgid "RAW Files Decoding Settings" -msgstr "Додаткові параметри штампа з даними" +msgstr "Налаштування Декодування RAW Файлів" #: showfoto/setup/setup.cpp:106 -#, fuzzy msgid "Color Management Settings" -msgstr "Comment=Налаштування керування живленням дисплея" +msgstr "Налаштування Керування Кольорів" #: showfoto/setup/setup.cpp:110 utilities/setup/setup.cpp:174 msgid "Save Images" -msgstr "Зберегти зображення" +msgstr "Зберегти Зображення" #: showfoto/setup/setup.cpp:110 -#, fuzzy msgid "Save Images' Files' Settings" -msgstr "Параметри В/В файлів зображень редактора зображень" +msgstr "Зберегти Налаштування Файлів Зображень" #: showfoto/setup/setup.cpp:114 utilities/setup/setup.cpp:190 msgid "Slide Show" -msgstr "Показ слайдів" +msgstr "Показ Слайдів" #: showfoto/setup/setup.cpp:114 utilities/setup/setup.cpp:190 msgid "Slide Show Settings" -msgstr "Параметри показу слайдів" +msgstr "Параметри Показу Слайдів" #: showfoto/setup/setupeditor.cpp:104 utilities/setup/setupeditor.cpp:84 #: utilities/setup/setupgeneral.cpp:168 utilities/setup/setuplighttable.cpp:74 msgid "Interface Options" -msgstr "Параметри інтерфейсу" +msgstr "Параметри Інтерфейсу" #: showfoto/setup/setupeditor.cpp:106 utilities/setup/setupeditor.cpp:86 msgid "&Use theme background color" msgstr "В&живати колір тла теми" #: showfoto/setup/setupeditor.cpp:109 utilities/setup/setupeditor.cpp:88 -#, fuzzy msgid "" "<p>Enable this option to use background theme color in image editor area" msgstr "" -"<p>Ввімкніть цей параметр, щоб вживати колір тла теми в ділянці редактора " +"<p>Увімкніть цей параметр для вживання кольору тла теми у області редактору " "зображень" #: showfoto/setup/setupeditor.cpp:113 utilities/setup/setupeditor.cpp:93 @@ -9523,23 +9587,22 @@ msgid "&Background color:" msgstr "Колір &тла:" #: showfoto/setup/setupeditor.cpp:116 -#, fuzzy msgid "<p>Select background color to use for image editor area." -msgstr "<p>Тут виберіть колір тла для ділянки редактора зображення." +msgstr "<p>Оберіть колір тла для використання у області редактору зображень." #: showfoto/setup/setupeditor.cpp:119 utilities/setup/setupeditor.cpp:100 #: utilities/setup/setuplighttable.cpp:92 -#, fuzzy msgid "H&ide toolbar in fullscreen mode" -msgstr "Хова&ти пенал в повноекранному режимі" +msgstr "Схова&ти панель інструментів у повноекранному режимі" #: showfoto/setup/setupeditor.cpp:120 msgid "Hide &thumbbar in fullscreen mode" -msgstr "" +msgstr "Сховати панель &мініатюр у повноекранному режимі" #: showfoto/setup/setupeditor.cpp:121 msgid "Use &horizontal thumbbar (need to restart showFoto)" msgstr "" +"Використати &горизонтальну панель мініатюр (необхідно перезапустити showFoto)" #: showfoto/setup/setupeditor.cpp:122 msgid "" @@ -9547,6 +9610,9 @@ msgid "" "horizontally behind the image area. You need to restart showFoto for this " "option take effect.<p>" msgstr "" +"<p>За увімкнення цього параметру панель мініатюр буде відображено " +"горизонтально під областю зображення. Ви маєте перезапустити showFoto для " +"набуття ефекту цього параметру.<p>" #: showfoto/setup/setupeditor.cpp:124 msgid "&Deleting items should move them to trash" @@ -9558,37 +9624,42 @@ msgstr "Показувати &екран заставки під час запу #: showfoto/setup/setupeditor.cpp:127 utilities/setup/setupeditor.cpp:102 msgid "Use Raw Import Tool to handle Raw image" -msgstr "" +msgstr "Використати Засіб Імпорту Raw для поводження із Raw зображенням" #: showfoto/setup/setupeditor.cpp:128 utilities/setup/setupeditor.cpp:103 msgid "" "<p>Set on this option to use Raw Import tool before to load a Raw image, to " "customize indeep decoding settings." msgstr "" +"<p>Встановіть цей параметр для використання засобу Імпорту Raw перед " +"завантаженням Raw зображення, для налаштування параметрів глибокого " +"декодування." #: showfoto/setup/setupeditor.cpp:134 utilities/setup/setupeditor.cpp:109 msgid "Exposure Indicators" -msgstr "Індикатори експозиції" +msgstr "Індикатори Експозиції" #: showfoto/setup/setupeditor.cpp:137 utilities/setup/setupeditor.cpp:112 msgid "&Under-exposure color:" -msgstr "" +msgstr "Колір &Недоекспозиції:" #: showfoto/setup/setupeditor.cpp:140 -#, fuzzy msgid "" "<p>Customize color used in image editor to identify under-exposed pixels." -msgstr "<p>Тут виберіть колір тла для ділянки редактора зображення." +msgstr "" +"<p>Персоналізуйте колір використаний у редакторі зображень для ідентифікації " +"недоекспонованих пікселів." #: showfoto/setup/setupeditor.cpp:144 utilities/setup/setupeditor.cpp:119 msgid "&Over-exposure color:" -msgstr "" +msgstr "Колір &Переекспозиції:" #: showfoto/setup/setupeditor.cpp:147 -#, fuzzy msgid "" "<p>Customize color used in image editor to identify over-exposed pixels." -msgstr "<p>Тут виберіть колір тла для ділянки редактора зображення." +msgstr "" +"<p>Персоналізуйте колір використаний у редакторі зображень для ідентифікації " +"переекспонованих пікселів." #: showfoto/setup/setupeditor.cpp:152 utilities/setup/setupmetadata.cpp:96 msgid "EXIF Actions" @@ -9597,239 +9668,217 @@ msgstr "Дії EXIF" #: showfoto/setup/setupeditor.cpp:155 utilities/setup/setupmetadata.cpp:99 msgid "Show images/thumbs &rotated according to orientation tag" msgstr "" +"Показати зображення/мініатюри &повернутими відповідно до мітки орієнтації" #: showfoto/setup/setupeditor.cpp:158 utilities/setup/setupmetadata.cpp:102 msgid "Set orientation tag to normal after rotate/flip" -msgstr "" +msgstr "Встановити мітку орієнтації у норму після повертання/перевертання" #: showfoto/setup/setupeditor.cpp:162 -#, fuzzy msgid "Sort order for images" -msgstr "&Впорядкувати зображення" +msgstr "Впорядкування зображень" #: showfoto/setup/setupeditor.cpp:165 msgid "Sort images by:" msgstr "Впорядкувати зображення за:" #: showfoto/setup/setupeditor.cpp:167 -#, fuzzy msgid "File Date" -msgstr "Дата зображення" +msgstr "Дата Файлу" #: showfoto/setup/setupeditor.cpp:168 msgid "File Name" -msgstr "Назва файла" +msgstr "Назва Файлу" #: showfoto/setup/setupeditor.cpp:169 msgid "File size" -msgstr "Розмір файла" +msgstr "Розмір Файлу" #: showfoto/setup/setupeditor.cpp:170 msgid "" "<p>Here, select whether newly-loaded images are sorted by file-date, file-" "name, or file-size." msgstr "" +"<p>Тут оберіть чи сортувати нові завантажені зображення за датою, назвою, " +"розміром файлу." #: showfoto/setup/setupeditor.cpp:173 msgid "Reverse ordering" msgstr "Зворотний порядок" #: showfoto/setup/setupeditor.cpp:174 -#, fuzzy msgid "" "<p>If this option is enabled, newly-loaded images will be sorted in " "descending order." msgstr "" -"<p>Якщо увімкнено цей параметр, то показ слайдів почнеться з поточного " -"зображення, яке вибране в списку." +"<p>З увімкненням цього параметру нові завантажені зображення сортуватимуться " +"у порядку зменшення." #: showfoto/setup/setuptooltip.cpp:98 -#, fuzzy msgid "Show Thumbbar items toolti&ps" -msgstr "Показувати мініатюри" +msgstr "Показати вигулькну допомогу елементів Панелі Мініатюр" #: showfoto/setup/setuptooltip.cpp:99 -#, fuzzy msgid "" "<p>Set this option to display image information when the mouse hovers over a " "thumbbar item." msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +"<p>Встановіть цей параметр для відображення інформації зображення за мишею " +"над елементом панелі мініатюр." #: showfoto/setup/setuptooltip.cpp:106 utilities/setup/setuptooltip.cpp:117 msgid "File/Image Information" -msgstr "Інформація про файл/зображення" +msgstr "Інформація Файлу/Зображення" #: showfoto/setup/setuptooltip.cpp:108 utilities/setup/setuptooltip.cpp:119 msgid "Show file name" -msgstr "Показати назву файла" +msgstr "Показати назву файлу" #: showfoto/setup/setuptooltip.cpp:109 utilities/setup/setuptooltip.cpp:120 -#, fuzzy msgid "<p>Set this option to display the image file name." -msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +msgstr "<p>Встановіть цей параметр для відображення назви файлу зображення." #: showfoto/setup/setuptooltip.cpp:111 utilities/setup/setuptooltip.cpp:122 msgid "Show file date" -msgstr "Показати дату файла" +msgstr "Показати дату файлу" #: showfoto/setup/setuptooltip.cpp:112 utilities/setup/setuptooltip.cpp:123 -#, fuzzy msgid "<p>Set this option to display the image file date." -msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +msgstr "<p>Встановіть цей параметр для відображення дати файлу." #: showfoto/setup/setuptooltip.cpp:114 utilities/setup/setuptooltip.cpp:125 msgid "Show file size" -msgstr "Показати розмір файла" +msgstr "Показати розмір файлу" #: showfoto/setup/setuptooltip.cpp:115 utilities/setup/setuptooltip.cpp:126 -#, fuzzy msgid "<p>Set this option to display the image file size." -msgstr "Увімкніть цей параметр, щоб показувати цитати меншим шрифтом." +msgstr "<p>Встановіть цей параметр для відображення розміру файлу." #: showfoto/setup/setuptooltip.cpp:117 utilities/setup/setuptooltip.cpp:128 msgid "Show image type" msgstr "Показати тип зображення" #: showfoto/setup/setuptooltip.cpp:118 utilities/setup/setuptooltip.cpp:129 -#, fuzzy msgid "<p>Set this option to display the image type." -msgstr "" -"Ввімкніть цей параметр для того, щоб ввімкнути режим збереження енергії " -"вашого дисплея." +msgstr "<p>Встановіть цей параметр для відображення типу зображення." #: showfoto/setup/setuptooltip.cpp:120 utilities/setup/setuptooltip.cpp:131 msgid "Show image dimensions" -msgstr "Показати розміри зображення" +msgstr "Показати роздільну здатність зображення" #: showfoto/setup/setuptooltip.cpp:121 utilities/setup/setuptooltip.cpp:132 -#, fuzzy msgid "<p>Set this option to display the image dimensions in pixels." msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +"<p>Встановіть цей параметр для відображення роздільної здатності зображення " +"в пікселях." #: showfoto/setup/setuptooltip.cpp:129 utilities/setup/setuptooltip.cpp:140 msgid "Show camera make and model" msgstr "Показати виробника і модель камери" #: showfoto/setup/setuptooltip.cpp:130 utilities/setup/setuptooltip.cpp:141 -#, fuzzy msgid "" "<p>Set this option to display the make and model of the camera with which " "the image has been taken." msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +"<p>Встановіть цей параметр для відображення виробнику та моделі камери якою " +"зображення було отримано." #: showfoto/setup/setuptooltip.cpp:133 utilities/setup/setuptooltip.cpp:144 msgid "Show camera date" -msgstr "Показати дату з камери" +msgstr "Показати дату камери" #: showfoto/setup/setuptooltip.cpp:134 utilities/setup/setuptooltip.cpp:145 -#, fuzzy msgid "<p>Set this option to display the date when the image was taken." -msgstr "<p>Увімкніть цей параметр, щоб показувати дату фотографування." +msgstr "<p>Встановіть цей параметр для відображення дати отримання зображення." #: showfoto/setup/setuptooltip.cpp:136 msgid "Show camera aperture and focal length" -msgstr "Показувати діафрагму і фокусну відстань фотоапарата" +msgstr "Показати діафрагму і фокусну відстань камери" #: showfoto/setup/setuptooltip.cpp:137 utilities/setup/setuptooltip.cpp:148 -#, fuzzy msgid "" "<p>Set this option to display the camera aperture and focal settings used to " "take the image." msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +"<p>Увімкніть цей параметр, щоб показувати налаштування діафрагми і фокусної " +"відстані камери використані для отримання зображення." #: showfoto/setup/setuptooltip.cpp:140 utilities/setup/setuptooltip.cpp:151 msgid "Show camera exposure and sensitivity" -msgstr "Показувати експозицію і чутливість фотоапарата" +msgstr "Показати експозицію і чутливість камери" #: showfoto/setup/setuptooltip.cpp:141 utilities/setup/setuptooltip.cpp:152 -#, fuzzy msgid "" "<p>Set this option to display the camera exposure and sensitivity used to " "take the image." msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +"<p>Увімкніть цей параметр, щоб показувати експозицію і чутливість камери " +"використані для отримання зображення." #: showfoto/setup/setuptooltip.cpp:144 utilities/setup/setuptooltip.cpp:155 msgid "Show camera mode and program" -msgstr "Показувати режим і програму фотоапарата" +msgstr "Показати режим і програму камери" #: showfoto/setup/setuptooltip.cpp:145 utilities/setup/setuptooltip.cpp:156 -#, fuzzy msgid "" "<p>Set this option to display the camera mode and program used to take the " "image." msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +"<p>Увімкніть цей параметр, щоб показувати режим і програму камери " +"використані для отримання зображення." #: showfoto/setup/setuptooltip.cpp:148 utilities/setup/setuptooltip.cpp:159 msgid "Show camera flash settings" -msgstr "Показувати параметри спалаху фотоапарата" +msgstr "Показати параметри спалаху камери" #: showfoto/setup/setuptooltip.cpp:149 utilities/setup/setuptooltip.cpp:160 -#, fuzzy msgid "" "<p>Set this option to display the camera flash settings used to take the " "image." msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +"<p>Увімкніть цей параметр, щоб показувати налаштування спалаху камери " +"використані для отримання зображення." #: showfoto/setup/setuptooltip.cpp:152 utilities/setup/setuptooltip.cpp:163 msgid "Show camera white balance settings" -msgstr "Показати параметри балансу білого камери" +msgstr "Показати налаштування балансу білого камери" #: showfoto/setup/setuptooltip.cpp:153 utilities/setup/setuptooltip.cpp:164 -#, fuzzy msgid "" "<p>Set this option to display the camera white balance settings used to take " "the image." msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +"<p>Увімкніть цей параметр, щоб показувати налаштування балансу білого камери " +"використані для отримання зображення." #: showfoto/showfoto.cpp:214 msgid "Brightness/Contrast/Gamma" -msgstr "Яскравість/контраст/гама" +msgstr "Яскравість/Контраст/Гама" #: showfoto/showfoto.cpp:217 -#, fuzzy msgid "Increase Gamma" -msgstr "Збільшити гаму" +msgstr "Збільшити Гаму" #: showfoto/showfoto.cpp:220 -#, fuzzy msgid "Decrease Gamma" -msgstr "Зменшити гаму" +msgstr "Зменшити Гаму" #: showfoto/showfoto.cpp:223 msgid "Increase Brightness" -msgstr "Збільшити яскравість" +msgstr "Збільшити Яскравість" #: showfoto/showfoto.cpp:226 msgid "Decrease Brightness" -msgstr "Зменшити яскравість" +msgstr "Зменшити Яскравість" #: showfoto/showfoto.cpp:229 msgid "Increase Contrast" -msgstr "Збільшити контрасність" +msgstr "Збільшити Контраст" #: showfoto/showfoto.cpp:232 msgid "Decrease Contrast" -msgstr "Зменшити контрасність" +msgstr "Зменшити Контраст" #: showfoto/showfoto.cpp:362 msgid "" @@ -9837,46 +9886,48 @@ msgid "" "now, select \"Yes\", otherwise select \"No\". In this case, \"Color " "Management\" feature will be disabled until you solve this issue</p></qt>" msgstr "" +"<qt><p>Шлях до профілю ICC здається некоректний.</p><p>Якщо ви бажаєте " +"встановити його зараз, оберіть \"Так\", інакше оберіть \"Ні\". У такому " +"випадку властивість \"Керування Кольором\" буде вимкнено до виправлення цієї " +"проблеми</p></qt>" #: showfoto/showfoto.cpp:484 msgid "Open folder" msgstr "Відкрити теку" #: showfoto/showfoto.cpp:496 -#, fuzzy msgid "Show Thumbnails" -msgstr "Показувати мініатюри" +msgstr "Показати Панель Мініатюр" #: showfoto/showfoto.cpp:565 msgid "Delete File" -msgstr "Видалити файл" +msgstr "Видалити Файл" #: showfoto/showfoto.cpp:792 utilities/imageeditor/editor/imagewindow.cpp:719 msgid " (%2 of %3)" msgstr " (%2 з %3)" #: showfoto/showfoto.cpp:904 -#, fuzzy msgid "There are no images in this folder." -msgstr "В цій теці немає зображень." +msgstr "У цій теці немає зображень." #: showfoto/showfoto.cpp:926 msgid "Open Images From Folder" -msgstr "Відкрити зображення з теки" +msgstr "Відкрити Зображення з Теки" #: showfoto/showfoto.cpp:1104 msgid "" "About to delete file \"%1\"\n" "Are you sure?" msgstr "" -"Ви вилучаєте файл «%1»\n" -"Ви впевнені, що цього бажаєте?" +"Щодо видалення файлу «%1»\n" +"Ви певні?" #: showfoto/showfoto.cpp:1205 utilities/imageeditor/editor/imagewindow.cpp:1065 #: utilities/imageeditor/editor/imagewindow.cpp:1095 #: utilities/lighttable/lighttablewindow.cpp:1290 msgid "Preparing slideshow. Please wait..." -msgstr "Підготовка до показу слайда. Будь ласка, зачекайте…" +msgstr "Приготування показу слайдів. Будь ласка, зачекайте…" #: tdeioslave/digikamalbums.cpp:486 tdeioslave/digikamalbums.cpp:942 #: tdeioslave/digikamalbums.cpp:952 tdeioslave/digikamalbums.cpp:1212 @@ -9899,26 +9950,29 @@ msgid "" "Source: %1\n" "Destination: %2" msgstr "" +"Джерело та Призначення мають відмінні Шляхи Бібліотеки Альбому.\n" +"Джерело: %1\n" +"Призначення: %2" #: tdeioslave/digikamalbums.cpp:960 -#, fuzzy msgid "Destination album %1 not found in database" -msgstr "Доріжку %1 не було знайдено в базі даних MusicBrainz." +msgstr "Альбом призначення %1 не знайдено в базі даних" #: tdeioslave/digikamalbums.cpp:979 msgid "" "This file/folder is on a different filesystem through symlinks. Moving/" "Renaming files between them is currently unsupported " msgstr "" +"Цей файл/тека на різних файлових системах через посилання. Пересування/" +"Перейменування файлів між ними наразі не підтримується " #: tdeioslave/digikamalbums.cpp:1765 -#, fuzzy msgid "Source image %1 not found in database" -msgstr "Доріжку %1 не було знайдено в базі даних MusicBrainz." +msgstr "Зображення джерела %1 не знайдено в базі даних" #: tdeioslave/digikamthumbnail.cpp:125 msgid "No or invalid size specified" -msgstr "Не вказано розмір, або вказано не чинний" +msgstr "Розмір не вказано, або вказано некоректний" #: tdeioslave/digikamthumbnail.cpp:143 msgid "File does not exist" @@ -9931,102 +9985,97 @@ msgstr "Не вдається створити мініатюру для %1" #: themedesigner/main.cpp:46 msgid "Document to open." -msgstr "" +msgstr "Документ для відкриття." #: themedesigner/main.cpp:53 themedesigner/mainwindow.cpp:69 msgid "digiKam Theme Designer" -msgstr "" +msgstr "Дизайнер Тем digiKam" #: themedesigner/themedicongroupitem.cpp:79 -#, fuzzy msgid "Album Banner" -msgstr "Назва альбому" +msgstr "Прапор Альбому" #: themedesigner/themedicongroupitem.cpp:93 msgid "July 2007 - 10 Items" -msgstr "" +msgstr "Липень 2007 - 10 Елементів" #: themedesigner/themediconitem.cpp:153 -#, fuzzy msgid "Photo caption" -msgstr "Показувати коментарі зображення" +msgstr "Заголовок фотографії" #: themedesigner/themediconitem.cpp:170 msgid "Events, Places, Vacation" -msgstr "" +msgstr "Події, Місця, Відпуски" #: utilities/batch/batchalbumssyncmetadata.cpp:78 msgid "Sync All Images' Metadata" -msgstr "" +msgstr "Синхронізувати Всі Метадані Зображень" #: utilities/batch/batchalbumssyncmetadata.cpp:79 -#, fuzzy msgid "" "<b>Syncing the metadata of all images with the digiKam database. Please " "wait...</b>" -msgstr "Запис метаданих у файли. Будь ласка, зачекайте..." +msgstr "" +"<b>Синхронізація метаданих всіх зображень із базою даних digiKam. Будь " +"ласка, зачекайте...</b>" #: utilities/batch/batchalbumssyncmetadata.cpp:92 msgid "Parsing all albums" -msgstr "" +msgstr "Розбір всіх альбомів" #: utilities/batch/batchalbumssyncmetadata.cpp:111 msgid "" "<b>The metadata of all images has been synchronized with the digiKam " "database.</b>" msgstr "" +"<b>Метадані всіх зображень було синхронізовано із базою даних digiKam.</b>" #: utilities/batch/batchalbumssyncmetadata.cpp:112 #: utilities/batch/batchthumbsgenerator.cpp:126 -#, fuzzy, c-format +#, c-format msgid "Duration: %1" msgstr "Тривалість: %1" #: utilities/batch/batchsyncmetadata.cpp:118 -#, fuzzy msgid "Synchonizing images' Metadata with database. Please wait..." -msgstr "Запис метаданих у файли. Будь ласка, зачекайте..." +msgstr "" +"Синхронізація Метаданих зображень із базою даних. Будь ласка, зачекайте..." #: utilities/batch/batchthumbsgenerator.cpp:82 -#, fuzzy msgid "Thumbnails processing" msgstr "Обробка мініатюр" #: utilities/batch/batchthumbsgenerator.cpp:83 -#, fuzzy msgid "<b>Updating thumbnails database. Please wait...</b>" -msgstr "<b>Оновлюється база даних мініатюр. Будь ласка, зачекайте...</b>" +msgstr "<b>Оновлення бази даних мініатюр. Будь ласка, зачекайте...</b>" #: utilities/batch/batchthumbsgenerator.cpp:102 -#, fuzzy msgid "Processing small thumbs" msgstr "Обробка малих мініатюр" #: utilities/batch/batchthumbsgenerator.cpp:111 -#, fuzzy msgid "Processing large thumbs" msgstr "Обробка великих мініатюр" #: utilities/batch/batchthumbsgenerator.cpp:125 -#, fuzzy msgid "<b>The thumbnails database has been updated.</b>" -msgstr "<b>Оновлення бази даних мініатюр закінчилось</b>" +msgstr "<b>Базу даних мініатюр оновлено</b>" #: utilities/cameragui/albumselectdialog.cpp:87 msgid "Select Album" -msgstr "Виберіть альбом" +msgstr "Оберіть Альбом" #: utilities/cameragui/albumselectdialog.cpp:90 msgid "&New Album" -msgstr "&Новий альбом" +msgstr "&Новий Альбом" #: utilities/cameragui/albumselectdialog.cpp:278 msgid "Create New Album" -msgstr "Створити новий альбом" +msgstr "Створити Новий Альбом" #: utilities/cameragui/albumselectdialog.cpp:300 msgid "New Album Name" -msgstr "Назва нового альбому" +msgstr "Назва Нового Альбому" #: utilities/cameragui/albumselectdialog.cpp:301 msgid "" @@ -10038,19 +10087,19 @@ msgstr "" #: utilities/cameragui/cameracontroller.cpp:217 msgid "Connecting to camera..." -msgstr "З'єднання з камерою..." +msgstr "Підключення до камери..." #: utilities/cameragui/cameracontroller.cpp:226 msgid "Connection established" -msgstr "Зв'язок встановлено" +msgstr "Підключення встановлено" #: utilities/cameragui/cameracontroller.cpp:228 msgid "Connection failed" -msgstr "Не вдалося встановити з'єднання" +msgstr "Невдале підключення" #: utilities/cameragui/cameracontroller.cpp:234 msgid "Getting camera information..." -msgstr "Отримання інформації з камери..." +msgstr "Отримання інформації камери..." #: utilities/cameragui/cameracontroller.cpp:251 msgid "Listing folders..." @@ -10058,25 +10107,24 @@ msgstr "Перелік тек..." #: utilities/cameragui/cameracontroller.cpp:265 msgid "The folders have been listed." -msgstr "" +msgstr "Теки перелічено." #: utilities/cameragui/cameracontroller.cpp:273 msgid "The files in %1 have been listed." -msgstr "" +msgstr "Файли у %1 перелічено." #: utilities/cameragui/cameracontroller.cpp:279 #, c-format msgid "Failed to list files in %1" -msgstr "Не вдалось перелічити файли в %1" +msgstr "Невдале перелічення файлів у %1" #: utilities/cameragui/cameracontroller.cpp:295 msgid "Listing files in %1 is complete" -msgstr "Перелік файлів у %1 завершений" +msgstr "Завершено перелічення файлів у %1" #: utilities/cameragui/cameracontroller.cpp:304 -#, fuzzy msgid "Getting thumbnails..." -msgstr "Отримання мініатюри для %1/%2..." +msgstr "Отримання мініатюр..." #: utilities/cameragui/cameracontroller.cpp:327 msgid "Getting EXIF information for %1/%2..." @@ -10084,45 +10132,43 @@ msgstr "Отримання інформації EXIF для %1/%2..." #: utilities/cameragui/cameracontroller.cpp:366 msgid "Downloading file %1..." -msgstr "Звантаження файла %1..." +msgstr "Завантаження файлу %1..." #: utilities/cameragui/cameracontroller.cpp:389 -#, fuzzy msgid "EXIF rotating file %1..." -msgstr "Видалення файла %1..." +msgstr "EXIF повертає файл %1..." #: utilities/cameragui/cameracontroller.cpp:396 msgid "Setting Metadata tags to file %1..." -msgstr "Встановлення міток метаданих для файла %1..." +msgstr "Встановлення міток Метаданих до файлу %1..." #: utilities/cameragui/cameracontroller.cpp:417 msgid "Converting %1 to lossless file format..." -msgstr "Перетворення %1 у формат зі стисканням без втрати даних..." +msgstr "Перетворення %1 у формат зі стисканням без втрати..." #: utilities/cameragui/cameracontroller.cpp:464 msgid "Retrieving file %1 from camera..." -msgstr "Отримання файла %1 з камери..." +msgstr "Отримання файлу %1 з камери..." #: utilities/cameragui/cameracontroller.cpp:478 msgid "Failed to retrieve file %1 from camera" -msgstr "Не вдалось отримати файл %1 з камери" +msgstr "Не вдалося отримати файл %1 з камери" #: utilities/cameragui/cameracontroller.cpp:493 msgid "Uploading file %1 to camera..." -msgstr "Вивантаження файла %1 в камеру..." +msgstr "Вивантаження файлу %1 до камери..." #: utilities/cameragui/cameracontroller.cpp:524 msgid "Deleting file %1..." -msgstr "Видалення файла %1..." +msgstr "Видалення файлу %1..." #: utilities/cameragui/cameracontroller.cpp:550 -#, fuzzy msgid "Toggle lock file %1..." -msgstr "Звантаження файла %1..." +msgstr "Переключити файл блокування %1..." #: utilities/cameragui/cameracontroller.cpp:941 msgid "Rename File" -msgstr "Перейменувати файл" +msgstr "Перейменувати Файл" #: utilities/cameragui/cameracontroller.cpp:999 #, c-format @@ -10138,7 +10184,7 @@ msgstr "Не вдалось звантажити файл \"%1\"." #: utilities/cameragui/cameracontroller.cpp:1110 #: utilities/cameragui/cameracontroller.cpp:1145 msgid " Do you want to continue?" -msgstr " Хочете продовжити?" +msgstr " Бажаєте продовжити?" #: utilities/cameragui/cameracontroller.cpp:1065 msgid "Failed to upload file \"%1\"." @@ -10149,9 +10195,8 @@ msgid "Failed to delete file \"%1\"." msgstr "Не вдалось видалити файл \"%1\"." #: utilities/cameragui/cameracontroller.cpp:1135 -#, fuzzy msgid "Failed to toggle lock file \"%1\"." -msgstr "Не вдалось звантажити файл %1." +msgstr "Не вдалось переключити файл блокування %1." #: utilities/cameragui/cameracontroller.cpp:1165 msgid "Camera \"%1\"" @@ -10159,41 +10204,38 @@ msgstr "Камера \"%1\"" #: utilities/cameragui/camerafolderdialog.cpp:52 msgid "%1 - Select Camera Folder" -msgstr "%1 - виберіть теку камери" +msgstr "%1 - Оберіть Теку Камери" #: utilities/cameragui/camerafolderdialog.cpp:69 msgid "" "<p>Please select the camera folder where you want to upload the images.</p>" msgstr "" -"<p>Будь ласка, виберіть теку фотоапарата, куди ви бажаєте завантажити ці " -"зображення.</p>" +"<p>Будь ласка, оберіть теку камери, куди бажаєте вивантажити зображення.</p>" #: utilities/cameragui/camerafolderview.cpp:62 msgid "Camera Folders" -msgstr "Теки камери" +msgstr "Теки Камери" #: utilities/cameragui/cameraiconview.cpp:588 msgid "Download" -msgstr "Звантажити" +msgstr "Завантажити" #: utilities/cameragui/cameraiconview.cpp:589 -#, fuzzy msgid "Download && Delete" -msgstr "Звантажити вибрані" +msgstr "Завантажити && Видалити" #: utilities/cameragui/cameraiconview.cpp:590 msgid "Toggle lock" -msgstr "Перемкнути блокування" +msgstr "Переключити блокування" #: utilities/cameragui/cameraiconview.cpp:755 -#, fuzzy msgid "&Upload to camera" -msgstr "&Вивантажити в камеру" +msgstr "&Вивантажити до камери" #: utilities/cameragui/camerainfodialog.cpp:45 #: utilities/cameragui/cameraui.cpp:454 msgid "Camera Information" -msgstr "Інформація про камеру" +msgstr "Інформація Камери" #: utilities/cameragui/camerainfodialog.cpp:52 msgid "Summary" @@ -10201,19 +10243,19 @@ msgstr "Зведення" #: utilities/cameragui/camerainfodialog.cpp:52 msgid "Camera Summary" -msgstr "Зведення про камеру" +msgstr "Зведення Камери" #: utilities/cameragui/camerainfodialog.cpp:62 msgid "Manual" -msgstr "Інструкція" +msgstr "Посібник" #: utilities/cameragui/camerainfodialog.cpp:62 msgid "Camera Manual" -msgstr "Інструкція камери" +msgstr "Посібник Камери" #: utilities/cameragui/camerainfodialog.cpp:72 msgid "About Driver" -msgstr "Про драйвер" +msgstr "Про Драйвер" #: utilities/cameragui/cameraui.cpp:234 msgid "D&elete" @@ -10221,22 +10263,20 @@ msgstr "В&идалити" #: utilities/cameragui/cameraui.cpp:235 msgid "&Download" -msgstr "&Звантажити" +msgstr "&Завантажити" #: utilities/cameragui/cameraui.cpp:236 msgid "&Images" msgstr "&Зображення" #: utilities/cameragui/cameraui.cpp:267 -#, fuzzy msgid "<p>Set how digiKam will rename files as they are downloaded." msgstr "" -"<p>Перемкніть цей параметр, щоб зберегти мітки зображення в мітку IPTC " -"<i>Ключові слова</i>." +"<p>Встановити яким чином digiKam перейменовуватиме файли із їх завантаженням." #: utilities/cameragui/cameraui.cpp:270 msgid "File Renaming Options" -msgstr "Параметри перейменування файлів" +msgstr "Параметри Перейменування Файлів" #: utilities/cameragui/cameraui.cpp:276 msgid "Extension-based sub-albums" @@ -10259,19 +10299,18 @@ msgstr "ISO" #: utilities/cameragui/cameraui.cpp:282 #: utilities/cameragui/renamecustomizer.cpp:211 msgid "Full Text" -msgstr "Повний текст" +msgstr "Повний Текст" #: utilities/cameragui/cameraui.cpp:283 #: utilities/cameragui/renamecustomizer.cpp:212 msgid "Local Settings" -msgstr "Локальні параметри" +msgstr "Локальні Налаштування" #: utilities/cameragui/cameraui.cpp:289 -#, fuzzy msgid "<p>Set how digiKam creates albums automatically when downloading." msgstr "" -"<p>Перемкніть цей параметр, щоб зберегти мітки зображення в мітку IPTC " -"<i>Ключові слова</i>." +"<p>Встановити яким чином digiKam автоматично створюватиме альбоми із їх " +"завантаженням." #: utilities/cameragui/cameraui.cpp:290 msgid "" @@ -10280,12 +10319,19 @@ msgid "" "album. This way, you can separate JPEG and RAW files as they are downloaded " "from your camera." msgstr "" +"<p>Увімкніть цей параметр якщо бажаєте завантажувати ваші картинки до " +"автоматично створюваного підальбому спираючись на суфікс файлу до альбому " +"призначення. Таким чином ви можете відокремити JPEG та RAW файли під час " +"завантаження із вашої камери." #: utilities/cameragui/cameraui.cpp:293 msgid "" "<p>Enable this option if you want to download your pictures into " "automatically created file date-based sub-albums of the destination album." msgstr "" +"<p>Увімкніть цей параметр якщо бажаєте завантажувати ваші картинки до " +"автоматично створюваного підальбому спираючись на суфікс файлу до альбому " +"призначення." #: utilities/cameragui/cameraui.cpp:296 msgid "" @@ -10295,10 +10341,16 @@ msgid "" "in a user-readable string. E.g.: <i>Thu Aug 24 2006</i><p><b>Local Settings</" "b>: the date format depending on TDE control panel settings.<p>" msgstr "" +"<p>Оберіть формат дати якому ви віддаєте перевагу, використаному для " +"створення нових альбомів. Наявні параметри:<p><b>ISO</b>: формат дати згідно " +"до ISO 8601 (YYYY-MM-DD). Наприклад: <i>2006-08-24</i><p><b>Повний Текст</" +"b>: формат дати читабельним рядком. Наприклад: <i>Thu Aug 24 2006</" +"i><p><b>Налаштування Локалі</b>: формат даних залежний від параметрів панелі " +"контролю TDE.<p>" #: utilities/cameragui/cameraui.cpp:305 msgid "Auto-creation of Albums" -msgstr "Автостворення альбомів" +msgstr "Автостворення Альбомів" #: utilities/cameragui/cameraui.cpp:311 msgid "Set default photographer identity" @@ -10314,48 +10366,47 @@ msgstr "Виправити внутрішню дату і час" #: utilities/cameragui/cameraui.cpp:315 msgid "Auto-rotate/flip image" -msgstr "Автоматично обернути/перекинути зображення" +msgstr "Автоматично обернути/перевернути зображення" #: utilities/cameragui/cameraui.cpp:316 msgid "Convert to lossless file format" -msgstr "Перетворити в формат, який не стискає без втрати даних" +msgstr "Перетворити в формат без втрати даних" #: utilities/cameragui/cameraui.cpp:318 msgid "New image format:" msgstr "Новий формат зображення:" #: utilities/cameragui/cameraui.cpp:330 -#, fuzzy msgid "" "<p>Set here all options to fix/transform JPEG files automatically as they " "are downloaded." msgstr "" -"<p>Перемкніть цей параметр, щоб зберегти мітки зображення в мітку IPTC " -"<i>Ключові слова</i>." +"<p>Встановіть тут всі параметри автоматичного виправлення/трансформації JPEG " +"файлів із їх завантаженням." #: utilities/cameragui/cameraui.cpp:332 msgid "" "<p>Enable this option if you want images automatically rotated or flipped " "using EXIF information provided by the camera." msgstr "" +"<p>Увімкніть цей параметр якщо бажаєте використання автоматичного повертання " +"або перевертання спираючись на надану камерою EXIF інформацію." #: utilities/cameragui/cameraui.cpp:334 -#, fuzzy msgid "" "<p>Enable this option to store the default photographer identity in the IPTC " "tags using digiKam's metadata settings." msgstr "" -"<p>Перемкніть цей параметр, щоб зберегти типову інформацію про фотографа в " -"мітки IPTC за допомогою параметрів метаданих digiKam." +"<p>Увімкніть цей параметр для збереження типового профілю фотографу в IPTC " +"тегах, використовуючи налаштування метаданих digiKam." #: utilities/cameragui/cameraui.cpp:336 -#, fuzzy msgid "" "<p>Enable this option to store the default credit and copyright information " "in the IPTC tags using digiKam's metadata settings." msgstr "" -"<p>Перемкніть цей параметр, щоб зберегти типову інформацію про фотографа в " -"мітки IPTC. Цю інформацію можна заповнити на сторінці налаштування." +"<p>Увімкніть цей параметр для збереження інформації про автора і авторські " +"права в IPTC тегах, використовуючи налаштування метаданих digiKam." #: utilities/cameragui/cameraui.cpp:338 msgid "" @@ -10364,6 +10415,10 @@ msgid "" "The values will be saved in the DateTimeDigitized and DateTimeCreated EXIF/" "IPTC fields." msgstr "" +"<p>Увімкніть цей параметр для встановлення тегів метаданих дати та часу у " +"правильні значення якщо ваша камера не встановлює їх коректно при отримані " +"картинок. Значення буде збережено у EXIF/IPTC полях DateTimeDigitized і " +"DateTimeCreated." #: utilities/cameragui/cameraui.cpp:342 msgid "" @@ -10371,12 +10426,18 @@ msgid "" "image format. <b>Note:</b> Image conversion can take a while on a slow " "computer." msgstr "" +"<p>Увімкніть цей параметр для автоматичного перетворення всіх JPEG файлів у " +"формат зображення без втрати даних. <b>Примітка:</b> Перетворення зображень " +"може зайняти певний час на повільних комп'ютерах." #: utilities/cameragui/cameraui.cpp:345 msgid "" "<p>Select your preferred lossless image file format to convert to. <b>Note:" "</b> All metadata will be preserved during the conversion." msgstr "" +"<p>Оберіть формат файлів зображень без втрати даних якому віддаєте перевагу " +"для перетворення. <b>Примітка:</b> Всі метадані протягом перетворення буде " +"збережено." #: utilities/cameragui/cameraui.cpp:349 msgid "On the Fly Operations (JPEG only)" @@ -10384,51 +10445,47 @@ msgstr "Дії «на ходу» (тільки JPEG)" #: utilities/cameragui/cameraui.cpp:411 msgid "Select &All" -msgstr "Вибрати &все" +msgstr "Обрати &Все" #: utilities/cameragui/cameraui.cpp:412 msgid "Select N&one" -msgstr "Очистити в&ибір" +msgstr "Не обирати &Жодного" #: utilities/cameragui/cameraui.cpp:413 msgid "&Invert Selection" -msgstr "&Інвертувати вибір" +msgstr "&Інвертувати Вибір" #: utilities/cameragui/cameraui.cpp:415 msgid "Select &New Items" -msgstr "Вибрати &нові елементи" +msgstr "Обрати &Нові Елементи" #: utilities/cameragui/cameraui.cpp:417 -#, fuzzy msgid "Increase Thumbnail Size" -msgstr "Збільшити розмір мініатюр" +msgstr "Збільшити Розмір Мініатюр" #: utilities/cameragui/cameraui.cpp:418 -#, fuzzy msgid "Decrease Thumbnail Size" -msgstr "Зменшити розмір мініатюр" +msgstr "Зменшити Розмір Мініатюр" #: utilities/cameragui/cameraui.cpp:420 msgid "Toggle Lock" -msgstr "Перемикнути блокування" +msgstr "Переключити Блокування" #: utilities/cameragui/cameraui.cpp:426 msgid "Download Selected" -msgstr "Звантажити вибрані" +msgstr "Завантажити Обране" #: utilities/cameragui/cameraui.cpp:428 msgid "Download All" -msgstr "Звантажити всі" +msgstr "Завантажити Все" #: utilities/cameragui/cameraui.cpp:431 -#, fuzzy msgid "Download/Delete Selected" -msgstr "Звантажити вибрані" +msgstr "Завантажити/Видалити Обране" #: utilities/cameragui/cameraui.cpp:433 -#, fuzzy msgid "Download/Delete All" -msgstr "Звантажити всі" +msgstr "Завантажити/Видалити Все" #: utilities/cameragui/cameraui.cpp:436 msgid "Upload..." @@ -10436,19 +10493,19 @@ msgstr "Вивантажити..." #: utilities/cameragui/cameraui.cpp:445 msgid "Delete Selected" -msgstr "Видалити вибрані" +msgstr "Видалити Обране" #: utilities/cameragui/cameraui.cpp:680 msgid "Cancelling current operation, please wait..." -msgstr "Будь ласка, зачекайте. Скасовується поточна дія..." +msgstr "Будь ласка, зачекайте. Скасування поточної дії..." #: utilities/cameragui/cameraui.cpp:708 msgid "Do you want to close the dialog and cancel the current operation?" -msgstr "Хочете закрити вікно і скасувати поточну дію?" +msgstr "Бажаєте закрити діалог та скасувати поточну операцію?" #: utilities/cameragui/cameraui.cpp:714 msgid "Disconnecting from camera, please wait..." -msgstr "Від'єднання камери, будь ласка, зачекайте..." +msgstr "Відключення камери, будь ласка, зачекайте..." #: utilities/cameragui/cameraui.cpp:750 msgid "Scanning for new files, please wait..." @@ -10456,23 +10513,23 @@ msgstr "Сканування нових файлів, будь ласка, за #: utilities/cameragui/cameraui.cpp:791 msgid "Ready" -msgstr "Готове" +msgstr "Готово" #: utilities/cameragui/cameraui.cpp:863 msgid "" "Failed to connect to the camera. Please make sure it is connected properly " "and turned on. Would you like to try again?" msgstr "" -"Не вдалось з'єднатись з камерою. Будь ласка, перевірте чи вона правильно " +"Не вдалось підключитися до камери. Будь ласка, перевірте чи вона правильно " "приєднана і увімкнена. Хочете спробувати знов?" #: utilities/cameragui/cameraui.cpp:867 msgid "Connection Failed" -msgstr "Помилка з'єднання" +msgstr "Помилка Підключення" #: utilities/cameragui/cameraui.cpp:868 msgid "Retry" -msgstr "Спробувати ще раз" +msgstr "Повторити" #: utilities/cameragui/cameraui.cpp:869 #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:251 @@ -10481,14 +10538,14 @@ msgstr "Перервати" #: utilities/cameragui/cameraui.cpp:1028 msgid "Select Image to Upload" -msgstr "Виберіть зображення для вивантаження" +msgstr "Оберіть Зображення до Вивантаження" #: utilities/cameragui/cameraui.cpp:1063 msgid "" "Camera Folder <b>%1</b> already contains item <b>%2</b><br>Please enter a " "new file name (without extension):" msgstr "" -"Тека камери <b>%1</b> вже містить елемент <b>%2</b><br>Будь ласка, введіть " +"Тека Камери <b>%1</b> вже містить елемент <b>%2</b><br>Будь ласка, введіть " "нову назву (без розширення):" #: utilities/cameragui/cameraui.cpp:1067 utilities/cameragui/cameraui.cpp:1070 @@ -10503,14 +10560,19 @@ msgid "" "Estimated space require: %1\n" "Available free space: %2" msgstr "" +"Недостатньо вільного місця за Шляхом Бібліотеки Альбомів для завантаження та " +"опрацювання обраних картинок із камери.\n" +"\n" +"Орієнтовно необхідно місця: %1\n" +"Наявно вільного місця: %2" #: utilities/cameragui/cameraui.cpp:1166 msgid "" "<p>Please select the destination album from the digiKam library to import " "the camera pictures into.</p>" msgstr "" -"<p>Будь ласка, виберіть альбом призначення з бібліотеки digiKam, до якого " -"слід імпортувати знімки з фотоапарата.</p>" +"<p>Будь ласка, оберіть альбом призначення з бібліотеки digiKam, до якого " +"слід імпортувати знімки з камери.</p>" #: utilities/cameragui/cameraui.cpp:1454 msgid "" @@ -10518,9 +10580,9 @@ msgid "" "not be deleted. If you really want to delete these items, please unlock them " "and try again." msgstr "" -"Наступні зображення заблоковано фотоапаратом (тільки-читання). Їх не буде " -"вилучено. Якщо ви дійсно хочете їх вилучити, будь ласка, розблокуйте їх і " -"спробуйте знову." +"Наступні елементи заблоковано камерою (лише-читання). Їх не буде вилучено. " +"Якщо ви дійсно бажаєте їх вилучення, будь ласка, розблокуйте їх і спробуйте " +"знову." #: utilities/cameragui/cameraui.cpp:1466 #, c-format @@ -10539,15 +10601,15 @@ msgstr "" #: utilities/cameragui/cameraui.cpp:1623 msgid "A file with same name (%1) exists in folder %2" -msgstr "Файл з цією назвою (%1) існує в теці %2" +msgstr "Файл з такою назвою (%1) існує в теці %2" #: utilities/cameragui/cameraui.cpp:1636 msgid "Failed to find Album for path '%1'" -msgstr "Не вдалось знайти альбом для шляху \"%1\"" +msgstr "Не вдалось знайти альбому за шляхом \"%1\"" #: utilities/cameragui/freespacewidget.cpp:184 msgid "Album Library" -msgstr "Бібліотека альбомів" +msgstr "Бібліотека Альбомів" #: utilities/cameragui/freespacewidget.cpp:196 #: utilities/cameragui/freespacewidget.cpp:207 @@ -10561,10 +10623,9 @@ msgstr "Доступно:" #: utilities/cameragui/freespacewidget.cpp:202 msgid "Require:" -msgstr "Потрібно:" +msgstr "Необхідно:" #: utilities/cameragui/gpcamera.cpp:965 -#, fuzzy msgid "" "Title: %1\n" "Model: %2\n" @@ -10583,11 +10644,11 @@ msgstr "" "Порт: %3\n" "Шлях: %4\n" "\n" -"Підтримка мініатюр: %5\n" -"Підтримка видалення елементів: %6\n" -"Підтримка вивантаження елементів: %7\n" -"Підтримка створення каталогів: %8\n" -"Підтримка видалення каталогів: %9\n" +"Мініатюри: %5\n" +"Видалення елементів: %6\n" +"Вивантаження елементів: %7\n" +"Створення каталогів: %8\n" +"Видалення каталогів: %9\n" "\n" #: utilities/cameragui/gpcamera.cpp:978 utilities/cameragui/gpcamera.cpp:979 @@ -10619,16 +10680,15 @@ msgstr "" #: utilities/cameragui/renamecustomizer.cpp:143 msgid "Camera filenames" -msgstr "Назви файлів з камери" +msgstr "Назви файлів Камери" #: utilities/cameragui/renamecustomizer.cpp:144 -#, fuzzy msgid "" "<p>Turn on this option to use camera provided image filenames without " "modifications." msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +"<p>Увімкніть цей параметр для використання без змін назв файлів, " +"запропонованих камерою." #: utilities/cameragui/renamecustomizer.cpp:153 msgid "Change case to:" @@ -10636,7 +10696,7 @@ msgstr "Змінити регістр на:" #: utilities/cameragui/renamecustomizer.cpp:157 msgid "Leave as Is" -msgstr "Залишити як є" +msgstr "Залишити як Є" #: utilities/cameragui/renamecustomizer.cpp:158 msgid "Upper" @@ -10647,46 +10707,42 @@ msgid "Lower" msgstr "Нижній" #: utilities/cameragui/renamecustomizer.cpp:161 -#, fuzzy msgid "<p>Set the method to use to change the case of image filenames." -msgstr "<p>Вкажіть метод для зміни регістру назв файлів зображень." +msgstr "" +"<p>Встановити використаний метод для зміни регістру назв файлів зображень." #: utilities/cameragui/renamecustomizer.cpp:173 msgid "Customize" msgstr "Налаштувати" #: utilities/cameragui/renamecustomizer.cpp:175 -#, fuzzy msgid "<p>Turn on this option to customize image filenames during download." msgstr "" -"<p>Перемкніть цей параметр, щоб зберегти мітки зображення в мітку IPTC " -"<i>Ключові слова</i>." +"<p>Увімкніть цей параметр для підлаштування назв імен протягом завантаження." #: utilities/cameragui/renamecustomizer.cpp:187 msgid "Prefix:" msgstr "Префікс:" #: utilities/cameragui/renamecustomizer.cpp:192 -#, fuzzy msgid "<p>Set the prefix which will be added to image filenames." -msgstr "<p>Вкажіть метод для зміни регістру назв файлів зображень." +msgstr "<p>Встановити префікс, який буде додано до назв файлів зображень." #: utilities/cameragui/renamecustomizer.cpp:195 msgid "Suffix:" msgstr "Суфікс:" #: utilities/cameragui/renamecustomizer.cpp:199 -#, fuzzy msgid "<p>Set the suffix which will be added to image filenames." -msgstr "<p>Вкажіть метод для зміни регістру назв файлів зображень." +msgstr "<p>Встановити суфікс, який буде додано до назв файлів зображень." #: utilities/cameragui/renamecustomizer.cpp:202 msgid "Add Date && Time" -msgstr "Додати дату і час" +msgstr "Додати Дату і Час" #: utilities/cameragui/renamecustomizer.cpp:204 msgid "<p>Set this option to add the camera provided date and time." -msgstr "<p>Встановіть цей параметр, щоб додати, надані камерою, дату і час." +msgstr "<p>Встановіть цей параметр для додання наданих камерою дати і часу." #: utilities/cameragui/renamecustomizer.cpp:209 msgid "Standard" @@ -10694,7 +10750,7 @@ msgstr "Стандартний" #: utilities/cameragui/renamecustomizer.cpp:213 msgid "Advanced..." -msgstr "Додаткові..." +msgstr "Додаткове..." #: utilities/cameragui/renamecustomizer.cpp:214 msgid "" @@ -10707,36 +10763,45 @@ msgid "" "Settings</b>: the date format depending on TDE control panel settings.</" "p><p><b>Advanced:</b> allows the user to specify a custom date format.</p>" msgstr "" +"<p>Оберіть бажаний формат дати для створення нових альбомів. Наявно " +"параметри:</p><p><b>Стандартно</b>: формат дати, що використано digiKam як " +"стандарт. Наприклад: <i>20060824T142618</i></p><p/><b>ISO</b>: формат дати " +"відповідно до ISO 8601 (YYYY-MM-DD). Наприклад: <i>2006-08-24T14:26:18</i></" +"p><p><b>Повний Текст</b>: формат дати читабельним рядком. Наприклад: <i>Thu " +"Aug 24 14:26:18 2006</i></p><p><b>Налаштування Локалі</b>: формат дати " +"залежно від налаштувань панелі керування TDE.</p><p><b>Розширено:</b> " +"дозволяє користувачу визначити власний формат дати.</p>" #: utilities/cameragui/renamecustomizer.cpp:234 msgid "Add Camera Name" -msgstr "Додати назву камери" +msgstr "Додати Назву Камери" #: utilities/cameragui/renamecustomizer.cpp:236 msgid "<p>Set this option to add the camera name." -msgstr "<p>Увімкніть цей параметр, щоб додати назву камери." +msgstr "<p>Встановіть цей параметр для додання назви камери." #: utilities/cameragui/renamecustomizer.cpp:238 msgid "Add Sequence Number" -msgstr "Додати порядковий номер" +msgstr "Додати Порядковий Номер" #: utilities/cameragui/renamecustomizer.cpp:240 -#, fuzzy msgid "" "<p>Set this option to add a sequence number starting with the index set " "below." msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +"<p>Встановити цей параметр для додання порядкового номеру починаючи із " +"наведеного нижче індексу." #: utilities/cameragui/renamecustomizer.cpp:243 msgid "Start Index:" -msgstr "" +msgstr "Початковий Індекс:" #: utilities/cameragui/renamecustomizer.cpp:246 msgid "" "<p>Set the starting index value used to rename files with a sequence number." msgstr "" +"<p>Встановіть значення використаного початкового індексу для перейменування " +"файлів із порядковим номером." #: utilities/cameragui/renamecustomizer.cpp:436 msgid "" @@ -10746,11 +10811,16 @@ msgid "" "<i>yyyyMMddThhmmss</i> for 20060824T142418,<br><i>yyyy-MM-dd hh:mm:ss</i> " "for 2006-08-24 14:24:18.</p></qt>" msgstr "" +"<qt><p>Введіть формат дати та часу.</p><p>Використати <i>dd</i> для дня, " +"<i>MM</i> для місяця, <i>yyyy</i> для року, <i>hh</i> для годин, <i>mm</i> " +"для хвилин, <i>ss</i> для секунд.</p><p>Приклади: <i>yyyyMMddThhmmss</i> для " +"20060824T142418,<br><i>yyyy-MM-dd hh:mm:ss</i> для 2006-08-24 14:24:18.</p></" +"qt>" #: utilities/cameragui/renamecustomizer.cpp:449 #: utilities/cameragui/renamecustomizer.cpp:453 msgid "Change Date and Time Format" -msgstr "Змінити формат дати і часу" +msgstr "Змінити Формат Дати і Часу" #: utilities/cameragui/renamecustomizer.cpp:475 msgid "photo" @@ -10761,6 +10831,8 @@ msgid "" "<b>Mounted Camera</b> driver for USB/IEEE1394 mass storage cameras and Flash " "disk card readers.<br><br>" msgstr "" +"<b>Підключена Камера</b> драйвер до USB/IEEE1394 камер масового зберігання " +"та читачів карт Флеш дисків.<br><br>" #: utilities/cameragui/umscamera.cpp:490 msgid "Title: %1<br>Model: %2<br>Port: %3<br>Path: %4<br>" @@ -10771,6 +10843,8 @@ msgid "" "For more information about the <b>Mounted Camera</b> driver, please read " "<b>Supported Digital Still Cameras</b> section in the digiKam manual." msgstr "" +"Щодо додаткової інформації про драйвер <b>Підключеної Камери</b> прочитайте, " +"будь ласка, розділ <b>Підтримувані Цифрові Фотокамери</b> посібнику digiKam." #: utilities/cameragui/umscamera.cpp:511 msgid "" @@ -10779,6 +10853,11 @@ msgid "" "<br><br>To report any problems with this driver, please contact the digiKam " "team at:<br><br>http://www.digikam.org/?q=contact" msgstr "" +"Драйвер <b>Підключеної Камери</b> є простим інтерфейсом до диску камери, що " +"локально підключається до вашої системи.<br><br>Він не використовує " +"драйверів libgphoto2.<br><br>Для повідомлення про будь які проблеми із цим " +"драйвером, будь ласка, зверніться до команди digiKam:<br><br>http://www." +"digikam.org/?q=contact" #: utilities/imageeditor/canvas/colorcorrectiondlg.cpp:62 msgid "Convert" @@ -10790,7 +10869,7 @@ msgstr "Застосувати до зображення типовий проф #: utilities/imageeditor/canvas/colorcorrectiondlg.cpp:64 msgid "Do Nothing" -msgstr "Нічого не робити" +msgstr "Не Діяти" #: utilities/imageeditor/canvas/colorcorrectiondlg.cpp:65 msgid "Do not change the image" @@ -10801,21 +10880,18 @@ msgid "Assign" msgstr "Призначити" #: utilities/imageeditor/canvas/colorcorrectiondlg.cpp:67 -#, fuzzy msgid "" "Only embed the color workspace profile in the image, don't change the image" msgstr "" -"Тільки вбудувати профіль кольорів робочого простору без змін у зображенні" +"Лише вбудувати до зображення профіль кольорів робочого простору без змін" #: utilities/imageeditor/canvas/colorcorrectiondlg.cpp:75 -#, fuzzy msgid "Original Image:" -msgstr "Джерело" +msgstr "Оригінальне Зображення:" #: utilities/imageeditor/canvas/colorcorrectiondlg.cpp:77 -#, fuzzy msgid "Corrected Image:" -msgstr "Виправлене зображення:" +msgstr "Виправлене Зображення:" #: utilities/imageeditor/canvas/colorcorrectiondlg.cpp:81 msgid "Current workspace color profile:" @@ -10826,24 +10902,22 @@ msgid "Embedded color profile:" msgstr "Вбудований профіль кольорів:" #: utilities/imageeditor/canvas/colorcorrectiondlg.cpp:91 -#, fuzzy msgid "" "<p>This image has not been assigned a color profile.</p><p>Do you want to " "convert it to your workspace color profile?</p>" msgstr "" -"<p>Цьому зображенню не призначено жодного профілю кольорів.</p><p>Хочете " +"<p>Цьому зображенню не призначено жодного профілю кольорів.</p><p>Бажаєте " "перетворити його у ваш профіль кольорів робочого простору?</p>" #: utilities/imageeditor/canvas/colorcorrectiondlg.cpp:101 -#, fuzzy msgid "" "<p>This image has been assigned to a color profile that does not match your " "default workspace color profile.</p><p>Do you want to convert it to your " "workspace color profile?</p>" msgstr "" -"<p>Це зображення має призначений профіль кольорів, який не співпадає з вашим " -"профілем кольорів робочого простору.</p><p>Хочете перетворити його у ваш " -"профіль кольорів робочого простору?</p>" +"<p>Це зображення має призначений профіль кольорів, який не збігається із " +"вашим профілем кольорів робочого простору.</p><p>Бажаєте перетворити його у " +"ваш профіль кольорів робочого простору?</p>" #: utilities/imageeditor/canvas/dimginterface.cpp:422 msgid "" @@ -10851,71 +10925,70 @@ msgid "" "be invalid. No color transform will be applied. Please check the \"Color " "Management\" configuration in digiKam's setup to verify the ICC path." msgstr "" +"Не можу знайти файлу ICC профілю кольорів-простору. Шлях профілів ICC схоже " +"неправильний. Не буде здійснено жодного перетворення кольору. Будь ласка, " +"перевірте у налаштуваннях digiKam конфігурацію \"Керування Кольорів\" щодо " +"шляху ICC." #: utilities/imageeditor/canvas/imagepluginloader.cpp:117 -#, fuzzy msgid "Loading Image Plugins" -msgstr "Втулки зображень" +msgstr "Завантаження Втулок Зображень" #: utilities/imageeditor/canvas/undoaction.cpp:37 msgid "unknown" -msgstr "невідомий" +msgstr "невідомо" #: utilities/imageeditor/canvas/undoaction.cpp:56 msgid "Rotate 90 Degrees" -msgstr "Обернути на 90 градусів" +msgstr "Обернути на 90 Градусів" #: utilities/imageeditor/canvas/undoaction.cpp:59 msgid "Rotate 180 Degrees" -msgstr "Обернути на 180 градусів" +msgstr "Обернути на 180 Градусів" #: utilities/imageeditor/canvas/undoaction.cpp:62 msgid "Rotate 270 Degrees" -msgstr "Обернути на 270 градусів" +msgstr "Обернути на 270 Градусів" #: utilities/imageeditor/canvas/undoaction.cpp:112 msgid "Flip Horizontal" -msgstr "Перевернути горизонтально" +msgstr "Перевернути Горизонтально" #: utilities/imageeditor/canvas/undoaction.cpp:114 msgid "Flip Vertical" -msgstr "Перевернути вертикально" +msgstr "Перевернути Вертикально" #: utilities/imageeditor/canvas/undoaction.cpp:149 msgid "Brightness,Contrast,Gamma" -msgstr "Яскравість, контрастність, гама" +msgstr "Яскравість, Контраст, Гама" #: utilities/imageeditor/editor/editortoolsettings.cpp:143 msgid "Guide:" msgstr "Напрямна:" #: utilities/imageeditor/editor/editortoolsettings.cpp:164 -#, fuzzy msgid "<p>Reset all settings to their default values." -msgstr "<p>Скинути всі параметри фільтра до їх типових значень." +msgstr "<p>Скинути всі налаштування до їх типових значень." #: utilities/imageeditor/editor/editortoolsettings.cpp:191 msgid "Load..." msgstr "Завантажити…" #: utilities/imageeditor/editor/editortoolsettings.cpp:192 -#, fuzzy msgid "<p>Load all parameters from settings text file." -msgstr "<p>Завантажити всі параметри фільтра з текстового файла параметрів." +msgstr "<p>Завантажити всі параметри із текстового файлу налаштувань." #: utilities/imageeditor/editor/editortoolsettings.cpp:198 -#, fuzzy msgid "<p>Save all parameters to settings text file." -msgstr "<p>Зберегти всі параметри фільтра до текстового файла параметрів." +msgstr "<p>Зберегти всі параметри до текстового файлу налаштувань." #: utilities/imageeditor/editor/editortoolsettings.cpp:206 msgid "Try" msgstr "Спробувати" #: utilities/imageeditor/editor/editortoolsettings.cpp:207 -#, fuzzy msgid "<p>Try all settings." -msgstr "Загальні параметри" +msgstr "<p>Спробувати всі налаштування." #: utilities/imageeditor/editor/editorwindow.cpp:267 #: utilities/lighttable/lighttablewindow.cpp:339 @@ -10929,36 +11002,35 @@ msgstr "&Останнє" #: utilities/imageeditor/editor/editorwindow.cpp:290 msgid "Print Image..." -msgstr "Друкувати зображення..." +msgstr "Друкувати Зображення..." #: utilities/imageeditor/editor/editorwindow.cpp:370 msgid "Fit to &Selection" -msgstr "Вмістити &вибране" +msgstr "Вмістити до О&браного" #: utilities/imageeditor/editor/editorwindow.cpp:374 msgid "" "This option can be used to zoom the image to the current selection area." msgstr "" -"Цей параметр можна використовувати для зміни розмірів зображення до поточної " -"вибраної області." +"Цей параметр можна використати для зміни розмірів зображення до поточної " +"обраної області." #: utilities/imageeditor/editor/editorwindow.cpp:408 #: utilities/lighttable/lighttablewindow.cpp:424 -#, fuzzy msgid "Toggle the window to full screen mode" -msgstr "Цей параметр дає змогу перемикати головне вікно в повноекранний режим." +msgstr "Перемкнути повноекранний режим вікна" #: utilities/imageeditor/editor/editorwindow.cpp:414 msgid "Under-Exposure Indicator" -msgstr "Індикатор недостатньої експозиції" +msgstr "Індикатор Недостатньої Експозиції" #: utilities/imageeditor/editor/editorwindow.cpp:419 msgid "Over-Exposure Indicator" -msgstr "Індикатор надмірної експозиції" +msgstr "Індикатор Надмірної Експозиції" #: utilities/imageeditor/editor/editorwindow.cpp:424 msgid "Color Managed View" -msgstr "Перегляд з керуванням кольорами" +msgstr "Перегляд з Керуванням Кольорами" #: utilities/imageeditor/editor/editorwindow.cpp:431 msgid "&Resize..." @@ -10973,41 +11045,40 @@ msgid "" "This option can be used to crop the image. Select a region of the image to " "enable this action." msgstr "" -"Цей параметр можна використовувати для обрізання зображення. Виберіть " -"область зображення, щоб дозволити цю дію." +"Цей параметр можна використовувати для обрізання зображення. Оберіть область " +"зображення для увімкнення цієї дії." #: utilities/imageeditor/editor/editorwindow.cpp:446 msgid "Flip Horizontally" -msgstr "Віддзеркалити горизонтально" +msgstr "Перевернути Горизонтально" #: utilities/imageeditor/editor/editorwindow.cpp:451 msgid "Flip Vertically" -msgstr "Віддзеркалити вертикально" +msgstr "Перевернути Вертикально" #: utilities/imageeditor/editor/editorwindow.cpp:458 msgid "Rotate Left" -msgstr "Повернути ліворуч" +msgstr "Повернути Ліворуч" #: utilities/imageeditor/editor/editorwindow.cpp:464 msgid "Rotate Right" -msgstr "Повернути праворуч" +msgstr "Повернути Праворуч" #: utilities/imageeditor/editor/editorwindow.cpp:517 #: utilities/lighttable/lighttablewindow.cpp:509 -#, fuzzy msgid "Exit Fullscreen mode" -msgstr "Звичайний режим" +msgstr "Покинути Повноекранний режим" #: utilities/imageeditor/editor/editorwindow.cpp:518 msgid "Exit out of the fullscreen mode" -msgstr "Вийти з повноекранного режиму" +msgstr "Покинути повноекранний режим" #: utilities/imageeditor/editor/editorwindow.cpp:523 #: utilities/imageeditor/editor/editorwindow.cpp:538 #: utilities/lighttable/lighttablewindow.cpp:515 #: utilities/lighttable/lighttablewindow.cpp:530 msgid "Load Next Image" -msgstr "Завантажити наступне зображення" +msgstr "Завантажити Наступне Зображення" #: utilities/imageeditor/editor/editorwindow.cpp:528 #: utilities/imageeditor/editor/editorwindow.cpp:533 @@ -11016,29 +11087,28 @@ msgstr "Завантажити наступне зображення" #: utilities/lighttable/lighttablewindow.cpp:525 #: utilities/lighttable/lighttablewindow.cpp:535 msgid "Load Previous Image" -msgstr "Завантажити попереднє зображення" +msgstr "Завантажити Попереднє Зображення" #: utilities/imageeditor/editor/editorwindow.cpp:548 msgid "Zoom in on Image" -msgstr "Збільшити зображення" +msgstr "Збільшити Зображення" #: utilities/imageeditor/editor/editorwindow.cpp:553 msgid "Zoom out of Image" -msgstr "Зменшити зображення" +msgstr "Зменшити Зображення" #: utilities/imageeditor/editor/editorwindow.cpp:558 -#, fuzzy msgid "Redo Last action" -msgstr "Нетипові пропорції:" +msgstr "Повернути Останню дію" #: utilities/imageeditor/editor/editorwindow.cpp:570 #: utilities/imageeditor/editor/editorwindow.cpp:1288 msgid "No selection" -msgstr "Нічого не вибрано" +msgstr "Не обрано" #: utilities/imageeditor/editor/editorwindow.cpp:574 msgid "Information about current selection area" -msgstr "" +msgstr "Інформація щодо поточної області обрання" #: utilities/imageeditor/editor/editorwindow.cpp:580 msgid "Information about image size" @@ -11058,8 +11128,8 @@ msgid "" "About to overwrite file \"%1\"\n" "Are you sure?" msgstr "" -"Ви перезаписуєте файл «%1»\n" -"Ви справді хочете виконати цю дію?" +"Щодо перезапису файлу «%1»\n" +"Ви певні?" #: utilities/imageeditor/editor/editorwindow.cpp:1174 #: utilities/imageeditor/editor/editorwindow.cpp:1656 @@ -11073,11 +11143,11 @@ msgid "" "Do you want to save it?" msgstr "" "Зображення \"%1\" було змінено.\n" -"Хочете його зберегти?" +"Бажаєте зберегти?" #: utilities/imageeditor/editor/editorwindow.cpp:1247 msgid "Please wait while the image is being saved..." -msgstr "Будь ласка, зачекайте поки зберігається зображення..." +msgstr "Будь ласка, зачекайте збереження зображення..." #: utilities/imageeditor/editor/editorwindow.cpp:1353 msgid "Failed to load image \"%1\"" @@ -11102,14 +11172,11 @@ msgstr "" #: utilities/imageeditor/editor/editorwindow.cpp:1556 msgid "New Image File Name" -msgstr "Нова назва файла зображення" +msgstr "Нова Назва Файлу Зображення" #: utilities/imageeditor/editor/editorwindow.cpp:1611 -#, fuzzy msgid "Target image file format \"%1\" unsupported." -msgstr "" -"Не вдалося відкрити \"%1\" - формат зображення не підтримується.\n" -"Можливо, пошкоджений файл." +msgstr "Не підтримується формат цільового файлу \"%1\"." #: utilities/imageeditor/editor/editorwindow.cpp:1621 msgid "" @@ -11124,20 +11191,19 @@ msgstr "" #: utilities/imageeditor/editor/editorwindow.cpp:1651 msgid "" "A file named \"%1\" already exists. Are you sure you want to overwrite it?" -msgstr "Файл з назвою \"%1\" вже існує. Хочете його перезаписати?" +msgstr "Файл з назвою \"%1\" вже існує. Бажаєте перезаписати?" #: utilities/imageeditor/editor/editorwindow.cpp:1655 #: utilities/imageeditor/editor/editorwindow.cpp:1701 msgid "Overwrite File?" -msgstr "Перезаписати файл?" +msgstr "Перезаписати Файл?" #: utilities/imageeditor/editor/editorwindow.cpp:1696 msgid "" "You do not have write permissions for the file named \"%1\". Are you sure " "you want to overwrite it?" msgstr "" -"Ви не маєте прав запису для файла \"%1\". Ви впевнені, що хочете його " -"перезаписати?" +"Ви не маєте прав для запису до файлу \"%1\". Ви дійсно бажаєте перезаписати?" #: utilities/imageeditor/editor/editorwindow.cpp:1738 msgid "Failed to overwrite original file" @@ -11145,73 +11211,73 @@ msgstr "Не вдалося перезаписати оригінальний ф #: utilities/imageeditor/editor/editorwindow.cpp:1739 msgid "Error Saving File" -msgstr "Помилка збереження файла" +msgstr "Помилка Збереження Файлу" #: utilities/imageeditor/editor/editorwindow.cpp:1785 -#, fuzzy msgid "Color Managed View is enabled" -msgstr "Втулок Konqueror для менеджера друку" +msgstr "Увімкнено Перегляд від Керування Кольорами" #: utilities/imageeditor/editor/editorwindow.cpp:1787 -#, fuzzy msgid "Color Managed View is disabled" -msgstr "Втулок Konqueror для менеджера друку" +msgstr "Вимкнено Перегляд від Керування Кольорами" #: utilities/imageeditor/editor/editorwindow.cpp:1791 msgid "" "Color Management is not configured, so the Color Managed View is not " "available" msgstr "" +"Керування Кольорами не налаштовано, тож Перегляд від Керування Кольорами " +"недоступний" #: utilities/imageeditor/editor/editorwindow.cpp:1814 msgid "Under-Exposure indicator is enabled" -msgstr "Індикатор недоекспонування увімкнено" +msgstr "Увімкнено індикатор недостатнього експонування" #: utilities/imageeditor/editor/editorwindow.cpp:1815 msgid "Under-Exposure indicator is disabled" -msgstr "Індикатор недоекспонування вимкнено" +msgstr "Увімкнено індикатор надмірного експонування" #: utilities/imageeditor/editor/editorwindow.cpp:1836 msgid "Over-Exposure indicator is enabled" -msgstr "Індикатор переекспонування увімкнено" +msgstr "Увімкнено індикатор Пере-Експонування" #: utilities/imageeditor/editor/editorwindow.cpp:1837 msgid "Over-Exposure indicator is disabled" -msgstr "Індикатор переекспонування вимкнено" +msgstr "Вимкнено індикатор Пере-Експонування" #: utilities/imageeditor/editor/imagewindow.cpp:336 msgid "Delete File Permanently" -msgstr "Видалити файл назавжди" +msgstr "Видалити Файл Назавжди" #: utilities/imageeditor/editor/imagewindow.cpp:346 msgid "Delete Permanently without Confirmation" -msgstr "Вилучити остаточно без підтвердження" +msgstr "Видалити Назавжди без Підтвердження" #: utilities/imageeditor/editor/imagewindow.cpp:354 msgid "Move to Trash without Confirmation" -msgstr "Пересунути до смітника без підтвердження" +msgstr "Пересунути до Смітника без Підтвердження" #: utilities/imageeditor/editor/imagewindow.cpp:447 #, c-format msgid "Image Editor - %1" -msgstr "Редактор зображень — %1" +msgstr "Редактор Зображень — %1" #: utilities/imageeditor/editor/imagewindow.cpp:449 #: utilities/setup/setup.cpp:170 msgid "Image Editor" -msgstr "Редактор зображень" +msgstr "Редактор Зображень" #: utilities/imageeditor/editor/imagewindow.cpp:1032 msgid "" "There is no image to show in the current album.\n" "The image editor will be closed." msgstr "" -"В поточному альбомі нема зображення для показу.\n" +"В поточному альбомі відсутні зображення до показу.\n" "Редактор зображень буде закрито." #: utilities/imageeditor/editor/imagewindow.cpp:1034 msgid "No Image in Current Album" -msgstr "Нема зображення в поточному альбомі" +msgstr "Жодного Зображення у Поточному Альбомі" #: utilities/imageeditor/rawimport/rawimport.cpp:78 msgid "Raw Import" @@ -11220,7 +11286,7 @@ msgstr "Імпорт RAW" #: utilities/imageeditor/rawimport/rawimport.cpp:80 #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:379 msgid "Post Processing" -msgstr "Остаточна обробка" +msgstr "Після Обробка" #: utilities/imageeditor/rawimport/rawimport.cpp:172 #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:378 @@ -11228,16 +11294,14 @@ msgid "Raw Decoding" msgstr "Декодування RAW" #: utilities/imageeditor/rawimport/rawpreview.cpp:188 -#, fuzzy msgid "" "Cannot decode RAW image for\n" "\"%1\"" msgstr "" -"Неможливо показати зображення\n" +"Неможливо декодувати RAW зображення для\n" "\"%1\"" #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:181 -#, fuzzy msgid "" "<p>Select the histogram channel to display here:<p><b>Luminosity</b>: " "display the image's luminosity values.<p><b>Red</b>: display the red image-" @@ -11245,17 +11309,15 @@ msgid "" "<p><b>Blue</b>: display the blue image-channel values.<p><b>Colors</b>: " "Display all color channel values at the same time." msgstr "" -"<p>Виберіть який канал гістограми показати:<p><b>Яскравість світла</b>: " -"Показати значення яскравості світла (сприйняття яскравості).<p><b>Червоний</" -"b>: Показати червоний канал зображення.<p><b>Зелений</b>: Показати зелений " -"канал зображення.<p><b>Синій</b>: Показати синій канал зображення." -"<p><b>Альфа</b>: Показати альфа-канал зображення. Цей канал відповідає " -"значенню прозорості і підтримується деякими форматами зображень, такими як " -"PNG і TIFF.<p><b>Кольори</b>: Показати одночасно всі канали кольорів." +"<p>Оберіть відображуваний канал гістограми:<p><b>Яскравість</b>: показати " +"значення яскравості світла.<p><b>Червоний</b>: показати значення червоного " +"каналу зображення.<p><b>Зелений</b>: показати значення зеленого каналу " +"зображення.<p><b>Синій</b>: показати значення синього каналу зображення." +"<p><b>Кольори</b>: Показати одночасно всі канали кольорів." #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:254 msgid "Abort the current Raw image preview." -msgstr "Перервати показ попереднього перегляду поточного зображення RAW." +msgstr "Перервати попередній перегляд поточного зображення Raw." #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:257 msgid "Update" @@ -11263,18 +11325,15 @@ msgstr "Оновити" #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:260 msgid "Generate a Raw image preview using current settings." -msgstr "" -"Створити зображення попереднього перегляду Raw з поточними параметрами." +msgstr "Створити попередній перегляд Raw зображення за поточними параметрами." #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:297 -#, fuzzy msgid "Set here the gamma adjustement of the image" -msgstr "<p>Вкажіть максимальну інтенсивність вибраного на гістограмі." +msgstr "Встановити тут підлаштування гами зображення" #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:304 -#, fuzzy msgid "<p>Set here the color saturation correction." -msgstr "<p>Вкажіть товщину напрямних переривистих ліній." +msgstr "<p>Встановити тут корекцію насиченості кольору." #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:306 msgid "Exposure (E.V):" @@ -11285,10 +11344,11 @@ msgid "" "<p>This value in E.V will be used to perform an exposure compensation of the " "image." msgstr "" +"<p>Це значення у E.V буде використано для компенсації експозиції зображення." #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:347 msgid "Reset curve to linear" -msgstr "Перетворити криву на пряму" +msgstr "Скинути криву до прямої" #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:367 msgid "Exposure" @@ -11296,45 +11356,42 @@ msgstr "Експозиція" #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:368 msgid "Luminosity Curve" -msgstr "Крива яскравості світла" +msgstr "Крива Яскравості" #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:380 msgid "Info" msgstr "Інформація" #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:386 -#, fuzzy msgid "<p>Reset all settings to default values." -msgstr "<p>Скинути всі параметри фільтра до їх типових значень." +msgstr "<p>Скинути всі налаштування до типових значень." #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:390 -#, fuzzy msgid "<p>Import image to editor using current settings." msgstr "" -"<p>Тут ви побачите елементи, які знайдено в бібліотеці альбомів при поточних " -"параметрах." +"<p>Імпортувати зображення до редактору використовуючи поточні налаштування." #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:392 msgid "Use Default" -msgstr "Використати типові" +msgstr "Використати Типове" #: utilities/imageeditor/rawimport/rawsettingsbox.cpp:394 msgid "<p>Use general Raw decoding settings to load this image in editor." msgstr "" +"<p>Використати загальні налаштування декодування Raw для завантаження цього " +"зображення до редактору." #: utilities/imageeditor/tools/imageprint.cpp:208 -#, fuzzy msgid "The image will not fit on the page, what do you want to do?" -msgstr "Зображення не вміщається на сторінці. Що ви хочете робити?" +msgstr "Зображення не вміщається на сторінці, що бажаєте вчинити?" #: utilities/imageeditor/tools/imageprint.cpp:210 -#, fuzzy msgid "Shrink" -msgstr "Зменшити" +msgstr "Скоротити" #: utilities/imageeditor/tools/imageprint.cpp:368 msgid "Image Settings" -msgstr "Парамери зображення" +msgstr "Налаштування Зображення" #: utilities/imageeditor/tools/imageprint.cpp:382 msgid "Image position:" @@ -11344,25 +11401,25 @@ msgstr "Позиція зображення:" #: utilities/imageeditor/tools/imageprint.cpp:576 #: utilities/imageeditor/tools/imageprint.cpp:623 msgid "Top-Left" -msgstr "Зверху ліворуч" +msgstr "Нагору Ліворуч" #: utilities/imageeditor/tools/imageprint.cpp:387 #: utilities/imageeditor/tools/imageprint.cpp:592 #: utilities/imageeditor/tools/imageprint.cpp:639 msgid "Top-Central" -msgstr "Зверху посередині" +msgstr "Нагору Посередині" #: utilities/imageeditor/tools/imageprint.cpp:388 #: utilities/imageeditor/tools/imageprint.cpp:580 #: utilities/imageeditor/tools/imageprint.cpp:627 msgid "Top-Right" -msgstr "Зверху праворуч" +msgstr "Нагору Праворуч" #: utilities/imageeditor/tools/imageprint.cpp:389 #: utilities/imageeditor/tools/imageprint.cpp:568 #: utilities/imageeditor/tools/imageprint.cpp:615 msgid "Central-Left" -msgstr "Центр ліворуч" +msgstr "Центр Ліворуч" #: utilities/imageeditor/tools/imageprint.cpp:390 #: utilities/imageeditor/tools/imageprint.cpp:648 @@ -11373,33 +11430,33 @@ msgstr "Центр" #: utilities/imageeditor/tools/imageprint.cpp:572 #: utilities/imageeditor/tools/imageprint.cpp:619 msgid "Central-Right" -msgstr "Центр праворуч" +msgstr "Центр Праворуч" #: utilities/imageeditor/tools/imageprint.cpp:392 #: utilities/imageeditor/tools/imageprint.cpp:584 #: utilities/imageeditor/tools/imageprint.cpp:631 msgid "Bottom-Left" -msgstr "Внизу ліворуч" +msgstr "Додолу Ліворуч" #: utilities/imageeditor/tools/imageprint.cpp:393 #: utilities/imageeditor/tools/imageprint.cpp:596 #: utilities/imageeditor/tools/imageprint.cpp:643 msgid "Bottom-Central" -msgstr "Внизу посередині" +msgstr "Додолу Посередині" #: utilities/imageeditor/tools/imageprint.cpp:394 #: utilities/imageeditor/tools/imageprint.cpp:588 #: utilities/imageeditor/tools/imageprint.cpp:635 msgid "Bottom-Right" -msgstr "Внизу праворуч" +msgstr "Додолу Праворуч" #: utilities/imageeditor/tools/imageprint.cpp:399 msgid "Print fi&lename below image" -msgstr "Друкувати &назву файла під зображенням" +msgstr "Друкувати &назву файлу під зображенням" #: utilities/imageeditor/tools/imageprint.cpp:403 msgid "Print image in &black and white" -msgstr "Друкувати зображення в &чорно-білому" +msgstr "Друкувати зображення у &чорно-білому" #: utilities/imageeditor/tools/imageprint.cpp:407 msgid "&Auto-rotate page" @@ -11407,11 +11464,11 @@ msgstr "&Автоматично обернути сторінку" #: utilities/imageeditor/tools/imageprint.cpp:415 msgid "Use Color Management for Printing" -msgstr "Використовувати керування кольорами для друку" +msgstr "Використати Керування Кольорами для Друку" #: utilities/imageeditor/tools/imageprint.cpp:418 msgid "Settings..." -msgstr "Параметри..." +msgstr "Налаштування..." #: utilities/imageeditor/tools/imageprint.cpp:428 msgid "Scaling" @@ -11419,11 +11476,11 @@ msgstr "Масштабування" #: utilities/imageeditor/tools/imageprint.cpp:432 msgid "Scale image to &fit" -msgstr "Масштабувати зображення, щоб &вмістити" +msgstr "Масштабувати зображення для &влаштування" #: utilities/imageeditor/tools/imageprint.cpp:435 msgid "Print e&xact size: " -msgstr "Не змінювати &розмір при друку: " +msgstr "Друкувати у &точному розмірі: " #: utilities/imageeditor/tools/imageprint.cpp:451 #: utilities/imageeditor/tools/imageprint.cpp:545 @@ -11448,84 +11505,76 @@ msgid "Keep ratio" msgstr "Зберігати пропорції" #: utilities/imageeditor/tools/imageprint.cpp:758 -#, fuzzy msgid "" "<p>Color Management is disabled.</p> <p>You " "can enable it now by clicking on the \"Settings\" button.</p>" msgstr "" -"<p>Керування кольорами вимкнено</p> <p>Його " -"можна увімкнути, натиснувши на кнопку \"Параметри\".</p>" +"<p>Керування Кольором вимкнено</p> <p>Можете " +"увімкнути натиснувши кнопку \"Налаштування\".</p>" #: utilities/imageeditor/tools/imageresize.cpp:147 msgid "Resize Image" -msgstr "Змінити розмір зображення" +msgstr "Змінити Розмір Зображення" #: utilities/imageeditor/tools/imageresize.cpp:178 msgid "New Size" -msgstr "Новий розмір" +msgstr "Новий Розмір" #: utilities/imageeditor/tools/imageresize.cpp:185 -#, fuzzy msgid "<p>Set here the new image width in pixels." -msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +msgstr "<p>Встановити тут нову ширину зображення у пікселях." #: utilities/imageeditor/tools/imageresize.cpp:192 -#, fuzzy msgid "<p>Set here the new image height in pixels." -msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +msgstr "<p>Встановити тут нову висоту зображення у пікселях." #: utilities/imageeditor/tools/imageresize.cpp:199 -#, fuzzy msgid "<p>Set here the new image width in percent." -msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +msgstr "<p>Встановити тут нову ширину зображення у відсотках." #: utilities/imageeditor/tools/imageresize.cpp:201 msgid "Height (%):" msgstr "Висота (%):" #: utilities/imageeditor/tools/imageresize.cpp:206 -#, fuzzy msgid "<p>Set here the new image height in percent." -msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +msgstr "<p>Встановити тут нову висоту зображення у відсотках." #: utilities/imageeditor/tools/imageresize.cpp:208 msgid "Maintain aspect ratio" -msgstr "Зберігати співвідношення розмірів" +msgstr "Зберігати пропорцію" #: utilities/imageeditor/tools/imageresize.cpp:209 -#, fuzzy msgid "<p>Enable this option to maintain aspect ratio with new image sizes." -msgstr "Увімкніть цей параметр, щоб показувати цитати меншим шрифтом." +msgstr "" +"<p>Увімкнути цей параметр для збереження пропорції із новими розмірами " +"зображень." #: utilities/imageeditor/tools/imageresize.cpp:221 -#, fuzzy msgid "Restore photograph" -msgstr "Застосувати Гаусове розмивання до фотографії" +msgstr "Відновити фотографію" #: utilities/imageeditor/tools/imageresize.cpp:222 msgid "" "<p>Enable this option to restore photograph content. This way is usefull to " "scale-up an image to an huge size. Warning: this process can take a while." msgstr "" +"<p>Увімкнути цей параметр для відновлення вмісту фотографії. Цей спосіб " +"корисний для збільшення зображення до величезного розміру. Попередження: цей " +"процес може тривати деякий час." #: utilities/imageeditor/tools/imageresize.cpp:226 msgid "" "<b>Note: use Restoration Mode to only scale-up an image to huge size. " "Warning, this process can take a while.</b>" msgstr "" +"<b>Примітка: використовувати Режим Відновлення лише для збільшення " +"зображення до величезного розміру. Попередження: цей процес може тривати " +"деякий час.</b>" #: utilities/imageeditor/tools/imageresize.cpp:231 -#, fuzzy msgid "<p>This shows the current progress when you use Restoration mode." -msgstr "<p>Інформація про завершення цього завдання у відсотках." +msgstr "<p>Відображає поточний прогрес при використанні режиму Відновлення." #: utilities/imageeditor/tools/imageresize.cpp:551 #: utilities/imageeditor/tools/imageresize.cpp:583 @@ -11534,33 +11583,34 @@ msgstr "Змінити розмір" #: utilities/imageeditor/tools/imageresize.cpp:608 msgid "Photograph Resizing Settings File to Load" -msgstr "Файл параметрів зміни розміру фотографій, який слід завантажити" +msgstr "Файл Налаштувань Зміни Розміру Фотографії до Завантаження" #: utilities/imageeditor/tools/imageresize.cpp:619 msgid "\"%1\" is not a Photograph Resizing settings text file." -msgstr "«%1» не є текстовим файлом параметрів зміни розміру фотографій." +msgstr "«%1» не є текстовим файлом налаштувань Зміни Розміру Фотографії." #: utilities/imageeditor/tools/imageresize.cpp:626 msgid "Cannot load settings from the Photograph Resizing text file." msgstr "" -"Не вдалося завантажити параметри з текстового файла зміни розміру фотографій." +"Неможливо завантажити налаштування із текстового файлу Зміни Розміру " +"Фотографії." #: utilities/imageeditor/tools/imageresize.cpp:635 msgid "Photograph Resizing Settings File to Save" -msgstr "Файл параметрів зміни розміру фотографій, який слід зберегти" +msgstr "Файл Налаштувань Зміни Розміру Фотографії до Збереження" #: utilities/imageeditor/tools/imageresize.cpp:644 msgid "Cannot save settings to the Photograph Resizing text file." msgstr "" -"Не вдалося зберегти текстовий файл параметрів зміни розміру фотографії." +"Неможливо зберегти налаштування до текстового файлу Зміни Розміру Фотографії." #: utilities/lighttable/lighttablebar.cpp:174 msgid "Show on left panel" -msgstr "Показ на лівій панелі" +msgstr "Показати на лівій панелі" #: utilities/lighttable/lighttablebar.cpp:175 msgid "Show on right panel" -msgstr "Показ на правій панелі" +msgstr "Показати на правій панелі" #: utilities/lighttable/lighttablebar.cpp:185 msgid "Remove item" @@ -11568,54 +11618,51 @@ msgstr "Вилучити пункт" #: utilities/lighttable/lighttablebar.cpp:189 msgid "Clear all" -msgstr "Вилучити всі" +msgstr "Очистити все" #: utilities/lighttable/lighttablebar.cpp:619 msgid "Drag and drop images here" msgstr "Перетягніть і скиньте зображення тут" #: utilities/lighttable/lighttablepreview.cpp:145 -#, fuzzy msgid "Pan the image" -msgstr "Друкувати зображення в &чорно-білому" +msgstr "Панарамувати зображення" #: utilities/lighttable/lighttablepreview.cpp:195 msgid "Drag and drop an image here" msgstr "Перетягніть і скиньте зображення тут" #: utilities/lighttable/lighttablepreview.cpp:281 -#, fuzzy msgid "" "Unable to display preview for\n" "\"%1\"" msgstr "" -"Не вдається показати перегляд для\n" +"Неможливо показати попередній перегляд для\n" "\"%1\"" #: utilities/lighttable/lighttablewindow.cpp:351 msgid "On Left" -msgstr "" +msgstr "Ліворуч" #: utilities/lighttable/lighttablewindow.cpp:355 msgid "Show item on left panel" -msgstr "Показати запис на лівій панелі" +msgstr "Показати пункт на лівій панелі" #: utilities/lighttable/lighttablewindow.cpp:357 -#, fuzzy msgid "On Right" -msgstr "Внизу праворуч" +msgstr "Праворуч" #: utilities/lighttable/lighttablewindow.cpp:361 msgid "Show item on right panel" -msgstr "Показувати запис на правій панелі" +msgstr "Показати пункт на правій панелі" #: utilities/lighttable/lighttablewindow.cpp:368 msgid "Remove item from LightTable" -msgstr "Вилучити запис зі стола з підсвічуванням" +msgstr "Вилучити пункт з Підсвіченого Столу" #: utilities/lighttable/lighttablewindow.cpp:373 msgid "Remove all items from LightTable" -msgstr "Вилучити всі записи зі стола з підсвічуванням" +msgstr "Вилучити всі пункти з Підсвіченого Столу" #: utilities/lighttable/lighttablewindow.cpp:388 msgid "Synchronize" @@ -11623,7 +11670,7 @@ msgstr "Синхронізувати" #: utilities/lighttable/lighttablewindow.cpp:393 msgid "Synchronize preview from left and right panels" -msgstr "Синхронізувати перегляд з лівої та правої панелей" +msgstr "Синхронізувати попередній перегляд із лівою та правою панелями" #: utilities/lighttable/lighttablewindow.cpp:395 msgid "By Pair" @@ -11631,49 +11678,43 @@ msgstr "Парами" #: utilities/lighttable/lighttablewindow.cpp:400 msgid "Navigate by pair with all items" -msgstr "" +msgstr "Навігація парами за всіма пунктами" #: utilities/lighttable/lighttablewindow.cpp:510 -#, fuzzy msgid "Exit fullscreen viewing mode" -msgstr "Вийти з режиму попереднього перегляду" +msgstr "Залишити повноекранний режим перегляду" #: utilities/lighttable/lighttablewindow.cpp:540 -#, fuzzy msgid "Zoom in on image" msgstr "Збільшити зображення" #: utilities/lighttable/lighttablewindow.cpp:545 -#, fuzzy msgid "Zoom out from image" msgstr "Зменшити зображення" #: utilities/lighttable/lighttablewindow.cpp:625 -#, fuzzy msgid "No item on Light Table" -msgstr "Показати назву файла" +msgstr "Жодного пункту на Підсвіченому Столі" #: utilities/lighttable/lighttablewindow.cpp:629 -#, fuzzy msgid "1 item on Light Table" -msgstr "Освітлення" +msgstr "1 пункт на Підсвіченому Столі" #: utilities/lighttable/lighttablewindow.cpp:633 -#, fuzzy msgid "%1 items on Light Table" -msgstr "Освітлення" +msgstr "%1 пунктів на Підсвіченому Столі" #: utilities/setup/cameraselection.cpp:100 msgid "Camera Configuration" -msgstr "Налаштування камери" +msgstr "Налаштування Камери" #: utilities/setup/cameraselection.cpp:108 msgid "Mounted Camera" -msgstr "Змонтована камера" +msgstr "Змонтована Камера" #: utilities/setup/cameraselection.cpp:118 msgid "Camera List" -msgstr "Список камер" +msgstr "Перелік Камер" #: utilities/setup/cameraselection.cpp:122 msgid "" @@ -11681,34 +11722,36 @@ msgid "" "right panel will be set automatically.</p><p>This list has been generated " "using the gphoto2 library installed on your computer.</p>" msgstr "" +"<p>Оберіть назву камери, яку бажаєте використати. Всі типові налаштування на " +"панелі праворуч буде встановлено автоматично.</p><p>Цей перелік згенеровано " +"із використанням бібліотеки gphoto2, встановленої на вашому комп'ютері.</p>" #: utilities/setup/cameraselection.cpp:131 msgid "Camera Title" -msgstr "Заголовок камери" +msgstr "Заголовок Камери" #: utilities/setup/cameraselection.cpp:133 msgid "" "<p>Set here the name used in digiKam interface to identify this camera.</p>" msgstr "" -"<p>Тут ви можете вказати назву, що використовуватиметься інтерфейсом digiKam " -"для ідентифікації цього фотоапарата.</p>" +"<p>Встановіть тут назву використаного у digiKam інтерфейсу для визначення " +"цієї камери.</p>" #: utilities/setup/cameraselection.cpp:138 msgid "Camera Port Type" -msgstr "Тип порту камери" +msgstr "Тип Порту Камери" #: utilities/setup/cameraselection.cpp:142 msgid "USB" msgstr "USB" #: utilities/setup/cameraselection.cpp:143 -#, fuzzy msgid "" "<p>Select this option if your camera is connected to your computer using an " "USB cable.</p>" msgstr "" -"Якщо цю опцію вибрано, фотоапарат має бути під'єднаний через один з роз'ємів " -"USB на Вашому комп'ютері." +"<p>Оберіть цей параметр якщо вашу камеру підключено до комп'ютеру із " +"використанням USB кабелю.</p>" #: utilities/setup/cameraselection.cpp:147 msgid "Serial" @@ -11719,43 +11762,41 @@ msgid "" "<p>Select this option if your camera is connected to your computer using a " "serial cable.</p>" msgstr "" -"<p>Виберіть цей параметр, якщо ваш фотоапарат з’єднано з комп’ютером за " -"допомогою послідовного шнура.</p>" +"<p>Оберіть цей параметр якщо вашу камеру підключено до комп'ютеру із " +"використанням послідовного кабелю.</p>" #: utilities/setup/cameraselection.cpp:153 msgid "Camera Port Path" -msgstr "Шлях порту камери" +msgstr "Шлях Порту Камери" #: utilities/setup/cameraselection.cpp:155 msgid "Note: only for serial port camera" -msgstr "Примітка: тільки для камери на послідовному порту" +msgstr "Примітка: лише для камери на послідовному порту" #: utilities/setup/cameraselection.cpp:159 -#, fuzzy msgid "" "<p>Select the serial port to use on your computer. This option is only " "required if you use a serial camera.</p>" msgstr "" -"Якщо цю опцію вибрано, фотоапарат має бути під'єднаний через один з " -"послідовних портів Вашого комп'ютера (відомих також як COM у Microsoft " -"Windows)." +"<p>Оберіть послідовний порт для використання на вашому комп'ютері. Цей " +"параметр необхідний лише при використанні послідовної камери.</p>" #: utilities/setup/cameraselection.cpp:164 msgid "Camera Mount Path" -msgstr "Шлях монтування камери" +msgstr "Шлях Монтування Камери" #: utilities/setup/cameraselection.cpp:167 msgid "Note: only for USB/IEEE mass storage camera" -msgstr "" +msgstr "Примітка: лише для USB/IEEE камер з накопичувачем" #: utilities/setup/cameraselection.cpp:171 msgid "" "<p>Set here the mount path to use on your computer. This option is only " "required if you use a <b>USB Mass Storage</b> camera.</p>" msgstr "" -"<p>Тут ви можете вказати шлях монтування, що використовуватиметься на вашому " -"комп’ютері. Цей параметр потрібен, лише якщо ви використовуєте фотоапарат з " -"<b>Накопичувачем USB</b>.</p>" +"<p>Встановити тут шлях монтування для використання на вашому комп’ютері. Цей " +"параметр необхідний лише якщо ви використовуєте камеру з <b>Накопичувачем " +"USB</b>.</p>" #: utilities/setup/cameraselection.cpp:188 msgid "" @@ -11763,6 +11804,9 @@ msgid "" "drive when mounted on your desktop), please<br>use <a href=\"umscamera\">%1</" "a> from camera list.</p>" msgstr "" +"<p>Для встановлення камери <b>Накопичувача USB</b><br>(яка виглядає " +"від'єднуваним диском при підключенні до вашої стільниці), будь " +"ласка<br>використайте <a href=\"umscamera\">%1</a> із переліку камер.</p>" #: utilities/setup/cameraselection.cpp:194 msgid "" @@ -11770,16 +11814,22 @@ msgid "" "Transfer Protocol), please<br>use <a href=\"ptpcamera\">%1</a> from the " "camera list.</p>" msgstr "" +"<p>Для встановлення <b>Загального PTP USB Пристрою</b><br>(який використовує " +"Протокол Передавання Картинок), будь ласка<br>використайте <a href=" +"\"ptpcamera\">%1</a> із переліку камер.</p>" #: utilities/setup/cameraselection.cpp:200 msgid "" "<p>A complete list of camera settings to use is<br>available at <a " "href='http://www.teaser.fr/~hfiguiere/linux/digicam.html'>this url</a>.</p>" msgstr "" +"<p>Загальний перелік параметрів камер для використання<br>доступний за <a " +"href='http://www.teaser.fr/~hfiguiere/linux/digicam.html'>цією адресою</a>.</" +"p>" #: utilities/setup/setup.cpp:142 msgid "Album Settings" -msgstr "Параметри альбому" +msgstr "Налаштування Альбому" #: utilities/setup/setup.cpp:146 msgid "Collections" @@ -11787,11 +11837,11 @@ msgstr "Збірки" #: utilities/setup/setup.cpp:146 msgid "Album Collections" -msgstr "Збірки альбомів" +msgstr "Збірки Альбомів" #: utilities/setup/setup.cpp:150 msgid "Identity" -msgstr "Інформація про особу" +msgstr "Ідентифікація" #: utilities/setup/setup.cpp:150 msgid "Default IPTC identity information" @@ -11799,12 +11849,11 @@ msgstr "Типова ідентифікаційна інформація IPTC" #: utilities/setup/setup.cpp:154 msgid "Embedded Image Information Management" -msgstr "Керування вбудованою в зображення інформацією" +msgstr "Керування Вбудованою до Зображення Інформацією" #: utilities/setup/setup.cpp:158 -#, fuzzy msgid "Album Items Tool Tip Settings" -msgstr "Параметри підказок для елементів альбому" +msgstr "Налаштування Вигулькних Підказок до Елементів Альбому" #: utilities/setup/setup.cpp:162 msgid "Mime Types" @@ -11812,26 +11861,23 @@ msgstr "Типи Mime" #: utilities/setup/setup.cpp:162 msgid "File (MIME) Types Settings" -msgstr "Параметри типів файлів (MIME)" +msgstr "Налаштування Типів Файлів (MIME)" #: utilities/setup/setup.cpp:166 -#, fuzzy msgid "Light Table Settings" -msgstr "Освітлення" +msgstr "Налаштування Підсвітленого Столу" #: utilities/setup/setup.cpp:170 msgid "Image Editor General Settings" -msgstr "Загальні параметри редактора зображень" +msgstr "Загальні Налаштування Редактору Зображень" #: utilities/setup/setup.cpp:174 -#, fuzzy msgid "Image Editor: Settings for Saving Images Files" -msgstr "Параметри В/В файлів зображень редактора зображень" +msgstr "Редактор Зображень: Параметри для Збереження Файлів Зображень" #: utilities/setup/setup.cpp:182 -#, fuzzy msgid "Image Editor Color Management Settings" -msgstr "Керування кольором редактора зображень" +msgstr "Параметри Керування Кольору Редактора Зображень" #: utilities/setup/setup.cpp:186 msgid "Kipi Plugins" @@ -11839,7 +11885,7 @@ msgstr "Втулки Kipi" #: utilities/setup/setup.cpp:186 msgid "Main Interface Plug-in Settings" -msgstr "Параметри втулків головного інтерфейсу" +msgstr "Параметри Втулок Головного Інтерфейсу" #: utilities/setup/setup.cpp:194 msgid "Cameras" @@ -11847,11 +11893,11 @@ msgstr "Камери" #: utilities/setup/setup.cpp:194 msgid "Camera Settings" -msgstr "Параметри камери" +msgstr "Параметри Камери" #: utilities/setup/setup.cpp:198 msgid "Miscellaneous Settings" -msgstr "Інші параметри" +msgstr "Інші Параметри" #: utilities/setup/setup.cpp:245 msgid "" @@ -11861,6 +11907,11 @@ msgid "" "Note: thumbnail processing can take a while! You can start this job later " "from the \"Tools\" menu." msgstr "" +"Змінено Exif параметр авто-повертання мініатюр.\n" +"Бажаєте зараз перебудувати всі мініатюри елементів альбомів?\n" +"\n" +"Примітка: опрацювання мініатюр може тривати певний час! Ви можете розпочати " +"це завдання пізніше із меню \"Інструменти\"." #: utilities/setup/setupcamera.cpp:87 msgid "Title" @@ -11879,6 +11930,8 @@ msgid "" "<p>Here you can see the digital camera list used by digiKam via the Gphoto " "interface." msgstr "" +"<p>Тут ви можете бачити перелік цифрових камер використовуваних digiKam " +"через інтерфейс Gphoto." #: utilities/setup/setupcamera.cpp:103 utilities/setup/setupcollections.cpp:100 msgid "&Add..." @@ -11886,15 +11939,15 @@ msgstr "&Додати..." #: utilities/setup/setupcamera.cpp:107 msgid "&Edit..." -msgstr "&Змінити..." +msgstr "&Редагувати..." #: utilities/setup/setupcamera.cpp:109 msgid "Auto-&Detect" -msgstr "Авто-&виявити" +msgstr "Авто-&Виявити" #: utilities/setup/setupcamera.cpp:122 msgid "Visit Gphoto project website" -msgstr "Відвідайте вебсайт проекту Gphoto" +msgstr "Відвідайте вебсайт проєкту Gphoto" #: utilities/setup/setupcamera.cpp:245 msgid "" @@ -11902,9 +11955,9 @@ msgid "" "Please check if your camera is turned on and retry or try setting it " "manually." msgstr "" -"Не вдалося виявити камеру автоматично.\n" -"Будь ласка, перевірте чи увімкнено камеру і спробуйте знов, або налаштуйте " -"її вручну." +"Не вдалося автоматично виявити камеру.\n" +"Будь ласка, перевірте чи увімкнено камеру і спробуйте знов, або спробуйте " +"налаштувати вручну." #: utilities/setup/setupcamera.cpp:257 msgid "Camera '%1' (%2) is already in list." @@ -11919,11 +11972,13 @@ msgid "" "<p>You can add or remove Album collection types here to improve how your " "Albums are sorted in digiKam." msgstr "" +"<p>Тут ви можете додати або видалити типи колекцій Альбомів для покращення " +"сортування ваших альбомів у digiKam." #: utilities/setup/setupcollections.cpp:180 #: utilities/setup/setupcollections.cpp:185 msgid "New Collection Name" -msgstr "Назва нової збірки" +msgstr "Назва Нової Збірки" #: utilities/setup/setupcollections.cpp:181 #: utilities/setup/setupcollections.cpp:186 @@ -11931,25 +11986,26 @@ msgid "Enter new collection name:" msgstr "Введіть назву нової збірки:" #: utilities/setup/setupeditor.cpp:97 -#, fuzzy msgid "<p>Customize background color to use in image editor area." msgstr "<p>Налаштуйте колір тла для ділянки редагування зображень." #: utilities/setup/setupeditor.cpp:115 -#, fuzzy msgid "" "<p>Customize the color used in image editor to identify under-exposed pixels." -msgstr "<p>Тут виберіть колір тла для ділянки редактора зображення." +msgstr "" +"<p>Налаштуйте колір ідентифікації недоекспонованих пікселів у редакторі " +"зображень." #: utilities/setup/setupeditor.cpp:122 -#, fuzzy msgid "" "<p>Customize the color used in image editor to identify over-exposed pixels." -msgstr "<p>Тут виберіть колір тла для ділянки редактора зображення." +msgstr "" +"<p>Налаштуйте колір ідентифікації переекспонованих пікселів у редакторі " +"зображень." #: utilities/setup/setupgeneral.cpp:113 msgid "Album &Library Path" -msgstr "Шлях &бібліотеки альбомів" +msgstr "Шлях &Бібліотеки Альбомів" #: utilities/setup/setupgeneral.cpp:117 msgid "" @@ -11957,126 +12013,121 @@ msgid "" "computer.<p>Write access is required for this path and do not use a remote " "path here, like an NFS mounted file system." msgstr "" +"<p>Тут ви можете встановити основний шлях до бібліотеки альбомів digiKam на " +"вашому комп'ютері.<p>Для цього шляху необхідний доступ на запис і не " +"використовуйте тут віддалених шляхів, як то змонтовані файлові системи NFS." #: utilities/setup/setupgeneral.cpp:132 -#, fuzzy msgid "Thumbnail Information" -msgstr "Інформація про зображення" +msgstr "Інформація Мініатюр" #: utilities/setup/setupgeneral.cpp:134 msgid "Show file &name" -msgstr "Показувати &назви файлів" +msgstr "Показувати &назву файлу" #: utilities/setup/setupgeneral.cpp:135 -#, fuzzy msgid "<p>Set this option to show the file name below the image thumbnail." msgstr "" -"<p>Ввімкніть цей параметр, щоб під мініатюрою зображення показувати назву " -"файла." +"<p>Встановіть цей параметр для відображення назви файлу під мініатюрою " +"зображення." #: utilities/setup/setupgeneral.cpp:137 msgid "Show file si&ze" -msgstr "Показувати &розміри файлів" +msgstr "Показувати &розмір файлу" #: utilities/setup/setupgeneral.cpp:138 -#, fuzzy msgid "<p>Set this option to show the file size below the image thumbnail." msgstr "" -"<p>Ввімкніть цей параметр, щоб під мініатюрою зображення показувати розмір " -"файла." +"<p>Встановіть цей параметр для відображення розміру файлу під мініатюрою " +"зображення." #: utilities/setup/setupgeneral.cpp:140 msgid "Show camera creation &date" -msgstr "Показувати дату &створення з фотоапарата" +msgstr "Показати &дату створення з камери" #: utilities/setup/setupgeneral.cpp:141 -#, fuzzy msgid "" "<p>Set this option to show the camera creation date below the image " "thumbnail." msgstr "" -"<p>Ввімкніть цей параметр, щоб під мініатюрою зображення показувати дату " -"створення файла." +"<p>Встановіть цей параметр для відображення дати створення файлу з камери " +"під мініатюрою зображення." #: utilities/setup/setupgeneral.cpp:144 msgid "Show file &modification date" -msgstr "Показувати дату моди&фікації файлів" +msgstr "Показати дату &модифікації файлу" #: utilities/setup/setupgeneral.cpp:145 -#, fuzzy msgid "" "<p>Set this option to show the file modification date below the image " "thumbnail." msgstr "" -"<p>Ввімкніть цей параметр, щоб під мініатюрою зображення показувати дату " -"модифікації файла." +"<p>Встановіть цей параметр для відображення дати модифікації файлу під " +"мініатюрою зображення." #: utilities/setup/setupgeneral.cpp:148 msgid "Show digiKam &captions" -msgstr "Показувати &підписи digiKam" +msgstr "Показати &заголовки digiKam" #: utilities/setup/setupgeneral.cpp:149 -#, fuzzy msgid "" "<p>Set this option to show the digiKam captions below the image thumbnail." msgstr "" -"<p>Ввімкніть цей параметр, щоб під мініатюрою зображення показувати рейтинг " -"digiKam." +"<p>Встановіть цей параметр для відображення заголовків digiKam під " +"мініатюрою зображення." #: utilities/setup/setupgeneral.cpp:152 msgid "Show digiKam &tags" -msgstr "Показувати мі&тки digiKam" +msgstr "Показати мі&тки digiKam" #: utilities/setup/setupgeneral.cpp:153 -#, fuzzy msgid "<p>Set this option to show the digiKam tags below the image thumbnail." msgstr "" -"<p>Ввімкніть цей параметр, щоб під мініатюрою зображення показувати мітки " -"digiKam." +"<p>Встановіть цей параметр для відображення міток digiKam під мініатюрою " +"зображення." #: utilities/setup/setupgeneral.cpp:156 msgid "Show digiKam &rating" msgstr "Показати &рейтинг digiKam" #: utilities/setup/setupgeneral.cpp:157 -#, fuzzy msgid "" "<p>Set this option to show the digiKam rating below the image thumbnail." msgstr "" -"<p>Ввімкніть цей параметр, щоб під мініатюрою зображення показувати рейтинг " -"digiKam." +"<p>Встановіть цей параметр для відображення рейтингу digiKam під мініатюрою " +"зображення." #: utilities/setup/setupgeneral.cpp:160 msgid "Show ima&ge dimensions (warning: slow)" -msgstr "Показувати &розміри зображень (повільне)" +msgstr "Показати &розміри зображення (увага: повільно)" #: utilities/setup/setupgeneral.cpp:161 -#, fuzzy msgid "" "<p>Set this option to show the image size in pixels below the image " "thumbnail." msgstr "" -"<p>Ввімкніть цей параметр, щоб під мініатюрою показувати розмір зображення в " -"пікселях." +"<p>Встановіть цей параметр для відображення розміру зображення у пікселях " +"під мініатюрою." #: utilities/setup/setupgeneral.cpp:173 -#, fuzzy msgid "Sidebar thumbnail size:" -msgstr "Збільшити розмір мініатюр" +msgstr "Розмір мініатюр бокової панелі:" #: utilities/setup/setupgeneral.cpp:179 msgid "" "<p>Set this option to configure the size in pixels of the thumbnails in " "digiKam's sidebars. This option will take effect when you restart digiKam." msgstr "" +"<p>Встановіть цей параметр для налаштування розміру мініатюр бокової панелі " +"digiKam у пікселях. Цей параметр набуде чинності із перезапуском digiKam." #: utilities/setup/setupgeneral.cpp:186 msgid "Show count of items in all tree-view" -msgstr "" +msgstr "Показати кількість елементів усього дерева перегляду" #: utilities/setup/setupgeneral.cpp:190 msgid "Thumbnail click action:" -msgstr "Дія за натисканням мініатюри:" +msgstr "Дія за кліком мініатюри:" #: utilities/setup/setupgeneral.cpp:192 msgid "Show embedded preview" @@ -12087,15 +12138,12 @@ msgid "Start image editor" msgstr "Запустити редактор зображень" #: utilities/setup/setupgeneral.cpp:194 -#, fuzzy msgid "<p>Here, choose what should happen when you click on a thumbnail." -msgstr "" -"<p>Виберіть дію, яка має виконуватись, коли ви клацнете правою кнопкою мишки " -"на мініатюру зображення." +msgstr "<p>Оберіть дію, яка має виконатися за кліком на мініатюрі зображення." #: utilities/setup/setupgeneral.cpp:199 msgid "Embedded preview loads full image size" -msgstr "" +msgstr "Вбудований попередній перегляд завантажує повний розмір зображення" #: utilities/setup/setupgeneral.cpp:200 msgid "" @@ -12103,35 +12151,38 @@ msgid "" "instead a reduced one. Because this option will take more time to load " "images, use it only if you have a fast computer." msgstr "" +"<p>Встановіть цей параметр для завантаження із вбудованим попереднім " +"переглядом повного розміру зображення замість зменшеного. Оскільки цей " +"параметр потребує більше часу для завантаження зображень, використовуйте " +"його лише якщо маєте швидкий комп'ютер." #: utilities/setup/setupgeneral.cpp:281 -#, fuzzy msgid "Sorry you can't use your home directory as album library." -msgstr "Вибачте, неможливо вживати каталог домівки як бібліотеку альбомів." +msgstr "" +"Вибачте, ви не можете вживати каталог домівки у якості бібліотеки альбомів." #: utilities/setup/setupgeneral.cpp:289 -#, fuzzy msgid "" "No write access for this path.\n" "Warning: the caption and tag features will not work." msgstr "" -"У вас немає прав записувати в цей каталог.\n" -"Попередження: коментарі і мітки не будуть працювати." +"Немає права запису за цим шляхом.\n" +"Попередження: властивості заголовків та міток не працюватимуть." #: utilities/setup/setupicc.cpp:157 msgid "Color Management Policy" -msgstr "Правила керування кольором" +msgstr "Правила Керування Кольором" #: utilities/setup/setupicc.cpp:161 msgid "Enable Color Management" -msgstr "Ввімкнути керування кольором" +msgstr "Увімкнути Керування Кольором" #: utilities/setup/setupicc.cpp:162 msgid "" "<ul><li>Checked: Color Management is enabled</li><li>Unchecked: Color " "Management is disabled</li></ul>" msgstr "" -"<ul><li>Ввімкнено: керування кольором активовано</li><li>Вимкнено: керування " +"<ul><li>Увімкнено: керування кольором активовано</li><li>Вимкнено: керування " "кольором деактивовано</li></ul>" #: utilities/setup/setupicc.cpp:173 @@ -12139,61 +12190,54 @@ msgid "Behavior" msgstr "Поведінка" #: utilities/setup/setupicc.cpp:179 -#, fuzzy msgid "Apply when opening an image in the Image Editor" -msgstr "Застосовувати при відкриванні зображення в редакторі" +msgstr "Застосувати при відкриванні зображення у Редакторі" #: utilities/setup/setupicc.cpp:180 -#, fuzzy msgid "" "<p>If this option is enabled, digiKam applies the Workspace default color " "profile to an image, without prompting you about missing embedded profiles " "or embedded profiles different from the workspace profile.</p>" msgstr "" -"<qt><b>Вибір режиму кольрів:</b> Можна вибрати серед двох перамертів: " -"<ul><li><b>колір</b> та</li> <li><b>градації сірого</b></li></ul> " -"<b>Примітка:</b> поле вибору може бути нективним. Це трапляється коли " -"система друку TDE не може отримати достатньо інформацї з файла для друку. У " -"цьому випадку буде використано інформацю вкладену у файл для друку, або " -"типовий режим принтера.</qt>" +"<p>За увімкнення цього параметру digiKam застосовує типовий профіль кольору " +"Робочого Простору без зауважень щодо відсутності вбудованих профілів або " +"відмінності вбудованого із профілем робочого простору.</p>" #: utilities/setup/setupicc.cpp:185 -#, fuzzy msgid "Ask when opening an image in the Image Editor" -msgstr "Застосовувати при відкриванні зображення в редакторі" +msgstr "Питати при відкритті зображення у Редакторі" #: utilities/setup/setupicc.cpp:186 -#, fuzzy msgid "" "<p>If this option is enabled, digiKam asks to user before it applies the " "Workspace default color profile to an image which has no embedded profile " "or, if the image has an embedded profile, when it's not the same as the " "workspace profile.</p>" msgstr "" -"<qt><b>Вибір режиму кольрів:</b> Можна вибрати серед двох перамертів: " -"<ul><li><b>колір</b> та</li> <li><b>градації сірого</b></li></ul> " -"<b>Примітка:</b> поле вибору може бути нективним. Це трапляється коли " -"система друку TDE не може отримати достатньо інформацї з файла для друку. У " -"цьому випадку буде використано інформацю вкладену у файл для друку, або " -"типовий режим принтера.</qt>" +"<p>За увімкнення цього параметру digiKam питає користувача перед " +"застосуванням типового профілю кольору Робочого Простору до зображення, яке " +"не містить вбудованого або містить не такий самий, що профіль робочого " +"простору.</p>" #: utilities/setup/setupicc.cpp:201 msgid "Color Profiles Directory" -msgstr "" +msgstr "Каталог Профілів Кольору" #: utilities/setup/setupicc.cpp:206 msgid "" "<p>Default path to the color profiles folder. You must store all your color " "profiles in this directory.</p>" msgstr "" +"<p>Типовий шлях до тек профілів кольору. Ви маєте зберігати всі ваші профілі " +"кольорів у цьому каталозі.</p>" #: utilities/setup/setupicc.cpp:213 msgid "ICC Profiles Settings" -msgstr "" +msgstr "Параметри Профілів ICC" #: utilities/setup/setupicc.cpp:218 msgid "Use color managed view (warning: slow)" -msgstr "" +msgstr "Використати режим керування кольору (увага: повільно)" #: utilities/setup/setupicc.cpp:219 msgid "" @@ -12202,6 +12246,11 @@ msgid "" "adapted to your monitor. Warning: this option can take a while to render " "pictures on the screen, especially with a slow computer.</p>" msgstr "" +"<p>Увімкніть цей параметр за бажання використати ваш <b>Профіль Кольору " +"Монітору</b> для відображення картинок у вікні Редактору Зображень із " +"корекцією кольору, адаптованою до вашого монітору. Попередження: цей " +"параметр може потребувати певного часу для відображення картинок на екрані, " +"особливо на повільному комп'ютері.</p>" #: utilities/setup/setupicc.cpp:227 msgid "Monitor:" @@ -12212,18 +12261,21 @@ msgid "" "<p>Select the color profile for your monitor. You need to enable the <b>Use " "color managed view</b> option to use this profile.</p>" msgstr "" +"<p>Оберіть профіль кольору для вашого монітору. Вам необхідно увімкнути " +"параметр <b>Використати режим керування кольору</b> для використання цього " +"профілю.</p>" #: utilities/setup/setupicc.cpp:233 msgid "" "<p>You can use this button to get more detailed information about the " "selected monitor profile.</p>" msgstr "" -"<p>Можете скористатись цією кнопкою для отримання докладнішої інформації про " -"вибраний профіль монітора.</p>" +"<p>Можете скористатись цією кнопкою для отримання докладної інформації про " +"обраний профіль монітора.</p>" #: utilities/setup/setupicc.cpp:244 msgid "Workspace:" -msgstr "Робоче місце:" +msgstr "Робочий простір:" #: utilities/setup/setupicc.cpp:247 msgid "" @@ -12231,14 +12283,17 @@ msgid "" "you must select a profile appropriate for editing.</p><p>These color " "profiles are device independent.</p>" msgstr "" +"<p>Усі зображення буде конвертовано у простір кольорів цього профілю, тож ви " +"маєте обрати профіль підхожий для редагування.</p><p>Ці кольори є " +"незалежними від пристрою.</p>" #: utilities/setup/setupicc.cpp:251 msgid "" "<p>You can use this button to get more detailed information about the " "selected workspace profile.</p>" msgstr "" -"<p>Ви можете скористатися цією кнопкою, щоб отримати докладнішу інформацію " -"про вибраний профіль робочого простору.</p>" +"<p>Ви можете скористатися цією кнопкою для отримання докладної інформації " +"обраного профілю робочого простору.</p>" #: utilities/setup/setupicc.cpp:261 msgid "Input:" @@ -12249,18 +12304,20 @@ msgid "" "<p>You must select the profile for your input device (usually, your camera, " "scanner...)</p>" msgstr "" +"<p>Ви можете обрати профіль для вашого пристрою введення (зазвичай ваша " +"камера, сканер...)</p>" #: utilities/setup/setupicc.cpp:267 msgid "" "<p>You can use this button to get more detailed information about the " "selected input profile.</p>" msgstr "" -"<p>Ви можете скористатися цією кнопкою, щоб отримати детальнішу інформацію " -"про вибраний профіль вхідних даних.</p>" +"<p>Ви можете скористатися цією кнопкою для отримання детальної інформації " +"обраного профілю введених даних.</p>" #: utilities/setup/setupicc.cpp:277 msgid "Soft proof:" -msgstr "" +msgstr "М'яка проба:" #: utilities/setup/setupicc.cpp:280 msgid "" @@ -12268,19 +12325,22 @@ msgid "" "printer). This profile will be used to do a soft proof, so you will be able " "to preview how an image will be rendered via an output device.</p>" msgstr "" +"<p>Ви можете обрати профіль для вашого пристрою виведення (зазвичай ваш " +"принтер). Цей профіль буде використано для здійснення м'якої проби, тож ви " +"зможете попередньо переглянути як це зображення буде відображатися через " +"пристрій виведення.</p>" #: utilities/setup/setupicc.cpp:284 -#, fuzzy msgid "" "<p>You can use this button to get more detailed information about the " "selected soft proof profile.</p>" msgstr "" -"Поле тексту показує детальну інформацію про завантажені шрифти. Це корисно " -"для експертів, які хочуть відстежити проблеми в установці TeX або KDVI." +"<p>Ви можете скористатися цією кнопкою для отримання детальної інформації " +"обраного профілю проби.</p>" #: utilities/setup/setupicc.cpp:299 msgid "Use black point compensation" -msgstr "Використовувати компенсацію чорної точки" +msgstr "Використати компенсацію чорної точки" #: utilities/setup/setupicc.cpp:300 msgid "" @@ -12288,13 +12348,13 @@ msgid "" "maximum black levels of digital files and the black capabilities of various " "digital devices.</p>" msgstr "" -"<p><b>Компенсація чорної точки</b> це спосіб налаштування між максимальними " -"рівнями чорного цифрових файлів і можливостями у відтворенні кольорів " -"різноманітних цифрових пристроїв.</p>" +"<p><b>Компенсація Чорної Точки</b> це спосіб налаштування між максимальними " +"рівнями чорного цифрових файлів і можливостями відтворення кольорів " +"різноманітними цифровими пристроями.</p>" #: utilities/setup/setupicc.cpp:307 msgid "Rendering Intents:" -msgstr "Відтворення кольорів:" +msgstr "Відтворення Кольорів:" #: utilities/setup/setupicc.cpp:314 msgid "" @@ -12324,18 +12384,41 @@ msgid "" "colors be vivid and contrast well with each other rather than a specific " "color.</p></li></ul>" msgstr "" +"<ul><li><p><b>Перцептивне відтворення</b> призводить до стиснення всієї гами " +"зображення або розширення до повної гами цільового пристрою, тож баланс " +"сірого зберігається, але колориметрична точність може не зберігатися.</" +"p><p>Іншими словами, якщо певні кольори зображення випадають із діапазону " +"кольорів відображення вивідного пристрою, відтворення зображення призведе до " +"підлаштування всіх кольорів зображення для потрапляння до діапазону " +"відображення таким чином, що відношення між кольорами зберігається наскільки " +"це можливо.</p><p>Це відтворення найбільш підходить для відображення " +"фотографій та зображень, та воно типове.</p></li><li><p><b>Абсолютне " +"Колориметричне відтворення</b> призводить до підлаштування кольорів, що не " +"потрапляють до діапазону пристрою виведення, до найближчих кольорів " +"відображення, тоді як решта кольорів залишаються незмінними.</p><p>Це " +"відтворення зберігає білу точку та найбільш підходить для плямистих кольорів " +"(Pantone, TruMatch, кольори лого, ...).</p></li><li><p><b>Відносне " +"Колориметричне відтворення</b> визначається як таке, що підлаштовує кольори, " +"які не потрапляють до діапазону пристрою виведення, до найближчих кольорів " +"відображення, тоді як решта кольорів залишаються незмінними. Пробне " +"відображення не зберігає білої точки.</p></li><li><p><b>Насичене " +"відтворення</b> зберігає насиченість кольорів зображення ціною відтінку та " +"яскравості.</p><p>Реалізація цього відображення залишається дещо " +"проблематичною, та ICC все ще працює над методами досягнення бажаних ефектів." +"</p><p>Це відтворення найбільше підходить для бізнес графіки як то схеми, де " +"найбільш важливим є те, щоб кольори були живими і добре контрастними до " +"інших, аніж специфіка кольору.</p></li></ul>" #: utilities/setup/setupicc.cpp:467 msgid "" "<p>You must set a correct default path for your ICC color profiles files.</p>" msgstr "" +"<p>Ви мусите встановити коректний типовий шлях до файлів ваших профілів ICC." +"</p>" #: utilities/setup/setupicc.cpp:484 -#, fuzzy msgid "<p>Sorry, there are no ICC profiles files in " -msgstr "" -"Вибраний файл не є програмою.\n" -"Хочете вибрати інший файл?" +msgstr "<p>Вибачте, відсутні файли профілів ICC у " #: utilities/setup/setupicc.cpp:486 msgid "</p>" @@ -12343,33 +12426,31 @@ msgstr "</p>" #: utilities/setup/setupicc.cpp:551 msgid "<p>The following profile is invalid:</p><p><b>" -msgstr "<p>Наступний профіль не чинний:</p><p><b>" +msgstr "<p>Наступний профіль неправильний:</p><p><b>" #: utilities/setup/setupicc.cpp:555 msgid "Invalid Profile" -msgstr "Не чинний профіль" +msgstr "Неправильний Профіль" #: utilities/setup/setupicc.cpp:559 msgid "Invalid color profile has been removed" -msgstr "" +msgstr "Неправильний профіль кольору було видалено" #: utilities/setup/setupicc.cpp:563 msgid "" "<p>digiKam has failed to remove the invalid color profile</p><p>You have to " "do it manually</p>" msgstr "" +"<p>digiKam зазнав невдачі при видалені неправильного профілю кольору</" +"p><p>Ви маєте здійснити це вручну</p>" #: utilities/setup/setupicc.cpp:691 -#, fuzzy msgid "Sorry, there is not any selected profile" -msgstr "" -"Вибраний файл не є програмою.\n" -"Хочете вибрати інший файл?" +msgstr "Пробачте, не обрано жодного профілю" #: utilities/setup/setupidentity.cpp:81 -#, fuzzy msgid "Photographer and Copyright Information" -msgstr "Інформація про фотографа" +msgstr "Інформація про Фотографа та Права" #: utilities/setup/setupidentity.cpp:84 msgid "Author:" @@ -12385,10 +12466,17 @@ msgid "" "support the use of commas or semi-colons as separator. \n" "This field is limited to 32 ASCII characters.</p>" msgstr "" +"<p>Це поле має містити ваше ім'я, або ім'я персони, яка цю фотографію " +"створила. Якщо додання ім'я фотографа неприйнятне (до прикладу, якщо " +"ідентичність фотографа має бути захищена) може бути використана назва " +"компанії або організації. Поле, одного разу збережене, не повинне " +"змінюватися більше ніким. Поле не підтримує використання коми або крапки з " +"комою у якості розділювача. \n" +"Поле обмежене 32вома ASCII символами.</p>" #: utilities/setup/setupidentity.cpp:97 msgid "Author Title:" -msgstr "Титул фотографа:" +msgstr "Титул Фотографа:" #: utilities/setup/setupidentity.cpp:104 msgid "" @@ -12398,10 +12486,15 @@ msgid "" "Author field, the Author field must also be filled out. \n" "This field is limited to 32 ASCII characters.</p>" msgstr "" +"<p>Це поле має містити характер діяльності фотографу. До прикладу, наступне: " +"Штатний Фотограф, Вільнонайманий Фотограф, або Незалежний Комерційний " +"Фотограф. Оскільки це кваліфікатор до поля \"Автор\", поле \"Автор\" також " +"має бути заповнене. \n" +"Поле обмежене 32вома ASCII символами.</p>" #: utilities/setup/setupidentity.cpp:111 msgid "Credit and Copyright" -msgstr "Подяка і авторські права" +msgstr "Подяка і Авторські Права" #: utilities/setup/setupidentity.cpp:114 msgid "Credit:" @@ -12418,6 +12511,13 @@ msgid "" "be listed here. \n" "This field is limited to 32 ASCII characters.</p>" msgstr "" +"<p>(синонім до Провайдер): Використайте поле \"Провайдер\" для ідентифікації " +"надавача фотографії. Це не обов'язково має бути автор. Якщо фотограф працює " +"на новинну агенцію як то Ройтерс або Асоціейтед Прес, ці організації можуть " +"тут перелічуватися як \"надавачі\" цього зображення для використання іншими. " +"Якщо зображення є стоковою фотографією, тут має бути вказано групу " +"(агентство), яка бере участь у постачанні зображення. \n" +"Поле обмежене 32вома ASCII символами.</p>" #: utilities/setup/setupidentity.cpp:128 msgid "Source:" @@ -12436,10 +12536,20 @@ msgid "" "Creator and from the names listed in the Copyright Notice.\n" "This field is limited to 32 ASCII characters.</p>" msgstr "" +"<p>Поле \"Джерело\" має використовуватися для ідентифікації первинного " +"власника або тримача авторських прав фотографії. Значення цього поля ніколи " +"не повинне змінюватися після введення супровідної інформації створення " +"зображення. Хоча таке не передбачено спеціальними панелями, але ви маєте " +"вважати це полем одноразового записуваним. Джерело має бути індивідуальним, " +"агенція або член агенції. Щоб допомогти у пізнішому пошуку, пропонується " +"відокремлювати слеші \"/\" символом пробілу. Використовуйте форму " +"\"фотограф / агенція\" радше ніж \"фотограф/агенція\". Джерело також може " +"бути відмінним від Автора та із переліку імен у Примітці Авторських Прав.\n" +"Поле обмежене 32вома ASCII символами.</p>" #: utilities/setup/setupidentity.cpp:144 msgid "Copyright:" -msgstr "Авторські права:" +msgstr "Авторські Права:" #: utilities/setup/setupidentity.cpp:151 msgid "" @@ -12465,6 +12575,27 @@ msgid "" "include the phrase \"all rights reserved.\"\n" "This field is limited to 128 ASCII characters.</p>" msgstr "" +"<p>Примітка Авторських Прав має містити будь які необхідні примітки " +"авторських прав для затвердження інтелектуальної власності, та має " +"ідентифікувати поточного власника(ів) авторських прав фотографії. Зазвичай, " +"це має бути фотограф, але якщо зображення створено робітником або для роботи " +"по найму, то має бути перелічено агенціу або компанію. Використовуйте " +"властиву для вашої країни форму. Ukraine: © {дата першої публікації} " +"ім'я власника авторських прав, як \"©2005 Vasily Nesterenko.\" " +"Зауважте, слово \"copyright\" або абревіатура \"copr\" може бути використано " +"на місці символу ©. У деяких іноземних країнах лише символ \"copyright" +"\" визначається і абревіатура не працює. Крім того, символом авторських прав " +"має бути коло із літерою \"c\" всередині; використання чогось на кшталт (c), " +"із дужками у якості частини кола, не є достатнім. Для додаткового захисту в " +"усьому світі рекомендується використовувати фразу \"всі права захищено\" " +"після повідомлення вище. \n" +"У Європі ви маєте використати: Copyright {Рік} {Власник авт.прав}, all " +"rights reserved. \n" +"У Японії, для максимального захисту, наступні три елементи мають з'явитися у " +"полі авторських прав ядра IPTC: (a) слово, Copyright; (b) рік першої " +"публікації; та (c) ім'я автору. Ви також можете забажати включити фразу " +"\"all rights reserved.\"\n" +"Поле обмежене 128вома ASCII символами.</p>" #: utilities/setup/setupidentity.cpp:169 msgid "" @@ -12473,6 +12604,11 @@ msgid "" "printable <b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " "characters set and limit strings size. Use contextual help for details.</b>" msgstr "" +"<b>Примітка: Ця інформація використовується для встановлення вмісту міток " +"<b><a href='http://en.wikipedia.org/wiki/IPTC'>IPTC</a></b>. Текстові мітки " +"IPTC підтримують лише набір друкованих <b><a href='http://en.wikipedia.org/" +"wiki/Ascii'>ASCII</a></b> символів та обмежений розмір рядка. Використовуйте " +"контекстну допомогу для деталізації.</b>" #: utilities/setup/setuplighttable.cpp:77 msgid "Synchronize panels automatically" @@ -12483,23 +12619,25 @@ msgid "" "<p>Set this option to automatically synchronize zooming and panning between " "left and right panels if the images have the same size." msgstr "" +"<p>Встановити цей параметр для автоматичної синхронізації масштабування та " +"панарамування між лівою і правою панелями за однакового розміру зображень." #: utilities/setup/setuplighttable.cpp:82 msgid "Selecting a thumbbar item loads image to the right panel" msgstr "" +"Обрання елементу панелі мініатюр завантажує зображення до правої панелі" #: utilities/setup/setuplighttable.cpp:84 -#, fuzzy msgid "" "<p>Set this option to automatically load an image into the right panel when " "the corresponding item is selected on the thumbbar." msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +"<p>Встановити цей параметр для автоматичного завантаження зображення до " +"правої панелі із обранням відповідного елементу на панелі мініатюр." #: utilities/setup/setuplighttable.cpp:87 msgid "Load full image size" -msgstr "" +msgstr "Завантажити повний розмір зображення" #: utilities/setup/setuplighttable.cpp:88 msgid "" @@ -12507,6 +12645,10 @@ msgid "" "a reduced size. Because this option will take more time to load images, use " "it only if you have a fast computer." msgstr "" +"<p>Встановити цей параметр для завантаження повного розміру зображення, " +"замість стиснутого, до панелі попереднього перегляду. Оскільки цей параметр " +"потребуватиме більше часу не завантаження зображення, використовуйте його " +"лише на швидкому комп'ютері." #: utilities/setup/setupmetadata.cpp:106 msgid "IPTC Actions" @@ -12517,12 +12659,11 @@ msgid "&Save image tags as \"Keywords\" tag" msgstr "&Зберегти мітки зображення як мітку \"Ключові слова\"" #: utilities/setup/setupmetadata.cpp:110 -#, fuzzy msgid "" "<p>Turn this option on to store the image tags in the IPTC <i>Keywords</i> " "tag." msgstr "" -"<p>Перемкніть цей параметр, щоб зберегти мітки зображення в мітку IPTC " +"<p>Увімкнути цей параметр для збереження міток зображення до мітки IPTC " "<i>Ключові слова</i>." #: utilities/setup/setupmetadata.cpp:114 @@ -12530,76 +12671,69 @@ msgid "&Save default photographer identity as tags" msgstr "&Зберегти типову інформацію про фотографа як мітки" #: utilities/setup/setupmetadata.cpp:115 -#, fuzzy msgid "" "<p>Turn this option on to store the default photographer identity in the " "IPTC tags. You can set this value in the Identity setup page." msgstr "" -"<p>Перемкніть цей параметр, щоб зберегти типову інформацію про фотографа в " -"мітки IPTC. Цю інформацію можна заповнити на сторінці налаштування." +"<p>Увімкнути цей параметр для збереження типової інформації про фотографа у " +"мітках IPTC. Цю інформацію можна заповнити на сторінці налаштування." #: utilities/setup/setupmetadata.cpp:120 msgid "&Save default credit and copyright identity as tags" -msgstr "" +msgstr "&Зберегти типову інформацію про подяки та авторські права як теги" #: utilities/setup/setupmetadata.cpp:121 -#, fuzzy msgid "" "<p>Turn this option on to store the default credit and copyright identity in " "the IPTC tags. You can set this value in the Identity setup page." msgstr "" -"<p>Перемкніть цей параметр, щоб зберегти типову інформацію про фотографа в " -"мітки IPTC. Цю інформацію можна заповнити на сторінці налаштування." +"<p>Увімкніть цей параметр для збереження типової інформації про подяки та " +"авторські права до міток IPTC. Цю інформацію можна заповнити на сторінці " +"налаштування." #: utilities/setup/setupmetadata.cpp:127 msgid "Common Metadata Actions" -msgstr "" +msgstr "Дії Загальних Метаданих" #: utilities/setup/setupmetadata.cpp:130 -#, fuzzy msgid "&Save image captions as embedded text" -msgstr "&Зберегти рейтинг зображення як мітку \"Терміновості\"" +msgstr "&Зберегти заголовки зображення вбудованим текстом" #: utilities/setup/setupmetadata.cpp:131 -#, fuzzy msgid "" "<p>Turn this option on to store image captions in the JFIF section, EXIF " "tag, and IPTC tag." msgstr "" -"<p>Перемкніть цей параметр, щоб зберегти мітки зображення в мітку IPTC " -"<i>Ключові слова</i>." +"<p>Увімкніть цей параметр для збереження заголовків зображення у секції " +"JFIF, міток EXIF та IPTC." #: utilities/setup/setupmetadata.cpp:135 -#, fuzzy msgid "&Save image timestamps as tags" -msgstr "&Зберегти рейтинг зображення як мітку \"Терміновості\"" +msgstr "&Зберегти відбитки часу зображення як мітки" #: utilities/setup/setupmetadata.cpp:136 -#, fuzzy msgid "" "<p>Turn this option on to store the image date and time in the EXIF and IPTC " "tags." msgstr "" -"<p>Перемкніть цей параметр, щоб зберегти оцінку зображення в мітку IPTC " -"<i>Терміновості</i>." +"<p>Увімкніть цей параметр для збереження дати і часу зображення у мітках " +"EXIF та IPTC." #: utilities/setup/setupmetadata.cpp:140 -#, fuzzy msgid "&Save image rating as tags" -msgstr "&Зберегти рейтинг зображення як мітку \"Терміновості\"" +msgstr "&Зберегти рейтинг зображення як мітки" #: utilities/setup/setupmetadata.cpp:141 -#, fuzzy msgid "" "<p>Turn this option on to store the image rating in the EXIF tag and IPTC " "<i>Urgency</i> tag." msgstr "" -"<p>Ввімкніть цей параметр, щоб зберегти рейтинг зображення в мітку IPTC " -"<i>Терміновість</i>." +"<p>Увімкніть цей параметр для збереження рейтингу зображення у мітці EXIF та " +"мітці IPTC <i>Терміновість</i>." #: utilities/setup/setupmetadata.cpp:154 msgid "Visit Exiv2 project website" -msgstr "Відвідайте сторінку проекту Exiv2" +msgstr "Відвідати сторінку проєкту Exiv2" #: utilities/setup/setupmetadata.cpp:157 msgid "" @@ -12609,85 +12743,84 @@ msgid "" "b> is an standard used in digital photography to store photographer " "informations in pictures.</p>" msgstr "" +"<p><b><a href='http://en.wikipedia.org/wiki/Exif'>EXIF</a></b> є стандартом, " +"використовуваним на цей час більшістю цифрових камер для зберігання " +"технічної інформації про фотографію.</p><p><b><a href='http://en.wikipedia." +"org/wiki/IPTC'>IPTC</a></b> є стандартом, використовуваним у цифрових " +"камерах для зберігання інформації фотографа у картинках.</p>" #: utilities/setup/setupmime.cpp:94 msgid "Show only &image files with extensions:" -msgstr "Показати тільки файли зо&бражень з розширеннями:" +msgstr "Показати лише файли зо&бражень із розширеннями:" #: utilities/setup/setupmime.cpp:98 -#, fuzzy msgid "" "<p>Here you can set the extensions of image files to be displayed in Albums " "(such as JPEG or TIFF); clicking on these files will open them in the " "digiKam Image Editor." msgstr "" -"<p>Тут можна вказати розширення файлів для зображень, які потрібно " -"показувати в альбомах (напр., JPEG або TIFF); коли двічі клацнути на ці " -"файли, їх буде відкрито у редакторі зображень digiKam." +"<p>Тут можна вказати розширення файлів зображень, показуваних в альбомах " +"(напр., JPEG або TIFF); клацання на ці файли відкриє їх у Редакторі " +"Зображень digiKam." #: utilities/setup/setupmime.cpp:107 utilities/setup/setupmime.cpp:138 #: utilities/setup/setupmime.cpp:169 utilities/setup/setupmime.cpp:199 msgid "Revert to default settings" -msgstr "Вернути типові параметри" +msgstr "Повернути типові параметри" #: utilities/setup/setupmime.cpp:125 msgid "Show only &movie files with extensions:" -msgstr "Показати тільки файли в&ідео з розширеннями:" +msgstr "Показати лише файли в&ідео з розширеннями:" #: utilities/setup/setupmime.cpp:129 -#, fuzzy msgid "" "<p>Here you can set the extensions of movie files to be displayed in Albums " "(such as MPEG or AVI); clicking on these files will open them with the " "default TDE movie player." msgstr "" -"<p>Тут можна вказати розширення файлів для відео, яке потрібно показувати в " -"альбомах (напр., MPEG або AVI); коли двічі клацнути на ці файли, їх буде " -"відкрито в типовому програвачі відео для TDE." +"<p>Тут можна вказати розширення файлів відео, показуваних в альбомах (напр., " +"MPEG або AVI); клацання на ці файли відкриє їх типовим відео програвачем TDE." #: utilities/setup/setupmime.cpp:156 msgid "Show only &audio files with extensions:" -msgstr "Показати тільки файли &аудіо з розширеннями:" +msgstr "Показати лише файли &аудіо з розширеннями:" #: utilities/setup/setupmime.cpp:160 -#, fuzzy msgid "" "<p>Here you can set the extensions of audio files to be displayed in Albums " "(such as MP3 or OGG); clicking on these files will open them with the " "default TDE audio player." msgstr "" -"<p>Тут можна вказати розширення файлів для аудіо, яке потрібно показувати в " -"альбомах (напр., MP3 або OGG); коли двічі клацнути на ці файли, їх буде " -"відкрито в типовому програвачі аудіо для TDE." +"<p>Тут можна вказати розширення файлів аудіо, показуваних в альбомах (напр., " +"MP3 або OGG); клацання на ці файли відкриє їх типовим аудіо програвачем TDE." #: utilities/setup/setupmime.cpp:187 -#, fuzzy msgid "Show only &RAW files with extensions:" -msgstr "Показати тільки файли &raw з розширеннями:" +msgstr "Показати лише файли &RAW з розширеннями:" #: utilities/setup/setupmime.cpp:191 msgid "" "<p>Here you can set the extensions of RAW image files to be displayed in " "Albums (such as CRW, for Canon cameras, or NEF, for Nikon cameras)." msgstr "" -"<p>Тут можна вказати розширення файлів для RAW-зображень, які потрібно " -"показувати в альбомах (напр., CRW для камер Canon або NEF, для камер Nikon)." +"<p>Тут можна вказати розширення файлів RAW зображень, показуваних в альбомах " +"(напр., CRW для камер Canon або NEF, для камер Nikon)." #: utilities/setup/setupmisc.cpp:72 msgid "Show confirmation dialog when moving items to the &trash" -msgstr "" +msgstr "Показати діалог підтвердження при переміщенні елементів до &смітника" #: utilities/setup/setupmisc.cpp:77 msgid "Apply changes in the &right sidebar without confirmation" -msgstr "" +msgstr "Застосувати зміни у правій боковій панелі без підтвердження" #: utilities/setup/setupmisc.cpp:87 msgid "&Scan for new items on startup (slows down startup)" -msgstr "&Під час запуску виявляти нові елементи (зповільняє запуск)" +msgstr "&Сканувати щодо нових елементів із запуском (сповільняє запуск)" #: utilities/setup/setupplugins.cpp:78 msgid "<p>A list of available Kipi plugins appears below." -msgstr "<p>Нижче показано список наявних втулків Kipi." +msgstr "<p>Нижче з'являється перелік наявних втулків Kipi." #: utilities/setup/setupplugins.cpp:95 #, c-format @@ -12695,7 +12828,7 @@ msgid "" "_n: 1 Kipi plugin found\n" "%n Kipi plugins found" msgstr "" -"Знайдено втулку Kipi\n" +"Знайдено втулок Kipi\n" "Знайдено %n втулки Kipi\n" "Знайдено %n втулків Kipi" @@ -12704,165 +12837,132 @@ msgid "&Delay between images:" msgstr "За&тримка між зображеннями:" #: utilities/setup/setupslideshow.cpp:85 -#, fuzzy msgid "<p>The delay, in seconds, between images." -msgstr "<p>Затримка між зображеннями в секундах." +msgstr "<p>Затримка між зображеннями, в секундах." #: utilities/setup/setupslideshow.cpp:87 msgid "Start with current image" msgstr "Почати з поточного зображення" #: utilities/setup/setupslideshow.cpp:88 -#, fuzzy msgid "" "<p>If this option is enabled, slideshow will be started with currently " "selected image." msgstr "" -"<p>Якщо увімкнено цей параметр, то показ слайдів почнеться з поточного " -"зображення, яке вибране в списку." +"<p>Із увімкненням цього параметру показ слайдів почнеться з поточного " +"обраного зображення." #: utilities/setup/setupslideshow.cpp:91 -#, fuzzy msgid "Display in a loop" -msgstr "Показувати циклічно" +msgstr "Показати циклічно" #: utilities/setup/setupslideshow.cpp:92 msgid "<p>Run the slideshow in endless repetition." -msgstr "" +msgstr "<p>Виконати показ слайдів у нескінченному повторенні." #: utilities/setup/setupslideshow.cpp:94 -#, fuzzy msgid "Print image file name" -msgstr "Друкувати зображення в &чорно-білому" +msgstr "Друкувати назву файлу" #: utilities/setup/setupslideshow.cpp:95 -#, fuzzy msgid "<p>Print the image file name at the bottom of the screen." -msgstr "Друкувати зображення в &чорно-білому" +msgstr "<p>Друкувати назву файлу зображення унизу екрану." #: utilities/setup/setupslideshow.cpp:97 -#, fuzzy msgid "Print image creation date" -msgstr "Друкувати зображення в &чорно-білому" +msgstr "Друкувати дату створення зображення" #: utilities/setup/setupslideshow.cpp:98 -#, fuzzy msgid "<p>Print the image creation time/date at the bottom of the screen." -msgstr "Друкувати зображення в &чорно-білому" +msgstr "<p>Друкувати час/дату створення зображення унизу екрану." #: utilities/setup/setupslideshow.cpp:100 -#, fuzzy msgid "Print camera aperture and focal length" -msgstr "Показати виробника і модель камери" +msgstr "Друкувати діафрагму та фокусну відстань камери" #: utilities/setup/setupslideshow.cpp:101 -#, fuzzy msgid "" "<p>Print the camera aperture and focal length at the bottom of the screen." -msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +msgstr "<p>Друкувати діафрагму та фокусну відстань камери унизу екрану." #: utilities/setup/setupslideshow.cpp:103 msgid "Print camera exposure and sensitivity" -msgstr "" +msgstr "Друкувати витримку та чутливість камери" #: utilities/setup/setupslideshow.cpp:104 -#, fuzzy msgid "" "<p>Print the camera exposure and sensitivity at the bottom of the screen." -msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +msgstr "<p>Друкувати витримку та чутливість камери унизу екрану." #: utilities/setup/setupslideshow.cpp:106 -#, fuzzy msgid "Print camera make and model" -msgstr "Показати виробника і модель камери" +msgstr "Друкувати виробника і модель камери" #: utilities/setup/setupslideshow.cpp:107 -#, fuzzy msgid "<p>Print the camera make and model at the bottom of the screen." -msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +msgstr "<p>Друкувати виробника і модель камери унизу екрану." #: utilities/setup/setupslideshow.cpp:109 -#, fuzzy msgid "Print image caption" -msgstr "Друкувати зображення в &чорно-білому" +msgstr "Друкувати заголовок зображення" #: utilities/setup/setupslideshow.cpp:110 -#, fuzzy msgid "<p>Print the image caption at the bottom of the screen." -msgstr "Друкувати зображення в &чорно-білому" +msgstr "<p>Друкувати заголовок зображення унизу екрану." #: utilities/setup/setuptooltip.cpp:109 msgid "Show album items toolti&ps" -msgstr "" +msgstr "По&казати вигулькну підказку альбому" #: utilities/setup/setuptooltip.cpp:110 -#, fuzzy msgid "" "<p>Set this option to display image information when the mouse hovers over " "an album item." msgstr "" -"Коли ця опція вибрана, то, коли курсор мишки буде знаходитися над " -"піктограмами, кнопками та аплетами; будуть з'являтися підказки." +"<p>Встановити цей параметр для відображення інформації зображення за " +"наведення миші на елемент альбому." #: utilities/setup/setuptooltip.cpp:147 msgid "Show camera aperture and focal" -msgstr "" +msgstr "Показати діафрагму та фокус камери" #: utilities/setup/setuptooltip.cpp:171 msgid "digiKam Information" -msgstr "Інформація про digiKam" +msgstr "Інформація digiKam" #: utilities/setup/setuptooltip.cpp:173 msgid "Show album name" -msgstr "Показувати назву альбома" +msgstr "Показати назву альбома" #: utilities/setup/setuptooltip.cpp:174 -#, fuzzy msgid "<p>Set this option to display the album name." -msgstr "" -"Ввімкніть цей параметр для того, щоб ввімкнути режим збереження енергії " -"вашого дисплея." +msgstr "<p>Встановити цей параметр для відображення назви альбому." #: utilities/setup/setuptooltip.cpp:176 msgid "Show image caption" -msgstr "Показувати підписи зображень" +msgstr "Показати заголовок зображення" #: utilities/setup/setuptooltip.cpp:177 -#, fuzzy msgid "<p>Set this option to display the image captions." -msgstr "" -"Ввімкніть цей параметр для того, щоб ввімкнути режим збереження енергії " -"вашого дисплея." +msgstr "<p>Встановити цей параметр для відображення заголовків зображення." #: utilities/setup/setuptooltip.cpp:179 msgid "Show image tags" -msgstr "Показувати мітки зображень" +msgstr "Показати мітки зображення" #: utilities/setup/setuptooltip.cpp:180 -#, fuzzy msgid "<p>Set this option to display the image tags." -msgstr "" -"Ввімкніть цей параметр для того, щоб ввімкнути режим збереження енергії " -"вашого дисплея." +msgstr "<p>Встановити цей параметр для відображення міток зображення." #: utilities/setup/setuptooltip.cpp:182 -#, fuzzy msgid "Show image rating" -msgstr "Показувати рейтинг зображення" +msgstr "Показати рейтинг зображення" #: utilities/setup/setuptooltip.cpp:183 -#, fuzzy msgid "<p>Set this option to display the image rating." -msgstr "<p>Ввімкніть цей параметр, щоб показувати рейтинг зображення." +msgstr "<p>Встановити цей параметр для відображення рейтингу зображення." #: utilities/slideshow/slideshow.cpp:433 -#, fuzzy msgid "" "Cannot display image\n" "\"%1\"" @@ -12872,11 +12972,11 @@ msgstr "" #: utilities/slideshow/slideshow.cpp:451 msgid "SlideShow Completed." -msgstr "Показ слайдів закінчився." +msgstr "Показ Слайдів Завершено." #: utilities/slideshow/slideshow.cpp:452 msgid "Click To Exit..." -msgstr "Клацніть, щоб вийти..." +msgstr "Клацніть Для Виходу..." #: digikam/digikamui.rc:7 #, no-c-format @@ -12894,9 +12994,9 @@ msgid "&Image" msgstr "&Зображення" #: digikam/digikamui.rc:84 -#, fuzzy, no-c-format +#, no-c-format msgid "&Batch" -msgstr "&Назад" +msgstr "&Пачка" #: digikam/digikamui.rc:88 #, no-c-format @@ -12944,7 +13044,7 @@ msgstr "Покра&щення" #: imageplugins/raindrop/digikamimageplugin_raindrop_ui.rc:6 #: showfoto/showfotoui.rc:75 #: utilities/imageeditor/editor/digikamimagewindowui.rc:69 -#, fuzzy, no-c-format +#, no-c-format msgid "F&ilters" msgstr "Фі&льтри" @@ -12956,7 +13056,7 @@ msgstr "Фі&льтри" #: utilities/imageeditor/editor/digikamimagewindowui.rc:66 #, no-c-format msgid "&Decorate" -msgstr "Дек&орування" +msgstr "Дек&орувати" #: imageplugins/coreplugin/digikamimageplugin_core_ui.rc:18 #, no-c-format @@ -12971,60 +13071,60 @@ msgstr "&Глибина" #: utilities/imageeditor/editor/digikamimagewindowui.rc:55 #, no-c-format msgid "Tra&nsform" -msgstr "Пере&творення" +msgstr "Пере&творити" #: libs/dialogs/deletedialogbase.ui:16 -#, fuzzy, no-c-format +#, no-c-format msgid "DeleteDialogBase" -msgstr "Видалити файл" +msgstr "БазаВидаленняДіалогу" #: libs/dialogs/deletedialogbase.ui:60 -#, fuzzy, no-c-format +#, no-c-format msgid "Icon Placeholder, not in GUI" -msgstr "Шаблон заміни піктограм (не в графічному інтерфейсі)" +msgstr "Заповнювач піктограми, не у графічному інтерфейсі" #: libs/dialogs/deletedialogbase.ui:76 -#, fuzzy, no-c-format +#, no-c-format msgid "Deletion method placeholder, never shown to user." -msgstr "Шаблон заміни методу видалення (невидимий для користувача)." +msgstr "Заповнювач методу видалення, невидимий користувачу." #: libs/dialogs/deletedialogbase.ui:79 #, no-c-format msgid "WordBreak|AlignCenter" -msgstr "" +msgstr "WordBreak|AlignCenter" #: libs/dialogs/deletedialogbase.ui:94 -#, fuzzy, no-c-format +#, no-c-format msgid "List of files that are about to be deleted." -msgstr "Список файлів, які зараз будуть видалені." +msgstr "Перелік файлів до видалення." #: libs/dialogs/deletedialogbase.ui:97 #, no-c-format msgid "This is the list of items that are about to be deleted." -msgstr "Це список записів, які зараз буде вилучено." +msgstr "Це перелік елементів до видалення." #: libs/dialogs/deletedialogbase.ui:105 -#, fuzzy, no-c-format +#, no-c-format msgid "Placeholder for number of files, not in GUI" -msgstr "Шаблон заміни для кількості файлів (не в графічному інтерфейсі)" +msgstr "Заповнювач номерів файлів, не у графічному інтерфейсі" #: libs/dialogs/deletedialogbase.ui:108 -#, fuzzy, no-c-format +#, no-c-format msgid "AlignVCenter|AlignRight" -msgstr "Центр праворуч" +msgstr "AlignVCenter|AlignRight" #: libs/dialogs/deletedialogbase.ui:134 -#, fuzzy, no-c-format +#, no-c-format msgid "&Delete files instead of moving them to the trash" -msgstr "&Видаляти файли замість пересування у смітник" +msgstr "&Видалити файли замість пересування у смітник" #: libs/dialogs/deletedialogbase.ui:137 -#, fuzzy, no-c-format +#, no-c-format msgid "" "If checked, files will be permanently removed instead of being placed in the " "Trash Bin" msgstr "" -"Якщо увімкнено, файли будуть видалені назавжди, а не пересунуті в смітник" +"За увімкнення, файли буде видалено назавжди замість перенесення до Смітнику" #: libs/dialogs/deletedialogbase.ui:140 #, no-c-format @@ -13035,11 +13135,17 @@ msgid "" "\t\t\t\t\t\t\t\t\t<p><em>Use this option with caution</em>: most filesystems " "are unable to undelete deleted files reliably.</p></qt>" msgstr "" +"<qt><p>Із обранням цього, файли будуть <b>видалятися назавжди</b> замість " +"розміщення у Смітнику.</p>\n" +"\t\t\t\t\t\t\t\t\t\n" +"\t\t\t\t\t\t\t\t\t<p><em>Використовуйте цей параметр обережно</em>: " +"більшість файлових систем не можуть надійно повертати видалені файли.</p></" +"qt>" #: libs/dialogs/deletedialogbase.ui:166 #, no-c-format msgid "Do not &ask again" -msgstr "Н&е запитувати знову" +msgstr "Не &запитувати знову" #: libs/dialogs/deletedialogbase.ui:169 #, no-c-format @@ -13047,6 +13153,8 @@ msgid "" "If checked, this dialog will no longer be shown, and files will be directly " "moved to the Trash Bin" msgstr "" +"За обранням, цей діалог більше не відображатиметься та файли будуть прямо " +"переноситися до Смітника" #: libs/dialogs/deletedialogbase.ui:172 #, no-c-format @@ -13054,6 +13162,8 @@ msgid "" "<qt><p>If this box is checked, this dialog will no longer be shown, and " "files will be directly moved to the Trash Bin</p>" msgstr "" +"<qt><p>За обранням цього прапорця, цей діалог більше не відображатиметься та " +"файли будуть прямо переноситися до Смітника</p>" #: tips:3 msgid "" @@ -13072,9 +13182,22 @@ msgid "" "</table>\n" "</p>\n" msgstr "" +"<p>\n" +"<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" +"<tr>\n" +"<td>\n" +"<img src=\"hicolor/32x32/apps/digikam.png\">\n" +"</td>\n" +"<td>\n" +"... що digiKam підтримує <b>Перетягування і Відпускання</b>? Тож ви можете " +"легко переміщувати зображення із Konqueror до digiKam або із digiKam до K3b " +"просто використавши \"Перетягування і Відпускання\".\n" +"</td>\n" +"</tr>\n" +"</table>\n" +"</p>\n" #: tips:20 -#, fuzzy msgid "" "<p>\n" "<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" @@ -13089,13 +13212,20 @@ msgid "" "</table>\n" "</p>\n" msgstr "" -"<p>...що можна використовувати SSH/SCP для дій над файлами за допомогою\n" -"<b>fish://user@domain/path</b> у файловому вікні? У вас буде запитано про " -"пароль.\n" +"<p>\n" +"<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" +"<tr>\n" +"<td>\n" +"<img src=\"hicolor/32x32/apps/digikam.png\">\n" +"</td>\n" +"<td>\n" +"... що ви можете використовувати вмонтовані до digiKam альбоми.\n" +"</td>\n" +"</tr>\n" +"</table>\n" "</p>\n" #: tips:37 -#, fuzzy msgid "" "<p>\n" "<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" @@ -13111,15 +13241,21 @@ msgid "" "</table>\n" "</p>\n" msgstr "" -"Вмикає відображення мініатюри зображення у вікні, коли Ви насуваєте " -"вказівник миші над елементом. Нігті відображуються з досить низькою якістю і " -"можуть не відображувати поточного змісту вікна.\n" -"\n" -"Використання цієї опції на повільних машинах може значно вплинути на " -"швидкодію." +"<p>\n" +"<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" +"<tr>\n" +"<td>\n" +"<img src=\"hicolor/32x32/apps/digikam.png\">\n" +"</td>\n" +"<td>\n" +"... що ви можете переглядати фото інформацію <b>Exif</b>, <b>MakerNotes</b>, " +"та <b>IPTC</b> використовуючи бокову панель <b>Metadata</b>?\n" +"</td>\n" +"</tr>\n" +"</table>\n" +"</p>\n" #: tips:54 -#, fuzzy msgid "" "<p>\n" "<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" @@ -13136,16 +13272,20 @@ msgid "" "</p>\n" msgstr "" "<p>\n" -"Можна сховати деякі повзунки мікшера у мікшері звуку (KMix) вибравши\n" -"\"Сховати\" у контекстному меню, яке з'являється коли Ви клацаєте\n" -"правою кнопкою мишки на один з повзунків.\n" +"<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" +"<tr>\n" +"<td>\n" +"<img src=\"hicolor/32x32/apps/digikam.png\">\n" +"</td>\n" +"<td>\n" +"... що кожне фото має контекстне меню, якого можна досягнути клацанням " +"правої кнопки миші?\n" +"</td>\n" +"</tr>\n" +"</table>\n" "</p>\n" -"<p>Додаткові поради що до використання KMix знаходиться у <a\n" -"href=\"help:/kmix\">підручнику з KMix</a>.\n" -"<p align=\"right\"><em>Автор поради: Stefan Schimanski</em></p>\n" #: tips:71 -#, fuzzy msgid "" "<p>\n" "<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" @@ -13161,13 +13301,22 @@ msgid "" "</table>\n" "</p>\n" msgstr "" -"<p>...що ви можете створити дії, які будуть виконувати скрипти у меню\n" -"<b>Параметри > Налаштувати дії</b> і розмістити їх в пеналі? Можна, " -"навіть, надати їм швидкі клавіші.\n" +"<p>\n" +"<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" +"<tr>\n" +"<td>\n" +"<img src=\"hicolor/32x32/apps/digikam.png\">\n" +"</td>\n" +"<td>\n" +"... що альбоми у digiKam є теки у вашій Бібліотеці Альбомів? Тож ви можете " +"легко імпортувати ваші фото простим їх копіюванням до вашої Бібліотеки " +"Альбомів.\n" +"</td>\n" +"</tr>\n" +"</table>\n" "</p>\n" #: tips:88 -#, fuzzy msgid "" "<p>\n" "<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" @@ -13183,13 +13332,21 @@ msgid "" "</table>\n" "</p>\n" msgstr "" -"<p>...що ви можете створити дії, які будуть виконувати скрипти у меню\n" -"<b>Параметри > Налаштувати дії</b> і розмістити їх в пеналі? Можна, " -"навіть, надати їм швидкі клавіші.\n" +"<p>\n" +"<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" +"<tr>\n" +"<td>\n" +"<img src=\"hicolor/32x32/apps/digikam.png\">\n" +"</td>\n" +"<td>\n" +"... що ви можете налаштувати вашу панель інструментів digiKam використовуючи " +"Налаштування -> Конфігурація Панелей Інструментів...?\n" +"</td>\n" +"</tr>\n" +"</table>\n" "</p>\n" #: tips:105 -#, fuzzy msgid "" "<p>\n" "<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" @@ -13206,16 +13363,22 @@ msgid "" "</table>\n" "</p>\n" msgstr "" -"<p>...можна затирати "[назва списку розсилки]"\n" -"вилучив його з теми повідомлення за допомогою дії фільтра <em>переписати\n" -"заголовок</em>? Просто вкажіть\n" -"<pre>переписати заголовок "Subject"\n" -" замінити "\\s*\\[назва списку розсилки\\]\\s*"\n" -" на ""</pre>\n" +"<p>\n" +"<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" +"<tr>\n" +"<td>\n" +"<img src=\"hicolor/32x32/apps/digikam.png\">\n" +"</td>\n" +"<td>\n" +"... що ви можете зв'язатися із іншими користувачами через поштову розсилку " +"digiKam-користувачів? Підпишіться на неї за <a href=\"https://mail.kde.org/" +"mailman/listinfo/digikam-users\">цією адресою</a>.\n" +"</td>\n" +"</tr>\n" +"</table>\n" "</p>\n" #: tips:122 -#, fuzzy msgid "" "<p>\n" "<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" @@ -13233,12 +13396,20 @@ msgid "" "</table>\n" "</p>\n" msgstr "" -"<p>...можна затирати "[назва списку розсилки]"\n" -"вилучив його з теми повідомлення за допомогою дії фільтра <em>переписати\n" -"заголовок</em>? Просто вкажіть\n" -"<pre>переписати заголовок "Subject"\n" -" замінити "\\s*\\[назва списку розсилки\\]\\s*"\n" -" на ""</pre>\n" +"<p>\n" +"<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" +"<tr>\n" +"<td>\n" +"<img src=\"hicolor/32x32/apps/digikam.png\">\n" +"</td>\n" +"<td>\n" +"... що digiKam має багато втулок із додатковими можливостями на кшталт " +"<b>HTML експорту</b>, <b>Архівації на CD</b>, <b>Показу слайдів</b>,... і " +"те, що ви можете написати власні втулки? Більше інформації ви можете знайти " +"за <a href=\"http://extragear.kde.org/apps/kipi\">цією адресою</a>.\n" +"</td>\n" +"</tr>\n" +"</table>\n" "</p>\n" #: tips:139 @@ -13255,9 +13426,16 @@ msgid "" "</table>\n" "</p>\n" msgstr "" -"<p>...що можна використовувати SSH/SCP для дій над файлами за допомогою\n" -"<b>fish://user@domain/path</b> у файловому вікні? У вас буде запитано про " -"пароль.\n" +"<p>\n" +"<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" +"<tr>\n" +"<td><img src=\"hicolor/32x32/apps/digikam.png\"></td>\n" +"<td>\n" +"... що ви маєте прямий доступ до Конфігурації Гами TDE використовуючи " +"Інструменти -> Налаштування Гами?\n" +"</td>\n" +"</tr>\n" +"</table>\n" "</p>\n" #: tips:154 @@ -13276,6 +13454,19 @@ msgid "" "</table>\n" "</p>\n" msgstr "" +"<p>\n" +"<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" +"<tr>\n" +"<td>\n" +"<img src=\"hicolor/32x32/apps/digikam.png\">\n" +"</td>\n" +"<td>\n" +"... що ви можете друкувати зображення використовуючи Майстер Друку? Ви " +"можете почати із використання Альбом -> Експорт -> Майстер Друку.\n" +"</td>\n" +"</tr>\n" +"</table>\n" +"</p>\n" #: tips:171 msgid "" @@ -13299,7 +13490,7 @@ msgstr "" "</td>\n" "<td>\n" "... що ви можете вживати формат файлів <b>PNG</b> замість <b>TIFF</b> для " -"значного стискання зображень без втрати їх якості?\n" +"значного стиснення зображень без втрати їх якості?\n" "</td>\n" "</tr>\n" "</table>\n" @@ -13320,6 +13511,18 @@ msgid "" "</table>\n" "</p>\n" msgstr "" +"<p>\n" +"<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" +"<tr>\n" +"<td>\n" +"<img src=\"hicolor/32x32/apps/digikam.png\"></td>\n" +"<td>\n" +"... що більшість налаштувань у діалогах містять інформацію <b>Що це?</b>, " +"якої можна досягти правою кнопкою миші?\n" +"</td>\n" +"</tr>\n" +"</table>\n" +"</p>\n" #: tips:203 msgid "" @@ -13344,16 +13547,14 @@ msgstr "" "<img src=\"hicolor/32x32/apps/digikam.png\">\n" "</td>\n" "<td>\n" -"... що, оскільки формат файлів PNG вживає алгоритм стискання без втрати " -"даних (якості) зображення, ви можете застосовувати в ньому максимальний " -"рівень стискання?\n" +"... що, оскільки формат файлів PNG вживає алгоритм стискання без втрати, ви " +"можете застосовувати у ньому максимальний рівень стискання?\n" "</td>\n" "</tr>\n" "</table>\n" "</p>\n" #: tips:220 -#, fuzzy msgid "" "<p>\n" "<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" @@ -13369,21 +13570,21 @@ msgid "" "</table>\n" "</p>\n" msgstr "" -"<qt>\n" -"В нетиповому полі можна використовувати наступні ключові слова:\n" -"<ul>\n" -"<li>%f: назва файла</li>\n" -"<li>%p: шлях до файла</li>\n" -"<li>%c: коментар</li>\n" -"<li>%r: роздільна здатність</li>\n" -"<li>%n: поточне положення зображення</li>\n" -"<li>%N: лічильник зображень</li>\n" -"<li>\\n: новий рядок</li>\n" -"</ul>\n" -"</qt>" +"<p>\n" +"<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" +"<tr>\n" +"<td>\n" +"<img src=\"hicolor/32x32/apps/digikam.png\">\n" +"</td>\n" +"<td>\n" +"... що ви можете друкувати поточне відкрите зображення у редакторі зображень " +"digiKam?\n" +"</td>\n" +"</tr>\n" +"</table>\n" +"</p>\n" #: tips:237 -#, fuzzy msgid "" "<p>\n" "<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" @@ -13399,15 +13600,22 @@ msgid "" "</table>\n" "</p>\n" msgstr "" -"Вмикає відображення мініатюри зображення у вікні, коли Ви насуваєте " -"вказівник миші над елементом. Нігті відображуються з досить низькою якістю і " -"можуть не відображувати поточного змісту вікна.\n" -"\n" -"Використання цієї опції на повільних машинах може значно вплинути на " -"швидкодію." +"<p>\n" +"<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" +"<tr>\n" +"<td>\n" +"<img src=\"hicolor/32x32/apps/digikam.png\">\n" +"</td>\n" +"<td>\n" +"... що ви можете редагувати компоненти поточного відкритого зображення у " +"редакторі зображень digiKam використовуючи вкладку <b>Коментарі та Мітки</b> " +"бокової панелі?\n" +"</td>\n" +"</tr>\n" +"</table>\n" +"</p>\n" #: tips:254 -#, fuzzy msgid "" "<p>\n" "<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" @@ -13423,18 +13631,19 @@ msgid "" "</table>\n" "</p>\n" msgstr "" -"<qt>\n" -"В нетиповому полі можна використовувати наступні ключові слова:\n" -"<ul>\n" -"<li>%f: назва файла</li>\n" -"<li>%p: шлях до файла</li>\n" -"<li>%c: коментар</li>\n" -"<li>%r: роздільна здатність</li>\n" -"<li>%n: поточне положення зображення</li>\n" -"<li>%N: лічильник зображень</li>\n" -"<li>\\n: новий рядок</li>\n" -"</ul>\n" -"</qt>" +"<p>\n" +"<table border=\"0\" cellpadding=\"0\" cellspacing=\"10\" align=\"center\">\n" +"<tr>\n" +"<td>\n" +"<img src=\"hicolor/32x32/apps/digikam.png\">\n" +"</td>\n" +"<td>\n" +"... що ви можете використати <Сторінка Вниз> та <Сторінка Вверх> " +"вашої клавіатури для перемикання між фото у вашому редакторі зображень?\n" +"</td>\n" +"</tr>\n" +"</table>\n" +"</p>\n" #, fuzzy #~ msgid "Import" |