From c663b6440964f6ac48027143ac9e63298991f9d0 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:33:34 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- konqueror/konq_main.cc | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'konqueror/konq_main.cc') diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc index e64016ed9..3f3e47bc3 100644 --- a/konqueror/konq_main.cc +++ b/konqueror/konq_main.cc @@ -32,9 +32,9 @@ #include #include #include -#include +#include -#include +#include static const KCmdLineOptions options[] = { @@ -75,8 +75,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) int n = 1; while ( KonqMainWindow::canBeRestored( n ) ) { - QString className = KMainWindow::classNameOfToplevel( n ); - if( className == QString::fromLatin1( "KonqMainWindow" )) + TQString className = KMainWindow::classNameOfToplevel( n ); + if( className == TQString::fromLatin1( "KonqMainWindow" )) (new KonqMainWindow( KURL(), false ) )->restore( n ); else kdWarning() << "Unknown class " << className << " in session saved data!" << endl; @@ -87,34 +87,34 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) { if (args->isSet("profiles")) { - QStringList profiles = KGlobal::dirs()->findAllResources("data", "konqueror/profiles/*", false, true); + TQStringList profiles = KGlobal::dirs()->findAllResources("data", "konqueror/profiles/*", false, true); profiles.sort(); - for(QStringList::ConstIterator it = profiles.begin(); + for(TQStringList::ConstIterator it = profiles.begin(); it != profiles.end(); ++it) { - QString file = *it; + TQString file = *it; file = file.mid(file.findRev('/')+1); - printf("%s\n", QFile::encodeName(file).data()); + printf("%s\n", TQFile::encodeName(file).data()); } return 0; } if (args->isSet("profile")) { - QString profile = QString::fromLocal8Bit(args->getOption("profile")); - QString profilePath = profile; + TQString profile = TQString::fromLocal8Bit(args->getOption("profile")); + TQString profilePath = profile; if (profile[0] != '/') - profilePath = locate( "data", QString::fromLatin1("konqueror/profiles/")+profile ); - QString url; - QStringList filesToSelect; + profilePath = locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ); + TQString url; + TQStringList filesToSelect; if (args->count() == 1) - url = QString::fromLocal8Bit(args->arg(0)); + url = TQString::fromLocal8Bit(args->arg(0)); KURL kurl(url); KParts::URLArgs urlargs; if (args->isSet("mimetype")) - urlargs.serviceType = QString::fromLocal8Bit(args->getOption("mimetype")); + urlargs.serviceType = TQString::fromLocal8Bit(args->getOption("mimetype")); if (args->isSet("select")) { - QString fn = kurl.fileName(false); + TQString fn = kurl.fileName(false); if( !fn.isEmpty() ){ filesToSelect += fn; kurl.setFileName(""); @@ -149,8 +149,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) else if (!args->isSet("silent")) { // By default try to open in webbrowser mode. People can use "konqueror ." to get a filemanager. - QString profile = "webbrowsing"; - QString profilePath = locate( "data", QString::fromLatin1("konqueror/profiles/")+profile ); + TQString profile = "webbrowsing"; + TQString profilePath = locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ); if ( !profilePath.isEmpty() ) { KonqMisc::createBrowserWindowFromProfile( profilePath, profile ); } else { @@ -169,23 +169,23 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) // KonqMisc::konqFilteredURL doesn't cope with local files... A bit of hackery below KURL url = args->url(i); KURL urlToOpen; - QStringList filesToSelect; + TQStringList filesToSelect; - if (url.isLocalFile() && QFile::exists(url.path())) // "konqueror index.html" + if (url.isLocalFile() && TQFile::exists(url.path())) // "konqueror index.html" urlToOpen = url; else - urlToOpen = KURL( KonqMisc::konqFilteredURL(0L, QString::fromLocal8Bit(args->arg(i))) ); // "konqueror slashdot.org" + urlToOpen = KURL( KonqMisc::konqFilteredURL(0L, TQString::fromLocal8Bit(args->arg(i))) ); // "konqueror slashdot.org" if ( !mainwin ) { KParts::URLArgs urlargs; if (args->isSet("mimetype")) { - urlargs.serviceType = QString::fromLocal8Bit(args->getOption("mimetype")); + urlargs.serviceType = TQString::fromLocal8Bit(args->getOption("mimetype")); kdDebug(1202) << "main() : setting serviceType to " << urlargs.serviceType << endl; } if (args->isSet("select")) { - QString fn = urlToOpen.fileName(false); + TQString fn = urlToOpen.fileName(false); if( !fn.isEmpty() ){ filesToSelect += fn; urlToOpen.setFileName(""); -- cgit v1.2.1