diff options
Diffstat (limited to 'rbutil/rbutilqt')
58 files changed, 111 insertions, 111 deletions
diff --git a/rbutil/rbutilqt/base/autodetection.cpp b/rbutil/rbutilqt/base/autodetection.cpp index 8c800607c3..00918bf769 100644 --- a/rbutil/rbutilqt/base/autodetection.cpp +++ b/rbutil/rbutilqt/base/autodetection.cpp | |||
@@ -250,7 +250,7 @@ void Autodetection::mergePatcher(void) | |||
250 | // try ipodpatcher | 250 | // try ipodpatcher |
251 | // initialize sector buffer. Needed. | 251 | // initialize sector buffer. Needed. |
252 | struct ipod_t ipod; | 252 | struct ipod_t ipod; |
253 | ipod.sectorbuf = NULL; | 253 | ipod.sectorbuf = nullptr; |
254 | ipod_alloc_buffer(&ipod, BUFFER_SIZE); | 254 | ipod_alloc_buffer(&ipod, BUFFER_SIZE); |
255 | n = ipod_scan(&ipod); | 255 | n = ipod_scan(&ipod); |
256 | // FIXME: handle more than one Ipod connected in ipodpatcher. | 256 | // FIXME: handle more than one Ipod connected in ipodpatcher. |
diff --git a/rbutil/rbutilqt/base/autodetection.h b/rbutil/rbutilqt/base/autodetection.h index f9adf2aa0c..cdbb94d303 100644 --- a/rbutil/rbutilqt/base/autodetection.h +++ b/rbutil/rbutilqt/base/autodetection.h | |||
@@ -32,7 +32,7 @@ class Autodetection :public QObject | |||
32 | Q_OBJECT | 32 | Q_OBJECT |
33 | 33 | ||
34 | public: | 34 | public: |
35 | Autodetection(QObject* parent=0); | 35 | Autodetection(QObject* parent=nullptr); |
36 | 36 | ||
37 | enum PlayerStatus { | 37 | enum PlayerStatus { |
38 | PlayerOk, | 38 | PlayerOk, |
diff --git a/rbutil/rbutilqt/base/bootloaderinstallams.cpp b/rbutil/rbutilqt/base/bootloaderinstallams.cpp index 3905ae9fd3..524ce99e98 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallams.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallams.cpp | |||
@@ -93,7 +93,7 @@ void BootloaderInstallAms::installStage2(void) | |||
93 | rb_packed = load_rockbox_file(bootfile.toLocal8Bit().data(), &model, | 93 | rb_packed = load_rockbox_file(bootfile.toLocal8Bit().data(), &model, |
94 | &bootloader_size,&rb_packedsize, | 94 | &bootloader_size,&rb_packedsize, |
95 | errstr,sizeof(errstr)); | 95 | errstr,sizeof(errstr)); |
96 | if (rb_packed == NULL) | 96 | if (rb_packed == nullptr) |
97 | { | 97 | { |
98 | LOG_ERROR() << "could not load bootloader: " << bootfile; | 98 | LOG_ERROR() << "could not load bootloader: " << bootfile; |
99 | emit logItem(errstr, LOGERROR); | 99 | emit logItem(errstr, LOGERROR); |
@@ -106,7 +106,7 @@ void BootloaderInstallAms::installStage2(void) | |||
106 | buf = load_of_file(m_offile.toLocal8Bit().data(), model, &len, &sum, | 106 | buf = load_of_file(m_offile.toLocal8Bit().data(), model, &len, &sum, |
107 | &firmware_size, &of_packed ,&of_packedsize, | 107 | &firmware_size, &of_packed ,&of_packedsize, |
108 | errstr, sizeof(errstr)); | 108 | errstr, sizeof(errstr)); |
109 | if (buf == NULL) | 109 | if (buf == nullptr) |
110 | { | 110 | { |
111 | LOG_ERROR() << "could not load OF: " << m_offile; | 111 | LOG_ERROR() << "could not load OF: " << m_offile; |
112 | emit logItem(errstr, LOGERROR); | 112 | emit logItem(errstr, LOGERROR); |
diff --git a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp index 5f8fd40d08..efc61f7529 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp | |||
@@ -246,7 +246,7 @@ bool BootloaderInstallBase::setOfFile(QString of, QStringList blfile) | |||
246 | delete zu; | 246 | delete zu; |
247 | 247 | ||
248 | // if ZIP failed, try CAB | 248 | // if ZIP failed, try CAB |
249 | if(util == 0) | 249 | if(util == nullptr) |
250 | { | 250 | { |
251 | MsPackUtil *msu = new MsPackUtil(this); | 251 | MsPackUtil *msu = new MsPackUtil(this); |
252 | if(msu->open(of)) | 252 | if(msu->open(of)) |
diff --git a/rbutil/rbutilqt/base/bootloaderinstallbspatch.cpp b/rbutil/rbutilqt/base/bootloaderinstallbspatch.cpp index 8b2ef97cd2..f8eab408fd 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallbspatch.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallbspatch.cpp | |||
@@ -57,7 +57,7 @@ void BootloaderThreadBSPatch::run(void) | |||
57 | BootloaderInstallBSPatch::BootloaderInstallBSPatch(QObject *parent) | 57 | BootloaderInstallBSPatch::BootloaderInstallBSPatch(QObject *parent) |
58 | : BootloaderInstallBase(parent) | 58 | : BootloaderInstallBase(parent) |
59 | { | 59 | { |
60 | m_thread = NULL; | 60 | m_thread = nullptr; |
61 | } | 61 | } |
62 | 62 | ||
63 | QString BootloaderInstallBSPatch::ofHint() | 63 | QString BootloaderInstallBSPatch::ofHint() |
diff --git a/rbutil/rbutilqt/base/bootloaderinstallchinachip.h b/rbutil/rbutilqt/base/bootloaderinstallchinachip.h index d82919a571..e92f292283 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallchinachip.h +++ b/rbutil/rbutilqt/base/bootloaderinstallchinachip.h | |||
@@ -27,7 +27,7 @@ class BootloaderInstallChinaChip : public BootloaderInstallBase | |||
27 | Q_OBJECT | 27 | Q_OBJECT |
28 | 28 | ||
29 | public: | 29 | public: |
30 | BootloaderInstallChinaChip(QObject *parent = 0); | 30 | BootloaderInstallChinaChip(QObject *parent = nullptr); |
31 | bool install(void); | 31 | bool install(void); |
32 | bool uninstall(void); | 32 | bool uninstall(void); |
33 | BootloaderInstallBase::BootloaderType installed(void); | 33 | BootloaderInstallBase::BootloaderType installed(void); |
diff --git a/rbutil/rbutilqt/base/bootloaderinstallhelper.cpp b/rbutil/rbutilqt/base/bootloaderinstallhelper.cpp index ca055bc7e9..c94ed29140 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallhelper.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallhelper.cpp | |||
@@ -73,7 +73,7 @@ BootloaderInstallBase* BootloaderInstallHelper::createBootloaderInstaller(QObjec | |||
73 | return new BootloaderInstallBSPatch(parent); | 73 | return new BootloaderInstallBSPatch(parent); |
74 | } | 74 | } |
75 | else { | 75 | else { |
76 | return NULL; | 76 | return nullptr; |
77 | } | 77 | } |
78 | } | 78 | } |
79 | 79 | ||
diff --git a/rbutil/rbutilqt/base/bootloaderinstallhex.cpp b/rbutil/rbutilqt/base/bootloaderinstallhex.cpp index 0c8087eaf4..931c7dfa2e 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallhex.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallhex.cpp | |||
@@ -32,11 +32,11 @@ struct md5s { | |||
32 | 32 | ||
33 | struct md5s md5sums[] = { | 33 | struct md5s md5sums[] = { |
34 | #include "irivertools/h100sums.h" | 34 | #include "irivertools/h100sums.h" |
35 | { 0, 0 }, | 35 | { nullptr, nullptr }, |
36 | #include "irivertools/h120sums.h" | 36 | #include "irivertools/h120sums.h" |
37 | { 0, 0 }, | 37 | { nullptr, nullptr }, |
38 | #include "irivertools/h300sums.h" | 38 | #include "irivertools/h300sums.h" |
39 | { 0, 0 } | 39 | { nullptr, nullptr } |
40 | }; | 40 | }; |
41 | 41 | ||
42 | 42 | ||
@@ -86,7 +86,7 @@ bool BootloaderInstallHex::install(void) | |||
86 | m_model = 4; | 86 | m_model = 4; |
87 | // 3: h300, 2: h120, 1: h100, 0:invalid | 87 | // 3: h300, 2: h120, 1: h100, 0:invalid |
88 | while(i--) { | 88 | while(i--) { |
89 | if(md5sums[i].orig == 0) | 89 | if(md5sums[i].orig == nullptr) |
90 | m_model--; | 90 | m_model--; |
91 | if(!qstrcmp(md5sums[i].orig, hash.toLatin1())) | 91 | if(!qstrcmp(md5sums[i].orig, hash.toLatin1())) |
92 | break; | 92 | break; |
diff --git a/rbutil/rbutilqt/base/bootloaderinstallhex.h b/rbutil/rbutilqt/base/bootloaderinstallhex.h index c971429a10..700d77447a 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallhex.h +++ b/rbutil/rbutilqt/base/bootloaderinstallhex.h | |||
@@ -31,7 +31,7 @@ class BootloaderInstallHex : public BootloaderInstallBase | |||
31 | Q_OBJECT | 31 | Q_OBJECT |
32 | 32 | ||
33 | public: | 33 | public: |
34 | BootloaderInstallHex(QObject *parent = 0); | 34 | BootloaderInstallHex(QObject *parent = nullptr); |
35 | bool install(void); | 35 | bool install(void); |
36 | bool uninstall(void); | 36 | bool uninstall(void); |
37 | BootloaderInstallBase::BootloaderType installed(void); | 37 | BootloaderInstallBase::BootloaderType installed(void); |
diff --git a/rbutil/rbutilqt/base/bootloaderinstallimx.cpp b/rbutil/rbutilqt/base/bootloaderinstallimx.cpp index 547c8d8fc4..581d70270c 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallimx.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallimx.cpp | |||
@@ -63,7 +63,7 @@ void BootloaderThreadImx::run(void) | |||
63 | BootloaderInstallImx::BootloaderInstallImx(QObject *parent) | 63 | BootloaderInstallImx::BootloaderInstallImx(QObject *parent) |
64 | : BootloaderInstallBase(parent) | 64 | : BootloaderInstallBase(parent) |
65 | { | 65 | { |
66 | m_thread = NULL; | 66 | m_thread = nullptr; |
67 | } | 67 | } |
68 | 68 | ||
69 | 69 | ||
diff --git a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp index fdee6f5778..3535f9c69c 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp | |||
@@ -45,7 +45,7 @@ BootloaderInstallIpod::~BootloaderInstallIpod() | |||
45 | 45 | ||
46 | bool BootloaderInstallIpod::install(void) | 46 | bool BootloaderInstallIpod::install(void) |
47 | { | 47 | { |
48 | if(ipod.sectorbuf == NULL) { | 48 | if(ipod.sectorbuf == nullptr) { |
49 | emit logItem(tr("Error: can't allocate buffer memory!"), LOGERROR); | 49 | emit logItem(tr("Error: can't allocate buffer memory!"), LOGERROR); |
50 | emit done(true); | 50 | emit done(true); |
51 | return false; | 51 | return false; |
diff --git a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp index 5d56fe593a..e4fd3766cb 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp | |||
@@ -46,7 +46,7 @@ BootloaderInstallSansa::~BootloaderInstallSansa() | |||
46 | */ | 46 | */ |
47 | bool BootloaderInstallSansa::install(void) | 47 | bool BootloaderInstallSansa::install(void) |
48 | { | 48 | { |
49 | if(sansa.sectorbuf == NULL) { | 49 | if(sansa.sectorbuf == nullptr) { |
50 | emit logItem(tr("Error: can't allocate buffer memory!"), LOGERROR); | 50 | emit logItem(tr("Error: can't allocate buffer memory!"), LOGERROR); |
51 | return false; | 51 | return false; |
52 | emit done(true); | 52 | emit done(true); |
@@ -88,7 +88,7 @@ bool BootloaderInstallSansa::install(void) | |||
88 | */ | 88 | */ |
89 | void BootloaderInstallSansa::installStage2(void) | 89 | void BootloaderInstallSansa::installStage2(void) |
90 | { | 90 | { |
91 | unsigned char* buf = NULL; | 91 | unsigned char* buf = nullptr; |
92 | unsigned int len; | 92 | unsigned int len; |
93 | 93 | ||
94 | emit logItem(tr("Installing Rockbox bootloader"), LOGINFO); | 94 | emit logItem(tr("Installing Rockbox bootloader"), LOGINFO); |
diff --git a/rbutil/rbutilqt/base/bootloaderinstallsansa.h b/rbutil/rbutilqt/base/bootloaderinstallsansa.h index 40dc89ff25..45837f0ac3 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallsansa.h +++ b/rbutil/rbutilqt/base/bootloaderinstallsansa.h | |||
@@ -30,7 +30,7 @@ class BootloaderInstallSansa : public BootloaderInstallBase | |||
30 | Q_OBJECT | 30 | Q_OBJECT |
31 | 31 | ||
32 | public: | 32 | public: |
33 | BootloaderInstallSansa(QObject *parent = 0); | 33 | BootloaderInstallSansa(QObject *parent = nullptr); |
34 | ~BootloaderInstallSansa(); | 34 | ~BootloaderInstallSansa(); |
35 | bool install(void); | 35 | bool install(void); |
36 | bool uninstall(void); | 36 | bool uninstall(void); |
diff --git a/rbutil/rbutilqt/base/bootloaderinstalltcc.cpp b/rbutil/rbutilqt/base/bootloaderinstalltcc.cpp index e0bfbe3cf2..1551d7c45d 100644 --- a/rbutil/rbutilqt/base/bootloaderinstalltcc.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstalltcc.cpp | |||
@@ -57,7 +57,7 @@ bool BootloaderInstallTcc::install(void) | |||
57 | 57 | ||
58 | void BootloaderInstallTcc::installStage2(void) | 58 | void BootloaderInstallTcc::installStage2(void) |
59 | { | 59 | { |
60 | unsigned char *of_buf, *boot_buf = NULL, *patched_buf = NULL; | 60 | unsigned char *of_buf, *boot_buf = nullptr, *patched_buf = nullptr; |
61 | int n, of_size, boot_size, patched_size; | 61 | int n, of_size, boot_size, patched_size; |
62 | char errstr[200]; | 62 | char errstr[200]; |
63 | bool ret = false; | 63 | bool ret = false; |
@@ -76,7 +76,7 @@ void BootloaderInstallTcc::installStage2(void) | |||
76 | 76 | ||
77 | /* Load original firmware file */ | 77 | /* Load original firmware file */ |
78 | of_buf = file_read(m_offile.toLocal8Bit().data(), &of_size); | 78 | of_buf = file_read(m_offile.toLocal8Bit().data(), &of_size); |
79 | if (of_buf == NULL) | 79 | if (of_buf == nullptr) |
80 | { | 80 | { |
81 | emit logItem(errstr, LOGERROR); | 81 | emit logItem(errstr, LOGERROR); |
82 | emit logItem(tr("Could not load %1").arg(m_offile), LOGERROR); | 82 | emit logItem(tr("Could not load %1").arg(m_offile), LOGERROR); |
@@ -93,7 +93,7 @@ void BootloaderInstallTcc::installStage2(void) | |||
93 | 93 | ||
94 | /* Load bootloader file */ | 94 | /* Load bootloader file */ |
95 | boot_buf = file_read(bootfile.toLocal8Bit().data(), &boot_size); | 95 | boot_buf = file_read(bootfile.toLocal8Bit().data(), &boot_size); |
96 | if (boot_buf == NULL) | 96 | if (boot_buf == nullptr) |
97 | { | 97 | { |
98 | emit logItem(errstr, LOGERROR); | 98 | emit logItem(errstr, LOGERROR); |
99 | emit logItem(tr("Could not load %1").arg(bootfile), LOGERROR); | 99 | emit logItem(tr("Could not load %1").arg(bootfile), LOGERROR); |
@@ -105,7 +105,7 @@ void BootloaderInstallTcc::installStage2(void) | |||
105 | 105 | ||
106 | patched_buf = patch_firmware_tcc(of_buf, of_size, boot_buf, boot_size, | 106 | patched_buf = patch_firmware_tcc(of_buf, of_size, boot_buf, boot_size, |
107 | &patched_size); | 107 | &patched_size); |
108 | if (patched_buf == NULL) | 108 | if (patched_buf == nullptr) |
109 | { | 109 | { |
110 | emit logItem(errstr, LOGERROR); | 110 | emit logItem(errstr, LOGERROR); |
111 | emit logItem(tr("Could not patch firmware"), LOGERROR); | 111 | emit logItem(tr("Could not patch firmware"), LOGERROR); |
diff --git a/rbutil/rbutilqt/base/encoderexe.h b/rbutil/rbutilqt/base/encoderexe.h index dd1c57ec67..4008689167 100644 --- a/rbutil/rbutilqt/base/encoderexe.h +++ b/rbutil/rbutilqt/base/encoderexe.h | |||
@@ -34,7 +34,7 @@ class EncoderExe : public EncoderBase | |||
34 | 34 | ||
35 | Q_OBJECT | 35 | Q_OBJECT |
36 | public: | 36 | public: |
37 | EncoderExe(QString name,QObject *parent = NULL); | 37 | EncoderExe(QString name,QObject *parent = nullptr); |
38 | bool encode(QString input,QString output); | 38 | bool encode(QString input,QString output); |
39 | bool start(); | 39 | bool start(); |
40 | bool stop() {return true;} | 40 | bool stop() {return true;} |
diff --git a/rbutil/rbutilqt/base/encoderrbspeex.cpp b/rbutil/rbutilqt/base/encoderrbspeex.cpp index 0fc0293685..2bee66028a 100644 --- a/rbutil/rbutilqt/base/encoderrbspeex.cpp +++ b/rbutil/rbutilqt/base/encoderrbspeex.cpp | |||
@@ -83,11 +83,11 @@ bool EncoderRbSpeex::encode(QString input,QString output) | |||
83 | char errstr[512]; | 83 | char errstr[512]; |
84 | 84 | ||
85 | FILE *fin,*fout; | 85 | FILE *fin,*fout; |
86 | if ((fin = fopen(input.toLocal8Bit(), "rb")) == NULL) { | 86 | if ((fin = fopen(input.toLocal8Bit(), "rb")) == nullptr) { |
87 | LOG_ERROR() << "Error: could not open input file\n"; | 87 | LOG_ERROR() << "Error: could not open input file\n"; |
88 | return false; | 88 | return false; |
89 | } | 89 | } |
90 | if ((fout = fopen(output.toLocal8Bit(), "wb")) == NULL) { | 90 | if ((fout = fopen(output.toLocal8Bit(), "wb")) == nullptr) { |
91 | LOG_ERROR() << "Error: could not open output file\n"; | 91 | LOG_ERROR() << "Error: could not open output file\n"; |
92 | fclose(fin); | 92 | fclose(fin); |
93 | return false; | 93 | return false; |
diff --git a/rbutil/rbutilqt/base/encoderrbspeex.h b/rbutil/rbutilqt/base/encoderrbspeex.h index b3028b3250..6ad41c38a3 100644 --- a/rbutil/rbutilqt/base/encoderrbspeex.h +++ b/rbutil/rbutilqt/base/encoderrbspeex.h | |||
@@ -34,7 +34,7 @@ class EncoderRbSpeex : public EncoderBase | |||
34 | 34 | ||
35 | Q_OBJECT | 35 | Q_OBJECT |
36 | public: | 36 | public: |
37 | EncoderRbSpeex(QObject *parent = NULL); | 37 | EncoderRbSpeex(QObject *parent = nullptr); |
38 | bool encode(QString input,QString output); | 38 | bool encode(QString input,QString output); |
39 | bool start(); | 39 | bool start(); |
40 | bool stop() {return true;} | 40 | bool stop() {return true;} |
diff --git a/rbutil/rbutilqt/base/httpget.h b/rbutil/rbutilqt/base/httpget.h index 7cdddedfbf..dfd7b87c89 100644 --- a/rbutil/rbutilqt/base/httpget.h +++ b/rbutil/rbutilqt/base/httpget.h | |||
@@ -32,7 +32,7 @@ class HttpGet : public QObject | |||
32 | Q_OBJECT | 32 | Q_OBJECT |
33 | 33 | ||
34 | public: | 34 | public: |
35 | HttpGet(QObject *parent = 0); | 35 | HttpGet(QObject *parent = nullptr); |
36 | 36 | ||
37 | void getFile(const QUrl &url); | 37 | void getFile(const QUrl &url); |
38 | void setProxy(const QUrl &url); | 38 | void setProxy(const QUrl &url); |
diff --git a/rbutil/rbutilqt/base/mspackutil.cpp b/rbutil/rbutilqt/base/mspackutil.cpp index 1ee250cd6d..b794272199 100644 --- a/rbutil/rbutilqt/base/mspackutil.cpp +++ b/rbutil/rbutilqt/base/mspackutil.cpp | |||
@@ -24,8 +24,8 @@ | |||
24 | MsPackUtil::MsPackUtil(QObject* parent) | 24 | MsPackUtil::MsPackUtil(QObject* parent) |
25 | :ArchiveUtil(parent) | 25 | :ArchiveUtil(parent) |
26 | { | 26 | { |
27 | m_cabd = mspack_create_cab_decompressor(NULL); | 27 | m_cabd = mspack_create_cab_decompressor(nullptr); |
28 | m_cabinet = NULL; | 28 | m_cabinet = nullptr; |
29 | if(!m_cabd) | 29 | if(!m_cabd) |
30 | LOG_ERROR() << "CAB decompressor creation failed!"; | 30 | LOG_ERROR() << "CAB decompressor creation failed!"; |
31 | } | 31 | } |
@@ -41,20 +41,20 @@ bool MsPackUtil::open(QString& mspackfile) | |||
41 | { | 41 | { |
42 | close(); | 42 | close(); |
43 | 43 | ||
44 | if(m_cabd == NULL) | 44 | if(m_cabd == nullptr) |
45 | { | 45 | { |
46 | LOG_ERROR() << "No CAB decompressor available: cannot open file!"; | 46 | LOG_ERROR() << "No CAB decompressor available: cannot open file!"; |
47 | return false; | 47 | return false; |
48 | } | 48 | } |
49 | m_cabinet = m_cabd->search(m_cabd, QFile::encodeName(mspackfile).constData()); | 49 | m_cabinet = m_cabd->search(m_cabd, QFile::encodeName(mspackfile).constData()); |
50 | return m_cabinet != NULL; | 50 | return m_cabinet != nullptr; |
51 | } | 51 | } |
52 | 52 | ||
53 | bool MsPackUtil::close(void) | 53 | bool MsPackUtil::close(void) |
54 | { | 54 | { |
55 | if(m_cabd && m_cabinet) | 55 | if(m_cabd && m_cabinet) |
56 | m_cabd->close(m_cabd, m_cabinet); | 56 | m_cabd->close(m_cabd, m_cabinet); |
57 | m_cabinet = NULL; | 57 | m_cabinet = nullptr; |
58 | return true; | 58 | return true; |
59 | } | 59 | } |
60 | 60 | ||
@@ -76,7 +76,7 @@ bool MsPackUtil::extractArchive(const QString& dest, QString file) | |||
76 | else if(!file.isEmpty()) | 76 | else if(!file.isEmpty()) |
77 | singleoutfile = dest; | 77 | singleoutfile = dest; |
78 | struct mscabd_file *f = m_cabinet->files; | 78 | struct mscabd_file *f = m_cabinet->files; |
79 | if(f == NULL) | 79 | if(f == nullptr) |
80 | { | 80 | { |
81 | LOG_WARNING() << "CAB doesn't contain file" << file; | 81 | LOG_WARNING() << "CAB doesn't contain file" << file; |
82 | return true; | 82 | return true; |
diff --git a/rbutil/rbutilqt/base/rbsettings.cpp b/rbutil/rbutilqt/base/rbsettings.cpp index 512341b84c..827c0f96fd 100644 --- a/rbutil/rbutilqt/base/rbsettings.cpp +++ b/rbutil/rbutilqt/base/rbsettings.cpp | |||
@@ -82,11 +82,11 @@ const static struct { | |||
82 | }; | 82 | }; |
83 | 83 | ||
84 | //! pointer to setting object to NULL | 84 | //! pointer to setting object to NULL |
85 | QSettings* RbSettings::userSettings = NULL; | 85 | QSettings* RbSettings::userSettings = nullptr; |
86 | 86 | ||
87 | void RbSettings::ensureRbSettingsExists() | 87 | void RbSettings::ensureRbSettingsExists() |
88 | { | 88 | { |
89 | if(userSettings == NULL) | 89 | if(userSettings == nullptr) |
90 | { | 90 | { |
91 | // portable installation: | 91 | // portable installation: |
92 | // check for a configuration file in the program folder. | 92 | // check for a configuration file in the program folder. |
@@ -96,13 +96,13 @@ void RbSettings::ensureRbSettingsExists() | |||
96 | if(config.isFile()) | 96 | if(config.isFile()) |
97 | { | 97 | { |
98 | userSettings = new QSettings(QCoreApplication::instance()->applicationDirPath() | 98 | userSettings = new QSettings(QCoreApplication::instance()->applicationDirPath() |
99 | + "/RockboxUtility.ini", QSettings::IniFormat, NULL); | 99 | + "/RockboxUtility.ini", QSettings::IniFormat, nullptr); |
100 | LOG_INFO() << "configuration: portable"; | 100 | LOG_INFO() << "configuration: portable"; |
101 | } | 101 | } |
102 | else | 102 | else |
103 | { | 103 | { |
104 | userSettings = new QSettings(QSettings::IniFormat, | 104 | userSettings = new QSettings(QSettings::IniFormat, |
105 | QSettings::UserScope, "rockbox.org", "RockboxUtility",NULL); | 105 | QSettings::UserScope, "rockbox.org", "RockboxUtility",nullptr); |
106 | LOG_INFO() << "configuration: system"; | 106 | LOG_INFO() << "configuration: system"; |
107 | } | 107 | } |
108 | } | 108 | } |
@@ -123,7 +123,7 @@ void RbSettings::sync() | |||
123 | { | 123 | { |
124 | char* realuser = getenv("SUDO_UID"); | 124 | char* realuser = getenv("SUDO_UID"); |
125 | char* realgroup = getenv("SUDO_GID"); | 125 | char* realgroup = getenv("SUDO_GID"); |
126 | if(realuser != NULL && realgroup != NULL) | 126 | if(realuser != nullptr && realgroup != nullptr) |
127 | { | 127 | { |
128 | int realuid = atoi(realuser); | 128 | int realuid = atoi(realuser); |
129 | int realgid = atoi(realgroup); | 129 | int realgid = atoi(realgroup); |
diff --git a/rbutil/rbutilqt/base/system.cpp b/rbutil/rbutilqt/base/system.cpp index 73f5024fa2..dafab971ec 100644 --- a/rbutil/rbutilqt/base/system.cpp +++ b/rbutil/rbutilqt/base/system.cpp | |||
@@ -242,18 +242,18 @@ QMultiMap<uint32_t, QString> System::listUsbDevices(void) | |||
242 | LOG_INFO() << "Searching for USB devices"; | 242 | LOG_INFO() << "Searching for USB devices"; |
243 | #if defined(Q_OS_LINUX) | 243 | #if defined(Q_OS_LINUX) |
244 | libusb_device **devs; | 244 | libusb_device **devs; |
245 | if(libusb_init(NULL) != 0) { | 245 | if(libusb_init(nullptr) != 0) { |
246 | LOG_ERROR() << "Initializing libusb-1 failed."; | 246 | LOG_ERROR() << "Initializing libusb-1 failed."; |
247 | return usbids; | 247 | return usbids; |
248 | } | 248 | } |
249 | 249 | ||
250 | if(libusb_get_device_list(NULL, &devs) < 1) { | 250 | if(libusb_get_device_list(nullptr, &devs) < 1) { |
251 | LOG_ERROR() << "Error getting device list."; | 251 | LOG_ERROR() << "Error getting device list."; |
252 | return usbids; | 252 | return usbids; |
253 | } | 253 | } |
254 | libusb_device *dev; | 254 | libusb_device *dev; |
255 | int i = 0; | 255 | int i = 0; |
256 | while((dev = devs[i++]) != NULL) { | 256 | while((dev = devs[i++]) != nullptr) { |
257 | QString name; | 257 | QString name; |
258 | unsigned char buf[256]; | 258 | unsigned char buf[256]; |
259 | uint32_t id; | 259 | uint32_t id; |
@@ -279,7 +279,7 @@ QMultiMap<uint32_t, QString> System::listUsbDevices(void) | |||
279 | } | 279 | } |
280 | 280 | ||
281 | libusb_free_device_list(devs, 1); | 281 | libusb_free_device_list(devs, 1); |
282 | libusb_exit(NULL); | 282 | libusb_exit(nullptr); |
283 | #endif | 283 | #endif |
284 | 284 | ||
285 | #if defined(Q_OS_MACX) | 285 | #if defined(Q_OS_MACX) |
diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp index f2d47be93d..67b0428ceb 100644 --- a/rbutil/rbutilqt/base/systeminfo.cpp +++ b/rbutil/rbutilqt/base/systeminfo.cpp | |||
@@ -200,7 +200,7 @@ QMap<int, QStringList> SystemInfo::usbIdMap(enum MapType type) | |||
200 | int j = ids.size(); | 200 | int j = ids.size(); |
201 | while(j--) { | 201 | while(j--) { |
202 | QStringList l; | 202 | QStringList l; |
203 | int id = ids.at(j).toInt(0, 16); | 203 | int id = ids.at(j).toInt(nullptr, 16); |
204 | if(id == 0) { | 204 | if(id == 0) { |
205 | continue; | 205 | continue; |
206 | } | 206 | } |
diff --git a/rbutil/rbutilqt/base/talkfile.cpp b/rbutil/rbutilqt/base/talkfile.cpp index b4f05762e9..1b1dd934ed 100644 --- a/rbutil/rbutilqt/base/talkfile.cpp +++ b/rbutil/rbutilqt/base/talkfile.cpp | |||
@@ -230,7 +230,7 @@ bool TalkFileCreator::copyTalkFiles(QString* errString) | |||
230 | int m_progress = 0; | 230 | int m_progress = 0; |
231 | emit logProgress(m_progress,progressMax); | 231 | emit logProgress(m_progress,progressMax); |
232 | 232 | ||
233 | QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0); | 233 | QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, nullptr); |
234 | installlog.beginGroup("talkfiles"); | 234 | installlog.beginGroup("talkfiles"); |
235 | 235 | ||
236 | for(int i=0; i < m_talkList.size(); i++) | 236 | for(int i=0; i < m_talkList.size(); i++) |
diff --git a/rbutil/rbutilqt/base/ttsbase.cpp b/rbutil/rbutilqt/base/ttsbase.cpp index 0254c44e1d..0102d215a6 100644 --- a/rbutil/rbutilqt/base/ttsbase.cpp +++ b/rbutil/rbutilqt/base/ttsbase.cpp | |||
@@ -69,7 +69,7 @@ void TTSBase::initTTSList() | |||
69 | TTSBase* TTSBase::getTTS(QObject* parent,QString ttsName) | 69 | TTSBase* TTSBase::getTTS(QObject* parent,QString ttsName) |
70 | { | 70 | { |
71 | 71 | ||
72 | TTSBase* tts = 0; | 72 | TTSBase* tts = nullptr; |
73 | #if defined(Q_OS_WIN) | 73 | #if defined(Q_OS_WIN) |
74 | if(ttsName == "sapi") | 74 | if(ttsName == "sapi") |
75 | tts = new TTSSapi(parent); | 75 | tts = new TTSSapi(parent); |
diff --git a/rbutil/rbutilqt/base/ttsespeak.h b/rbutil/rbutilqt/base/ttsespeak.h index 85d126e94f..afe19fbdac 100644 --- a/rbutil/rbutilqt/base/ttsespeak.h +++ b/rbutil/rbutilqt/base/ttsespeak.h | |||
@@ -28,7 +28,7 @@ class TTSEspeak : public TTSExes | |||
28 | { | 28 | { |
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | public: | 30 | public: |
31 | TTSEspeak(QObject* parent=NULL) : TTSExes(parent) | 31 | TTSEspeak(QObject* parent=nullptr) : TTSExes(parent) |
32 | { | 32 | { |
33 | m_name = "espeak"; | 33 | m_name = "espeak"; |
34 | 34 | ||
diff --git a/rbutil/rbutilqt/base/ttsespeakng.h b/rbutil/rbutilqt/base/ttsespeakng.h index 367b70b06c..55aba62e7d 100644 --- a/rbutil/rbutilqt/base/ttsespeakng.h +++ b/rbutil/rbutilqt/base/ttsespeakng.h | |||
@@ -28,7 +28,7 @@ class TTSEspeakNG : public TTSExes | |||
28 | { | 28 | { |
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | public: | 30 | public: |
31 | TTSEspeakNG(QObject* parent=NULL) : TTSExes(parent) | 31 | TTSEspeakNG(QObject* parent=nullptr) : TTSExes(parent) |
32 | { | 32 | { |
33 | m_name = "espeak-ng"; | 33 | m_name = "espeak-ng"; |
34 | 34 | ||
diff --git a/rbutil/rbutilqt/base/ttsexes.h b/rbutil/rbutilqt/base/ttsexes.h index 03252cdc92..5707c827fe 100644 --- a/rbutil/rbutilqt/base/ttsexes.h +++ b/rbutil/rbutilqt/base/ttsexes.h | |||
@@ -34,7 +34,7 @@ class TTSExes : public TTSBase | |||
34 | 34 | ||
35 | Q_OBJECT | 35 | Q_OBJECT |
36 | public: | 36 | public: |
37 | TTSExes(QObject* parent=NULL); | 37 | TTSExes(QObject* parent=nullptr); |
38 | TTSStatus voice(QString text, QString wavfile, QString *errStr); | 38 | TTSStatus voice(QString text, QString wavfile, QString *errStr); |
39 | bool start(QString *errStr); | 39 | bool start(QString *errStr); |
40 | bool stop() {return true;} | 40 | bool stop() {return true;} |
diff --git a/rbutil/rbutilqt/base/ttsfestival.h b/rbutil/rbutilqt/base/ttsfestival.h index 2772108a23..5f6dc13ab5 100644 --- a/rbutil/rbutilqt/base/ttsfestival.h +++ b/rbutil/rbutilqt/base/ttsfestival.h | |||
@@ -36,7 +36,7 @@ class TTSFestival : public TTSBase | |||
36 | 36 | ||
37 | Q_OBJECT | 37 | Q_OBJECT |
38 | public: | 38 | public: |
39 | TTSFestival(QObject* parent=NULL) : TTSBase(parent) {} | 39 | TTSFestival(QObject* parent=nullptr) : TTSBase(parent) {} |
40 | ~TTSFestival(); | 40 | ~TTSFestival(); |
41 | bool start(QString *errStr); | 41 | bool start(QString *errStr); |
42 | bool stop(); | 42 | bool stop(); |
diff --git a/rbutil/rbutilqt/base/ttsflite.h b/rbutil/rbutilqt/base/ttsflite.h index 1d9021108e..717c311a34 100644 --- a/rbutil/rbutilqt/base/ttsflite.h +++ b/rbutil/rbutilqt/base/ttsflite.h | |||
@@ -28,7 +28,7 @@ class TTSFlite : public TTSExes | |||
28 | { | 28 | { |
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | public: | 30 | public: |
31 | TTSFlite(QObject* parent=NULL) : TTSExes(parent) | 31 | TTSFlite(QObject* parent=nullptr) : TTSExes(parent) |
32 | { | 32 | { |
33 | m_name = "flite"; | 33 | m_name = "flite"; |
34 | 34 | ||
diff --git a/rbutil/rbutilqt/base/ttsmimic.h b/rbutil/rbutilqt/base/ttsmimic.h index fba4e53fe2..f4d7a8beac 100644 --- a/rbutil/rbutilqt/base/ttsmimic.h +++ b/rbutil/rbutilqt/base/ttsmimic.h | |||
@@ -28,7 +28,7 @@ class TTSMimic : public TTSExes | |||
28 | { | 28 | { |
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | public: | 30 | public: |
31 | TTSMimic(QObject* parent=NULL) : TTSExes(parent) | 31 | TTSMimic(QObject* parent=nullptr) : TTSExes(parent) |
32 | { | 32 | { |
33 | m_name = "mimic"; | 33 | m_name = "mimic"; |
34 | 34 | ||
diff --git a/rbutil/rbutilqt/base/ttsmssp.h b/rbutil/rbutilqt/base/ttsmssp.h index 6727ed5d37..817b9fde58 100644 --- a/rbutil/rbutilqt/base/ttsmssp.h +++ b/rbutil/rbutilqt/base/ttsmssp.h | |||
@@ -28,7 +28,7 @@ class TTSMssp: public TTSSapi | |||
28 | { | 28 | { |
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | public: | 30 | public: |
31 | TTSMssp(QObject* parent=NULL) : TTSSapi(parent) | 31 | TTSMssp(QObject* parent=nullptr) : TTSSapi(parent) |
32 | { | 32 | { |
33 | m_TTSTemplate = "cscript //nologo \"%exe\" " | 33 | m_TTSTemplate = "cscript //nologo \"%exe\" " |
34 | "/language:%lang /voice:\"%voice\" " | 34 | "/language:%lang /voice:\"%voice\" " |
diff --git a/rbutil/rbutilqt/base/ttssapi.cpp b/rbutil/rbutilqt/base/ttssapi.cpp index 75d83e7d21..f754f1a19b 100644 --- a/rbutil/rbutilqt/base/ttssapi.cpp +++ b/rbutil/rbutilqt/base/ttssapi.cpp | |||
@@ -124,7 +124,7 @@ bool TTSSapi::start(QString *errStr) | |||
124 | execstring.replace("%speed",m_TTSSpeed); | 124 | execstring.replace("%speed",m_TTSSpeed); |
125 | 125 | ||
126 | LOG_INFO() << "Start:" << execstring; | 126 | LOG_INFO() << "Start:" << execstring; |
127 | voicescript = new QProcess(NULL); | 127 | voicescript = new QProcess(nullptr); |
128 | //connect(voicescript,SIGNAL(readyReadStandardError()),this,SLOT(error())); | 128 | //connect(voicescript,SIGNAL(readyReadStandardError()),this,SLOT(error())); |
129 | voicescript->start(execstring); | 129 | voicescript->start(execstring); |
130 | LOG_INFO() << "wait for process"; | 130 | LOG_INFO() << "wait for process"; |
@@ -190,7 +190,7 @@ QStringList TTSSapi::getVoiceList(QString language) | |||
190 | execstring.replace("%lang",language); | 190 | execstring.replace("%lang",language); |
191 | 191 | ||
192 | LOG_INFO() << "Start:" << execstring; | 192 | LOG_INFO() << "Start:" << execstring; |
193 | voicescript = new QProcess(NULL); | 193 | voicescript = new QProcess(nullptr); |
194 | voicescript->start(execstring); | 194 | voicescript->start(execstring); |
195 | LOG_INFO() << "wait for process"; | 195 | LOG_INFO() << "wait for process"; |
196 | if(!voicescript->waitForStarted()) { | 196 | if(!voicescript->waitForStarted()) { |
diff --git a/rbutil/rbutilqt/base/ttssapi.h b/rbutil/rbutilqt/base/ttssapi.h index f645774852..25d7d3dab7 100644 --- a/rbutil/rbutilqt/base/ttssapi.h +++ b/rbutil/rbutilqt/base/ttssapi.h | |||
@@ -36,7 +36,7 @@ class TTSSapi : public TTSBase | |||
36 | 36 | ||
37 | Q_OBJECT | 37 | Q_OBJECT |
38 | public: | 38 | public: |
39 | TTSSapi(QObject* parent=NULL); | 39 | TTSSapi(QObject* parent=nullptr); |
40 | 40 | ||
41 | TTSStatus voice(QString text,QString wavfile, QString *errStr); | 41 | TTSStatus voice(QString text,QString wavfile, QString *errStr); |
42 | bool start(QString *errStr); | 42 | bool start(QString *errStr); |
diff --git a/rbutil/rbutilqt/base/ttssapi4.h b/rbutil/rbutilqt/base/ttssapi4.h index 7964cbfd2b..d6408eaa2c 100644 --- a/rbutil/rbutilqt/base/ttssapi4.h +++ b/rbutil/rbutilqt/base/ttssapi4.h | |||
@@ -28,7 +28,7 @@ class TTSSapi4: public TTSSapi | |||
28 | { | 28 | { |
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | public: | 30 | public: |
31 | TTSSapi4(QObject* parent=NULL) : TTSSapi(parent) | 31 | TTSSapi4(QObject* parent=nullptr) : TTSSapi(parent) |
32 | { | 32 | { |
33 | m_TTSTemplate = "cscript //nologo \"%exe\" " | 33 | m_TTSTemplate = "cscript //nologo \"%exe\" " |
34 | "/language:%lang /voice:\"%voice\" " | 34 | "/language:%lang /voice:\"%voice\" " |
diff --git a/rbutil/rbutilqt/base/ttsswift.h b/rbutil/rbutilqt/base/ttsswift.h index 9d678a6d92..adbc674d78 100644 --- a/rbutil/rbutilqt/base/ttsswift.h +++ b/rbutil/rbutilqt/base/ttsswift.h | |||
@@ -28,7 +28,7 @@ class TTSSwift : public TTSExes | |||
28 | { | 28 | { |
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | public: | 30 | public: |
31 | TTSSwift(QObject* parent=NULL) : TTSExes(parent) | 31 | TTSSwift(QObject* parent=nullptr) : TTSExes(parent) |
32 | { | 32 | { |
33 | m_name = "swift"; | 33 | m_name = "swift"; |
34 | m_TTSTemplate = "\"%exe\" %options -o \"%wavfile\" -- \"%text\""; | 34 | m_TTSTemplate = "\"%exe\" %options -o \"%wavfile\" -- \"%text\""; |
diff --git a/rbutil/rbutilqt/base/uninstall.cpp b/rbutil/rbutilqt/base/uninstall.cpp index 4b90bc6b77..5ab670a031 100644 --- a/rbutil/rbutilqt/base/uninstall.cpp +++ b/rbutil/rbutilqt/base/uninstall.cpp | |||
@@ -112,7 +112,7 @@ void Uninstaller::uninstall(void) | |||
112 | 112 | ||
113 | QStringList Uninstaller::getAllSections() | 113 | QStringList Uninstaller::getAllSections() |
114 | { | 114 | { |
115 | QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0); | 115 | QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, nullptr); |
116 | QStringList allSections = installlog.childGroups(); | 116 | QStringList allSections = installlog.childGroups(); |
117 | allSections.removeAt(allSections.lastIndexOf("Bootloader")); | 117 | allSections.removeAt(allSections.lastIndexOf("Bootloader")); |
118 | return allSections; | 118 | return allSections; |
diff --git a/rbutil/rbutilqt/base/voicefile.cpp b/rbutil/rbutilqt/base/voicefile.cpp index ec9ecbed33..c4edac64b9 100644 --- a/rbutil/rbutilqt/base/voicefile.cpp +++ b/rbutil/rbutilqt/base/voicefile.cpp | |||
@@ -300,7 +300,7 @@ void VoiceFileCreator::create(void) | |||
300 | //make voicefile | 300 | //make voicefile |
301 | emit logItem(tr("Creating voicefiles..."),LOGINFO); | 301 | emit logItem(tr("Creating voicefiles..."),LOGINFO); |
302 | FILE* ids2 = fopen(m_filename.toLocal8Bit(), "r"); | 302 | FILE* ids2 = fopen(m_filename.toLocal8Bit(), "r"); |
303 | if (ids2 == NULL) | 303 | if (ids2 == nullptr) |
304 | { | 304 | { |
305 | cleanup(); | 305 | cleanup(); |
306 | emit logItem(tr("Error opening downloaded file"),LOGERROR); | 306 | emit logItem(tr("Error opening downloaded file"),LOGERROR); |
@@ -310,7 +310,7 @@ void VoiceFileCreator::create(void) | |||
310 | 310 | ||
311 | FILE* output = fopen(QString(m_mountpoint + "/.rockbox/langs/" + m_lang | 311 | FILE* output = fopen(QString(m_mountpoint + "/.rockbox/langs/" + m_lang |
312 | + ".voice").toLocal8Bit(), "wb"); | 312 | + ".voice").toLocal8Bit(), "wb"); |
313 | if (output == NULL) | 313 | if (output == nullptr) |
314 | { | 314 | { |
315 | cleanup(); | 315 | cleanup(); |
316 | fclose(ids2); | 316 | fclose(ids2); |
@@ -327,7 +327,7 @@ void VoiceFileCreator::create(void) | |||
327 | cleanup(); | 327 | cleanup(); |
328 | 328 | ||
329 | // Add Voice file to the install log | 329 | // Add Voice file to the install log |
330 | QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0); | 330 | QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, nullptr); |
331 | installlog.beginGroup(QString("Voice (self created, %1)").arg(m_lang)); | 331 | installlog.beginGroup(QString("Voice (self created, %1)").arg(m_lang)); |
332 | installlog.setValue("/.rockbox/langs/" + m_lang + ".voice", m_versionstring); | 332 | installlog.setValue("/.rockbox/langs/" + m_lang + ".voice", m_versionstring); |
333 | installlog.endGroup(); | 333 | installlog.endGroup(); |
diff --git a/rbutil/rbutilqt/base/zipinstaller.cpp b/rbutil/rbutilqt/base/zipinstaller.cpp index 4bce1e5a25..3376169911 100644 --- a/rbutil/rbutilqt/base/zipinstaller.cpp +++ b/rbutil/rbutilqt/base/zipinstaller.cpp | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | ZipInstaller::ZipInstaller(QObject* parent) : | 25 | ZipInstaller::ZipInstaller(QObject* parent) : |
26 | QObject(parent), | 26 | QObject(parent), |
27 | m_unzip(true), m_usecache(false), m_getter(0) | 27 | m_unzip(true), m_usecache(false), m_getter(nullptr) |
28 | { | 28 | { |
29 | } | 29 | } |
30 | 30 | ||
@@ -87,7 +87,7 @@ void ZipInstaller::installStart() | |||
87 | m_file = m_downloadFile->fileName(); | 87 | m_file = m_downloadFile->fileName(); |
88 | m_downloadFile->close(); | 88 | m_downloadFile->close(); |
89 | // get the real file. | 89 | // get the real file. |
90 | if(m_getter != 0) m_getter->deleteLater(); | 90 | if(m_getter != nullptr) m_getter->deleteLater(); |
91 | m_getter = new HttpGet(this); | 91 | m_getter = new HttpGet(this); |
92 | if(m_usecache) { | 92 | if(m_usecache) { |
93 | m_getter->setCache(true); | 93 | m_getter->setCache(true); |
@@ -188,7 +188,7 @@ void ZipInstaller::downloadDone(bool error) | |||
188 | } | 188 | } |
189 | 189 | ||
190 | emit logItem(tr("Creating installation log"),LOGINFO); | 190 | emit logItem(tr("Creating installation log"),LOGINFO); |
191 | QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0); | 191 | QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, nullptr); |
192 | 192 | ||
193 | installlog.beginGroup(m_logsection); | 193 | installlog.beginGroup(m_logsection); |
194 | for(int i = 0; i < zipContents.size(); i++) | 194 | for(int i = 0; i < zipContents.size(); i++) |
diff --git a/rbutil/rbutilqt/base/ziputil.cpp b/rbutil/rbutilqt/base/ziputil.cpp index b6cfdddce2..45119f7d99 100644 --- a/rbutil/rbutilqt/base/ziputil.cpp +++ b/rbutil/rbutilqt/base/ziputil.cpp | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | ZipUtil::ZipUtil(QObject* parent) : ArchiveUtil(parent) | 30 | ZipUtil::ZipUtil(QObject* parent) : ArchiveUtil(parent) |
31 | { | 31 | { |
32 | m_zip = NULL; | 32 | m_zip = nullptr; |
33 | } | 33 | } |
34 | 34 | ||
35 | 35 | ||
@@ -65,7 +65,7 @@ bool ZipUtil::close(void) | |||
65 | error = m_zip->getZipError(); | 65 | error = m_zip->getZipError(); |
66 | } | 66 | } |
67 | delete m_zip; | 67 | delete m_zip; |
68 | m_zip = NULL; | 68 | m_zip = nullptr; |
69 | return (error == UNZ_OK) ? true : false; | 69 | return (error == UNZ_OK) ? true : false; |
70 | } | 70 | } |
71 | 71 | ||
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index fc67cb410e..066b9d7db7 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp | |||
@@ -370,7 +370,7 @@ void Config::setDevices() | |||
370 | QStringList brands = manuf.uniqueKeys(); | 370 | QStringList brands = manuf.uniqueKeys(); |
371 | QTreeWidgetItem *w; | 371 | QTreeWidgetItem *w; |
372 | QTreeWidgetItem *w2; | 372 | QTreeWidgetItem *w2; |
373 | QTreeWidgetItem *w3 = 0; | 373 | QTreeWidgetItem *w3 = nullptr; |
374 | 374 | ||
375 | QString selected = RbSettings::value(RbSettings::Platform).toString(); | 375 | QString selected = RbSettings::value(RbSettings::Platform).toString(); |
376 | for(int c = 0; c < brands.size(); c++) { | 376 | for(int c = 0; c < brands.size(); c++) { |
@@ -408,7 +408,7 @@ void Config::setDevices() | |||
408 | while(widgetitem); | 408 | while(widgetitem); |
409 | // add new items | 409 | // add new items |
410 | ui.treeDevices->insertTopLevelItems(0, items); | 410 | ui.treeDevices->insertTopLevelItems(0, items); |
411 | if(w3 != 0) { | 411 | if(w3 != nullptr) { |
412 | ui.treeDevices->setCurrentItem(w3); // hilight old selection | 412 | ui.treeDevices->setCurrentItem(w3); // hilight old selection |
413 | ui.treeDevices->scrollToItem(w3); | 413 | ui.treeDevices->scrollToItem(w3); |
414 | } | 414 | } |
diff --git a/rbutil/rbutilqt/configure.h b/rbutil/rbutilqt/configure.h index 4e69996d1f..5f63e82447 100644 --- a/rbutil/rbutilqt/configure.h +++ b/rbutil/rbutilqt/configure.h | |||
@@ -30,7 +30,7 @@ class Config : public QDialog | |||
30 | { | 30 | { |
31 | Q_OBJECT | 31 | Q_OBJECT |
32 | public: | 32 | public: |
33 | Config(QWidget *parent = 0,int index=0); | 33 | Config(QWidget *parent = nullptr,int index=0); |
34 | 34 | ||
35 | signals: | 35 | signals: |
36 | void settingsUpdated(void); | 36 | void settingsUpdated(void); |
diff --git a/rbutil/rbutilqt/encttscfggui.cpp b/rbutil/rbutilqt/encttscfggui.cpp index bf3432dc90..19181c0f8b 100644 --- a/rbutil/rbutilqt/encttscfggui.cpp +++ b/rbutil/rbutilqt/encttscfggui.cpp | |||
@@ -44,8 +44,8 @@ EncTtsCfgGui::EncTtsCfgGui(QDialog* parent, EncTtsSettingInterface* iface, QStri | |||
44 | m_busyDlg= new QProgressDialog("", "", 0, 0,this); | 44 | m_busyDlg= new QProgressDialog("", "", 0, 0,this); |
45 | m_busyDlg->setWindowTitle(tr("Waiting for engine...")); | 45 | m_busyDlg->setWindowTitle(tr("Waiting for engine...")); |
46 | m_busyDlg->setModal(true); | 46 | m_busyDlg->setModal(true); |
47 | m_busyDlg->setLabel(0); | 47 | m_busyDlg->setLabel(nullptr); |
48 | m_busyDlg->setCancelButton(0); | 48 | m_busyDlg->setCancelButton(nullptr); |
49 | m_busyDlg->hide(); | 49 | m_busyDlg->hide(); |
50 | connect(iface,SIGNAL(busy()),this,SLOT(showBusy())); | 50 | connect(iface,SIGNAL(busy()),this,SLOT(showBusy())); |
51 | connect(iface,SIGNAL(busyEnd()),this,SLOT(hideBusy())); | 51 | connect(iface,SIGNAL(busyEnd()),this,SLOT(hideBusy())); |
@@ -74,7 +74,7 @@ void EncTtsCfgGui::setUpWindow() | |||
74 | gridLayout->addWidget(widget, i, 1); | 74 | gridLayout->addWidget(widget, i, 1); |
75 | widget->setLayoutDirection(Qt::LeftToRight); | 75 | widget->setLayoutDirection(Qt::LeftToRight); |
76 | QWidget *btn = createButton(m_settingsList.at(i)); | 76 | QWidget *btn = createButton(m_settingsList.at(i)); |
77 | if(btn != NULL) | 77 | if(btn != nullptr) |
78 | { | 78 | { |
79 | gridLayout->addWidget(btn, i, 2); | 79 | gridLayout->addWidget(btn, i, 2); |
80 | } | 80 | } |
@@ -113,7 +113,7 @@ void EncTtsCfgGui::setUpWindow() | |||
113 | QWidget* EncTtsCfgGui::createWidgets(EncTtsSetting* setting) | 113 | QWidget* EncTtsCfgGui::createWidgets(EncTtsSetting* setting) |
114 | { | 114 | { |
115 | // value display | 115 | // value display |
116 | QWidget* value = NULL; | 116 | QWidget* value = nullptr; |
117 | switch(setting->type()) | 117 | switch(setting->type()) |
118 | { | 118 | { |
119 | case EncTtsSetting::eDOUBLE: | 119 | case EncTtsSetting::eDOUBLE: |
@@ -181,7 +181,7 @@ QWidget* EncTtsCfgGui::createWidgets(EncTtsSetting* setting) | |||
181 | } | 181 | } |
182 | 182 | ||
183 | // remember widget | 183 | // remember widget |
184 | if(value != NULL) | 184 | if(value != nullptr) |
185 | { | 185 | { |
186 | m_settingsWidgetsMap.insert(setting,value); | 186 | m_settingsWidgetsMap.insert(setting,value); |
187 | connect(setting,SIGNAL(updateGui()),this,SLOT(updateWidget())); | 187 | connect(setting,SIGNAL(updateGui()),this,SLOT(updateWidget())); |
@@ -208,14 +208,14 @@ QWidget* EncTtsCfgGui::createButton(EncTtsSetting* setting) | |||
208 | return refreshbtn; | 208 | return refreshbtn; |
209 | } | 209 | } |
210 | else | 210 | else |
211 | return NULL; | 211 | return nullptr; |
212 | } | 212 | } |
213 | 213 | ||
214 | void EncTtsCfgGui::updateSetting() | 214 | void EncTtsCfgGui::updateSetting() |
215 | { | 215 | { |
216 | //cast and get the sender widget | 216 | //cast and get the sender widget |
217 | QWidget* widget = qobject_cast<QWidget*>(QObject::sender()); | 217 | QWidget* widget = qobject_cast<QWidget*>(QObject::sender()); |
218 | if(widget == NULL) return; | 218 | if(widget == nullptr) return; |
219 | // get the corresponding setting | 219 | // get the corresponding setting |
220 | EncTtsSetting* setting = m_settingsWidgetsMap.key(widget); | 220 | EncTtsSetting* setting = m_settingsWidgetsMap.key(widget); |
221 | 221 | ||
@@ -264,7 +264,7 @@ void EncTtsCfgGui::updateWidget() | |||
264 | { | 264 | { |
265 | // get sender setting | 265 | // get sender setting |
266 | EncTtsSetting* setting = qobject_cast<EncTtsSetting*>(QObject::sender()); | 266 | EncTtsSetting* setting = qobject_cast<EncTtsSetting*>(QObject::sender()); |
267 | if(setting == NULL) return; | 267 | if(setting == nullptr) return; |
268 | // get corresponding widget | 268 | // get corresponding widget |
269 | QWidget* widget = m_settingsWidgetsMap.value(setting); | 269 | QWidget* widget = m_settingsWidgetsMap.value(setting); |
270 | 270 | ||
@@ -370,7 +370,7 @@ void EncTtsCfgGui::browse(QObject* settingObj) | |||
370 | { | 370 | { |
371 | // cast top setting | 371 | // cast top setting |
372 | EncTtsSetting* setting= qobject_cast<EncTtsSetting*>(settingObj); | 372 | EncTtsSetting* setting= qobject_cast<EncTtsSetting*>(settingObj); |
373 | if(setting == NULL) return; | 373 | if(setting == nullptr) return; |
374 | 374 | ||
375 | //current path | 375 | //current path |
376 | QString curPath = setting->current().toString(); | 376 | QString curPath = setting->current().toString(); |
diff --git a/rbutil/rbutilqt/gui/backupdialog.h b/rbutil/rbutilqt/gui/backupdialog.h index 490a034c86..185166134a 100644 --- a/rbutil/rbutilqt/gui/backupdialog.h +++ b/rbutil/rbutilqt/gui/backupdialog.h | |||
@@ -29,7 +29,7 @@ class BackupDialog : public QDialog | |||
29 | { | 29 | { |
30 | Q_OBJECT | 30 | Q_OBJECT |
31 | public: | 31 | public: |
32 | BackupDialog(QWidget* parent = 0); | 32 | BackupDialog(QWidget* parent = nullptr); |
33 | 33 | ||
34 | private slots: | 34 | private slots: |
35 | void changeBackupPath(void); | 35 | void changeBackupPath(void); |
diff --git a/rbutil/rbutilqt/gui/changelog.h b/rbutil/rbutilqt/gui/changelog.h index 103a3bc9fb..aca2a6ed32 100644 --- a/rbutil/rbutilqt/gui/changelog.h +++ b/rbutil/rbutilqt/gui/changelog.h | |||
@@ -26,7 +26,7 @@ class Changelog : public QDialog | |||
26 | { | 26 | { |
27 | Q_OBJECT | 27 | Q_OBJECT |
28 | public: | 28 | public: |
29 | Changelog(QWidget *parent = 0); | 29 | Changelog(QWidget *parent = nullptr); |
30 | 30 | ||
31 | public slots: | 31 | public slots: |
32 | void accept(void); | 32 | void accept(void); |
diff --git a/rbutil/rbutilqt/gui/comboboxviewdelegate.h b/rbutil/rbutilqt/gui/comboboxviewdelegate.h index 30e1ae829a..a0070bb126 100644 --- a/rbutil/rbutilqt/gui/comboboxviewdelegate.h +++ b/rbutil/rbutilqt/gui/comboboxviewdelegate.h | |||
@@ -22,7 +22,7 @@ class ComboBoxViewDelegate : public QStyledItemDelegate | |||
22 | { | 22 | { |
23 | Q_OBJECT | 23 | Q_OBJECT |
24 | public: | 24 | public: |
25 | ComboBoxViewDelegate(QObject* parent = 0) : QStyledItemDelegate(parent) { } | 25 | ComboBoxViewDelegate(QObject* parent = nullptr) : QStyledItemDelegate(parent) { } |
26 | 26 | ||
27 | void paint(QPainter *painter, const QStyleOptionViewItem &option, | 27 | void paint(QPainter *painter, const QStyleOptionViewItem &option, |
28 | const QModelIndex &index) const; | 28 | const QModelIndex &index) const; |
diff --git a/rbutil/rbutilqt/gui/infowidget.h b/rbutil/rbutilqt/gui/infowidget.h index 94b79682e3..51eef0a37a 100644 --- a/rbutil/rbutilqt/gui/infowidget.h +++ b/rbutil/rbutilqt/gui/infowidget.h | |||
@@ -26,7 +26,7 @@ class InfoWidget : public QWidget | |||
26 | { | 26 | { |
27 | Q_OBJECT | 27 | Q_OBJECT |
28 | public: | 28 | public: |
29 | InfoWidget(QWidget *parent = 0); | 29 | InfoWidget(QWidget *parent = nullptr); |
30 | 30 | ||
31 | public slots: | 31 | public slots: |
32 | void updateInfo(void); | 32 | void updateInfo(void); |
diff --git a/rbutil/rbutilqt/gui/manualwidget.h b/rbutil/rbutilqt/gui/manualwidget.h index 01c1e82395..d6095d3e14 100644 --- a/rbutil/rbutilqt/gui/manualwidget.h +++ b/rbutil/rbutilqt/gui/manualwidget.h | |||
@@ -26,7 +26,7 @@ class ManualWidget : public QWidget | |||
26 | { | 26 | { |
27 | Q_OBJECT | 27 | Q_OBJECT |
28 | public: | 28 | public: |
29 | ManualWidget(QWidget *parent = 0); | 29 | ManualWidget(QWidget *parent = nullptr); |
30 | 30 | ||
31 | public slots: | 31 | public slots: |
32 | void downloadManual(void); | 32 | void downloadManual(void); |
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp index 805a432877..fafe79c8f7 100644 --- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp +++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | |||
@@ -45,9 +45,9 @@ SelectiveInstallWidget::SelectiveInstallWidget(QWidget* parent) : QWidget(parent | |||
45 | RockboxInfo info(m_mountpoint); | 45 | RockboxInfo info(m_mountpoint); |
46 | ui.bootloaderCheckbox->setChecked(!info.success()); | 46 | ui.bootloaderCheckbox->setChecked(!info.success()); |
47 | 47 | ||
48 | m_logger = NULL; | 48 | m_logger = nullptr; |
49 | m_zipinstaller = NULL; | 49 | m_zipinstaller = nullptr; |
50 | m_themesinstaller = NULL; | 50 | m_themesinstaller = nullptr; |
51 | 51 | ||
52 | connect(ui.installButton, SIGNAL(clicked()), this, SLOT(startInstall())); | 52 | connect(ui.installButton, SIGNAL(clicked()), this, SLOT(startInstall())); |
53 | connect(this, SIGNAL(installSkipped(bool)), this, SLOT(continueInstall(bool))); | 53 | connect(this, SIGNAL(installSkipped(bool)), this, SLOT(continueInstall(bool))); |
@@ -84,9 +84,9 @@ void SelectiveInstallWidget::updateVersion(void) | |||
84 | m_blmethod = SystemInfo::platformValue( | 84 | m_blmethod = SystemInfo::platformValue( |
85 | SystemInfo::BootloaderMethod, m_target).toString(); | 85 | SystemInfo::BootloaderMethod, m_target).toString(); |
86 | 86 | ||
87 | if(m_logger != NULL) { | 87 | if(m_logger != nullptr) { |
88 | delete m_logger; | 88 | delete m_logger; |
89 | m_logger = NULL; | 89 | m_logger = nullptr; |
90 | } | 90 | } |
91 | 91 | ||
92 | // re-populate all version items | 92 | // re-populate all version items |
@@ -166,7 +166,7 @@ void SelectiveInstallWidget::startInstall(void) | |||
166 | saveSettings(); | 166 | saveSettings(); |
167 | 167 | ||
168 | m_installStage = 0; | 168 | m_installStage = 0; |
169 | if(m_logger != NULL) delete m_logger; | 169 | if(m_logger != nullptr) delete m_logger; |
170 | m_logger = new ProgressLoggerGui(this); | 170 | m_logger = new ProgressLoggerGui(this); |
171 | QString warning = Utils::checkEnvironment(false); | 171 | QString warning = Utils::checkEnvironment(false); |
172 | if(!warning.isEmpty()) | 172 | if(!warning.isEmpty()) |
@@ -238,7 +238,7 @@ void SelectiveInstallWidget::installBootloader(void) | |||
238 | BootloaderInstallBase *bl = | 238 | BootloaderInstallBase *bl = |
239 | BootloaderInstallHelper::createBootloaderInstaller(this, | 239 | BootloaderInstallHelper::createBootloaderInstaller(this, |
240 | SystemInfo::platformValue(SystemInfo::BootloaderMethod).toString()); | 240 | SystemInfo::platformValue(SystemInfo::BootloaderMethod).toString()); |
241 | if(bl == NULL) { | 241 | if(bl == nullptr) { |
242 | m_logger->addItem(tr("No install method known."), LOGERROR); | 242 | m_logger->addItem(tr("No install method known."), LOGERROR); |
243 | m_logger->setFinished(); | 243 | m_logger->setFinished(); |
244 | return; | 244 | return; |
@@ -393,7 +393,7 @@ void SelectiveInstallWidget::installRockbox(void) | |||
393 | ServerInfo::RelCandidateUrl, m_target).toString(); | 393 | ServerInfo::RelCandidateUrl, m_target).toString(); |
394 | 394 | ||
395 | //! install build | 395 | //! install build |
396 | if(m_zipinstaller != NULL) m_zipinstaller->deleteLater(); | 396 | if(m_zipinstaller != nullptr) m_zipinstaller->deleteLater(); |
397 | m_zipinstaller = new ZipInstaller(this); | 397 | m_zipinstaller = new ZipInstaller(this); |
398 | m_zipinstaller->setUrl(url); | 398 | m_zipinstaller->setUrl(url); |
399 | m_zipinstaller->setLogSection("Rockbox (Base)"); | 399 | m_zipinstaller->setLogSection("Rockbox (Base)"); |
@@ -437,7 +437,7 @@ void SelectiveInstallWidget::installFonts(void) | |||
437 | fontsurl.replace("%RELEASEVER%", relversion); | 437 | fontsurl.replace("%RELEASEVER%", relversion); |
438 | 438 | ||
439 | // create new zip installer | 439 | // create new zip installer |
440 | if(m_zipinstaller != NULL) m_zipinstaller->deleteLater(); | 440 | if(m_zipinstaller != nullptr) m_zipinstaller->deleteLater(); |
441 | m_zipinstaller = new ZipInstaller(this); | 441 | m_zipinstaller = new ZipInstaller(this); |
442 | m_zipinstaller->setUrl(fontsurl); | 442 | m_zipinstaller->setUrl(fontsurl); |
443 | m_zipinstaller->setLogSection("Fonts"); | 443 | m_zipinstaller->setLogSection("Fonts"); |
@@ -460,7 +460,7 @@ void SelectiveInstallWidget::installFonts(void) | |||
460 | 460 | ||
461 | void SelectiveInstallWidget::customizeThemes(void) | 461 | void SelectiveInstallWidget::customizeThemes(void) |
462 | { | 462 | { |
463 | if(m_themesinstaller == NULL) | 463 | if(m_themesinstaller == nullptr) |
464 | m_themesinstaller = new ThemesInstallWindow(this); | 464 | m_themesinstaller = new ThemesInstallWindow(this); |
465 | 465 | ||
466 | m_themesinstaller->setSelectOnly(true); | 466 | m_themesinstaller->setSelectOnly(true); |
@@ -472,7 +472,7 @@ void SelectiveInstallWidget::installThemes(void) | |||
472 | { | 472 | { |
473 | if(ui.themesCheckbox->isChecked()) { | 473 | if(ui.themesCheckbox->isChecked()) { |
474 | LOG_INFO() << "installing themes"; | 474 | LOG_INFO() << "installing themes"; |
475 | if(m_themesinstaller == NULL) | 475 | if(m_themesinstaller == nullptr) |
476 | m_themesinstaller = new ThemesInstallWindow(this); | 476 | m_themesinstaller = new ThemesInstallWindow(this); |
477 | 477 | ||
478 | connect(m_themesinstaller, SIGNAL(done(bool)), this, SLOT(continueInstall(bool))); | 478 | connect(m_themesinstaller, SIGNAL(done(bool)), this, SLOT(continueInstall(bool))); |
@@ -526,7 +526,7 @@ void SelectiveInstallWidget::installGamefiles(void) | |||
526 | LOG_INFO() << "installing gamefiles"; | 526 | LOG_INFO() << "installing gamefiles"; |
527 | 527 | ||
528 | // create new zip installer | 528 | // create new zip installer |
529 | if(m_zipinstaller != NULL) m_zipinstaller->deleteLater(); | 529 | if(m_zipinstaller != nullptr) m_zipinstaller->deleteLater(); |
530 | m_zipinstaller = new ZipInstaller(this); | 530 | m_zipinstaller = new ZipInstaller(this); |
531 | 531 | ||
532 | m_zipinstaller->setUrl(gameUrls); | 532 | m_zipinstaller->setUrl(gameUrls); |
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.h b/rbutil/rbutilqt/gui/selectiveinstallwidget.h index 77f4759509..799829e066 100644 --- a/rbutil/rbutilqt/gui/selectiveinstallwidget.h +++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.h | |||
@@ -29,7 +29,7 @@ class SelectiveInstallWidget : public QWidget | |||
29 | { | 29 | { |
30 | Q_OBJECT | 30 | Q_OBJECT |
31 | public: | 31 | public: |
32 | SelectiveInstallWidget(QWidget* parent = 0); | 32 | SelectiveInstallWidget(QWidget* parent = nullptr); |
33 | 33 | ||
34 | public slots: | 34 | public slots: |
35 | void updateVersion(void); | 35 | void updateVersion(void); |
diff --git a/rbutil/rbutilqt/installtalkwindow.h b/rbutil/rbutilqt/installtalkwindow.h index cd15dd4bd7..f965e4cb09 100644 --- a/rbutil/rbutilqt/installtalkwindow.h +++ b/rbutil/rbutilqt/installtalkwindow.h | |||
@@ -32,7 +32,7 @@ class InstallTalkWindow : public QDialog | |||
32 | { | 32 | { |
33 | Q_OBJECT | 33 | Q_OBJECT |
34 | public: | 34 | public: |
35 | InstallTalkWindow(QWidget *parent = 0); | 35 | InstallTalkWindow(QWidget *parent = nullptr); |
36 | 36 | ||
37 | public slots: | 37 | public slots: |
38 | void accept(void); | 38 | void accept(void); |
diff --git a/rbutil/rbutilqt/main.cpp b/rbutil/rbutilqt/main.cpp index eb34337b72..e9a86fd3c3 100644 --- a/rbutil/rbutilqt/main.cpp +++ b/rbutil/rbutilqt/main.cpp | |||
@@ -65,7 +65,7 @@ int main( int argc, char ** argv ) { | |||
65 | // check for a configuration file in the program folder. | 65 | // check for a configuration file in the program folder. |
66 | QSettings *user; | 66 | QSettings *user; |
67 | if(QFileInfo(absolutePath + "/RockboxUtility.ini").isFile()) | 67 | if(QFileInfo(absolutePath + "/RockboxUtility.ini").isFile()) |
68 | user = new QSettings(absolutePath + "/RockboxUtility.ini", QSettings::IniFormat, 0); | 68 | user = new QSettings(absolutePath + "/RockboxUtility.ini", QSettings::IniFormat, nullptr); |
69 | else user = new QSettings(QSettings::IniFormat, QSettings::UserScope, "rockbox.org", "RockboxUtility"); | 69 | else user = new QSettings(QSettings::IniFormat, QSettings::UserScope, "rockbox.org", "RockboxUtility"); |
70 | 70 | ||
71 | QString applang = QLocale::system().name(); | 71 | QString applang = QLocale::system().name(); |
@@ -98,7 +98,7 @@ int main( int argc, char ** argv ) { | |||
98 | QList<QTranslator*> translators; | 98 | QList<QTranslator*> translators; |
99 | translators.append(&translator); | 99 | translators.append(&translator); |
100 | translators.append(&qttrans); | 100 | translators.append(&qttrans); |
101 | RbUtilQt window(0); | 101 | RbUtilQt window(nullptr); |
102 | RbUtilQt::translators = translators; | 102 | RbUtilQt::translators = translators; |
103 | window.show(); | 103 | window.show(); |
104 | 104 | ||
diff --git a/rbutil/rbutilqt/preview.h b/rbutil/rbutilqt/preview.h index 5e43c2d9ac..7462413f0a 100644 --- a/rbutil/rbutilqt/preview.h +++ b/rbutil/rbutilqt/preview.h | |||
@@ -33,7 +33,7 @@ class PreviewDlg : public QDialog | |||
33 | Q_OBJECT | 33 | Q_OBJECT |
34 | 34 | ||
35 | public: | 35 | public: |
36 | PreviewDlg(QWidget *parent = 0); | 36 | PreviewDlg(QWidget *parent = nullptr); |
37 | void setPixmap(QPixmap p); | 37 | void setPixmap(QPixmap p); |
38 | void setText(QString text); | 38 | void setText(QString text); |
39 | 39 | ||
@@ -54,7 +54,7 @@ class PreviewLabel : public QLabel | |||
54 | Q_OBJECT | 54 | Q_OBJECT |
55 | 55 | ||
56 | public: | 56 | public: |
57 | PreviewLabel(QWidget * parent = 0, Qt::WindowFlags f = Qt::WindowFlags()); | 57 | PreviewLabel(QWidget * parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); |
58 | 58 | ||
59 | void setPixmap(QPixmap p); | 59 | void setPixmap(QPixmap p); |
60 | void setText(QString text); | 60 | void setText(QString text); |
diff --git a/rbutil/rbutilqt/progressloggergui.cpp b/rbutil/rbutilqt/progressloggergui.cpp index f084fc1dc1..ed76b43d9b 100644 --- a/rbutil/rbutilqt/progressloggergui.cpp +++ b/rbutil/rbutilqt/progressloggergui.cpp | |||
@@ -161,7 +161,7 @@ void ProgressLoggerGui::saveErrorLog() | |||
161 | 161 | ||
162 | int i=0; | 162 | int i=0; |
163 | loggerTexts = ""; | 163 | loggerTexts = ""; |
164 | while(dp.listProgress->item(i) != NULL) | 164 | while(dp.listProgress->item(i) != nullptr) |
165 | { | 165 | { |
166 | loggerTexts.append(dp.listProgress->item(i)->text()); | 166 | loggerTexts.append(dp.listProgress->item(i)->text()); |
167 | loggerTexts.append("\n"); | 167 | loggerTexts.append("\n"); |
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index cd5bea57b9..d013a7cb58 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -371,7 +371,7 @@ void RbUtilQt::updateSettings() | |||
371 | " or review your settings.")); | 371 | " or review your settings.")); |
372 | configDialog(); | 372 | configDialog(); |
373 | } | 373 | } |
374 | else if(chkConfig(0)) { | 374 | else if(chkConfig(nullptr)) { |
375 | QApplication::processEvents(); | 375 | QApplication::processEvents(); |
376 | QMessageBox::critical(this, tr("Configuration error"), | 376 | QMessageBox::critical(this, tr("Configuration error"), |
377 | tr("Your configuration is invalid. This is most likely due " | 377 | tr("Your configuration is invalid. This is most likely due " |
@@ -400,7 +400,7 @@ void RbUtilQt::updateDevice() | |||
400 | ui.actionRemove_bootloader->setEnabled(bootloaderUninstallable); | 400 | ui.actionRemove_bootloader->setEnabled(bootloaderUninstallable); |
401 | 401 | ||
402 | /* Disable the whole tab widget if configuration is invalid */ | 402 | /* Disable the whole tab widget if configuration is invalid */ |
403 | bool configurationValid = !chkConfig(0); | 403 | bool configurationValid = !chkConfig(nullptr); |
404 | ui.tabWidget->setEnabled(configurationValid); | 404 | ui.tabWidget->setEnabled(configurationValid); |
405 | ui.menuA_ctions->setEnabled(configurationValid); | 405 | ui.menuA_ctions->setEnabled(configurationValid); |
406 | 406 | ||
@@ -562,7 +562,7 @@ void RbUtilQt::uninstallBootloader(void) | |||
562 | = BootloaderInstallHelper::createBootloaderInstaller(this, | 562 | = BootloaderInstallHelper::createBootloaderInstaller(this, |
563 | SystemInfo::platformValue(SystemInfo::BootloaderMethod).toString()); | 563 | SystemInfo::platformValue(SystemInfo::BootloaderMethod).toString()); |
564 | 564 | ||
565 | if(bl == NULL) { | 565 | if(bl == nullptr) { |
566 | logger->addItem(tr("No uninstall method for this target known."), LOGERROR); | 566 | logger->addItem(tr("No uninstall method for this target known."), LOGERROR); |
567 | logger->setFinished(); | 567 | logger->setFinished(); |
568 | return; | 568 | return; |
diff --git a/rbutil/rbutilqt/rbutilqt.h b/rbutil/rbutilqt/rbutilqt.h index cfbef8b1fc..91486e9a2d 100644 --- a/rbutil/rbutilqt/rbutilqt.h +++ b/rbutil/rbutilqt/rbutilqt.h | |||
@@ -42,9 +42,9 @@ class RbUtilQt : public QMainWindow | |||
42 | Q_OBJECT | 42 | Q_OBJECT |
43 | 43 | ||
44 | public: | 44 | public: |
45 | RbUtilQt(QWidget *parent = 0); | 45 | RbUtilQt(QWidget *parent = nullptr); |
46 | static QList<QTranslator*> translators; | 46 | static QList<QTranslator*> translators; |
47 | static bool chkConfig(QWidget *parent = 0); | 47 | static bool chkConfig(QWidget *parent = nullptr); |
48 | 48 | ||
49 | private: | 49 | private: |
50 | ManualWidget *manual; | 50 | ManualWidget *manual; |
diff --git a/rbutil/rbutilqt/sysinfo.h b/rbutil/rbutilqt/sysinfo.h index e2b3675102..3211151bf0 100644 --- a/rbutil/rbutilqt/sysinfo.h +++ b/rbutil/rbutilqt/sysinfo.h | |||
@@ -34,7 +34,7 @@ class Sysinfo : public QDialog | |||
34 | InfoHtml, | 34 | InfoHtml, |
35 | InfoText, | 35 | InfoText, |
36 | }; | 36 | }; |
37 | Sysinfo(QWidget *parent = 0); | 37 | Sysinfo(QWidget *parent = nullptr); |
38 | 38 | ||
39 | static QString getInfo(InfoType type = InfoHtml); | 39 | static QString getInfo(InfoType type = InfoHtml); |
40 | private: | 40 | private: |
diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/rbutil/rbutilqt/themesinstallwindow.cpp index 6ad7c9bcae..ac31fe727c 100644 --- a/rbutil/rbutilqt/themesinstallwindow.cpp +++ b/rbutil/rbutilqt/themesinstallwindow.cpp | |||
@@ -63,7 +63,7 @@ ThemesInstallWindow::ThemesInstallWindow(QWidget *parent) : QDialog(parent) | |||
63 | igetter.setCache(infocachedir); | 63 | igetter.setCache(infocachedir); |
64 | } | 64 | } |
65 | 65 | ||
66 | logger = NULL; | 66 | logger = nullptr; |
67 | } | 67 | } |
68 | 68 | ||
69 | ThemesInstallWindow::~ThemesInstallWindow() | 69 | ThemesInstallWindow::~ThemesInstallWindow() |
@@ -347,7 +347,7 @@ void ThemesInstallWindow::install() | |||
347 | } | 347 | } |
348 | LOG_INFO() << "installing:" << themes; | 348 | LOG_INFO() << "installing:" << themes; |
349 | 349 | ||
350 | if(logger == NULL) | 350 | if(logger == nullptr) |
351 | logger = new ProgressLoggerGui(this); | 351 | logger = new ProgressLoggerGui(this); |
352 | logger->show(); | 352 | logger->show(); |
353 | QString mountPoint = RbSettings::value(RbSettings::Mountpoint).toString(); | 353 | QString mountPoint = RbSettings::value(RbSettings::Mountpoint).toString(); |
diff --git a/rbutil/rbutilqt/uninstallwindow.h b/rbutil/rbutilqt/uninstallwindow.h index d6f477c2f3..74e149aa02 100644 --- a/rbutil/rbutilqt/uninstallwindow.h +++ b/rbutil/rbutilqt/uninstallwindow.h | |||
@@ -31,7 +31,7 @@ class UninstallWindow : public QDialog | |||
31 | { | 31 | { |
32 | Q_OBJECT | 32 | Q_OBJECT |
33 | public: | 33 | public: |
34 | UninstallWindow(QWidget *parent = 0); | 34 | UninstallWindow(QWidget *parent = nullptr); |
35 | 35 | ||
36 | public slots: | 36 | public slots: |
37 | void accept(void); | 37 | void accept(void); |