[bt-devel] (no subject)
Martin Gruner
bt-devel@crosswire.org
Tue, 7 Jan 2003 15:20:54 +0000
--Boundary-00=_WBvG+56GEPu2PDl
Content-Type: text/plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
this is how the messages look like. Note that one message is generated for
every commit, but can cover multiple files that changed.
Martin
--Boundary-00=_WBvG+56GEPu2PDl
Content-Type: message/rfc822;
name="forwarded message"
Content-Transfer-Encoding: 8bit
Content-Description: joachim@users.sourceforge.net: [bibletime-cvs] bibletime/bibletime/frontend/keychooser ckeychooserwidget.cpp,1.64,1.65 clexiconkeychooser.cpp,1.49,1.50
Return-Path: <bibletime-cvs-admin@lists.sourceforge.net>
X-Flags: 0000
Delivered-To: GMX delivery to mg.pub@gmx.net
Received: (qmail 4737 invoked by uid 0); 7 Jan 2003 12:59:02 -0000
Received: from lists.sourceforge.net (HELO sc8-sf-list2.sourceforge.net) (66.35.250.206)
by mx0.gmx.net (mx029-rz3) with SMTP; 7 Jan 2003 12:59:02 -0000
Received: from sc8-sf-list1-b.sourceforge.net ([10.3.1.13] helo=sc8-sf-list1.sourceforge.net)
by sc8-sf-list2.sourceforge.net with esmtp (Exim 3.31-VA-mm2 #1 (Debian))
id 18VtJv-0005Ge-00
for <mg.pub@gmx.net>; Tue, 07 Jan 2003 04:59:03 -0800
Received: from sc8-sf-sshgate.sourceforge.net ([66.35.250.220] helo=sc8-sf-netmisc.sourceforge.net)
by sc8-sf-list1.sourceforge.net with esmtp
(Cipher TLSv1:DES-CBC3-SHA:168) (Exim 3.31-VA-mm2 #1 (Debian))
id 18VtIx-0000FP-00
for <bibletime-cvs@lists.sourceforge.net>; Tue, 07 Jan 2003 04:58:03 -0800
Received: from sc8-pr-cvs1-b.sourceforge.net ([10.5.1.7] helo=sc8-pr-cvs1.sourceforge.net)
by sc8-sf-netmisc.sourceforge.net with esmtp (Exim 3.36 #1 (Debian))
id 18VtIw-0000iI-00
for <bibletime-cvs@lists.sourceforge.net>; Tue, 07 Jan 2003 04:58:02 -0800
Received: from localhost ([127.0.0.1] helo=sc8-pr-cvs1.sourceforge.net)
by sc8-pr-cvs1.sourceforge.net with esmtp (Exim 3.22 #1 (Debian))
id 18VtIw-0005dg-00
for <bibletime-cvs@lists.sourceforge.net>; Tue, 07 Jan 2003 04:58:02 -0800
From: joachim@users.sourceforge.net
To: bibletime-cvs@lists.sourceforge.net
Message-Id: <E18VtIw-0005dg-00@sc8-pr-cvs1.sourceforge.net>
Date: Tue, 07 Jan 2003 04:58:02 -0800
Subject: [bibletime-cvs] bibletime/bibletime/frontend/keychooser ckeychooserwidget.cpp,1.64,1.65 clexiconkeychooser.cpp,1.49,1.50
Sender: bibletime-cvs-admin@lists.sourceforge.net
Errors-To: bibletime-cvs-admin@lists.sourceforge.net
X-BeenThere: bibletime-cvs@lists.sourceforge.net
X-Mailman-Version: 2.0.9-sf.net
Precedence: bulk
List-Help: <mailto:bibletime-cvs-request@lists.sourceforge.net?subject=help>
List-Post: <mailto:bibletime-cvs@lists.sourceforge.net>
List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/bibletime-cvs>,
<mailto:bibletime-cvs-request@lists.sourceforge.net?subject=subscribe>
List-Id: <bibletime-cvs.lists.sourceforge.net>
List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/bibletime-cvs>,
<mailto:bibletime-cvs-request@lists.sourceforge.net?subject=unsubscribe>
List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum=bibletime-cvs>
X-GMX-Antivirus: -1 (not scanned, may not use virus scanner)
Status: R
X-Status: N
X-KMail-EncryptionState:
X-KMail-SignatureState:
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
--Boundary-00=_WBvG+56GEPu2PDl--