Changeset 10524 in ntrip

Timestamp:

Aug 19, 2024, 4:14:37 PM (4 weeks ago)

Author:

stuerze

Message:

replacement of obsolete qt-class members

Location:

trunk/BNC/src

Files:

• bncfigure.cpp (modified) (1 diff)
• bncfigurelate.cpp (modified) (1 diff)
• bncfigureppp.cpp (modified) (1 diff)
• bnchlpdlg.cpp (modified) (1 diff)
• bncipport.cpp (modified) (1 diff)
• bncmain.cpp (modified) (1 diff)
• bncmap_svg.cpp (modified) (1 diff)
• bncserialport.cpp (modified) (1 diff)
• bncsinextro.cpp (modified) (2 diffs)
• bnctabledlg.cpp (modified) (5 diffs)
• bncudpport.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (4 diffs)
• pppMain.cpp (modified) (2 diffs)
• qtfilechooser.cpp (modified) (5 diffs)
• reqcdlg.cpp (modified) (1 diff)

trunk/BNC/src/bncfigure.cpp

@@ -58 +58 @@
   slotNextAnimationFrame();
   for (int ii = 0; ii <= 1000; ii++) {
-    _ran[0][ii] = qrand() % 255;
-    _ran[1][ii] = qrand() % 255;
-    _ran[2][ii] = qrand() % 255;
+    _ran[0][ii] = rand() % 255;
+    _ran[1][ii] = rand() % 255;
+    _ran[2][ii] = rand() % 255;
   }
 }

trunk/BNC/src/bncfigurelate.cpp

@@ -59 +59 @@
   slotNextAnimationFrame();
   for (int ii = 0; ii <= 1000; ii++) {
-    _ran[0][ii] = qrand() % 255;
-    _ran[1][ii] = qrand() % 255;
-    _ran[2][ii] = qrand() % 100;
+    _ran[0][ii] = rand() % 255;
+    _ran[1][ii] = rand() % 255;
+    _ran[2][ii] = rand() % 100;
   }
 }

trunk/BNC/src/bncfigureppp.cpp

@@ -175 +175 @@
       unsigned hour, minute;
       double   second;
-      int      ww = QFontMetrics(this->font()).width('w');
+      int      ww = QFontMetrics(this->font()).horizontalAdvance('w');
 
       // neu components

trunk/BNC/src/bnchlpdlg.cpp

@@ -50 +50 @@
                     QDialog(parent) {
 
-  const int ww = QFontMetrics(font()).width('w');
+  const int ww = QFontMetrics(font()).horizontalAdvance('w');
 
   _tb = new bncHtml;

trunk/BNC/src/bncipport.cpp

@@ -70 +70 @@
   _ipCountryLineEdit = new QLineEdit();
 
-  int ww = QFontMetrics(font()).width('w');
+  int ww = QFontMetrics(font()).horizontalAdvance('w');
   _ipPortLineEdit->setMaximumWidth(9*ww);
   _ipMountLineEdit->setMaximumWidth(9*ww);

trunk/BNC/src/bncmain.cpp

@@ -458 +458 @@
       QString val(argv[ii+2]);
       if (val.indexOf(";") != -1) {
-        settings.setValue(key, val.split(";", QString::SkipEmptyParts));
+        settings.setValue(key, val.split(";", Qt::SkipEmptyParts));
       }
       else {

trunk/BNC/src/bncmap_svg.cpp

@@ -76 +76 @@
   // Buttons
   // -------
-  int ww = QFontMetrics(font()).width('w');
+  int ww = QFontMetrics(font()).horizontalAdvance('w');
 
   _buttonClose = new QPushButton(tr("Close"), this);

trunk/BNC/src/bncserialport.cpp

@@ -84 +84 @@
   _serialDataBitsComboBox->setCurrentIndex(3);
 
-  int ww = QFontMetrics(font()).width('w');
+  int ww = QFontMetrics(font()).horizontalAdvance('w');
   _serialMountpointLineEdit->setMaximumWidth(11*ww);
   _serialPortLineEdit->setMaximumWidth(11*ww);

trunk/BNC/src/bncsinextro.cpp

@@ -93 +93 @@
     signalPriorities = "G:12&CWPSLX R:12&CP E:1&CBX E:5&QIX C:26&IQX";
   }
-  QStringList priorList = signalPriorities.split(" ", QString::SkipEmptyParts);
+  QStringList priorList = signalPriorities.split(" ", Qt::SkipEmptyParts);
   QStringList frqStrList;
   for (unsigned iFreq = 1; iFreq < t_frequency::max; iFreq++) {
@@ -102 +102 @@
     for (int ii = 0; ii < priorList.size(); ii++) {
       if (priorList[ii].indexOf(":") != -1) {
-        hlp = priorList[ii].split(":", QString::SkipEmptyParts);
+        hlp = priorList[ii].split(":", Qt::SkipEmptyParts);
         if (hlp.size() == 2 && hlp[0].length() == 1 && hlp[0][0] == frqSys) {
-          hlp = hlp[1].split("&", QString::SkipEmptyParts);
+          hlp = hlp[1].split("&", Qt::SkipEmptyParts);
         }
         if (hlp.size() == 2 && hlp[0].indexOf(frqNum) != -1) {

trunk/BNC/src/bnctabledlg.cpp

@@ -64 +64 @@
   QVBoxLayout* mainLayout = new QVBoxLayout(this);
 
-  int ww = QFontMetrics(font()).width('w');
+  int ww = QFontMetrics(font()).horizontalAdvance('w');
 
   _casterPortLineEdit = new QLineEdit();
@@ -316 +316 @@
     _table->setHorizontalHeaderLabels(labels);
     _table->setSortingEnabled(true);
-    int ww = QFontMetrics(this->font()).width('w');
+    int ww = QFontMetrics(this->font()).horizontalAdvance('w');
     _table->horizontalHeader()->resizeSection( 0,10*ww);
     _table->horizontalHeader()->resizeSection( 1,10*ww);
@@ -392 +392 @@
       QString             nmea = _table->item(ir,10)->text();
       format.replace(" ", "_");
-      if (_table->isItemSelected(item)) {
+      if (item->isSelected()) {
         url.setPath("/"+item->text());
         mountPoints->push_back(url.toString() + " " + format + " " + country + " " + latitude
@@ -593 +593 @@
   _casterTable->setSortingEnabled(true);
   _casterTable->sortItems(0);
-   int ww = QFontMetrics(this->font()).width('w');
+   int ww = QFontMetrics(this->font()).horizontalAdvance('w');
   _casterTable->horizontalHeader()->resizeSection(0,15*ww);
   _casterTable->horizontalHeader()->resizeSection(1, 5*ww);
@@ -659 +659 @@
   if (_casterTable) {
     for (int ir = _casterTable->rowCount() - 1; ir >= 0 ; ir--) {
-      if (_casterTable->isItemSelected(_casterTable->item(ir,0))) {
+      if (_casterTable->item(ir,0)->isSelected()) {
         emit newCaster(_casterTable->item(ir,0)->text(),
                        _casterTable->item(ir,1)->text());

trunk/BNC/src/bncudpport.cpp

@@ -69 +69 @@
   _ipCountryLineEdit = new QLineEdit();
 
-  int ww = QFontMetrics(font()).width('w');
+  int ww = QFontMetrics(font()).horizontalAdvance('w');
   _ipPortLineEdit->setMaximumWidth(9*ww);
   _ipMountLineEdit->setMaximumWidth(9*ww);

trunk/BNC/src/bncwindow.cpp

@@ -127 +127 @@
   _mapWin = 0;
 
-  int ww = QFontMetrics(this->font()).width('w');
+  int ww = QFontMetrics(this->font()).horizontalAdvance('w');
 
   static const QStringList labels = QString("account, Streams:   resource loader / mountpoint, decoder, country, lat, long, nmea, ntrip, bytes").split(",");
@@ -2515 +2515 @@
     settings.setValue("font", newFont.toString());
     QApplication::setFont(newFont);
-    int ww = QFontMetrics(newFont).width('w');
+    int ww = QFontMetrics(newFont).horizontalAdvance('w');
     setMinimumSize(60*ww, 80*ww);
     resize(60*ww, 80*ww);
@@ -2601 +2601 @@
   tb->setReadOnly(true);
 
-  int ww = QFontMetrics(font()).width('w');
+  int ww = QFontMetrics(font()).horizontalAdvance('w');
   QPushButton* _closeButton = new QPushButton("Close");
   _closeButton->setMaximumWidth(10*ww);
@@ -2631 +2631 @@
    QDialog(parent) {
 
-  int ww = QFontMetrics(font()).width('w');
+  int ww = QFontMetrics(font()).horizontalAdvance('w');
   QPushButton* _closeButton = new QPushButton("Close");
   _closeButton->setMaximumWidth(10*ww);

trunk/BNC/src/pppMain.cpp

@@ -407 +407 @@
 
     QString     priorStr  = QString::fromStdString(opt->_signalPriorities);
-    QStringList priorList = priorStr.split(" ", QString::SkipEmptyParts);
+    QStringList priorList = priorStr.split(" ", Qt::SkipEmptyParts);
     QStringList hlpList;
     vector<char> systems = opt->systems();
@@ -414 +414 @@
       for (int ii = 0; ii < priorList.size(); ii++) {
         if (priorList[ii].indexOf(":") != -1) {
-          hlpList = priorList[ii].split(":", QString::SkipEmptyParts);
+          hlpList = priorList[ii].split(":", Qt::SkipEmptyParts);
           if (hlpList.size() == 2 && hlpList[0].length() == 1 && hlpList[0][0] == sys) {
-            hlpList = hlpList[1].split("&", QString::SkipEmptyParts);
+            hlpList = hlpList[1].split("&", Qt::SkipEmptyParts);
             if (hlpList.size() == 2) {
               for (int jj = 0; jj < hlpList[0].size(); jj++) {

trunk/BNC/src/qtfilechooser.cpp

@@ -24 +24 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////////
-qtFileChooser::qtFileChooser(QWidget* parent, qtFileChooser::Mode mode) : 
+qtFileChooser::qtFileChooser(QWidget* parent, qtFileChooser::Mode mode) :
   QWidget(parent), _mode(mode) {
 
@@ -37 +37 @@
 
   _button = new QPushButton("...", this);
-  _button->setFixedWidth(_button->fontMetrics().width(" ... "));
+  _button->setFixedWidth(_button->fontMetrics().horizontalAdvance(" ... "));
   layout->addWidget(_button);
 
@@ -49 +49 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////////
 void qtFileChooser::setFileName(const QString& fileName) {
@@ -55 +55 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////////
 QString qtFileChooser::fileName() const {
@@ -61 +61 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////////
 void qtFileChooser::chooseFile() {

trunk/BNC/src/reqcdlg.cpp

@@ -64 +64 @@
   setWindowTitle(tr("RINEX Editing Options"));
 
-  int ww = QFontMetrics(font()).width('w');
+  int ww = QFontMetrics(font()).horizontalAdvance('w');
 
   const QString timeFmtString = "yyyy-MM-dd hh:mm:ss";