enhanced translation;

enhances for readability; some fixes;
F1ash · Jun 30, 2018 · 3fc1b53 · 3fc1b53
1 parent b72cfd5
commit 3fc1b53
Show file tree

Hide file tree

Showing 82 changed files with 262 additions and 241 deletions.
diff --git a/src/create_widgets/domain/_tab.cpp b/src/create_widgets/domain/_tab.cpp
@@ -39,7 +39,7 @@ void _Tab::readXMLDesciption()
 }
 void _Tab::readXMLDesciption(const QString &_xmlDesc)
 {
-
+    Q_UNUSED(_xmlDesc)
 }
 void _Tab::resetData()
 {

diff --git a/src/create_widgets/domain/common_widgets/net_if_widgets/generic_ethernet.cpp b/src/create_widgets/domain/common_widgets/net_if_widgets/generic_ethernet.cpp
@@ -30,7 +30,7 @@ Generic_Ethernet::Generic_Ethernet(
     commonLayout->addWidget(addr);
     commonLayout->addStretch(-1);
     setLayout(commonLayout);
-    // dataChanged connects
+    // dataChanged connections
     connect(target, SIGNAL(textEdited(QString)),
             this, SLOT(stateChanged()));
     connect(script, SIGNAL(textEdited(QString)),

diff --git a/src/create_widgets/domain/common_widgets/net_if_widgets/mac_address.cpp b/src/create_widgets/domain/common_widgets/net_if_widgets/mac_address.cpp
@@ -14,7 +14,7 @@ MAC_Address::MAC_Address(QWidget *parent) :
     setLayout(commonLayout);
     connect(useMac, SIGNAL(toggled(bool)),
             mac, SLOT(setEnabled(bool)));
-    // dataChanged connects
+    // dataChanged connections
     connect(useMac, SIGNAL(toggled(bool)),
             this, SLOT(stateChanged()));
     connect(mac, SIGNAL(textEdited(QString)),

diff --git a/src/create_widgets/domain/common_widgets/net_if_widgets/multicast_tunnel.cpp b/src/create_widgets/domain/common_widgets/net_if_widgets/multicast_tunnel.cpp
@@ -33,7 +33,7 @@ MultiCast_Tunnel::MultiCast_Tunnel(
     commonLayout->addWidget(addr);
     commonLayout->addStretch(-1);
     setLayout(commonLayout);
-    // dataChanged connects
+    // dataChanged connections
     connect(ipAddr, SIGNAL(textEdited(QString)),
             this, SLOT(stateChanged()));
     connect(port, SIGNAL(valueChanged(int)),

diff --git a/src/create_widgets/domain/common_widgets/net_if_widgets/tcp_tunnel.cpp b/src/create_widgets/domain/common_widgets/net_if_widgets/tcp_tunnel.cpp
@@ -38,7 +38,7 @@ TCP_Tunnel::TCP_Tunnel(
     commonLayout->addWidget(addr);
     commonLayout->addStretch(-1);
     setLayout(commonLayout);
-    // dataChanged connects
+    // dataChanged connections
     connect(type, SIGNAL(currentIndexChanged(int)),
             this, SLOT(stateChanged()));
     connect(ipAddr, SIGNAL(textEdited(QString)),

diff --git a/src/create_widgets/domain/common_widgets/net_if_widgets/userspace_slirp.cpp b/src/create_widgets/domain/common_widgets/net_if_widgets/userspace_slirp.cpp
@@ -34,7 +34,7 @@ to have outgoing access."));
     commonLayout->addWidget(addr);
     commonLayout->addStretch(-1);
     setLayout(commonLayout);
-    // dataChanged connects
+    // dataChanged connections
     connect(mac, SIGNAL(dataChanged()),
             this, SLOT(stateChanged()));
     connect(addr, SIGNAL(dataChanged()),

diff --git a/src/create_widgets/domain/common_widgets/net_if_widgets/virtual_port.cpp b/src/create_widgets/domain/common_widgets/net_if_widgets/virtual_port.cpp
@@ -52,7 +52,7 @@ VirtualPort::VirtualPort(QWidget *parent) :
             this, SLOT(virtPortTypeChanged(int)));
     // set empty type for the general case
     type->setCurrentIndex(type->count()-1);
-    // dataChanged connects
+    // dataChanged connections
     connect(useVirtPort, SIGNAL(toggled(bool)),
             this, SLOT(stateChanged()));
     connect(type, SIGNAL(currentIndexChanged(int)),

diff --git a/src/create_widgets/domain/common_widgets/os_boot_widgets/bios_boot.cpp b/src/create_widgets/domain/common_widgets/os_boot_widgets/bios_boot.cpp
@@ -47,7 +47,7 @@ BIOS_Boot::BIOS_Boot(QWidget *parent, QString _caps) :
     connect(architecture, SIGNAL(archType(const QString&)),
             this, SLOT(changeArch(const QString&)));
     architecture->setItems();
-    // dataChanged connectins
+    // dataChanged connections
     connect(architecture, SIGNAL(dataChanged()),
             this, SLOT(stateChanged()));
     connect(loader, SIGNAL(dataChanged()),

diff --git a/src/create_widgets/domain/create_virt_domain.cpp b/src/create_widgets/domain/create_virt_domain.cpp
@@ -301,7 +301,7 @@ bool CreateVirtDomain::buildXMLDescription()
          * but nullptr-elemens not removed
          * therefore keep to seek on not-nullptr next element
          */
-        uint j = 0;
+        int j = 0;
         int count = list.length();
         for (int i=0; i<count; i++) {
             //qDebug()<<list.item(j).nodeName()<<i;

diff --git a/src/create_widgets/domain/lxc_widgets/lxc_os_booting.cpp b/src/create_widgets/domain/lxc_widgets/lxc_os_booting.cpp
@@ -69,7 +69,7 @@ LXC_OSBooting::LXC_OSBooting(
     connect(architecture, SIGNAL(emulatorType(const QString&)),
             this, SIGNAL(emulatorType(const QString&)));
     architecture->setItems();
-    // dataChanged connectins
+    // dataChanged connections
     connect(architecture, SIGNAL(dataChanged()),
             this, SLOT(stateChanged()));
     connect(initPath, SIGNAL(textEdited(QString)),

diff --git a/src/create_widgets/snapshot/_snapshot_flags.cpp b/src/create_widgets/snapshot/_snapshot_flags.cpp
@@ -10,14 +10,15 @@ _SnapshotFlags::_SnapshotFlags(QWidget *parent) :
 }
 void _SnapshotFlags::changeAvailableFlags(int control)
 {
+    Q_UNUSED(control)
     return;
 }
-int _SnapshotFlags::getCompositeFlag() const
+uint _SnapshotFlags::getCompositeFlag() const
 {
-    int ret = 0;
+    uint ret = 0;
     foreach (QAction *act, actGroup->actions()) {
         if ( act->isChecked() ) {
-            ret += act->data().toInt();
+            ret += act->data().toUInt();
         };
     };
     return ret;

diff --git a/src/create_widgets/snapshot/_snapshot_flags.h b/src/create_widgets/snapshot/_snapshot_flags.h
@@ -10,10 +10,9 @@ class _SnapshotFlags : public QMenu
 {
     Q_OBJECT
 public:
-    explicit _SnapshotFlags(
-            QWidget     *parent = nullptr);
+    explicit _SnapshotFlags(QWidget *parent = nullptr);
     QActionGroup    *actGroup;
-    int              getCompositeFlag() const;
+    uint             getCompositeFlag() const;
     virtual void     changeAvailableFlags(int);
     virtual void     changeFlagCompatibility();
 };

diff --git a/src/create_widgets/snapshot/_snapshot_stuff.cpp b/src/create_widgets/snapshot/_snapshot_stuff.cpp
@@ -30,7 +30,7 @@ QDomDocument _SnapshotStuff::getElements() const
 void _SnapshotStuff::setParameters(virConnectPtr* connPtrPtr, QString &_domName)
 {
     SetDisksDataThread *setThread = new SetDisksDataThread(this);
-    setThread->setCurrentWorkConnect(connPtrPtr, 0, _domName);
+    setThread->setCurrentWorkConnection(connPtrPtr, 0, _domName);
     connect(setThread, SIGNAL(diskData(QDomElement&)),
             this, SLOT(setDiskItem(QDomElement&)));
     connect(setThread, SIGNAL(errorMsg(const QString&, const uint)),

diff --git a/src/create_widgets/snapshot/model/snapshot_tree_model.cpp b/src/create_widgets/snapshot/model/snapshot_tree_model.cpp
@@ -63,6 +63,7 @@ int SnapshotTreeModel::rowCount(const QModelIndex &parent) const
 }
 int SnapshotTreeModel::columnCount(const QModelIndex &parent) const
 {
+    Q_UNUSED(parent)
     return 2;
 }
 QVariant SnapshotTreeModel::headerData(int section, Qt::Orientation orientation, int role) const

diff --git a/src/create_widgets/snapshot/snapshot_action_dialog.cpp b/src/create_widgets/snapshot/snapshot_action_dialog.cpp
@@ -133,7 +133,7 @@ void SnapshotActionDialog::addSnapshotChild(int row, const QModelIndex &parent,
             _data.clear();
             _data.append(
                   QDateTime::fromMSecsSinceEpoch(
-                      _el.text().toULongLong()*1000)
+                      _el.text().toLongLong()*1000)
                         .toString("yyyy-MM-dd_HH:mm:ss"));
         };
         _el = doc

diff --git a/src/create_widgets/snapshot/snapshot_action_dialog.h b/src/create_widgets/snapshot/snapshot_action_dialog.h
@@ -41,7 +41,7 @@ class SnapshotActionDialog : public QDialog
     virDomainPtr         domain = nullptr;
     const QString        domName;
     Act_Param            params;
-    int                  flags = 0;
+    uint                 flags = 0;
     SnapshotTreeModel   *model;
     QAction             *revertAction;
     RevertSnapshotFlags *revertFlagsMenu;

diff --git a/src/create_widgets/storage/_create_storage_widgets/_auth.cpp b/src/create_widgets/storage/_create_storage_widgets/_auth.cpp
@@ -60,6 +60,7 @@ QString _Storage_Auth::getSecretType() const
 /* private slots */
 void _Storage_Auth::usageTypeChanged(int i)
 {
+    Q_UNUSED(i)
     QString _type = usageType->currentText().toLower();
     if ( _type=="usage" ) {
         usage->setPlaceholderText("libvirtiscsi");

diff --git a/src/create_widgets/storage/_create_storage_widgets/find_secret_dialog.cpp b/src/create_widgets/storage/_create_storage_widgets/find_secret_dialog.cpp
@@ -13,7 +13,7 @@ FindSecretDialog::FindSecretDialog(
     settings.endGroup();
     secrets = new VirtSecretControl(this);
     secrets->setUsageInSoftTouched(false);
-    secrets->setCurrentWorkConnect(ptr_ConnPtr);
+    secrets->setCurrentWorkConnection(ptr_ConnPtr);
     hlpThread = new SecretControlThread(this);
     connect(hlpThread, SIGNAL(resultData(Result)),
             this, SLOT(hlpThreadResult(Result)));

diff --git a/src/create_widgets/storage/create_pool.cpp b/src/create_widgets/storage/create_pool.cpp
@@ -158,7 +158,7 @@ QString CreatePool::getXMLDescFileName() const
          * but NULL-elemens not removed
          * therefore keep to seek on not-NULL next element
          */
-        uint j = 0;
+        int j = 0;
         const int count = list.length();
         for (int i=0; i<count;i++) {
             //qDebug()<<list.item(j).nodeName()<<i;

diff --git a/src/dock_head_widgets/bar_name.cpp b/src/dock_head_widgets/bar_name.cpp
@@ -9,7 +9,7 @@ BarNameLabel::BarNameLabel(QWidget *parent) :
 }
 
 /* public slots */
-void BarNameLabel::setColor(int color)
+void BarNameLabel::setColor(uint color)
 {
     _color = color;
 }

diff --git a/src/dock_head_widgets/bar_name.h b/src/dock_head_widgets/bar_name.h
@@ -12,11 +12,11 @@ class BarNameLabel : public QLabel
     explicit BarNameLabel(QWidget *parent = nullptr);
 
 private:
-    int _size = 0;
-    int _color = 0x000000;
+    int _size   = 0;
+    uint _color = 0x000000;
 
 public slots:
-    void setColor(int);
+    void setColor(uint);
 
 private slots:
     void paintEvent(QPaintEvent*);

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -779,12 +779,12 @@ void MainWindow::deleteCurrentConnection()
 {
     connListWidget->list->deleteCurrentConnection();
 }
-void MainWindow::removeConnItem(const QString &connect)
+void MainWindow::removeConnItem(const QString &connection)
 {
     settings.beginGroup("Connects");
-    settings.remove(connect);
+    settings.remove(connection);
     settings.endGroup();
-    //qDebug()<<connect<<"connect deleted";
+    //qDebug()<<connection<<"connection deleted";
 }
 void MainWindow::openCurrentConnection()
 {
@@ -914,18 +914,18 @@ void MainWindow::receiveConnPtrPtr(virConnectPtr *_connPtrPtr, const QString &na
     entityControlIsUpdated = 0;
     connListWidget->setEnabled(false);
     //qDebug()<<"receiveConnPtrPtr:"<<(*_connPtrPtr);
-    // send connect ptr to all related virtual resources for operating
-    if ( domainDockContent->setCurrentWorkConnect(_connPtrPtr) )
+    // send connection ptr to all related virtual resources for operating
+    if ( domainDockContent->setCurrentWorkConnection(_connPtrPtr) )
         domainDockContent->setListHeader(name);
-    if ( networkDockContent->setCurrentWorkConnect(_connPtrPtr) )
+    if ( networkDockContent->setCurrentWorkConnection(_connPtrPtr) )
         networkDockContent->setListHeader(name);
-    if ( storagePoolDockContent->setCurrentWorkConnect(_connPtrPtr) )
+    if ( storagePoolDockContent->setCurrentWorkConnection(_connPtrPtr) )
         storagePoolDockContent->setListHeader(name);
-    if ( secretDockContent->setCurrentWorkConnect(_connPtrPtr) )
+    if ( secretDockContent->setCurrentWorkConnection(_connPtrPtr) )
         secretDockContent->setListHeader(name);
-    if ( ifaceDockContent->setCurrentWorkConnect(_connPtrPtr) )
+    if ( ifaceDockContent->setCurrentWorkConnection(_connPtrPtr) )
         ifaceDockContent->setListHeader(name);
-    if ( nwfilterDockContent->setCurrentWorkConnect(_connPtrPtr) )
+    if ( nwfilterDockContent->setCurrentWorkConnection(_connPtrPtr) )
         nwfilterDockContent->setListHeader(name);
 }
 void MainWindow::entityControlUpdated()
@@ -957,7 +957,7 @@ void MainWindow::entityControlUpdated()
 }
 void MainWindow::stopConnProcessing(bool onView, const QString &_connName)
 {
-    // clear Overview Docks if closed connect is on View
+    // clear Overview Docks if closed connection is on View
     if ( onView ) {
         stopProcessing();
     };
@@ -1052,7 +1052,7 @@ void MainWindow::invokeVMDisplay(TASK *_task)
                 logDockContent, SLOT(appendMsgToLog(const QString&)));
         connect(VM_Displayed_Map.value(key), SIGNAL(addNewTask(TASK*)),
                 taskWrHouse, SLOT(addNewTask(TASK*)));
-        // will be showed when occured successful connect to VM
+        // will be showed when occured successful connection to VM
         //VM_Displayed_Map.value(key)->show();
     } else {
         //qDebug()<<key<<"vm invoked"<<"exist";
@@ -1096,10 +1096,10 @@ void MainWindow::deleteVMDisplay(const QString &key)
 }
 void MainWindow::buildMigrateArgs(TASK *_task)
 {
-    virConnectPtr *namedConnect =
+    virConnectPtr *namedConnection =
             connListWidget->list->getPtr_connectionPtr(_task->args.path);
-    if ( nullptr!=namedConnect ) {
-        domainDockContent->execMigrateAction(namedConnect, _task);
+    if ( nullptr!=namedConnection ) {
+        domainDockContent->execMigrateAction(namedConnection, _task);
     } else {
         QString time = QTime::currentTime().toString();
         QString title =

diff --git a/src/settings/conn_settings.cpp b/src/settings/conn_settings.cpp
@@ -117,9 +117,9 @@ void ConnSettings::initButtons()
     buttons = new QWidget(this);
     buttons->setLayout(buttonsLayout);
     connect(ok, SIGNAL(clicked()),
-            this, SLOT(saveConnect()));
+            this, SLOT(saveConnection()));
     connect(cancel, SIGNAL(clicked()),
-            this, SLOT(cancelConnect()));
+            this, SLOT(cancelConnection()));
 }
 void ConnSettings::setConnectItem(ConnItemIndex *idx)
 {
@@ -131,7 +131,7 @@ void ConnSettings::setConnectItem(ConnItemIndex *idx)
         initParameters();
     };
 }
-void ConnSettings::saveConnect()
+void ConnSettings::saveConnection()
 {
     name = ConnName->text();
     settings.beginGroup("Connects");
@@ -171,7 +171,7 @@ void ConnSettings::saveConnect()
     settings.sync();
     done(QDialog::Accepted);
 }
-void ConnSettings::cancelConnect()
+void ConnSettings::cancelConnection()
 {
     if (newbe) {
         settings.beginGroup("Connects");
@@ -248,7 +248,7 @@ void ConnSettings::saveParameters()
 void ConnSettings::closeEvent(QCloseEvent *ev)
 {
     ev->ignore();
-    cancelConnect();
+    cancelConnection();
 }
 void ConnSettings::set_Title_Name(QString s)
 {

diff --git a/src/settings/conn_settings.h b/src/settings/conn_settings.h
@@ -67,8 +67,8 @@ private slots:
     void                 initParamLayout();
     void                 initButtons();
     void                 initParameters();
-    void                 saveConnect();
-    void                 cancelConnect();
+    void                 saveConnection();
+    void                 cancelConnection();
     void                 saveParameters();
     void                 closeEvent(QCloseEvent*);
     void                 set_Title_Name(QString);

diff --git a/src/state_monitor/domain_monitor_thread.cpp b/src/state_monitor/domain_monitor_thread.cpp
@@ -53,10 +53,10 @@ void DomainMonitorThread::run()
             curr_cpuTime = info.cpuTime;
             _time_diff = tMark.elapsed()/1000;
             cpu_time_diff = (firstStep)? 0 : curr_cpuTime - prev_cpuTime;
-            CPU_percent = (qreal)100/(_time_diff * info.nrVirtCpu)*(qreal)cpu_time_diff/1000000000;
+            CPU_percent = qreal(100)/(_time_diff * info.nrVirtCpu)*qreal(cpu_time_diff)/1000000000;
             tMark.restart();
             MEM = info.maxMem;
-            MEM_percent = 100*(qreal)info.memory / MEM;
+            MEM_percent = qreal(info.memory)*100 / MEM;
             //qDebug()<<CPU_percent<< MEM_percent<<info.memory<< MEM;
             prev_cpuTime = curr_cpuTime;
             if ( firstStep ) firstStep = false;

diff --git a/src/state_monitor/domain_state_monitor.cpp b/src/state_monitor/domain_state_monitor.cpp
@@ -44,9 +44,11 @@ DomainStateMonitor::DomainStateMonitor(QWidget *parent) :
 
 /* public slots */
 void DomainStateMonitor::setNewMonitoredDomain(
-        virConnectPtr *connPtrPtr, const QString &connName, const QString &domainName)
+        virConnectPtr  *connPtrPtr,
+        const QString  &connName,
+        const QString  &domainName)
 {
-    QString _id = QString(tr("Domain : %1\nConnect: %2"))
+    QString _id = QString(tr("Domain : %1\nConnection: %2"))
             .arg(domainName)
             .arg(connName);
     int idx =
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,7 +39,7 @@ void _Tab::readXMLDesciption() @@
     }
     void _Tab::readXMLDesciption(const QString &_xmlDesc)
     {
+        Q_UNUSED(_xmlDesc)
     }
     void _Tab::resetData()
     {
@@ Expand Down @@