[bt-devel] Subject: [bibletime-cvs]

[Fred Saalbach]

Fine with me, but to keep from cluttering up my inbox I am going to
filter "subject = [bibletime-cvs]" to a mail folder.
Fred

Martin Gruner wrote:
> 
> this is how the messages look like. Note that one message is generated for
> every commit, but can cover multiple files that changed.
> 
> Martin
> 
>   ------------------------------------------------------------------------
> 
> Subject: [bibletime-cvs] bibletime/bibletime/frontend/keychooser ckeychooserwidget.cpp,1.64,1.65 clexiconkeychooser.cpp,1.49,1.50
> Date: Tue, 07 Jan 2003 04:58:02 -0800
> From: joachim@users.sourceforge.net
> To: bibletime-cvs@lists.sourceforge.net
> 
> Update of /cvsroot/bibletime/bibletime/bibletime/frontend/keychooser
> In directory sc8-pr-cvs1:/tmp/cvs-serv21617/bibletime/frontend/keychooser
> 
> Modified Files:
>         ckeychooserwidget.cpp clexiconkeychooser.cpp
> Log Message:
> fixes
> 
> Index: ckeychooserwidget.cpp
> ===================================================================
> RCS file: /cvsroot/bibletime/bibletime/bibletime/frontend/keychooser/ckeychooserwidget.cpp,v
> retrieving revision 1.64
> retrieving revision 1.65
> diff -u -d -r1.64 -r1.65
> --- ckeychooserwidget.cpp       2 Jan 2003 20:47:32 -0000       1.64
> +++ ckeychooserwidget.cpp       7 Jan 2003 12:57:59 -0000       1.65
> @@ -187,8 +187,8 @@
>         if (list) {
>                 m_comboBox->insertStringList(*list);
>    }
> -       m_comboBox->setCurrentItem(index);
> -       if (!list || (list && !list->count())) { //nothing in the combobox
> +
> +  if (!list || (list && !list->count())) { //nothing in the combobox
>                 btn_up->setEnabled( true );
>                 btn_fx->setEnabled( true );
>                 btn_down->setEnabled( true );
> @@ -201,7 +201,10 @@
>                 btn_fx->setEnabled( enableButtons );
>                 btn_down->setEnabled( list && (list->count()>1) );
>         }
> -
> +
> +  if (list->count()) {
> +       m_comboBox->setCurrentItem(index);
> +  }
>         if (do_emit) {
>                 emit changed(m_comboBox->currentItem());
>         }
> 
> Index: clexiconkeychooser.cpp
> ===================================================================
> RCS file: /cvsroot/bibletime/bibletime/bibletime/frontend/keychooser/clexiconkeychooser.cpp,v
> retrieving revision 1.49
> retrieving revision 1.50
> diff -u -d -r1.49 -r1.50
> --- clexiconkeychooser.cpp      7 Jan 2003 02:52:15 -0000       1.49
> +++ clexiconkeychooser.cpp      7 Jan 2003 12:57:59 -0000       1.50
> @@ -112,23 +112,24 @@
>      QStringList goodEntries; //The string list which contains the entries which are available in all modules
> 
>      EntryMap::iterator it = entryMap.begin(); //iterator to go thoigh all selected modules
> -    QStringList* refEntries = it->second; //this is a pointer to a string list, only use it for comparision
> +    QStringList refEntries = *(it->second); //copy the items for the first time
>      QStringList* cmpEntries = ( ++it )->second; //list for comparision, starts with the second module in the map
> +
>      while(it != entryMap.end()) {
>        std::set_intersection(
> -        refEntries->begin(), --(refEntries->end()), //--end() is the last valid entry
> +        refEntries.begin(), --(refEntries.end()), //--end() is the last valid entry
>          cmpEntries->begin(), --(cmpEntries->end()),
>          std::back_inserter(goodEntries), //append valid entries to the end of goodEntries
>          my_cmpEntries  //ci_cmpEntries is the comparision function
>        );
> 
> -      cmpEntries = ( ++it )->second; //this is a pointer to a string list, only use it for comparision
> +      cmpEntries = ( ++it )->second; //this is a pointer to the string list of a new module
> 
>        /*
>        * use the good entries for next comparision,
> -      * because the final list can only have the entries of goodEntries as ms maxiumum
> +      * because the final list can only have the entries of goodEntries as maxiumum
>        */
> -      *refEntries = goodEntries;
> +      refEntries = goodEntries;
>      };
> 
>      m_widget->reset(goodEntries, 0, true); //write down the entries
> 
> -------------------------------------------------------
> This SF.NET email is sponsored by:
> SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
> http://www.vasoftware.com
> _______________________________________________
> bibletime-cvs mailing list
> bibletime-cvs@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/bibletime-cvs