summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/base/mspackutil.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/base/mspackutil.cpp')
-rw-r--r--rbutil/rbutilqt/base/mspackutil.cpp12
1 files changed, 6 insertions, 6 deletions
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 @@
24MsPackUtil::MsPackUtil(QObject* parent) 24MsPackUtil::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
53bool MsPackUtil::close(void) 53bool 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;