From bf7f88413be3831a9372d323d02fc0335b9f9188 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 26 May 2011 21:04:57 +0000 Subject: TQt4 port Gwenview This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/gwenview@1233720 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/app/main.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/app/main.cpp') diff --git a/src/app/main.cpp b/src/app/main.cpp index 7e637be..52f9811 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include #include @@ -47,10 +47,10 @@ static const char version[] = "1.4.2"; void applyFilterArgs(KCmdLineArgs* args, FileViewController* controller) { - QString filterType = args->getOption("filter-type"); - QString filterName = args->getOption("filter-name"); - QString filterFrom = args->getOption("filter-from"); - QString filterTo = args->getOption("filter-to"); + TQString filterType = args->getOption("filter-type"); + TQString filterName = args->getOption("filter-name"); + TQString filterFrom = args->getOption("filter-from"); + TQString filterTo = args->getOption("filter-to"); // Do nothing if there is no filter if (filterType.isEmpty() && filterName.isEmpty() && filterFrom.isEmpty() && filterTo.isEmpty()) @@ -58,9 +58,9 @@ void applyFilterArgs(KCmdLineArgs* args, FileViewController* controller) { return; } - QStringList typeList; + TQStringList typeList; typeList << "all" << "images" << "videos"; - int mode = typeList.findIndex(filterType); + int mode = typeList.tqfindIndex(filterType); if (mode == -1) { // Default to "all" controller->setFilterMode(0); @@ -76,7 +76,7 @@ void applyFilterArgs(KCmdLineArgs* args, FileViewController* controller) { controller->setFilterName(filterName); bool ok = false; - QDate date; + TQDate date; if (!filterFrom.isEmpty()) { date = KGlobal::locale()->readDate(filterFrom, &ok); if (!ok) { @@ -85,7 +85,7 @@ void applyFilterArgs(KCmdLineArgs* args, FileViewController* controller) { } controller->setFilterFromDate(date); - date=QDate(); + date=TQDate(); if (!filterTo.isEmpty()) { date = KGlobal::locale()->readDate(filterTo, &ok); if (!ok) { @@ -117,7 +117,7 @@ KDE_EXPORT int kdemain (int argc, char *argv[]) { aboutData.addCredit("Marco Gazzetta", I18N_NOOP("Fixed crash when trying to generate a thumbnail for a broken JPEG file (v0.16.0)"), "mililani@pobox.com"); aboutData.addCredit("GeniusR13", I18N_NOOP("Fixed compilation on KDE 3.0 (v0.16.1)"), "geniusr13@gmx.net"); aboutData.addCredit("Ian Koenig", I18N_NOOP("First RPM spec file"), "iguy@ionsphere.org"); - aboutData.addCredit("Meni Livne", I18N_NOOP("Toolbar layout patch for RTL languages (v0.16.0)"), "livne@kde.org"); + aboutData.addCredit("Meni Livne", I18N_NOOP("Toolbar tqlayout patch for RTL languages (v0.16.0)"), "livne@kde.org"); aboutData.addCredit("Angelo Naselli", I18N_NOOP("Printing support (v1.0.0)"), "anaselli@linux.it"); aboutData.addCredit("Jos van den Oever", I18N_NOOP("File info view (v1.0.0)\nPatch to toggle auto-zoom on click (v1.0.0)"), "jos@vandenoever.info"); aboutData.addCredit("Jeroen Peters", I18N_NOOP("Configurable mouse wheel behavior (v1.1.1)"), "jpeters@coldmail.nl"); @@ -149,7 +149,7 @@ KDE_EXPORT int kdemain (int argc, char *argv[]) { if (MiscConfig::rememberURL() && MiscConfig::history().count() > 0) { url = KURL(MiscConfig::history()[0]); } else { - url.setPath( QDir::currentDirPath() ); + url.setPath( TQDir::currentDirPath() ); } } mainWindow->openURL(url); -- cgit v1.2.1