← Back to branch summary

~ubuntu-branches/ubuntu/utopic/hedgewars/utopic

« back to all changes in this revision

Viewing changes to QTfrontend/ui/widget/feedbackdialog.cpp

  • Committer: Package Import Robot
  • Author(s): Gianfranco Costamagna
  • Date: 2014-01-02 12:37:23 UTC
  • mfrom: (19.1.5 sid)
  • Revision ID: package-import@ubuntu.com-20140102123723-6pdhmyj8tb5y8xbg
Tags: 0.9.20.3-1
New upstream minor release, suitable for unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
QTfrontend/ui/widget/feedbackdialog.cpp
34
34
 
35
35
#include <string>
36
36
 
37
 
#ifdef Q_WS_WIN
 
37
#ifdef Q_OS_WIN
38
38
#define WINVER 0x0500
39
39
#include <windows.h>
40
40
#else
42
42
#include <sys/types.h>
43
43
#endif
44
44
 
45
 
#ifdef Q_WS_MAC
 
45
#ifdef Q_OS_MAC
46
46
#include <sys/sysctl.h>
47
47
#ifndef _SC_NPROCESSORS_ONLN
48
48
#define _SC_NPROCESSORS_ONLN 58
207
207
    QString processor_name = "Processor: ";
208
208
 
209
209
    // platform specific code
210
 
#ifdef Q_WS_MACX
 
210
#ifdef Q_OS_MACX
211
211
    number_of_cores += QString::number(sysconf(_SC_NPROCESSORS_ONLN)) + "\n";
212
212
 
213
213
    uint64_t memsize;
240
240
        default: os_version += "\"Unknown version\"\n"; break;
241
241
    }
242
242
#endif
243
 
#ifdef Q_WS_WIN
 
243
#ifdef Q_OS_WIN
244
244
    SYSTEM_INFO sysinfo;
245
245
    GetSystemInfo(&sysinfo);
246
246
    number_of_cores += QString::number(sysinfo.dwNumberOfProcessors) + "\n";
257
257
        case QSysInfo::WV_2003: os_version += "Windows Server 2003\n"; break;
258
258
        case QSysInfo::WV_VISTA: os_version += "Windows Vista\n"; break;
259
259
        case QSysInfo::WV_WINDOWS7: os_version += "Windows 7\n"; break;
260
 
        //case QSysInfo::WV_WINDOWS8: os_version += "Windows 8\n"; break; //QT 5+
 
260
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 
261
        case QSysInfo::WV_WINDOWS8: os_version += "Windows 8\n"; break;
 
262
#endif
261
263
        default: os_version += "Windows (Unknown version)\n"; break;
262
264
    }
263
265
    kernel_line += "Windows kernel\n";
264
266
#endif
265
 
#ifdef Q_WS_X11
 
267
#ifdef Q_OS_LINUX
266
268
    number_of_cores += QString::number(sysconf(_SC_NPROCESSORS_ONLN)) + "\n";
267
 
    long pages = sysconf(_SC_PHYS_PAGES),
268
 
/*
269
 
#ifndef Q_OS_FREEBSD
270
 
         available_pages = sysconf(_SC_AVPHYS_PAGES),
271
 
#else
272
 
         available_pages = 0,
273
 
#endif*/
274
 
    page_size = sysconf(_SC_PAGE_SIZE);
275
 
    total_ram += QString::number(pages*page_size/1024/1024) + " MB\n";
 
269
    quint32 pages = sysconf(_SC_PHYS_PAGES);
 
270
    quint32 page_size = sysconf(_SC_PAGE_SIZE);
 
271
    quint32 total = pages * page_size / 1024 / 1024;
 
272
    total_ram += QString::number(total) + " MB\n";
276
273
    os_version += "GNU/Linux or BSD\n";
277
274
#endif
278
275
 
279
276
    // uname -a
280
 
#if defined(Q_WS_X11) || defined(Q_WS_MACX)
 
277
#if defined(Q_OS_LINUX) || defined(Q_OS_MAC)
281
278
    QProcess *process = new QProcess();
282
279
    QStringList arguments = QStringList("-a");
283
280
    process->start("uname", arguments);
286
283
    delete process;
287
284
#endif
288
285
 
289
 
#if (!defined(Q_WS_MACX) && defined(__i386__)) || defined(__x86_64__)
 
286
#if (defined(Q_OS_WIN) && defined(__i386__)) || defined(__x86_64__)
290
287
    // cpu info
291
288
    quint32 registers[4];
292
289
    quint32 i;
432
429
 
433
430
void FeedbackDialog::finishedSlot(QNetworkReply* reply)
434
431
{
435
 
    if (reply && reply->error() == QNetworkReply::NoError)
 
432
    if (reply->error() == QNetworkReply::NoError)
436
433
    {
437
434
            QMessageBox infoMsg(this);
438
435
            infoMsg.setIcon(QMessageBox::Information);