Minimal fix needed to give Qt a label dialog again.

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 5cdbdc8d5f7328d968d582fda927fb9404464833..6e3699fdaba9b08f7fc33d696b0c774ec87e6109 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -9,10 +9,6 @@
 #include <config.h>
 #include <version.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "lyx_main.h"
 
 #include "support/filetools.h"
@@ -37,6 +33,7 @@
 #include "lastfiles.h"
 #include "encoding.h"
 #include "converter.h"
+#include "format.h"
 #include "lyxtextclasslist.h"
 
 #include "frontends/Alert.h"
@@ -294,8 +291,8 @@ void LyX::init(bool gui)
                FileInfo file(fullbinpath, true);
                followlink = file.isLink();
                if (followlink) {
-                       lyxerr << " directory " << fullbinpath
-                              << " is a link" << endl;
+                       lyxerr[Debug::INIT] << " directory " << fullbinpath
+                                           << " is a link" << endl;
                        string link;
                        if (LyXReadLink(fullbinpath, link, true)) {
                                fullbinpath = link;
@@ -447,7 +444,7 @@ void LyX::init(bool gui)
        // If there is a preferences file we read that instead
        // of the old lyxrc file.
        if (!readRcFile("preferences"))
-           readRcFile("lyxrc");
+               readRcFile("lyxrc");
 
        readEncodingsFile("encodings");
        readLanguagesFile("languages");