[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/kdewin32/installer/shared
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2007-02-02 18:45:58
Message-ID: 1170441958.825407.2172.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 629425 by chehrlic:

rename members (add m_)
don't leak m_downloader

 M  +4 -6      installer.cpp  
 M  +1 -1      package.cpp  
 M  +1 -1      package.h  
 M  +17 -17    packagelist.cpp  
 M  +3 -3      packagelist.h  


--- trunk/kdesupport/kdewin32/installer/shared/installer.cpp #629424:629425
@@ -51,8 +51,8 @@
     packageList = _packageList;
     if(packageList)
     {
-        packageList->installer = this;
-        packageList->root = m_root;
+        packageList->m_installer = this;
+        packageList->m_root = m_root;
     }
     connect (packageList,SIGNAL(loadedConfig()),this,SLOT(updatePackageList()));
 }
@@ -62,10 +62,8 @@
 
 void Installer::setRoot(const QString &root)
 {
-    m_root = root;
-    packageList->root = m_root;
-    QDir dir;
-    dir.mkdir(m_root);
+    packageList->m_root = m_root = root;
+    QDir().mkdir(m_root);
 }
 
 bool Installer::isEnabled()
--- trunk/kdesupport/kdewin32/installer/shared/package.cpp #629424:629425
@@ -250,7 +250,7 @@
     return true;
 }
 
-void Package::dump(const QString &title)
+void Package::dump(const QString &title) const
 {
     DUMP_HEADER(title,"Package");
     qDebug() << "m_name:    " << m_name;
--- trunk/kdesupport/kdewin32/installer/shared/package.h #629424:629425
@@ -95,7 +95,7 @@
     bool read(QTextStream &in);
     
     // dump package content
-    void dump(const QString &title=QString());
+    void dump(const QString &title=QString()) const;
     
     // download a package item
     bool downloadItem(Downloader *downloader, Package::Type type);
--- trunk/kdesupport/kdewin32/installer/shared/packagelist.cpp #629424:629425
@@ -40,8 +40,8 @@
     qDebug() << __FUNCTION__;
 #endif
 
-    downloader = _downloader ? _downloader : new Downloader;
-    root = ".";
+    m_downloader = _downloader ? _downloader : new Downloader(this);
+    m_root = ".";
     m_configFile = "/packages.txt";
 
 }
@@ -55,7 +55,7 @@
 
 bool PackageList::hasConfig()
 {
-    return QFile::exists(root + m_configFile);
+    return QFile::exists(m_root + m_configFile);
 }
 
 void PackageList::addPackage(const Package &package)
@@ -105,7 +105,7 @@
     if (m_packageList.count() == 0)
         return false;
 
-    QString fileName = _fileName.isEmpty() ? root + m_configFile : _fileName;
+    QString fileName = _fileName.isEmpty() ? m_root + m_configFile : _fileName;
     QFile file(fileName);
     if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
     {
@@ -130,7 +130,7 @@
     qDebug() << __FUNCTION__;
 #endif
 
-    QString fileName = _fileName.isEmpty() ? root + m_configFile : _fileName;
+    QString fileName = _fileName.isEmpty() ? m_root + m_configFile : _fileName;
     QFile file(fileName);
 
     if (!file.open(QIODevice::ReadOnly| QIODevice::Text))
@@ -158,7 +158,7 @@
     qDebug() << __FUNCTION__;
 #endif
 
-    QString fileName = _fileName.isEmpty() ? root + m_configFile : _fileName;
+    QString fileName = _fileName.isEmpty() ? m_root + m_configFile : _fileName;
     QFile file(fileName);
 
     if (!file.open(QIODevice::ReadOnly| QIODevice::Text))
@@ -431,13 +431,13 @@
     qDebug() << types;
 #endif
     if (types & Package::BIN)
-        pkg->downloadItem(downloader,Package::BIN);
+        pkg->downloadItem(m_downloader, Package::BIN);
     if (types & Package::LIB)
-        pkg->downloadItem(downloader,Package::LIB);
+        pkg->downloadItem(m_downloader, Package::LIB);
     if (types & Package::DOC)
-        pkg->downloadItem(downloader,Package::DOC);
+        pkg->downloadItem(m_downloader, Package::DOC);
     if (types & Package::SRC)
-        pkg->downloadItem(downloader,Package::SRC);
+        pkg->downloadItem(m_downloader, Package::SRC);
     return true;
 }
 
@@ -448,13 +448,13 @@
         return false;
     // FIXME: handle error code
     if (types & Package::BIN)
-        pkg->installItem(installer,Package::BIN);
+        pkg->installItem(m_installer, Package::BIN);
     if (types & Package::LIB)
-        pkg->installItem(installer,Package::LIB);
+        pkg->installItem(m_installer, Package::LIB);
     if (types & Package::DOC)
-        pkg->installItem(installer,Package::DOC);
+        pkg->installItem(m_installer, Package::DOC);
     if (types & Package::SRC)
-        pkg->installItem(installer,Package::SRC);
+        pkg->installItem(m_installer, Package::SRC);
     return true;
 }
 
@@ -462,11 +462,11 @@
 {
     qDebug() << "class PackageList dump: " << title;
     qDebug() << "m_name       " << m_name;
-    qDebug() << "root         " << root;
+    qDebug() << "root         " << m_root;
     qDebug() << "m_configFile " << m_configFile;
     qDebug() << "m_baseURL    " << m_baseURL;
-    QList<Package>::iterator it = m_packageList.begin();
-    for ( ; it != m_packageList.end(); ++it)
+    QList<Package>::ConstIterator it = m_packageList.constBegin();
+    for ( ; it != m_packageList.constEnd(); ++it)
         it->dump();
 }
 
--- trunk/kdesupport/kdewin32/installer/shared/packagelist.h #629424:629425
@@ -105,10 +105,10 @@
     bool readHTMLInternal(QIODevice *ioDev, PackageList::Type type);
 private:
     QList<Package> m_packageList;
-    QString root;
+    QString m_root;
     QString m_configFile;
-    Downloader *downloader;
-    Installer *installer;
+    Downloader *m_downloader;
+    Installer *m_installer;
     QString m_name;
     QString m_baseURL;
     Site *m_curSite;
[prev in list] [next in list] [prev in thread] [next in thread]