Fix warnings qt3support

qucs/CMakeLists.txt

@@ -36,7 +36,8 @@ SET( QT_DEBUG TRUE)
 
 INCLUDE( ${QT_USE_FILE} )
 
-ADD_DEFINITIONS(${QT_DEFINITIONS})
+ADD_DEFINITIONS(${QT_DEFINITIONS} -DQT_DEPRECATED_WARNINGS)
+
 
 ADD_SUBDIRECTORY( qucs )
 ADD_SUBDIRECTORY( qucs-activefilter )

qucs/configure.ac

@@ -299,7 +299,7 @@ case $host_os in
     if test "$enable_mt" = yes; then
       QT_LDF=""
       QT_LIB="-lQtCore -lQtGui -lQtXml -lQt3Support -lQtSvg -lQtScript"
-      QT_INC="$QT_DEF -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -DQT_THREAD_SUPPORT -D_REENTRANT"
+      QT_INC="$QT_DEF -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -DQT_DEPRECATED_WARNINGS -DQT_THREAD_SUPPORT -D_REENTRANT"
       [case $host_os in
         *freebsd*) QT_LIB="$QT_LIB -pthread" ;;
         *mingw* | *msys*) QT_INC="$QT_INC -mthreads"; QT_LDF="$QT_LDF -mthreads" ;;
@@ -412,7 +412,7 @@ case $host_os in
     fi
 
     dnl Define Qt3Support
-    QT_DEF="-DQT_SHARED -DQT3_SUPPORT"
+    QT_DEF="-DQT_SHARED -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -DQT_DEPRECATED_WARNINGS"
     CPPFLAGS="$CPPFLAGS $QT_DEF"
     QT_LDFLAGS="$QT_LDFLAGS -headerpad_max_install_names"
 

qucs/qucs-activefilter/main.cpp

@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
       QucsDir = QDir (var);
       QString QucsDirStr = QucsDir.canonicalPath ();
       LangDir =
-        QDir::convertSeparators (QucsDirStr + "/share/qucs/lang/");
+        QDir::toNativeSeparators(QucsDirStr + "/share/qucs/lang/");
     } else {
       QString QucsApplicationPath = QCoreApplication::applicationDirPath();
 #ifdef __APPLE__

qucs/qucs-attenuator/main.cpp

@@ -78,7 +78,7 @@ int main( int argc, char ** argv )
     QucsDir = QDir (var);
     QString QucsDirStr = QucsDir.canonicalPath ();
     QucsSettings.LangDir =
-      QDir::convertSeparators (QucsDirStr + "/share/qucs/lang/");
+      QDir::toNativeSeparators(QucsDirStr + "/share/qucs/lang/");
   } else {
     QString QucsApplicationPath = QCoreApplication::applicationDirPath();
 #ifdef __APPLE__

qucs/qucs-edit/main.cpp

@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
     QucsDir = QDir (var);
     QString QucsDirStr = QucsDir.canonicalPath ();
     QucsSettings.LangDir =
-      QDir::convertSeparators (QucsDirStr + "/share/qucs/lang/");
+      QDir::toNativeSeparators(QucsDirStr + "/share/qucs/lang/");
   } else {
     QString QucsApplicationPath = QCoreApplication::applicationDirPath();
 #ifdef __APPLE__

qucs/qucs-filter-v2/qf_main.cpp

@@ -48,7 +48,7 @@ int main (int argc, char * argv []) {
     QucsDir = QDir (var);
     QString QucsDirStr = QucsDir.canonicalPath ();
     QucsSettings.LangDir =
-      QDir::convertSeparators (QucsDirStr + "/share/qucs/lang/");
+      QDir::toNativeSeparators (QucsDirStr + "/share/qucs/lang/");
   } else {
     QString QucsApplicationPath = QCoreApplication::applicationDirPath();
 #ifdef __APPLE__

qucs/qucs-filter-v2/qf_settings.cpp

@@ -32,7 +32,7 @@ bool loadSettings (void)
 {
   bool result = true;
 
-  QFile file(QDir::homeDirPath()+QDir::convertSeparators ("/.qucs/filterrc"));
+  QFile file(QDir::homeDirPath()+QDir::toNativeSeparators ("/.qucs/filterrc"));
   if(!file.open(QIODevice::ReadOnly))
     result = false; // settings file doesn't exist
   else {
@@ -56,7 +56,7 @@ bool loadSettings (void)
     file.close();
   }  
 
-  file.setName(QDir::homeDirPath()+QDir::convertSeparators ("/.qucs/qucsrc"));
+  file.setName(QDir::homeDirPath()+QDir::toNativeSeparators ("/.qucs/qucsrc"));
   if(!file.open(QIODevice::ReadOnly))
     result = true; // qucs settings not necessary
   else {
@@ -85,7 +85,7 @@ bool saveSettings(qf_box *qucs)
       return true;   // nothing has changed
 
 
-  QFile file(QDir::homeDirPath()+QDir::convertSeparators ("/.qucs/filterrc"));
+  QFile file(QDir::homeDirPath()+QDir::toNativeSeparators ("/.qucs/filterrc"));
   if(!file.open(QIODevice::WriteOnly)) {
     QMessageBox::warning(0, QObject::tr("Warning"),
 			QObject::tr("Cannot save settings !"));
@@ -156,7 +156,7 @@ bool saveXmlSettings (qf_box * qucs)
   gr.appendChild (el);
   rt.appendChild (gr);
 
-  QFile file (QDir::homeDirPath()+QDir::convertSeparators ("/.qucs/filterrc"));
+  QFile file (QDir::homeDirPath()+QDir::toNativeSeparators ("/.qucs/filterrc"));
   if (!file.open (QIODevice::WriteOnly)) {
     QMessageBox::warning (0,
 			  QObject::tr("Warning"),
@@ -230,7 +230,7 @@ bool loadXmlSettings (void)
 {
   bool result = true;
 
-  QFile file (QDir::homeDirPath()+QDir::convertSeparators ("/.qucs/filterrc"));
+  QFile file (QDir::homeDirPath()+QDir::toNativeSeparators ("/.qucs/filterrc"));
   if (!file.open(QIODevice::ReadOnly))
     result = false; // settings file doesn't exist
   else {

qucs/qucs-filter/main.cpp

@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
     QucsDir = QDir (var);
     QString QucsDirStr = QucsDir.canonicalPath ();
     QucsSettings.LangDir =
-      QDir::convertSeparators (QucsDirStr + "/share/qucs/lang/");
+      QDir::toNativeSeparators(QucsDirStr + "/share/qucs/lang/");
   } else {
     QString QucsApplicationPath = QCoreApplication::applicationDirPath();
 #ifdef __APPLE__

qucs/qucs-help/main.cpp

@@ -138,9 +138,9 @@ int main(int argc, char *argv[])
     QucsDir = QDir (QString(var));
     QString QucsDirStr = QucsDir.canonicalPath ();
     QucsSettings.DocDir =
-      QDir::convertSeparators (QucsDirStr + "/share/qucs/docs/");
+      QDir::toNativeSeparators(QucsDirStr + "/share/qucs/docs/");
     QucsSettings.LangDir =
-      QDir::convertSeparators (QucsDirStr + "/share/qucs/lang/");
+      QDir::toNativeSeparators(QucsDirStr + "/share/qucs/lang/");
   } else {
     QString QucsApplicationPath = QCoreApplication::applicationDirPath();
     #ifdef __APPLE__

qucs/qucs-help/qucshelp.cpp

@@ -269,7 +269,7 @@ void QucsHelp::nextLink()
 
 void QucsHelp::slotToggleSidebar(bool b)
 {
-  dock->setShown(b);
+  dock->setVisible(b);
 }
 
 void QucsHelp::slotToggleSidebarAction(bool b)

qucs/qucs-transcalc/main.cpp

@@ -118,7 +118,7 @@ int main(int argc, char *argv[])
     QucsDir = QDir (var);
     QString QucsDirStr = QucsDir.canonicalPath ();
     QucsSettings.LangDir =
-      QDir::convertSeparators (QucsDirStr + "/share/qucs/lang/");
+      QDir::toNativeSeparators(QucsDirStr + "/share/qucs/lang/");
   } else {
     QString QucsApplicationPath = QCoreApplication::applicationDirPath();
 #ifdef __APPLE__

qucs/qucs-transcalc/qucstrans.cpp

@@ -1046,7 +1046,7 @@ void QucsTranscalc::slotValueChanged()
 
 // Load transmission line values from the given file.
 bool QucsTranscalc::loadFile(QString fname, int * _mode) {
-  QFile file(QDir::convertSeparators (fname));
+  QFile file(QDir::toNativeSeparators(fname));
   if(!file.open(QIODevice::ReadOnly)) return false; // file doesn't exist
 
   QTextStream stream(&file);
@@ -1088,7 +1088,7 @@ bool QucsTranscalc::loadFile(QString fname, int * _mode) {
 
 // Saves current transmission line values into the given file.
 bool QucsTranscalc::saveFile(QString fname) {
-  QFile file (QDir::convertSeparators (fname));
+  QFile file (QDir::toNativeSeparators(fname));
   if(!file.open (QIODevice::WriteOnly)) return false; // file not writable
   QTextStream stream (&file);
 

qucs/qucs/CMakeLists.txt

@@ -103,7 +103,7 @@ IF(WIN32)
   ENDIF()
 ENDIF(WIN32)
 
-ADD_DEFINITIONS(${QT_DEFINITIONS})
+ADD_DEFINITIONS(${QT_DEFINITIONS} -DQT3_SUPPORT_WARNINGS)
 
 INCLUDE_DIRECTORIES(
   ${qucs_SOURCE_DIR}

qucs/qucs/components/ac_sim.cpp

@@ -24,7 +24,7 @@ AC_Sim::AC_Sim()
 
   QString s = Description;
   int a = s.indexOf(" ");
-  int b = s.findRev(" ");
+  int b = s.lastIndexOf(" ");
   if (a != -1 && b != -1) {
     if (a > (int) s.length() - b)  b = a;
   }

qucs/qucs/components/componentdialog.cpp

@@ -1123,7 +1123,7 @@ void ComponentDialog::slotBrowseFile()
     edit->setText(s);
   }
   /* FIX
-  prop->currentItem()->setText(1, s); */
+  prop->currentIndex()->setText(1, s); */
 }
 
 // -------------------------------------------------------------------------

qucs/qucs/components/dc_sim.cpp

@@ -24,7 +24,7 @@ DC_Sim::DC_Sim()
 
   QString s = Description;
   int a = s.indexOf(" ");
-  int b = s.findRev(" ");
+  int b = s.lastIndexOf(" ");
   if (a != -1 && b != -1) {
     if (a > (int) s.length() - b)  b = a;
   }

qucs/qucs/components/hb_sim.cpp

@@ -23,7 +23,7 @@ HB_Sim::HB_Sim()
   Description = QObject::tr("Harmonic balance simulation");
 
   QString  s = Description;
-  int a = s.findRev(" ");
+  int a = s.lastIndexOf(" ");
   if (a != -1) s[a] = '\n';    // break line before the word "simulation"
 
   Texts.append(new Text(0, 0, s.left(a), Qt::darkBlue, QucsSettings.largeFontSize));

qucs/qucs/components/libcomp.cpp

@@ -86,14 +86,14 @@ int LibComp::loadSection(const QString& Name, QString& Section,
 			 QStringList *Includes)
 {
   QDir Directory(QucsSettings.LibDir);
-  QFile file(Directory.absFilePath(Props.first()->Value + ".lib"));
+  QFile file(Directory.absoluteFilePath(Props.first()->Value + ".lib"));
   if(!file.open(QIODevice::ReadOnly))
     return -1;
 
   QString libDefaultSymbol;
 
   QTextStream ReadWhole(&file);
-  Section = ReadWhole.read();
+  Section = ReadWhole.readAll();
   file.close();
 
 
@@ -140,7 +140,7 @@ int LibComp::loadSection(const QString& Name, QString& Section,
       if(EndI < 0)  return -11;  // file corrupt
       StartI++; EndI--;
       QString inc = Section.mid(StartI, EndI-StartI);
-      QStringList f = QStringList::split(QRegExp("\"\\s+\""), inc);
+      QStringList f = inc.split(QRegExp("\"\\s+\""));
       for(QStringList::Iterator it = f.begin(); it != f.end(); ++it ) {
 	Includes->append(*it);
       }
@@ -149,14 +149,15 @@ int LibComp::loadSection(const QString& Name, QString& Section,
 
   // search model
   Start = Section.indexOf("<"+Name+">");
-  if(Start < 0)
+  if(Start < 0) {
     if((Name == "Symbol") && (~libDefaultSymbol.isEmpty())) {
       // component does not define its own symbol but the library defines a default symbol
       Section = libDefaultSymbol;
       return 0;
     } else {
       return -7;  // symbol not found
     }
+  }
   Start = Section.indexOf('\n', Start);
   if(Start < 0)  return -8;  // file corrupt
   while(Section.at(++Start) == ' ') ;
@@ -222,7 +223,7 @@ int LibComp::loadSymbol()
 QString LibComp::getSubcircuitFile()
 {
   QDir Directory(QucsSettings.LibDir);
-  QString FileName = Directory.absFilePath(Props.first()->Value);
+  QString FileName = Directory.absoluteFilePath(Props.first()->Value);
   return misc::properAbsFileName(FileName);
 }
 
@@ -247,7 +248,7 @@ bool LibComp::createSubNetlist(QTextStream *stream, QStringList &FileList,
   for(QStringList::Iterator it = Includes.begin();
       it != Includes.end(); ++it ) {
     QString s = getSubcircuitFile()+"/"+*it;
-    if(FileList.findIndex(s) >= 0) continue;
+    if(FileList.indexOf(s) >= 0) continue;
     FileList.append(s);
 
     // load file and stuff into stream
@@ -257,7 +258,7 @@ bool LibComp::createSubNetlist(QTextStream *stream, QStringList &FileList,
     } else {
       QByteArray FileContent = file.readAll();
       file.close();
-      //?stream->writeRawBytes(FileContent.data(), FileContent.size());
+      //?stream->writeRawBytes(FileContent.value(), FileContent.size());
       (*stream) << FileContent.data();
       qDebug() << "hi from libcomp";
     }

qucs/qucs/components/opt_sim.cpp

@@ -267,7 +267,7 @@ bool Optimize_Sim::loadASCOout()
   while(!instream.atEnd()) Line = instream.readLine();
   infile.close();
 
-  QStringList entries = QStringList::split(':',Line);
+  QStringList entries = Line.split(':');
   QStringList::Iterator it;
   for(it = entries.begin(); it != entries.end(); ++it ) {
     QString Name = *it;

qucs/qucs/components/param_sweep.cpp

@@ -23,7 +23,7 @@ Param_Sweep::Param_Sweep()
   Description = QObject::tr("Parameter sweep");
 
   QString  s = Description;
-  int a = s.findRev(" ");
+  int a = s.lastIndexOf(" ");
   if (a != -1) s[a] = '\n';    // break line
 
   Texts.append(new Text(0, 0, s.left(a), Qt::darkBlue, QucsSettings.largeFontSize));

qucs/qucs/components/sp_sim.cpp

@@ -24,7 +24,7 @@ SP_Sim::SP_Sim()
 
   QString s = Description;
   int a = s.indexOf(" ");
-  int b = s.findRev(" ");
+  int b = s.lastIndexOf(" ");
   if (a != -1 && b != -1) {
     if (a > (int) s.length() - b)  b = a;
   }

qucs/qucs/components/spicedialog.cpp

@@ -39,7 +39,7 @@
 
 
 SpiceDialog::SpiceDialog(QucsApp* App_, SpiceFile *c, Schematic *d)
-    : QDialog(d, 0, TRUE, Qt::WDestructiveClose)
+    : QDialog(d, Qt::WDestructiveClose)
 {
   App = App_; // pointer to main application
 
@@ -161,9 +161,9 @@ SpiceDialog::SpiceDialog(QucsApp* App_, SpiceFile *c, Schematic *d)
   SimCheck->setChecked(Comp->Props.at(2)->Value == "yes");
   for(int i=0; i<PrepCombo->count(); i++)
   {
-    if(PrepCombo->text(i) == Comp->Props.at(3)->Value)
+    if(PrepCombo->itemText(i) == Comp->Props.at(3)->Value)
     {
-      PrepCombo->setCurrentItem(i);
+      PrepCombo->setCurrentIndex(i);
       currentPrep = i;
       break;
     }
@@ -288,11 +288,11 @@ void SpiceDialog::slotButtBrowse()
   }
 
   QFileInfo Info(s);
-  lastDir = Info.dirPath(true);  // remember last directory
+  lastDir = Info.absolutePath();  // remember last directory
 
   // snip path if file in current directory
   if(QucsSettings.QucsWorkDir.exists(Info.fileName()) &&
-          QucsSettings.QucsWorkDir.absPath() == Info.dirPath(true)) {
+          QucsSettings.QucsWorkDir.absolutePath() == Info.absolutePath()) {
     s = Info.fileName();
   }
   FileEdit->setText(s);
@@ -307,7 +307,7 @@ void SpiceDialog::slotPrepChanged(int i)
   if(currentPrep != i)
   {
     currentPrep = i;
-    PrepCombo->setCurrentItem(i);
+    PrepCombo->setCurrentIndex(i);
     loadSpiceNetList(FileEdit->text());  // reload netlist nodes
   }
 }
@@ -371,11 +371,12 @@ bool SpiceDialog::loadSpiceNetList(const QString& s)
       connect(SpicePrep, SIGNAL(readyReadStandardError()), SLOT(slotGetPrepErr()));
     }
 
-    QMessageBox *MBox = new QMessageBox(tr("Info"),
+    QMessageBox *MBox = new QMessageBox(QMessageBox::NoIcon,
+                                        tr("Info"),
                                         tr("Preprocessing SPICE file \"%1\".").arg(FileInfo.filePath()),
-                                        QMessageBox::NoIcon, QMessageBox::Abort,
-                                        QMessageBox::NoButton, QMessageBox::NoButton, this, 0, true,
-                                        Qt::WStyle_DialogBorder |  Qt::WDestructiveClose);
+                                        QMessageBox::Abort,
+                                        this);
+    MBox->setAttribute(Qt::WA_DeleteOnClose);
 
     connect(SpicePrep, SIGNAL(finished(int, QProcess::ExitStatus)), MBox, SLOT(close()));
 
@@ -438,12 +439,12 @@ bool SpiceDialog::loadSpiceNetList(const QString& s)
   connect(QucsConv, SIGNAL(readyReadStandardError()), SLOT(slotGetError()));
 
 
-  QMessageBox *MBox = new QMessageBox(tr("Info"),
+  QMessageBox *MBox = new QMessageBox(QMessageBox::NoIcon,
+                                      tr("Info"),
                                       tr("Converting SPICE file \"%1\".").arg(FileInfo.filePath()),
-                                      QMessageBox::NoIcon, QMessageBox::Abort,
-                                      QMessageBox::NoButton, QMessageBox::NoButton, this, 0, true,
-                                      Qt::WStyle_DialogBorder |  Qt::WDestructiveClose);
-
+                                      QMessageBox::Abort,
+                                      this);
+  MBox->setAttribute(Qt::WA_DeleteOnClose);
   connect(QucsConv, SIGNAL(finished(int, QProcess::ExitStatus)), MBox, SLOT(close()));
 
   QucsConv->start(Program, Arguments);
@@ -465,7 +466,7 @@ bool SpiceDialog::loadSpiceNetList(const QString& s)
   if(!pp->Value.isEmpty())
   {
     PortsList->clear();
-    QStringList ports = QStringList::split(',', pp->Value);
+    QStringList ports = pp->Value.split(',');
     foreach(QString port, ports) {
       PortsList->addItem(port);
     }