From 1344ab251b3f57eaa23029122ca4d97f6e096b7e Mon Sep 17 00:00:00 2001 From: hjk Date: Sat, 19 Nov 2011 23:41:36 +0100 Subject: Merge unneeded KDSysInfo 'pseudo namespace' into KDUpdater namespace. Change-Id: I9eec8c8e2dccb37741195bfc6df1f57052863a2d Reviewed-by: Tim Jenssen --- .../3rdparty/kdtools/kdrunoncechecker.cpp | 12 ++-- .../libinstaller/3rdparty/kdtools/kdsysinfo.cpp | 49 +++++++------- .../libinstaller/3rdparty/kdtools/kdsysinfo.h | 77 ++++++++++------------ .../3rdparty/kdtools/kdsysinfo_mac.cpp | 16 +++-- .../3rdparty/kdtools/kdsysinfo_win.cpp | 29 ++++---- .../3rdparty/kdtools/kdsysinfo_x11.cpp | 20 +++--- 6 files changed, 105 insertions(+), 98 deletions(-) (limited to 'installerbuilder/libinstaller/3rdparty') diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdrunoncechecker.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdrunoncechecker.cpp index 86a50728b..8e0af3ddc 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/kdrunoncechecker.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdrunoncechecker.cpp @@ -31,6 +31,8 @@ #include +using namespace KDUpdater; + class KDRunOnceChecker::Private { public: @@ -59,7 +61,7 @@ class ProcessnameEquals public: ProcessnameEquals(const QString &name): m_name(name) {} - bool operator()(const KDSysInfo::ProcessInfo &info) + bool operator()(const ProcessInfo &info) { #ifndef Q_WS_WIN if (info.name == m_name) @@ -96,17 +98,17 @@ bool KDRunOnceChecker::isRunning(Dependencies depends) } break; case ProcessList: { - const QList allProcesses = KDSysInfo::runningProcesses(); + const QList allProcesses = runningProcesses(); const QString appName = qApp->applicationFilePath(); - //QList< KDSysInfo::ProcessInfo >::const_iterator it = std::find_if(allProcesses.constBegin(), allProcesses.constEnd(), ProcessnameEquals(appName)); + //QList< ProcessInfo >::const_iterator it = std::find_if(allProcesses.constBegin(), allProcesses.constEnd(), ProcessnameEquals(appName)); const int count = std::count_if(allProcesses.constBegin(), allProcesses.constEnd(), ProcessnameEquals(appName)); running = running || /*it != allProcesses.constEnd()*/count > 1; } break; case Both: { - const QList allProcesses = KDSysInfo::runningProcesses(); + const QList allProcesses = runningProcesses(); const QString appName = qApp->applicationFilePath(); - //QList< KDSysInfo::ProcessInfo >::const_iterator it = std::find_if(allProcesses.constBegin(), allProcesses.constEnd(), ProcessnameEquals(appName)); + //QList::const_iterator it = std::find_if(allProcesses.constBegin(), allProcesses.constEnd(), ProcessnameEquals(appName)); const int count = std::count_if(allProcesses.constBegin(), allProcesses.constEnd(), ProcessnameEquals(appName)); const bool locked = d->m_hasLock || d->m_lockfile.lock(); if (locked) diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.cpp index 50ee8ce74..7c722a73d 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.cpp @@ -27,89 +27,92 @@ #include -QDebug operator<<(QDebug dbg, KDSysInfo::Volume volume) +using namespace KDUpdater; + +QDebug operator<<(QDebug dbg, VolumeInfo volume) { - return dbg << "KDSysInfo::Volume(" << volume.path() << ")"; + return dbg << "KDUpdater::Volume(" << volume.path() << ")"; } -QPair volumeSpace(const QString &volume); -QString volumeName(const QString &volume); +//QPair volumeSpace(const QString &volume); + +//QString volumeName(const QString &volume); -KDSysInfo::Volume::Volume() +VolumeInfo::VolumeInfo() { m_size = 0; m_availableSpace = 0; } -void KDSysInfo::Volume::setPath(const QString &path) +void VolumeInfo::setPath(const QString &path) { m_path = path; } -bool KDSysInfo::Volume::operator==(const Volume &other) const +bool VolumeInfo::operator==(const VolumeInfo &other) const { return m_name == other.m_name && m_path == other.m_path; } -void KDSysInfo::Volume::setName(const QString &name) +void VolumeInfo::setName(const QString &name) { m_name = name; } -QString KDSysInfo::Volume::name() const +QString VolumeInfo::name() const { return m_name; } -QString KDSysInfo::Volume::path() const +QString VolumeInfo::path() const { return m_path; } -quint64 KDSysInfo::Volume::size() const +quint64 VolumeInfo::size() const { return m_size; } -void KDSysInfo::Volume::setSize(const quint64 &size) +void VolumeInfo::setSize(const quint64 &size) { m_size = size; } -QString KDSysInfo::Volume::fileSystemType() const +QString VolumeInfo::fileSystemType() const { return m_fileSystemType; } -void KDSysInfo::Volume::setFileSystemType(const QString &type) +void VolumeInfo::setFileSystemType(const QString &type) { m_fileSystemType = type; } -quint64 KDSysInfo::Volume::availableSpace() const +quint64 VolumeInfo::availableSpace() const { return m_availableSpace; } -void KDSysInfo::Volume::setAvailableSpace(const quint64 &available) +void VolumeInfo::setAvailableSpace(const quint64 &available) { m_availableSpace = available; } struct PathLongerThan { - bool operator()(const KDSysInfo::Volume &lhs, const KDSysInfo::Volume &rhs) const + bool operator()(const VolumeInfo &lhs, const VolumeInfo &rhs) const { return lhs.path().length() > rhs.path().length(); } }; -KDSysInfo::Volume KDSysInfo::Volume::fromPath(const QString &path) +VolumeInfo VolumeInfo::fromPath(const QString &path) { - QList volumes = mountedVolumes(); + QList volumes = mountedVolumes(); // sort by length to get the longest mount point (not just "/") first std::sort(volumes.begin(), volumes.end(), PathLongerThan()); - for (QList< KDSysInfo::Volume >::const_iterator it = volumes.constBegin(); it != volumes.constEnd(); ++it) { + for (QList< VolumeInfo >::const_iterator it = volumes.constBegin(); it != volumes.constEnd(); ++it) { #ifdef Q_WS_WIN if (QDir::toNativeSeparators(path).toLower().startsWith(it->path().toLower())) #else @@ -117,10 +120,10 @@ KDSysInfo::Volume KDSysInfo::Volume::fromPath(const QString &path) #endif return *it; } - return KDSysInfo::Volume(); + return VolumeInfo(); } -QDebug operator<<(QDebug dbg, KDSysInfo::ProcessInfo process) +QDebug operator<<(QDebug dbg, ProcessInfo process) { - return dbg << "KDSysInfo::ProcessInfo(" << process.id << ", " << process.name << ")"; + return dbg << "KDUpdater::ProcessInfo(" << process.id << ", " << process.name << ")"; } diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.h b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.h index 0072b8f67..a4dc45345 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.h +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo.h @@ -26,63 +26,54 @@ #include #include -#include -#include -class KDTOOLS_EXPORT KDSysInfo : public QSysInfo -{ -private: - KDSysInfo() {} +namespace KDUpdater { +class KDTOOLS_EXPORT VolumeInfo +{ public: - ~KDSysInfo() {} + VolumeInfo(); + static VolumeInfo fromPath(const QString &path); - class KDTOOLS_EXPORT Volume - { - friend class ::KDSysInfo; - public: - Volume(); - static Volume fromPath(const QString &path); + QString name() const; + QString path() const; + quint64 size() const; + QString fileSystemType() const; + quint64 availableSpace() const; - QString name() const; - QString path() const; - quint64 size() const; - QString fileSystemType() const; - quint64 availableSpace() const; + bool operator==(const VolumeInfo &other) const; - bool operator==(const Volume &other) const; + void setPath(const QString &path); + void setName(const QString &name); + void setSize(const quint64 &size); + void setFileSystemType(const QString &type); + void setAvailableSpace(const quint64 &available); - private: - void setPath(const QString &path); - void setName(const QString &name); - void setSize(const quint64 &size); - void setFileSystemType(const QString &type); - void setAvailableSpace(const quint64 &available); +private: + QString m_path; + QString m_name; + QString m_fileSystemType; + quint64 m_size; + quint64 m_availableSpace; +}; - private: - QString m_path; - QString m_name; - QString m_fileSystemType; - quint64 m_size; - quint64 m_availableSpace; - }; +struct ProcessInfo +{ + quint32 id; + QString name; +}; - struct ProcessInfo - { - quint32 id; - QString name; - }; +quint64 installedMemory(); +QList mountedVolumes(); +QList runningProcesses(); - static quint64 installedMemory(); - static QList mountedVolumes(); - static QList runningProcesses(); -}; +} // namespace KDUpdater QT_BEGIN_NAMESPACE class QDebug; QT_END_NAMESPACE -QDebug operator<<(QDebug dbg, KDSysInfo::Volume volume); -QDebug operator<<(QDebug dbg, KDSysInfo::ProcessInfo process); +QDebug operator<<(QDebug dbg, KDUpdater::VolumeInfo volume); +QDebug operator<<(QDebug dbg, KDUpdater::ProcessInfo process); #endif // KDSYSINFO_H diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_mac.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_mac.cpp index bf1d070b8..f2bf3d2df 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_mac.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_mac.cpp @@ -26,22 +26,24 @@ #include +namespace KDUpdater { + static QString qt_mac_hfsunistr_to_qstring(const HFSUniStr255 *hfs) { const QChar *charPointer = reinterpret_cast(hfs->unicode); return QString(charPointer, hfs->length); } -quint64 KDSysInfo::installedMemory() +quint64 installedMemory() { SInt32 mb = 0; Gestalt(gestaltPhysicalRAMSizeInMegabytes, &mb); return quint64(static_cast(mb) * 1024LL * 1024LL); } -QList KDSysInfo::mountedVolumes() +QList mountedVolumes() { - QList result; + QList result; FSVolumeRefNum volume; FSVolumeInfo info; HFSUniStr255 volName; @@ -51,7 +53,7 @@ QList KDSysInfo::mountedVolumes() while (FSGetVolumeInfo(kFSInvalidVolumeRefNum, ++i, &volume, kFSVolInfoFSInfo, &info, &volName, &ref) == 0) { UInt8 path[PATH_MAX + 1]; if (FSRefMakePath(&ref, path, PATH_MAX) == 0) { - Volume v; + VolumeInfo v; v.setName(qt_mac_hfsunistr_to_qstring(&volName)); v.setPath(QString::fromLocal8Bit(reinterpret_cast< char* >(path))); @@ -69,7 +71,9 @@ QList KDSysInfo::mountedVolumes() return result; } -QList KDSysInfo::runningProcesses() +QList runningProcesses() { - return QList(); + return QList(); } + +} // namespace KDUpdater diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_win.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_win.cpp index 00d84ada7..c0519861e 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_win.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_win.cpp @@ -33,7 +33,9 @@ #define KDSYSINFO_PROCESS_QUERY_LIMITED_INFORMATION (0x1000) -quint64 KDSysInfo::installedMemory() +namespace KDUpdater { + +quint64 installedMemory() { MEMORYSTATUSEX status; status.dwLength = sizeof(status); @@ -92,12 +94,12 @@ QString fileSystemType(const QString &path) return QLatin1String("unknown"); } -QList KDSysInfo::mountedVolumes() +QList mountedVolumes() { - QList< Volume > result; + QList< VolumeInfo > result; const QFileInfoList drives = QDir::drives(); for (QFileInfoList::const_iterator it = drives.constBegin(); it != drives.constEnd(); ++it) { - Volume volume; + VolumeInfo volume; const QString path = QDir::toNativeSeparators( it->path() ); volume.setPath( path ); volume.setName( volumeName( path ) ); @@ -112,7 +114,7 @@ QList KDSysInfo::mountedVolumes() struct EnumWindowsProcParam { - QList processes; + QList processes; QList seenIDs; }; @@ -120,7 +122,7 @@ struct EnumWindowsProcParam //{ // EnumWindowsProcParam* const list = reinterpret_cast< EnumWindowsProcParam* >( lParam ); -// KDSysInfo::ProcessInfo info; +// ProcessInfo info; // // process id // DWORD procID = 0; @@ -144,7 +146,7 @@ struct EnumWindowsProcParam // return TRUE; //} -//QList< KDSysInfo::ProcessInfo > KDSysInfo::runningProcesses() +//QList< ProcessInfo > runningProcesses() //{ // EnumWindowsProcParam param; // HANDLE snapshot = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 ); @@ -156,7 +158,7 @@ struct EnumWindowsProcParam // while ( foundProcess ) // { // //const QString executableName = QString::fromWCharArray( processStruct.szExeFile ); -// KDSysInfo::ProcessInfo info; +// ProcessInfo info; // HANDLE procHandle = OpenProcess( PROCESS_QUERY_LIMITED_INFORMATION, false, processStruct.th32ProcessID ); // char buffer[ 1024 ]; // DWORD bufferSize = 1024; @@ -180,9 +182,9 @@ struct EnumWindowsProcParam //// EnumDesktopWindows( 0, &EnumWindowsProc, reinterpret_cast< LPARAM >( ¶m ) ); // return param.processes; //} -typedef BOOL ( WINAPI *QueryFullProcessImageNamePtr )( HANDLE, DWORD, char*, PDWORD ); -typedef DWORD ( WINAPI *GetProcessImageFileNamePtr )( HANDLE, char*, DWORD ); -QList< KDSysInfo::ProcessInfo > KDSysInfo::runningProcesses() +typedef BOOL (WINAPI *QueryFullProcessImageNamePtr)(HANDLE, DWORD, char *, PDWORD); +typedef DWORD (WINAPI *GetProcessImageFileNamePtr)(HANDLE, char *, DWORD); +QList runningProcesses() { EnumWindowsProcParam param; HANDLE snapshot = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 ); @@ -220,9 +222,8 @@ QList< KDSysInfo::ProcessInfo > KDSysInfo::runningProcesses() char buffer[ 1024 ]; DWORD bufferSize = 1024; bool succ = false; - QString whichFailed; QString executablePath; - KDSysInfo::ProcessInfo info; + ProcessInfo info; if (QSysInfo::windowsVersion() > QSysInfo::WV_5_2) { succ = callPtr( procHandle, 0, buffer, &bufferSize ); @@ -257,3 +258,5 @@ QList< KDSysInfo::ProcessInfo > KDSysInfo::runningProcesses() kernel32.unload(); return param.processes; } + +} // namespace KDUpdater diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_x11.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_x11.cpp index d237869f3..7225e996d 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_x11.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdsysinfo_x11.cpp @@ -30,7 +30,9 @@ #include #include -quint64 KDSysInfo::installedMemory() +namespace KDUpdater { + +quint64 installedMemory() { #ifdef Q_OS_LINUX QFile f(QLatin1String("/proc/meminfo")); @@ -56,14 +58,14 @@ quint64 KDSysInfo::installedMemory() return 0; } -QList KDSysInfo::mountedVolumes() +QList mountedVolumes() { - QList result; + QList result; QFile f(QLatin1String("/etc/mtab")); if (!f.open(QIODevice::ReadOnly)) { qCritical("%s: Could not open %s: %s", Q_FUNC_INFO, qPrintable(f.fileName()), qPrintable(f.errorString())); - return QList(); //better error-handling? + return QList(); //better error-handling? } QTextStream stream(&f); @@ -77,7 +79,7 @@ QList KDSysInfo::mountedVolumes() const QStringList parts = s.split( QLatin1Char(' '), QString::SkipEmptyParts); - Volume v; + VolumeInfo v; v.setName(parts.at(1)); v.setPath(parts.at(1)); @@ -93,9 +95,9 @@ QList KDSysInfo::mountedVolumes() return result; } -QList KDSysInfo::runningProcesses() +QList runningProcesses() { - QList processes; + QList processes; QDir procDir(QLatin1String("/proc")); const QFileInfoList procCont = procDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::Readable); QRegExp validator(QLatin1String("[0-9]+")); @@ -104,7 +106,7 @@ QList KDSysInfo::runningProcesses() const QString linkPath = QDir(info.absoluteFilePath()).absoluteFilePath(QLatin1String("exe")); const QFileInfo linkInfo(linkPath); if (linkInfo.exists()) { - KDSysInfo::ProcessInfo processInfo; + ProcessInfo processInfo; processInfo.name = linkInfo.symLinkTarget(); processInfo.id = info.fileName().toInt(); processes.append(processInfo); @@ -113,3 +115,5 @@ QList KDSysInfo::runningProcesses() } return processes; } + +} // namespace KDUpdater -- cgit v1.2.3