Debloatarise.

moz src 196 size lyx.o lyx
   text    data     bss     dec     hex filename
4517528  150224   28228 4695980  47a7ac lyx.o
4482094  150280   28228 4660602  471d7a lyx

There's undoubtedly more.

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 7cb41c05479b3094efcbcab1cfa432d65f7a4cc3..ed91fdb9710bdf89b9e0937e14f20bfdf8b37018 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,12 @@
+2002-11-18  John Levon  <levon@movementarian.org>
+
+       * ui/Makefile.am:
+       * moc/Makefile.am:
+       * ui/moc/Makefile.am:
+       * Makefile.am: define no translation
+
+       * QDocument.C: avoid QBloatList
+ 
 2002-11-17  John Levon  <levon@movementarian.org>
 
        * ui/QPrefScreenFontsModule.ui:

diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am
index 1a7fef539f9e5052acbef2cedc709f12a34060a0..462deef45961afcdfd8ffa90005d72febc161f46 100644 (file)
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt2/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
        $(FRONTEND_INCLUDES) $(BOOST_INCLUDES) \
        -I$(top_srcdir)/src/frontends/controllers
 
-AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
+AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
 
 include $(srcdir)/Makefile.dialogs
 

diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C
index b052c397afa2d589357a4b5572cffabdf0f0d18b..b5fcad6416249e1ce1478ab118884218681dfe0d 100644 (file)
--- a/src/frontends/qt2/QDocument.C
+++ b/src/frontends/qt2/QDocument.C
@@ -106,11 +106,11 @@ void QDocument::build_dialog()
        }
 
        // paper
-       QStringList papersize_;
-       papersize_ << _("Default") << _("Custom") << _("US letter") << _("US legal")
-                  << _("US executive") << _("A3") << _("A4") << _("A5")
-                  << _("B3") << _("B4") << _("B5");
-       dialog_->paperModule->papersizeCO->insertStringList(papersize_);
+       char const * sizes[] = { 
+               _("Default") , _("Custom") , _("US letter") , _("US legal")
+                  , _("US executive") , _("A3") , _("A4") , _("A5")
+                  , _("B3") , _("B4") , _("B5") };
+       dialog_->paperModule->papersizeCO->insertStrList(sizes);
 
        // layout
        for (LyXTextClassList::const_iterator cit = textclasslist.begin();
@@ -450,20 +450,15 @@ void QDocument::update_contents()
                params.user_defined_bullets[3].getSize() + 1);
        
        // packages
-       QStringList enc;
-       enc <<  "default" << "auto" << "latin1" << "latin2" << "latin3" <<
-               "latin4" << "latin5" << "latin9" << "koi8-r" << "koi8-u" <<
-               "cp866" << "cp1251" << "iso88595" << "pt154";
-       int pos2 = 0;
-       for (QStringList::Iterator it = enc.begin();
-            it!=enc.end(); ++it) {
-               if (*it == params.inputenc.c_str()) {
-                       dialog_->packagesModule->encodingCO->setCurrentItem(pos2);
-               }
-               ++pos2;
+       char const * enc[] = { 
+               "default" , "auto" , "latin1" , "latin2" , "latin3" ,
+               "latin4" , "latin5" , "latin9" , "koi8-r" , "koi8-u" ,
+               "cp866" , "cp1251" , "iso88595" , "pt154" };
+       for (size_t i = 0; i < sizeof(enc)/sizeof(char *); ++i) {
+               if (params.inputenc == enc[i])
+                       dialog_->packagesModule->encodingCO->setCurrentItem(i);
        }
 
-
        QString text = params.graphicsDriver.c_str();
        int nitem = dialog_->packagesModule->psdriverCO->count();
        for (int n = 0; n < nitem ; ++n) {

diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C
index 62249e4173430dbef913fdc776b24122cd58ce9c..515ffce0c3f466ee3ab2681c00bbd476ec105826 100644 (file)
--- a/src/frontends/qt2/QDocumentDialog.C
+++ b/src/frontends/qt2/QDocumentDialog.C
@@ -348,17 +348,17 @@ void QDocumentDialog::enableSkip(bool skip)
 
 void QDocumentDialog::setMargins(int papersize)
 {
-       QStringList a4only;
-       QStringList normal;
-       a4only << _("Small Margins") << _("Very small Margins")
-              << _("Very wide Margins ");
-       normal << _("Default") << _("Custom");
-
+       const char * a4only[] = {
+               _("Small Margins"), _("Very small Margins"),
+               _("Very wide Margins ") };
+       const char * normal[] = {
+               _("Default"), _("Custom") };
+ 
        int olditem = marginsModule->marginCO->currentItem();
        marginsModule->marginCO->clear();
-       marginsModule->marginCO->insertStringList(normal);
+       marginsModule->marginCO->insertStrList(normal);
        if (papersize==6) {
-               marginsModule->marginCO->insertStringList(a4only);
+               marginsModule->marginCO->insertStrList(a4only);
        }
        marginsModule->marginCO->setCurrentItem(olditem);
        setCustomMargins(olditem);

diff --git a/src/frontends/qt2/moc/Makefile.am b/src/frontends/qt2/moc/Makefile.am
index 324beee68b95b833ebc27adc3984324b90c00ed2..64dd31c8ef959de65782f798c27f2a6cbbc9cf70 100644 (file)
--- a/src/frontends/qt2/moc/Makefile.am
+++ b/src/frontends/qt2/moc/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES = -I$(top_srcdir)/src/ \
        $(FRONTEND_INCLUDES) \
        $(BOOST_INCLUDES)
 
-AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
+AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
 
 nodist_libqt2moc_la_SOURCES = \
        $(MOCDIALOGS) \

diff --git a/src/frontends/qt2/ui/Makefile.am b/src/frontends/qt2/ui/Makefile.am
index 2a555bb745d3fc710806dd1f2d2c5a7c1641b56d..b8cdadc579f1b69f758978e746461234e0c1e475 100644 (file)
--- a/src/frontends/qt2/ui/Makefile.am
+++ b/src/frontends/qt2/ui/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/frontends \
        $(FRONTEND_INCLUDES) $(BOOST_INCLUDES) \
        -I$(top_srcdir)/src/frontends/controllers
 
-AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
+AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
 
 
 SUBDIRS = . moc

diff --git a/src/frontends/qt2/ui/moc/Makefile.am b/src/frontends/qt2/ui/moc/Makefile.am
index 432be4de6b96ad5a1834393e2fe20ff5e8b89fa4..3d0116000a2e0ba28379a1d61dad97de858f1589 100644 (file)
--- a/src/frontends/qt2/ui/moc/Makefile.am
+++ b/src/frontends/qt2/ui/moc/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir)/src \
        $(FRONTEND_INCLUDES) \
        $(BOOST_INCLUDES)
 
-AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
+AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
 
 nodist_libqt2uimoc_la_SOURCES = $(UIMOCDIALOGS)