fix call to Dispatch

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

diff --git a/ChangeLog b/ChangeLog
index 9ec94b0e3f4fb7856e8f9aa0d9b661273a9d9c73..0ba6a70bb9cdbdbbc3771c8dbfcfb6233edbf992 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,27 @@
+2000-09-19  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * src/buffer.C (Dispatch): fix call to Dispatch
+       * src/insets/insetref.C (Edit): likewise
+       * src/insets/insetparent.C (Edit): likewise
+       * src/insets/insetinclude.C (include_cb): likewise
+       * src/frontends/xforms/FormUrl.C (apply): likewise
+       * src/frontends/xforms/FormToc.C (apply): likewise
+       * src/frontends/xforms/FormRef.C (apply): likewise
+       * src/frontends/xforms/FormIndex.C (apply): likewise
+       * src/frontends/xforms/FormCitation.C (apply): likewise
+       * src/lyxserver.C (callback): likewise
+       * src/lyxfunc.C (processKeySym): likewise
+       (Dispatch): likewise
+       (Dispatch): likewise
+       * src/lyx_cb.C (LayoutsCB): likewise
+
+       * Makefile.am (sourcedoc): small change
+
 2000-09-18  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
+       * src/main.C (main): Don't make an empty GUIRunTime object. all
+       methods are static. constify a bit remove unneded using + headers.
+
        * src/tabular.C: some more const to local vars move some loop vars
        
        * src/spellchecker.C: added some c_str after some word for pspell

diff --git a/Makefile.am b/Makefile.am
index 41372745b4ffdf1502257135bb7a6c0275aa8f25..9a52256508b8e6e96f06ae06ab82144692c971e3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,5 +52,5 @@ bindist:
 
 sourcedoc:
        mkdir sourcedoc
-       cd sourcedoc
-       doc++ -p $(srcdir)/src/*.h
+       cd sourcedoc ; \
+       doc++ -p `find ../$(top_srcdir)/src -name \*.h`

diff --git a/src/buffer.C b/src/buffer.C
index 2f1120b16a94ad77ed95a9ac58e9f59c78db7525..6f76dc578e0937176155ddfcff48cb665d573dbd 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -3801,7 +3801,7 @@ bool Buffer::Dispatch(string const & command)
        string cmd, line = frontStrip(command);
        string arg = strip(frontStrip(split(line, cmd, ' ')));
 
-       return Dispatch(lyxaction.LookupFunc(cmd.c_str()), arg.c_str());
+       return Dispatch(lyxaction.LookupFunc(cmd.c_str()), arg);
 }
 
 

diff --git a/src/frontends/gnome/GUIRunTime.C b/src/frontends/gnome/GUIRunTime.C
index 7a3c4522fe526be08d5f9342df98ffe532474811..041f12d673c4d9b521231ccbc38db4b0314d54ed 100644 (file)
--- a/src/frontends/gnome/GUIRunTime.C
+++ b/src/frontends/gnome/GUIRunTime.C
@@ -63,6 +63,8 @@ int GUIRunTime::initApplication(int, char * argv[])
                return 1;
        }
 
+       // I belive that this should be done at a later stage, in
+       // lyx_gui, the same place as xforms does the same. (Lgb)
        static string app_id(PACKAGE);
        static string app_version(VERSION);
        static Gnome::Main  a(app_id, app_version, 1, argv);

diff --git a/src/frontends/kde/GUIRunTime.C b/src/frontends/kde/GUIRunTime.C
index a836e50ddc172a53cd38b0b9e437c5245d386e2f..96f3dbd6e1769ea8fcaf12987507a603574f5f33 100644 (file)
--- a/src/frontends/kde/GUIRunTime.C
+++ b/src/frontends/kde/GUIRunTime.C
@@ -63,6 +63,8 @@ int GUIRunTime::initApplication(int argc, char * argv[])
                return 1;
        }
 
+       // I belive this is done in the wrong place, imo this should
+       // be done in lyx_gui.C similar to how/where xforms does it (Lgb)
        static KApplication a(argc, argv);
 
        return 0;

diff --git a/src/frontends/xforms/FormCitation.C b/src/frontends/xforms/FormCitation.C
index ac650b59022eb0c8017ed7a9fb36f94347bc3b5d..5d8fd82cecbf566ec93e4782bb5f20c4723cad6f 100644 (file)
--- a/src/frontends/xforms/FormCitation.C
+++ b/src/frontends/xforms/FormCitation.C
@@ -438,26 +438,25 @@ void FormCitation::input( long data )
 
 void FormCitation::apply()
 {
-       if( lv_->buffer()->isReadonly() ) return;
+       if(lv_->buffer()->isReadonly()) return;
 
        string contents;
-       for( unsigned int i = 0; i < citekeys.size(); ++i ) {
+       for(unsigned int i = 0; i < citekeys.size(); ++i) {
                if (i > 0) contents += ", ";
                contents += citekeys[i];
        }
 
-       params.setContents( contents );
-       params.setOptions( fl_get_input(dialog_->textAftr) );
+       params.setContents(contents);
+       params.setOptions(fl_get_input(dialog_->textAftr));
 
-       if( inset_ != 0 )
-       {
+       if (inset_ != 0) {
                // Only update if contents have changed
-               if( params != inset_->params() ) {
-                       inset_->setParams( params );
-                       lv_->view()->updateInset( inset_, true );
+               if(params != inset_->params()) {
+                       inset_->setParams(params);
+                       lv_->view()->updateInset(inset_, true);
                }
        } else {
-               lv_->getLyXFunc()->Dispatch( LFUN_CITATION_INSERT,
-                                            params.getAsString().c_str() );
+               lv_->getLyXFunc()->Dispatch(LFUN_CITATION_INSERT,
+                                           params.getAsString());
        }
 }

diff --git a/src/frontends/xforms/FormIndex.C b/src/frontends/xforms/FormIndex.C
index 23fe29a0c3e67bdc03ac43a46ee5506a3d587bdf..db1753948586bb368597088cf1c816d542dbe3dc 100644 (file)
--- a/src/frontends/xforms/FormIndex.C
+++ b/src/frontends/xforms/FormIndex.C
@@ -83,19 +83,18 @@ void FormIndex::update()
 
 void FormIndex::apply()
 {
-       if( lv_->buffer()->isReadonly() ) return;
+       if(lv_->buffer()->isReadonly()) return;
 
-       params.setContents( fl_get_input(dialog_->key) );
+       params.setContents(fl_get_input(dialog_->key));
 
-       if( inset_ != 0 )
-       {
+       if (inset_ != 0) {
                // Only update if contents have changed
-               if( params != inset_->params() ) {
-                       inset_->setParams( params );
-                       lv_->view()->updateInset( inset_, true );
+               if (params != inset_->params()) {
+                       inset_->setParams(params);
+                       lv_->view()->updateInset(inset_, true);
                }
        } else {
-               lv_->getLyXFunc()->Dispatch( LFUN_INDEX_INSERT,
-                                            params.getAsString().c_str() );
+               lv_->getLyXFunc()->Dispatch(LFUN_INDEX_INSERT,
+                                           params.getAsString());
        }
 }

diff --git a/src/frontends/xforms/FormRef.C b/src/frontends/xforms/FormRef.C
index 3c8bec6f53c949252a4de2686b752da10d99a6a3..a60ca919572003ba8adbb21a6c24769ad0aed839 100644 (file)
--- a/src/frontends/xforms/FormRef.C
+++ b/src/frontends/xforms/FormRef.C
@@ -234,21 +234,20 @@ void FormRef::apply()
        if (!lv_->view()->available())
                return;
 
-       Type type = static_cast<Type>( fl_get_choice(dialog_->type)-1 );
-       params.setCmdName( getName( type ) );
+       Type const type = static_cast<Type>(fl_get_choice(dialog_->type) - 1);
+       params.setCmdName(getName(type));
 
-       params.setOptions( fl_get_input(dialog_->name) );
+       params.setOptions(fl_get_input(dialog_->name));
 
-       if( inset_ != 0 )
-       {
+       if (inset_ != 0) {
                // Only update if contents have changed
-               if( params != inset_->params() ) {
-                       inset_->setParams( params );
-                       lv_->view()->updateInset( inset_, true );
+               if(params != inset_->params()) {
+                       inset_->setParams(params);
+                       lv_->view()->updateInset(inset_, true);
                }
        } else {
-               lv_->getLyXFunc()->Dispatch( LFUN_REF_INSERT,
-                                            params.getAsString().c_str() );
+               lv_->getLyXFunc()->Dispatch(LFUN_REF_INSERT,
+                                           params.getAsString());
        }
 }
 
@@ -262,12 +261,12 @@ void FormRef::input( long data )
                toggle = static_cast<Goto>(toggle + 1);
                if( toggle == GOFIRST ) toggle = GOREF;
        
-               switch( toggle ) {
+               switch (toggle) {
                case GOREF:
                {
                        lv_->getLyXFunc()->
                                Dispatch(LFUN_REF_GOTO,
-                                        params.getContents().c_str());
+                                        params.getContents());
                        fl_set_object_label(dialog_->go, _("Go back"));
                }
                break;

diff --git a/src/frontends/xforms/FormToc.C b/src/frontends/xforms/FormToc.C
index 3b0d4ca8d41dada429312189e6af7911d35abd91..de2d583afb719c497a2daa831a96b593414b94c9 100644 (file)
--- a/src/frontends/xforms/FormToc.C
+++ b/src/frontends/xforms/FormToc.C
@@ -146,9 +146,9 @@ void FormToc::apply()
 
        updateToc();
 
-       unsigned int choice = fl_get_browser( dialog_->browser );
+       unsigned int const choice = fl_get_browser( dialog_->browser );
        if (0 < choice && choice - 1 < toclist.size()) {
-               string tmp = tostr(toclist[choice-1].par->id());
-               lv_->getLyXFunc()->Dispatch(LFUN_GOTO_PARAGRAPH, tmp.c_str());
+               string const tmp = tostr(toclist[choice-1].par->id());
+               lv_->getLyXFunc()->Dispatch(LFUN_GOTO_PARAGRAPH, tmp);
        }
 }

diff --git a/src/frontends/xforms/FormUrl.C b/src/frontends/xforms/FormUrl.C
index 1584dff7892bfc1aad4814a66a0d65cc6fdf159f..73bb1342cb1bddd86be3e6a41a7fcdc1636f55e3 100644 (file)
--- a/src/frontends/xforms/FormUrl.C
+++ b/src/frontends/xforms/FormUrl.C
@@ -93,25 +93,24 @@ void FormUrl::update()
 
 void FormUrl::apply()
 {
-       if( lv_->buffer()->isReadonly() ) return;
+       if(lv_->buffer()->isReadonly()) return;
 
-       params.setContents( fl_get_input(dialog_->url) );
-       params.setOptions( fl_get_input(dialog_->name) );
+       params.setContents(fl_get_input(dialog_->url));
+       params.setOptions(fl_get_input(dialog_->name));
 
        if (fl_get_button(dialog_->radio_html))
                params.setCmdName("htmlurl");
        else
                params.setCmdName("url");
 
-       if( inset_ != 0 )
-       {
+       if(inset_ != 0) {
                // Only update if contents have changed
-               if( params != inset_->params() ) {
-                       inset_->setParams( params );
-                       lv_->view()->updateInset( inset_, true );
+               if(params != inset_->params()) {
+                       inset_->setParams(params);
+                       lv_->view()->updateInset(inset_, true);
                }
        } else {
-               lv_->getLyXFunc()->Dispatch( LFUN_INSERT_URL,
-                                            params.getAsString().c_str() );
+               lv_->getLyXFunc()->Dispatch(LFUN_INSERT_URL,
+                                           params.getAsString());
        }
 }

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index 8fd36b29747dbd9393232e6b9d822eb821ce13ec..14dc19a9dd710c0489846c0a19ee347e9ff756c5 100644 (file)
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -173,7 +173,7 @@ void include_cb(FL_OBJECT *, long arg)
                        
                        fl_hide_form(form->include);
                        current_view->updateInset(inset, true);
-                       current_view->owner()->getLyXFunc()->Dispatch(LFUN_CHILDOPEN, inset->getContents().c_str());
+                       current_view->owner()->getLyXFunc()->Dispatch(LFUN_CHILDOPEN, inset->getContents());
                 }
                 break;
                

diff --git a/src/insets/insetparent.C b/src/insets/insetparent.C
index 05b14f1626a60e58133882e99f0dbdd2b428dea8..b6a9381a20752e1f7fcf14673d42324aa77f2683 100644 (file)
--- a/src/insets/insetparent.C
+++ b/src/insets/insetparent.C
@@ -49,7 +49,7 @@ string const InsetParent::getScreenLabel() const
 void InsetParent::Edit(BufferView * bv, int, int, unsigned int)
 {    
        bv->owner()->getLyXFunc()->
-               Dispatch(LFUN_CHILDOPEN, getContents().c_str());
+               Dispatch(LFUN_CHILDOPEN, getContents());
 }
 
 

diff --git a/src/insets/insetref.C b/src/insets/insetref.C
index d40fe4c2c66aa397bafbeba7c5eebd36c733e291..31cce3a5d2a546f2c4f39a85fade94ae76bc8dfe 100644 (file)
--- a/src/insets/insetref.C
+++ b/src/insets/insetref.C
@@ -28,7 +28,7 @@ void InsetRef::Edit(BufferView * bv, int, int, unsigned int button)
        // Eventually trigger dialog with button 3 not 1
        if( button == 3 )
                bv->owner()->getLyXFunc()->
-                       Dispatch(LFUN_REF_GOTO, getContents().c_str());
+                       Dispatch(LFUN_REF_GOTO, getContents());
        else if( button == 1 )
                bv->owner()->getDialogs()->showRef( this );
 }

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 003643240b140efcb5727fa13465126159d9bb41..9c30a7931faec32b3b8c7bbf5b3fa152c0058de3 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -1178,7 +1178,7 @@ void LayoutsCB(int sel, void *, Combox *)
 {
        string tmp = tostr(sel);
        current_view->owner()->getLyXFunc()->Dispatch(LFUN_LAYOUTNO,
-                                                     tmp.c_str());
+                                                     tmp);
 }
 
 #ifndef NEW_EXPORT

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 11c6140e7f463288795b9fd6c2c8e29a60286c1f..5c6eece450d21a820e797518a324d35a5c30c503 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -298,7 +298,7 @@ int LyXFunc::processKeySym(KeySym keysym, unsigned int state)
 
         bool tmp_sc = show_sc;
        show_sc = false;
-       Dispatch(action, argument.c_str());
+       Dispatch(action, argument);
        show_sc = tmp_sc;
        
        return 0;
@@ -432,7 +432,7 @@ int LyXFunc::processKeyEvent(XEvent * ev)
 
         bool tmp_sc = show_sc;
        show_sc = false;
-       Dispatch(action, argument.c_str());
+       Dispatch(action, argument);
        show_sc = tmp_sc;
        
        return 0;
@@ -650,10 +650,11 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
 string const LyXFunc::Dispatch(string const & s) 
 {
        // Split command string into command and argument
-       string cmd, line = frontStrip(s);
+       string cmd;
+       string line = frontStrip(s);
        string arg = strip(frontStrip(split(line, cmd, ' ')));
 
-       return Dispatch(lyxaction.LookupFunc(cmd.c_str()), arg.c_str());
+       return Dispatch(lyxaction.LookupFunc(cmd.c_str()), arg);
 }
 
 
@@ -1388,7 +1389,7 @@ string const LyXFunc::Dispatch(int ac,
                Dispatch(int(LFUN_LAYOUT), 
                         textclasslist.NameOfLayout(owner->view()
                                                    ->buffer()->params.textclass,
-                                                   sel).c_str());
+                                                   sel));
                return string();
        }
                

diff --git a/src/lyxserver.C b/src/lyxserver.C
index d0ad5c7ce2e9734c4a0349da9492f97bcc6b94a3..375d506e96b4e3c7856d82c301d6eb07fe680861 100644 (file)
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -528,7 +528,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
                        string rval, buf;
                    
                        if (action>= 0) {
-                               rval = serv->func->Dispatch(action, arg.c_str());
+                               rval = serv->func->Dispatch(action, arg);
                        } else {
                                rval = "Unknown command";
                        }

diff --git a/src/main.C b/src/main.C
index 22e56f1708721ad49aed69b2222e170398a31a57..8d525321f078ff7677f61376690bafeb52cf74fa 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -9,7 +9,6 @@
  * ====================================================== */
 
 #include <config.h>
-#include <iostream>
 
 #include "lyx_main.h"
 #include "gettext.h"
@@ -17,14 +16,10 @@
 #include "support/filetools.h"
 #include "frontends/GUIRunTime.h"
 
-using std::cerr;
-using std::endl;
-
-GUIRunTime guiruntime;
 
 int main(int argc, char * argv[])
 {
-       int val = guiruntime.initApplication(argc, argv);
+       int const val = GUIRunTime::initApplication(argc, argv);
        if (val)
                return val;
 
@@ -35,8 +30,8 @@ int main(int argc, char * argv[])
                lyx_localedir = LOCALEDIR;
        
        // initialize for internationalized version *EK*
-       locale_init();
-       gettext_init();
+       locale_init(); // macro
+       gettext_init(); // macro
 
 #ifdef __EMX__
        _wildcard(&argc, &argv);

diff --git a/src/mathed/math_panel.C b/src/mathed/math_panel.C
index 75f12917289b677dd21b2f0a49752c01e8f03472..ae48f1fc2c5d02f600bd88e2c1b4b474a8cfb664 100644 (file)
--- a/src/mathed/math_panel.C
+++ b/src/mathed/math_panel.C
@@ -141,8 +141,8 @@ void button_cb(FL_OBJECT * ob, long data)
 /* callbacks for form delim */
 void delim_cb(FL_OBJECT *, long data)
 {
-   int left= fd_delim->left->u_ldata, right= fd_delim->right->u_ldata;
-   int side= (fl_get_button(fd_delim->right)!= 0);
+   int left = fd_delim->left->u_ldata, right= fd_delim->right->u_ldata;
+   int side = (fl_get_button(fd_delim->right)!= 0);
    
    switch (data) {
     case MM_APPLY:

diff --git a/src/minibuffer.h b/src/minibuffer.h
index d040e08f6a580993cbd97ca1df57ba69f9bec39a..f9b60d17473f8f1c11485c290353dea1eaa6c4fd 100644 (file)
--- a/src/minibuffer.h
+++ b/src/minibuffer.h
@@ -77,7 +77,7 @@ private:
        ///
        mutable int history_cnt;
         ///
-        void addHistory(string const &cmd) const { 
+        void addHistory(string const & cmd) const { 
                if (history_cnt == 0
                    || (history_cnt > 0
                        && cmd != history[(history_cnt - 1) % MAX_HISTORY])) {