fix some problems

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15430 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt3/ui/Makefile.am b/src/frontends/qt3/ui/Makefile.am
index e9f66bb559a056746fc82bce19059a23ca7a1196..1784ffb7ea7e67df36d83d16be4dbc85a56f356b 100644 (file)
--- a/src/frontends/qt3/ui/Makefile.am
+++ b/src/frontends/qt3/ui/Makefile.am
@@ -25,7 +25,7 @@ nodist_libqt3ui_la_SOURCES = $(UIFILES:.ui=.h) $(UIFILES:.ui=.C)
 libqt3ui_la_LINK = touch libqt3ui.la ; echo
 
 # Use _() for localization instead of tr() or trUtf8()
-UICFLAGS=-tr qt_
+UICFLAGS=-tr lyx::qt_
 
 %.h: %.ui
        $(UIC) $(UICFLAGS) $< -o $@

diff --git a/src/frontends/qt3/ui/moc/pch.h b/src/frontends/qt3/ui/moc/pch.h
index 2648c689d9de2858920bc9fe72b9f1a1e0fa7a3e..3738e9fe0a63835859ea36a54587dbf3887239f3 100644 (file)
--- a/src/frontends/qt3/ui/moc/pch.h
+++ b/src/frontends/qt3/ui/moc/pch.h
@@ -1,5 +1,2 @@
 #include <qapplication.h>
 #include <qmetaobject.h>
-
-
-namespace lyx {

diff --git a/src/frontends/qt3/ui/pch.h b/src/frontends/qt3/ui/pch.h
index 24a7547e294e3eb75a73c0efa6ac04257b89083e..6aa54defe181656f4f3d456fc3e1d4b69692c308 100644 (file)
--- a/src/frontends/qt3/ui/pch.h
+++ b/src/frontends/qt3/ui/pch.h
@@ -28,9 +28,5 @@
 #include <qwhatsthis.h>
 
 
-} // namespace lyx
 #include <qwidget.h>
 #include <qwidgetstack.h>
-
-
-namespace lyx {