Merge pull request #508 from in3otd/fix_fix_lib_lang_search

Instantiate QApplication sooner so applicationDirPath() is valid
Qucs · Oct 30, 2016 · 3df4200 · 3df4200
2 parents bcdc968 + bd4df61
commit 3df4200
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 8 deletions.
diff --git a/qucs/qucs-activefilter/main.cpp b/qucs/qucs-activefilter/main.cpp
@@ -63,6 +63,8 @@ bool saveApplSettings(QucsActiveFilter *qucs)
 
 int main(int argc, char *argv[])
 {
+    QApplication a(argc, argv);
+
     QString LangDir;
     // apply default settings
     QucsSettings.x = 200;
@@ -91,7 +93,6 @@ int main(int argc, char *argv[])
 
     loadSettings();
 
-    QApplication a(argc, argv);
     a.setFont(QucsSettings.font);
 
     QTranslator tor( 0 );

diff --git a/qucs/qucs-attenuator/main.cpp b/qucs/qucs-attenuator/main.cpp
@@ -64,6 +64,8 @@ bool saveApplSettings(QucsAttenuator *qucs)
 
 int main( int argc, char ** argv )
 {
+  QApplication a( argc, argv );
+
   // apply default settings
   QucsSettings.x = 200;
   QucsSettings.y = 100;
@@ -90,7 +92,6 @@ int main( int argc, char ** argv )
 
   loadSettings();
 
-  QApplication a( argc, argv );
   a.setFont(QucsSettings.font);
   QTranslator tor( 0 );
   QString lang = QucsSettings.Language;

diff --git a/qucs/qucs-edit/main.cpp b/qucs/qucs-edit/main.cpp
@@ -90,6 +90,8 @@ void showOptions()
 
 int main(int argc, char *argv[])
 {
+  QApplication a(argc, argv);
+
   // apply default settings
   QucsSettings.x = 200;
   QucsSettings.y = 100;
@@ -118,7 +120,6 @@ int main(int argc, char *argv[])
 
   loadSettings();
 
-  QApplication a(argc, argv);
   a.setFont(QucsSettings.font);
 
   QTranslator tor( 0 );

diff --git a/qucs/qucs-filter-v2/qf_main.cpp b/qucs/qucs-filter-v2/qf_main.cpp
@@ -34,6 +34,8 @@ void compute_lumped (qf_spec* spec_p, Q3TextStream& out) {
 
 int main (int argc, char * argv []) {
 
+  QApplication app (argc, argv);
+
   // apply default settings
   QucsSettings.x = 200;
   QucsSettings.y = 100;
@@ -60,7 +62,6 @@ int main (int argc, char * argv []) {
 
   loadSettings();
 
-  QApplication	    app (argc, argv);
   qf_spec*	    spec_p;
 
   int               result = 0;

diff --git a/qucs/qucs-filter/main.cpp b/qucs/qucs-filter/main.cpp
@@ -77,6 +77,8 @@ bool saveApplSettings(QucsFilter *qucs)
 
 int main(int argc, char *argv[])
 {
+  QApplication a(argc, argv);
+
   // apply default settings
   QucsSettings.x = 200;
   QucsSettings.y = 100;
@@ -103,7 +105,6 @@ int main(int argc, char *argv[])
 
   loadSettings();
 
-  QApplication a(argc, argv);
   a.setFont(QucsSettings.font);
 
   QTranslator tor( 0 );

diff --git a/qucs/qucs-lib/main.cpp b/qucs/qucs-lib/main.cpp
@@ -84,6 +84,8 @@ bool saveApplSettings(QucsLib *qucs)
 
 int main(int argc, char *argv[])
 {
+  QApplication a(argc, argv);
+
   // apply default settings
   QucsSettings.x = 100;
   QucsSettings.y = 50;
@@ -115,7 +117,6 @@ int main(int argc, char *argv[])
 
   UserLibDir.setPath(QucsSettings.QucsHomeDir.canonicalPath() + "/user_lib/");
 
-  QApplication a(argc, argv);
   a.setFont(QucsSettings.font);
 
   QTranslator tor( 0 );

diff --git a/qucs/qucs-rescodes/main.cpp b/qucs/qucs-rescodes/main.cpp
@@ -223,6 +223,8 @@ bool saveApplSettings(MyWidget *w)
 
 int main( int argc, char **argv )
 {
+  QApplication a(argc, argv);
+
   // apply default settings
   QucsSettings.x = 100;
   QucsSettings.y = 50;
@@ -247,7 +249,6 @@ int main( int argc, char **argv )
 
   loadSettings();
 
-  QApplication a(argc, argv);
   a.setFont(QucsSettings.font);
 
   QTranslator tor(0);

diff --git a/qucs/qucs-transcalc/main.cpp b/qucs/qucs-transcalc/main.cpp
@@ -97,6 +97,8 @@ bool saveApplSettings(QucsTranscalc *qucs)
 
 int main(int argc, char *argv[])
 {
+  QApplication a(argc, argv);
+
   // apply default settings
   QucsSettings.x = 100;
   QucsSettings.y = 50;
@@ -129,7 +131,6 @@ int main(int argc, char *argv[])
   }
   loadSettings();
 
-  QApplication a(argc, argv);
   a.setFont(QucsSettings.font);
 
   QTranslator tor( 0 );