diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-02-10 18:25:49 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-02-10 18:25:49 +0000 |
commit | ee09cb7f0d2635db0f01da1fb9a20dac07f357c9 (patch) | |
tree | fa53890548dd5b3bfee7ed609a25358543be4d8e /rbutil/rbutilqt | |
parent | 7b8f4a534d71e6ca432c3a13bb2b1dd09ad052ed (diff) | |
download | rockbox-ee09cb7f0d2635db0f01da1fb9a20dac07f357c9.tar.gz rockbox-ee09cb7f0d2635db0f01da1fb9a20dac07f357c9.zip |
Untie rbutil core logic from QtGui for cli:
- include QtCore instead of QtGui if possible
- replace qApp with QCoreApplication::instance(), as qApp is only defined for QtGui
- use QCoreApplication instead of QApplication for inherited static members.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16274 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r-- | rbutil/rbutilqt/autodetection.h | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/encoders.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/encoders.h | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/installbootloader.cpp | 6 | ||||
-rw-r--r-- | rbutil/rbutilqt/installbootloader.h | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/installzip.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/installzip.h | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/irivertools/irivertools.h | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/irivertools/md5sum.h | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/main.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/progressloggerinterface.h | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbsettings.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbsettings.h | 15 | ||||
-rw-r--r-- | rbutil/rbutilqt/talkfile.cpp | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/talkfile.h | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/tts.h | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/voicefile.cpp | 10 | ||||
-rw-r--r-- | rbutil/rbutilqt/voicefile.h | 2 |
18 files changed, 37 insertions, 36 deletions
diff --git a/rbutil/rbutilqt/autodetection.h b/rbutil/rbutilqt/autodetection.h index a620b69566..ec89dbf6cd 100644 --- a/rbutil/rbutilqt/autodetection.h +++ b/rbutil/rbutilqt/autodetection.h | |||
@@ -21,7 +21,7 @@ | |||
21 | #ifndef AUTODETECTION_H_ | 21 | #ifndef AUTODETECTION_H_ |
22 | #define AUTODETECTION_H_ | 22 | #define AUTODETECTION_H_ |
23 | 23 | ||
24 | #include <QtGui> | 24 | #include <QtCore> |
25 | 25 | ||
26 | extern "C" { | 26 | extern "C" { |
27 | // Ipodpatcher | 27 | // Ipodpatcher |
diff --git a/rbutil/rbutilqt/encoders.cpp b/rbutil/rbutilqt/encoders.cpp index 47e39e87e8..0077263df0 100644 --- a/rbutil/rbutilqt/encoders.cpp +++ b/rbutil/rbutilqt/encoders.cpp | |||
@@ -18,10 +18,10 @@ | |||
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #include "encoders.h" | 20 | #include "encoders.h" |
21 | #include "browsedirtree.h" | ||
22 | 21 | ||
23 | #ifndef CONSOLE | 22 | #ifndef CONSOLE |
24 | #include "encodersgui.h" | 23 | #include "encodersgui.h" |
24 | #include "browsedirtree.h" | ||
25 | #else | 25 | #else |
26 | #include "encodersguicli.h" | 26 | #include "encodersguicli.h" |
27 | #endif | 27 | #endif |
diff --git a/rbutil/rbutilqt/encoders.h b/rbutil/rbutilqt/encoders.h index 239ca3df79..8e91e6e149 100644 --- a/rbutil/rbutilqt/encoders.h +++ b/rbutil/rbutilqt/encoders.h | |||
@@ -20,7 +20,7 @@ | |||
20 | #ifndef ENCODERS_H | 20 | #ifndef ENCODERS_H |
21 | #define ENCODERS_H | 21 | #define ENCODERS_H |
22 | 22 | ||
23 | #include <QtGui> | 23 | #include <QtCore> |
24 | 24 | ||
25 | #include "rbsettings.h" | 25 | #include "rbsettings.h" |
26 | 26 | ||
diff --git a/rbutil/rbutilqt/installbootloader.cpp b/rbutil/rbutilqt/installbootloader.cpp index f55b73a7d5..7c6867ecbd 100644 --- a/rbutil/rbutilqt/installbootloader.cpp +++ b/rbutil/rbutilqt/installbootloader.cpp | |||
@@ -198,7 +198,7 @@ bool BootloaderInstaller::downloadInfo() | |||
198 | infoDownloaded=false; | 198 | infoDownloaded=false; |
199 | infoError = false; | 199 | infoError = false; |
200 | while(!infoDownloaded ) | 200 | while(!infoDownloaded ) |
201 | QApplication::processEvents(); | 201 | QCoreApplication::processEvents(); |
202 | return !infoError; | 202 | return !infoError; |
203 | } | 203 | } |
204 | 204 | ||
@@ -222,8 +222,10 @@ void BootloaderInstaller::infoRequestFinished(int id, bool error) | |||
222 | QString errorString; | 222 | QString errorString; |
223 | errorString = tr("Network error: %1. Please check your network and proxy settings.") | 223 | errorString = tr("Network error: %1. Please check your network and proxy settings.") |
224 | .arg(infodownloader->errorString()); | 224 | .arg(infodownloader->errorString()); |
225 | #ifndef CONSOLE | ||
225 | if(error) QMessageBox::about(NULL, "Network Error", errorString); | 226 | if(error) QMessageBox::about(NULL, "Network Error", errorString); |
226 | qDebug() << "downloadDone:" << id << error; | 227 | #endif |
228 | qDebug() << "downloadDone:" << id << error; | ||
227 | 229 | ||
228 | infoError = true; | 230 | infoError = true; |
229 | infoDownloaded = true; | 231 | infoDownloaded = true; |
diff --git a/rbutil/rbutilqt/installbootloader.h b/rbutil/rbutilqt/installbootloader.h index 03b715c15e..69757c5fc8 100644 --- a/rbutil/rbutilqt/installbootloader.h +++ b/rbutil/rbutilqt/installbootloader.h | |||
@@ -20,7 +20,11 @@ | |||
20 | #ifndef INSTALLBOOTLOADER_H | 20 | #ifndef INSTALLBOOTLOADER_H |
21 | #define INSTALLBOOTLOADER_H | 21 | #define INSTALLBOOTLOADER_H |
22 | 22 | ||
23 | #ifndef CONSOLE | ||
23 | #include <QtGui> | 24 | #include <QtGui> |
25 | #else | ||
26 | #include <QtCore> | ||
27 | #endif | ||
24 | 28 | ||
25 | #include "progressloggerinterface.h" | 29 | #include "progressloggerinterface.h" |
26 | #include "httpget.h" | 30 | #include "httpget.h" |
diff --git a/rbutil/rbutilqt/installzip.cpp b/rbutil/rbutilqt/installzip.cpp index 874417dc9a..641b057175 100644 --- a/rbutil/rbutilqt/installzip.cpp +++ b/rbutil/rbutilqt/installzip.cpp | |||
@@ -126,13 +126,13 @@ void ZipInstaller::downloadDone(bool error) | |||
126 | return; | 126 | return; |
127 | } | 127 | } |
128 | else m_dp->addItem(tr("Download finished."),LOGOK); | 128 | else m_dp->addItem(tr("Download finished."),LOGOK); |
129 | QApplication::processEvents(); | 129 | QCoreApplication::processEvents(); |
130 | if(m_unzip) { | 130 | if(m_unzip) { |
131 | // unzip downloaded file | 131 | // unzip downloaded file |
132 | qDebug() << "about to unzip the downloaded file" << m_file << "to" << m_mountpoint; | 132 | qDebug() << "about to unzip the downloaded file" << m_file << "to" << m_mountpoint; |
133 | 133 | ||
134 | m_dp->addItem(tr("Extracting file."),LOGINFO); | 134 | m_dp->addItem(tr("Extracting file."),LOGINFO); |
135 | QApplication::processEvents(); | 135 | QCoreApplication::processEvents(); |
136 | 136 | ||
137 | qDebug() << "file to unzip: " << m_file; | 137 | qDebug() << "file to unzip: " << m_file; |
138 | UnZip::ErrorCode ec; | 138 | UnZip::ErrorCode ec; |
diff --git a/rbutil/rbutilqt/installzip.h b/rbutil/rbutilqt/installzip.h index 8100dee2b4..906fc21013 100644 --- a/rbutil/rbutilqt/installzip.h +++ b/rbutil/rbutilqt/installzip.h | |||
@@ -23,7 +23,7 @@ | |||
23 | 23 | ||
24 | 24 | ||
25 | 25 | ||
26 | #include <QtGui> | 26 | #include <QtCore> |
27 | #include <QtNetwork> | 27 | #include <QtNetwork> |
28 | 28 | ||
29 | #include "progressloggerinterface.h" | 29 | #include "progressloggerinterface.h" |
diff --git a/rbutil/rbutilqt/irivertools/irivertools.h b/rbutil/rbutilqt/irivertools/irivertools.h index b1fce826c1..d0d1de6730 100644 --- a/rbutil/rbutilqt/irivertools/irivertools.h +++ b/rbutil/rbutilqt/irivertools/irivertools.h | |||
@@ -22,7 +22,7 @@ | |||
22 | #ifndef IRIVERTOOLS_H_INCLUDED | 22 | #ifndef IRIVERTOOLS_H_INCLUDED |
23 | #define IRIVERTOOLS_H_INCLUDED | 23 | #define IRIVERTOOLS_H_INCLUDED |
24 | 24 | ||
25 | #include <QtGui> | 25 | #include <QtCore> |
26 | 26 | ||
27 | #include "md5sum.h" | 27 | #include "md5sum.h" |
28 | #include "progressloggerinterface.h" | 28 | #include "progressloggerinterface.h" |
diff --git a/rbutil/rbutilqt/irivertools/md5sum.h b/rbutil/rbutilqt/irivertools/md5sum.h index ed22bdbb49..a24c1a3989 100644 --- a/rbutil/rbutilqt/irivertools/md5sum.h +++ b/rbutil/rbutilqt/irivertools/md5sum.h | |||
@@ -31,7 +31,7 @@ | |||
31 | #define uint32 unsigned long int | 31 | #define uint32 unsigned long int |
32 | #endif | 32 | #endif |
33 | 33 | ||
34 | #include <QtGui> | 34 | #include <QtCore> |
35 | 35 | ||
36 | typedef struct | 36 | typedef struct |
37 | { | 37 | { |
diff --git a/rbutil/rbutilqt/main.cpp b/rbutil/rbutilqt/main.cpp index 4928c51d89..b8419c00a3 100644 --- a/rbutil/rbutilqt/main.cpp +++ b/rbutil/rbutilqt/main.cpp | |||
@@ -29,7 +29,7 @@ Q_IMPORT_PLUGIN(qtaccessiblewidgets) | |||
29 | int main( int argc, char ** argv ) { | 29 | int main( int argc, char ** argv ) { |
30 | QApplication app( argc, argv ); | 30 | QApplication app( argc, argv ); |
31 | 31 | ||
32 | QString absolutePath = qApp->applicationDirPath(); | 32 | QString absolutePath = QCoreApplication::instance()->applicationDirPath(); |
33 | // portable installation: | 33 | // portable installation: |
34 | // check for a configuration file in the program folder. | 34 | // check for a configuration file in the program folder. |
35 | QSettings *user; | 35 | QSettings *user; |
diff --git a/rbutil/rbutilqt/progressloggerinterface.h b/rbutil/rbutilqt/progressloggerinterface.h index 2f593540fe..a6ec9fb748 100644 --- a/rbutil/rbutilqt/progressloggerinterface.h +++ b/rbutil/rbutilqt/progressloggerinterface.h | |||
@@ -20,7 +20,7 @@ | |||
20 | #ifndef PROGRESSLOGGERINTERFACE_H | 20 | #ifndef PROGRESSLOGGERINTERFACE_H |
21 | #define PROGRESSLOGGERINTERFACE_H | 21 | #define PROGRESSLOGGERINTERFACE_H |
22 | 22 | ||
23 | #include <QtGui> | 23 | #include <QtCore> |
24 | 24 | ||
25 | enum { | 25 | enum { |
26 | LOGNOICON, LOGOK, LOGINFO, LOGWARNING, LOGERROR | 26 | LOGNOICON, LOGOK, LOGINFO, LOGWARNING, LOGERROR |
diff --git a/rbutil/rbutilqt/rbsettings.cpp b/rbutil/rbutilqt/rbsettings.cpp index 51f7057cc2..6e3e63110e 100644 --- a/rbutil/rbutilqt/rbsettings.cpp +++ b/rbutil/rbutilqt/rbsettings.cpp | |||
@@ -28,10 +28,10 @@ void RbSettings::open() | |||
28 | // portable installation: | 28 | // portable installation: |
29 | // check for a configuration file in the program folder. | 29 | // check for a configuration file in the program folder. |
30 | QFileInfo config; | 30 | QFileInfo config; |
31 | config.setFile(qApp->applicationDirPath() + "/RockboxUtility.ini"); | 31 | config.setFile(QCoreApplication::instance()->applicationDirPath() + "/RockboxUtility.ini"); |
32 | if(config.isFile()) | 32 | if(config.isFile()) |
33 | { | 33 | { |
34 | userSettings = new QSettings(qApp->applicationDirPath() + "/RockboxUtility.ini", | 34 | userSettings = new QSettings(QCoreApplication::instance()->applicationDirPath() + "/RockboxUtility.ini", |
35 | QSettings::IniFormat, this); | 35 | QSettings::IniFormat, this); |
36 | qDebug() << "config: portable"; | 36 | qDebug() << "config: portable"; |
37 | } | 37 | } |
diff --git a/rbutil/rbutilqt/rbsettings.h b/rbutil/rbutilqt/rbsettings.h index 29aa9e8a1d..ad94c63801 100644 --- a/rbutil/rbutilqt/rbsettings.h +++ b/rbutil/rbutilqt/rbsettings.h | |||
@@ -20,7 +20,8 @@ | |||
20 | #ifndef RBSETTINGS_H | 20 | #ifndef RBSETTINGS_H |
21 | #define RBSETTINGS_H | 21 | #define RBSETTINGS_H |
22 | 22 | ||
23 | #include <QtGui> | 23 | #include <QtCore> |
24 | |||
24 | class QSettings; | 25 | class QSettings; |
25 | 26 | ||
26 | class RbSettings : public QObject | 27 | class RbSettings : public QObject |
@@ -79,7 +80,7 @@ class RbSettings : public QObject | |||
79 | QString name(QString plattform); | 80 | QString name(QString plattform); |
80 | QString brand(QString plattform); | 81 | QString brand(QString plattform); |
81 | QStringList allLanguages(); | 82 | QStringList allLanguages(); |
82 | 83 | ||
83 | bool curNeedsBootloader(); | 84 | bool curNeedsBootloader(); |
84 | QString curBrand(); | 85 | QString curBrand(); |
85 | QString curName(); | 86 | QString curName(); |
@@ -94,9 +95,7 @@ class RbSettings : public QObject | |||
94 | QString curTTS(); | 95 | QString curTTS(); |
95 | QString curResolution(); | 96 | QString curResolution(); |
96 | int curTargetId(); | 97 | int curTargetId(); |
97 | 98 | ||
98 | |||
99 | |||
100 | void setOfPath(QString path); | 99 | void setOfPath(QString path); |
101 | void setCachePath(QString path); | 100 | void setCachePath(QString path); |
102 | void setBuild(QString build); | 101 | void setBuild(QString build); |
@@ -123,11 +122,7 @@ class RbSettings : public QObject | |||
123 | void setEncoderComplexity(QString enc, int c); | 122 | void setEncoderComplexity(QString enc, int c); |
124 | void setEncoderVolume(QString enc,double v); | 123 | void setEncoderVolume(QString enc,double v); |
125 | void setEncoderNarrowband(QString enc,bool nb); | 124 | void setEncoderNarrowband(QString enc,bool nb); |
126 | 125 | ||
127 | |||
128 | |||
129 | |||
130 | |||
131 | private: | 126 | private: |
132 | QSettings *devices; | 127 | QSettings *devices; |
133 | QSettings *userSettings; | 128 | QSettings *userSettings; |
diff --git a/rbutil/rbutilqt/talkfile.cpp b/rbutil/rbutilqt/talkfile.cpp index 478e9ea19a..3b4e82caf6 100644 --- a/rbutil/rbutilqt/talkfile.cpp +++ b/rbutil/rbutilqt/talkfile.cpp | |||
@@ -55,7 +55,7 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger) | |||
55 | return false; | 55 | return false; |
56 | } | 56 | } |
57 | 57 | ||
58 | QApplication::processEvents(); | 58 | QCoreApplication::processEvents(); |
59 | 59 | ||
60 | connect(logger,SIGNAL(aborted()),this,SLOT(abort())); | 60 | connect(logger,SIGNAL(aborted()),this,SLOT(abort())); |
61 | m_logger->setProgressMax(0); | 61 | m_logger->setProgressMax(0); |
@@ -78,7 +78,7 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger) | |||
78 | return false; | 78 | return false; |
79 | } | 79 | } |
80 | 80 | ||
81 | QApplication::processEvents(); | 81 | QCoreApplication::processEvents(); |
82 | QFileInfo fileInf = it.fileInfo(); | 82 | QFileInfo fileInf = it.fileInfo(); |
83 | QString toSpeak; | 83 | QString toSpeak; |
84 | QString filename; | 84 | QString filename; |
@@ -144,7 +144,7 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger) | |||
144 | 144 | ||
145 | return false; | 145 | return false; |
146 | } | 146 | } |
147 | QApplication::processEvents(); | 147 | QCoreApplication::processEvents(); |
148 | } | 148 | } |
149 | m_logger->addItem(tr("Encoding of %1").arg(toSpeak),LOGINFO); | 149 | m_logger->addItem(tr("Encoding of %1").arg(toSpeak),LOGINFO); |
150 | if(!m_enc->encode(wavfilename,filename)) | 150 | if(!m_enc->encode(wavfilename,filename)) |
@@ -156,7 +156,7 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger) | |||
156 | 156 | ||
157 | return false; | 157 | return false; |
158 | } | 158 | } |
159 | QApplication::processEvents(); | 159 | QCoreApplication::processEvents(); |
160 | } | 160 | } |
161 | 161 | ||
162 | //! remove the intermedia wav file, if requested | 162 | //! remove the intermedia wav file, if requested |
diff --git a/rbutil/rbutilqt/talkfile.h b/rbutil/rbutilqt/talkfile.h index f3c0c54ce7..8341da4ca9 100644 --- a/rbutil/rbutilqt/talkfile.h +++ b/rbutil/rbutilqt/talkfile.h | |||
@@ -21,7 +21,7 @@ | |||
21 | #ifndef TALKFILE_H | 21 | #ifndef TALKFILE_H |
22 | #define TALKFILE_H | 22 | #define TALKFILE_H |
23 | 23 | ||
24 | #include <QtGui> | 24 | #include <QtCore> |
25 | #include "progressloggerinterface.h" | 25 | #include "progressloggerinterface.h" |
26 | 26 | ||
27 | #include "encoders.h" | 27 | #include "encoders.h" |
diff --git a/rbutil/rbutilqt/tts.h b/rbutil/rbutilqt/tts.h index eb5bbb731a..1addbe2ebb 100644 --- a/rbutil/rbutilqt/tts.h +++ b/rbutil/rbutilqt/tts.h | |||
@@ -23,7 +23,7 @@ | |||
23 | 23 | ||
24 | 24 | ||
25 | #include "rbsettings.h" | 25 | #include "rbsettings.h" |
26 | #include <QtGui> | 26 | #include <QtCore> |
27 | 27 | ||
28 | #ifndef CONSOLE | 28 | #ifndef CONSOLE |
29 | #include "ttsgui.h" | 29 | #include "ttsgui.h" |
diff --git a/rbutil/rbutilqt/voicefile.cpp b/rbutil/rbutilqt/voicefile.cpp index 42902b93d8..290c298c26 100644 --- a/rbutil/rbutilqt/voicefile.cpp +++ b/rbutil/rbutilqt/voicefile.cpp | |||
@@ -126,7 +126,7 @@ void VoiceFileCreator::downloadDone(bool error) | |||
126 | return; | 126 | return; |
127 | } | 127 | } |
128 | else m_logger->addItem(tr("Download finished."),LOGOK); | 128 | else m_logger->addItem(tr("Download finished."),LOGOK); |
129 | QApplication::processEvents(); | 129 | QCoreApplication::processEvents(); |
130 | 130 | ||
131 | 131 | ||
132 | m_logger->setProgressMax(0); | 132 | m_logger->setProgressMax(0); |
@@ -167,7 +167,7 @@ void VoiceFileCreator::downloadDone(bool error) | |||
167 | return; | 167 | return; |
168 | } | 168 | } |
169 | 169 | ||
170 | QApplication::processEvents(); | 170 | QCoreApplication::processEvents(); |
171 | connect(m_logger,SIGNAL(aborted()),this,SLOT(abort())); | 171 | connect(m_logger,SIGNAL(aborted()),this,SLOT(abort())); |
172 | 172 | ||
173 | //read in downloaded file | 173 | //read in downloaded file |
@@ -242,8 +242,8 @@ void VoiceFileCreator::downloadDone(bool error) | |||
242 | { | 242 | { |
243 | if(toSpeak == "") continue; | 243 | if(toSpeak == "") continue; |
244 | 244 | ||
245 | m_logger->addItem(tr("creating ")+toSpeak,LOGINFO); | 245 | m_logger->addItem(tr("creating ")+toSpeak,LOGINFO); |
246 | QApplication::processEvents(); | 246 | QCoreApplication::processEvents(); |
247 | m_tts->voice(toSpeak,wavname); // generate wav | 247 | m_tts->voice(toSpeak,wavname); // generate wav |
248 | } | 248 | } |
249 | 249 | ||
@@ -257,7 +257,7 @@ void VoiceFileCreator::downloadDone(bool error) | |||
257 | // remove the wav file | 257 | // remove the wav file |
258 | QFile::remove(wavname); | 258 | QFile::remove(wavname); |
259 | // remember the mp3 file for later removing | 259 | // remember the mp3 file for later removing |
260 | mp3files << encodedname; | 260 | mp3files << encodedname; |
261 | } | 261 | } |
262 | 262 | ||
263 | 263 | ||
diff --git a/rbutil/rbutilqt/voicefile.h b/rbutil/rbutilqt/voicefile.h index 55b2184c3f..fb567b32de 100644 --- a/rbutil/rbutilqt/voicefile.h +++ b/rbutil/rbutilqt/voicefile.h | |||
@@ -21,7 +21,7 @@ | |||
21 | #ifndef VOICEFILE_H | 21 | #ifndef VOICEFILE_H |
22 | #define VOICEFILE_H | 22 | #define VOICEFILE_H |
23 | 23 | ||
24 | #include <QtGui> | 24 | #include <QtCore> |
25 | #include "progressloggerinterface.h" | 25 | #include "progressloggerinterface.h" |
26 | 26 | ||
27 | #include "encoders.h" | 27 | #include "encoders.h" |