[dyntrans-cvs] qt-tr/src/widgets qcombobox.cpp,1.2,1.3

[Krzysztof L. <kli...@us...>]

Update of /cvsroot/dyntrans/qt-tr/src/widgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24982/src/widgets

Modified Files:
	qcombobox.cpp 
Log Message:
Removed modifications to Qt source, QTrString interface is better now.


Index: qcombobox.cpp
===================================================================
RCS file: /cvsroot/dyntrans/qt-tr/src/widgets/qcombobox.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- qcombobox.cpp	27 Sep 2004 23:47:18 -0000	1.2
+++ qcombobox.cpp	18 Nov 2004 10:17:52 -0000	1.3
@@ -630,7 +630,7 @@
 	if ( d->usingListBox() )
 	    d->listBox()->insertItem( QString::fromLatin1(tmp), index );
 	else
-	    d->popup()->insertItem( (QTrString)QString::fromLatin1(tmp), index, index );
+	    d->popup()->insertItem( QString::fromLatin1(tmp), index, index );
 	if ( index++ == d->current && d->current < count() ) {
 	    if ( d->ed ) {
 		d->ed->setText( text( d->current ) );
@@ -658,7 +658,7 @@
 	if ( d->usingListBox() )
 	    d->listBox()->insertItem( *it, index );
 	else
-	    d->popup()->insertItem( (QTrString)*it, index, index );
+	    d->popup()->insertItem( *it, index, index );
 	if ( index++ == d->current && d->current < count() ) {
 	    if ( d->ed ) {
 		d->ed->setText( text( d->current ) );
@@ -705,7 +705,7 @@
 	if ( d->usingListBox() )
 	    d->listBox()->insertItem( QString::fromLatin1(strings[i]), index );
 	else
-	    d->popup()->insertItem( (QTrString)QString::fromLatin1(strings[i]), index, index );
+	    d->popup()->insertItem( QString::fromLatin1(strings[i]), index, index );
 	i++;
 	if ( index++ == d->current && d->current < count()  ) {
 	    if ( d->ed ) {
@@ -734,7 +734,7 @@
     if ( d->usingListBox() )
 	d->listBox()->insertItem( t, index );
     else
-	d->popup()->insertItem( (QTrString)t, index, index );
+	d->popup()->insertItem( t, index, index );
     if ( index != cnt )
 	reIndex();
     if ( index == d->current && d->current < count()  ) {
@@ -792,7 +792,7 @@
     if ( d->usingListBox() )
 	d->listBox()->insertItem( pixmap, text, index );
     else
-	d->popup()->insertItem( pixmap, (QTrString)text, index, index );
+	d->popup()->insertItem( pixmap, text, index, index );
     if ( index != cnt )
 	reIndex();
     if ( index == d->current && d->current < count()  ) {
@@ -950,7 +950,7 @@
     if ( d->usingListBox() )
 	d->listBox()->changeItem( t, index );
     else
-	d->popup()->changeItem( (QTrString)t, index );
+	d->popup()->changeItem( t, index );
     if ( index == d->current ) {
 	if ( d->ed ) {
 	    d->ed->setText( text( d->current ) );
@@ -1531,12 +1531,12 @@
 	    for(unsigned int i = 0; i < d->listBox()->count(); i++) {
 		QListBoxItem *item = d->listBox()->item(i);
 		if(item->rtti() == QListBoxText::RTTI) {
-		    d->popup()->insertItem((QTrString)item->text(), i, i);
+		    d->popup()->insertItem(item->text(), i, i);
 		} else if(item->rtti() == QListBoxPixmap::RTTI) {
 		    if(item->pixmap())
-			d->popup()->insertItem(QIconSet(*item->pixmap()), (QTrString)item->text(), i, i);
+			d->popup()->insertItem(QIconSet(*item->pixmap()), item->text(), i, i);
 		    else
-			d->popup()->insertItem((QTrString)item->text(), i, i);
+			d->popup()->insertItem(item->text(), i, i);
 		} else {
 		    d->popup()->insertItem(new QComboBoxPopupItem(item), i, i);
 		}