Only in rbutilcli: autodetection.o diff -ur rbutilcli-old/configurecli.cpp rbutilcli/configurecli.cpp --- rbutilcli-old/configurecli.cpp 2008-02-10 14:09:20.000000000 +0100 +++ rbutilcli/configurecli.cpp 2008-02-10 19:32:21.000000000 +0100 @@ -430,7 +430,7 @@ QStringList ConfigureCli::findLanguageFiles() { - QDir dir(qApp->applicationDirPath()); + QDir dir(QCoreApplication::instance()->applicationDirPath()); QStringList fileNames; QStringList langs; fileNames = dir.entryList(QStringList("*.qm"), QDir::Files, QDir::Name); @@ -455,7 +455,7 @@ QTranslator translator; QString file = "rbutil_" + qmFile; - if(!translator.load(file, qApp->applicationDirPath())) + if(!translator.load(file, QCoreApplication::instance()->applicationDirPath())) translator.load(file, ":/lang"); return translator.translate("Configure", "English"); diff -ur rbutilcli-old/configurecli.h rbutilcli/configurecli.h --- rbutilcli-old/configurecli.h 2008-02-10 13:59:27.000000000 +0100 +++ rbutilcli/configurecli.h 2008-02-10 19:29:16.000000000 +0100 @@ -21,7 +21,7 @@ #define CONFIGURECLI_H #include -#include +#include #include "httpget.h" #include "rbsettings.h" #include "tts.h" Only in rbutilcli: configurecli.o diff -ur rbutilcli-old/encodersguicli.h rbutilcli/encodersguicli.h --- rbutilcli-old/encodersguicli.h 2008-01-30 21:01:21.000000000 +0100 +++ rbutilcli/encodersguicli.h 2008-02-10 19:30:21.000000000 +0100 @@ -20,7 +20,7 @@ #ifndef ENCODERSGUICLI_H #define ENCODERSGUICLI_H -#include +#include #include "utilscli.h" class RbSettings; Only in rbutilcli: encodersguicli.o Only in rbutilcli: encoders.o Only in rbutilcli: httpget.o Only in rbutilcli: installbootloader.o Only in rbutilcli: installzip.o Only in rbutilcli: ipodio-posix.o Only in rbutilcli: ipodpatcher.o Only in rbutilcli: irivertools.o diff -ur rbutilcli-old/main.cpp rbutilcli/main.cpp --- rbutilcli-old/main.cpp 2008-01-29 20:34:38.000000000 +0100 +++ rbutilcli/main.cpp 2008-02-10 19:28:59.000000000 +0100 @@ -18,7 +18,7 @@ ****************************************************************************/ -#include +#include #include "rbutilcli.h" @@ -30,9 +30,9 @@ int main( int argc, char ** argv ) { - QApplication app( argc, argv ,false); + QCoreApplication app(argc, argv); - QString absolutePath = qApp->applicationDirPath(); + QString absolutePath = QCoreApplication::instance()->applicationDirPath(); // portable installation: // check for a configuration file in the program folder. QSettings *user; Only in rbutilcli: main.o Only in rbutilcli: Makefile Only in rbutilcli: md5sum.o Only in rbutilcli: moc_autodetection.cpp Only in rbutilcli: moc_autodetection.o Only in rbutilcli: moc_configurecli.cpp Only in rbutilcli: moc_configurecli.o Only in rbutilcli: moc_encoders.cpp Only in rbutilcli: moc_encodersguicli.cpp Only in rbutilcli: moc_encodersguicli.o Only in rbutilcli: moc_encoders.o Only in rbutilcli: moc_httpget.cpp Only in rbutilcli: moc_httpget.o Only in rbutilcli: moc_installbootloader.cpp Only in rbutilcli: moc_installbootloader.o Only in rbutilcli: moc_installzip.cpp Only in rbutilcli: moc_installzip.o Only in rbutilcli: moc_progressloggercli.cpp Only in rbutilcli: moc_progressloggercli.o Only in rbutilcli: moc_progressloggerinterface.cpp Only in rbutilcli: moc_progressloggerinterface.o Only in rbutilcli: moc_rbsettings.cpp Only in rbutilcli: moc_rbsettings.o Only in rbutilcli: moc_rbutilcli.cpp Only in rbutilcli: moc_rbutilcli.o Only in rbutilcli: moc_talkfile.cpp Only in rbutilcli: moc_talkfile.o Only in rbutilcli: moc_tts.cpp Only in rbutilcli: moc_ttsguicli.cpp Only in rbutilcli: moc_ttsguicli.o Only in rbutilcli: moc_tts.o Only in rbutilcli: moc_utilscli.cpp Only in rbutilcli: moc_utilscli.o Only in rbutilcli: moc_voicefile.cpp Only in rbutilcli: moc_voicefile.o diff -ur rbutilcli-old/progressloggercli.h rbutilcli/progressloggercli.h --- rbutilcli-old/progressloggercli.h 2008-02-10 13:07:06.000000000 +0100 +++ rbutilcli/progressloggercli.h 2008-02-10 19:30:04.000000000 +0100 @@ -19,7 +19,7 @@ #ifndef PROGRESSLOGGERCLI_H #define PROGRESSLOGGERCLI_H -#include +#include #include "progressloggerinterface.h" Only in rbutilcli: progressloggercli.o Only in rbutilcli: qrc_rbutilqt.cpp Only in rbutilcli: qrc_rbutilqt.o Only in rbutilcli: rbsettings.o Only in rbutilcli: rbutilcli Only in rbutilcli: rbutilcli.bz2 diff -ur rbutilcli-old/rbutilcli.cpp rbutilcli/rbutilcli.cpp --- rbutilcli-old/rbutilcli.cpp 2008-02-10 13:58:54.000000000 +0100 +++ rbutilcli/rbutilcli.cpp 2008-02-10 19:35:15.000000000 +0100 @@ -40,7 +40,7 @@ RbUtilCli::RbUtilCli() { - absolutePath = qApp->applicationDirPath(); + absolutePath = QCoreApplication::instance()->applicationDirPath(); settings = new RbSettings(); settings->open(); @@ -71,7 +71,7 @@ selectAction(); - QApplication::quit(); + QCoreApplication::quit(); } void RbUtilCli::selectAction() @@ -129,7 +129,7 @@ daily = new HttpGet(NULL); connect(daily, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); connect(daily, SIGNAL(requestFinished(int, bool)), this, SLOT(downloadDone(int, bool))); - connect(qApp, SIGNAL(lastWindowClosed()), daily, SLOT(abort())); + connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), daily, SLOT(abort())); daily->setProxy(proxy()); if(settings->cacheOffline()) daily->setCache(settings->cachePath()); @@ -158,7 +158,7 @@ bleeding = new HttpGet(this); connect(bleeding, SIGNAL(done(bool)), this, SLOT(downloadBleedingDone(bool))); connect(bleeding, SIGNAL(requestFinished(int, bool)), this, SLOT(downloadDone(int, bool))); - connect(qApp, SIGNAL(lastWindowClosed()), daily, SLOT(abort())); + connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), daily, SLOT(abort())); bleeding->setProxy(proxy()); if(settings->cacheOffline()) bleeding->setCache(settings->cachePath()); Only in rbutilcli: rbutilcli.o diff -ur rbutilcli-old/rbutilcli.pro rbutilcli/rbutilcli.pro --- rbutilcli-old/rbutilcli.pro 2008-02-10 13:06:45.000000000 +0100 +++ rbutilcli/rbutilcli.pro 2008-02-10 19:28:02.000000000 +0100 @@ -110,6 +110,7 @@ ../rbutilqt/rbutil_zh_CN.ts \ ../rbutilqt/rbutil_zh_TW.ts QT += network +QT -= gui DEFINES += RBUTIL _LARGEFILE64_SOURCE CONSOLE win32 { Only in rbutilcli: sansaio-posix.o Only in rbutilcli: sansapatcher.o Only in rbutilcli: talkfile.o diff -ur rbutilcli-old/ttsguicli.h rbutilcli/ttsguicli.h --- rbutilcli-old/ttsguicli.h 2008-02-09 19:39:28.000000000 +0100 +++ rbutilcli/ttsguicli.h 2008-02-10 19:29:32.000000000 +0100 @@ -20,7 +20,7 @@ #ifndef TTSGUICLI_H #define TTSGUICLI_H -#include +#include class RbSettings; class TTSSapi; Only in rbutilcli: ttsguicli.o Only in rbutilcli: tts.o Only in rbutilcli: unzip.o diff -ur rbutilcli-old/utilscli.cpp rbutilcli/utilscli.cpp --- rbutilcli-old/utilscli.cpp 2008-02-10 13:44:07.000000000 +0100 +++ rbutilcli/utilscli.cpp 2008-02-10 19:32:42.000000000 +0100 @@ -107,7 +107,7 @@ { while(m_wait) { - QApplication::processEvents(); + QCoreApplication::processEvents(); } return m_error; } diff -ur rbutilcli-old/utilscli.h rbutilcli/utilscli.h --- rbutilcli-old/utilscli.h 2008-02-10 13:28:50.000000000 +0100 +++ rbutilcli/utilscli.h 2008-02-10 19:29:48.000000000 +0100 @@ -19,7 +19,7 @@ #ifndef MENUCLI_H #define MENUCLI_H -#include +#include #define MENU_RETURN -1 Only in rbutilcli: utilscli.o Only in rbutilcli: utils.o Only in rbutilcli: voicefile.o Only in rbutilcli: voicefont.o Only in rbutilcli: wavtrim.o Only in rbutilcli: zip.o