Menu
▾
▴
[Kbarcode-svn] SF.net SVN: kbarcode: [13] trunk/src
|
From: <vz...@us...> - 2008-02-26 22:23:32
|
Revision: 13
http://kbarcode.svn.sourceforge.net/kbarcode/?rev=13&view=rev
Author: vzsolt
Date: 2008-02-26 14:23:37 -0800 (Tue, 26 Feb 2008)
Log Message:
-----------
QComboBox's insertItem method is deprecated. I've replaced them with "addItem", as it's equivalent.
This cleaned up around 40 messages from the build log.
Modified Paths:
--------------
trunk/src/barcodedialogs.cpp
trunk/src/barcodeprinterdlg.cpp
trunk/src/batchwizard.cpp
trunk/src/configdialog.cpp
trunk/src/csvimportdlg.cpp
trunk/src/definitiondialog.cpp
trunk/src/previewdialog.cpp
trunk/src/printersettings.cpp
trunk/src/propertywidget.cpp
trunk/src/sqltables.cpp
trunk/src/tokendialog.cpp
Modified: trunk/src/barcodedialogs.cpp
===================================================================
--- trunk/src/barcodedialogs.cpp 2008-02-26 21:46:07 UTC (rev 12)
+++ trunk/src/barcodedialogs.cpp 2008-02-26 22:23:37 UTC (rev 13)
@@ -319,37 +319,37 @@
datamLayout->addWidget( comboDataMatrix );
datamLayout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Minimum ) );
- comboDataMatrix->insertItem( i18n("Automatic calculation" ) );
- comboDataMatrix->insertItem( "10 x 10" );
- comboDataMatrix->insertItem( "12 x 12" );
- comboDataMatrix->insertItem( "14 x 14" );
- comboDataMatrix->insertItem( "16 x 16" );
- comboDataMatrix->insertItem( "18 x 18" );
- comboDataMatrix->insertItem( "20 x 20" );
- comboDataMatrix->insertItem( "22 x 22" );
- comboDataMatrix->insertItem( "24 x 24" );
- comboDataMatrix->insertItem( "26 x 26" );
- comboDataMatrix->insertItem( "32 x 32" );
- comboDataMatrix->insertItem( "36 x 36" );
- comboDataMatrix->insertItem( "40 x 40" );
- comboDataMatrix->insertItem( "44 x 44" );
- comboDataMatrix->insertItem( "48 x 48" );
- comboDataMatrix->insertItem( "52 x 52" );
- comboDataMatrix->insertItem( "64 x 64" );
- comboDataMatrix->insertItem( "72 x 72" );
- comboDataMatrix->insertItem( "80 x 80" );
- comboDataMatrix->insertItem( "88 x 88" );
- comboDataMatrix->insertItem( "96 x 96" );
- comboDataMatrix->insertItem( "104 x 104" );
- comboDataMatrix->insertItem( "120 x 120" );
- comboDataMatrix->insertItem( "132 x 132" );
- comboDataMatrix->insertItem( "144 x 144" );
- comboDataMatrix->insertItem( "8 x 18" );
- comboDataMatrix->insertItem( "8 x 32" );
- comboDataMatrix->insertItem( "12 x 26" );
- comboDataMatrix->insertItem( "12 x 36" );
- comboDataMatrix->insertItem( "16 x 36" );
- comboDataMatrix->insertItem( "16 x 48" );
+ comboDataMatrix->addItem( i18n("Automatic calculation" ) );
+ comboDataMatrix->addItem( "10 x 10" );
+ comboDataMatrix->addItem( "12 x 12" );
+ comboDataMatrix->addItem( "14 x 14" );
+ comboDataMatrix->addItem( "16 x 16" );
+ comboDataMatrix->addItem( "18 x 18" );
+ comboDataMatrix->addItem( "20 x 20" );
+ comboDataMatrix->addItem( "22 x 22" );
+ comboDataMatrix->addItem( "24 x 24" );
+ comboDataMatrix->addItem( "26 x 26" );
+ comboDataMatrix->addItem( "32 x 32" );
+ comboDataMatrix->addItem( "36 x 36" );
+ comboDataMatrix->addItem( "40 x 40" );
+ comboDataMatrix->addItem( "44 x 44" );
+ comboDataMatrix->addItem( "48 x 48" );
+ comboDataMatrix->addItem( "52 x 52" );
+ comboDataMatrix->addItem( "64 x 64" );
+ comboDataMatrix->addItem( "72 x 72" );
+ comboDataMatrix->addItem( "80 x 80" );
+ comboDataMatrix->addItem( "88 x 88" );
+ comboDataMatrix->addItem( "96 x 96" );
+ comboDataMatrix->addItem( "104 x 104" );
+ comboDataMatrix->addItem( "120 x 120" );
+ comboDataMatrix->addItem( "132 x 132" );
+ comboDataMatrix->addItem( "144 x 144" );
+ comboDataMatrix->addItem( "8 x 18" );
+ comboDataMatrix->addItem( "8 x 32" );
+ comboDataMatrix->addItem( "12 x 26" );
+ comboDataMatrix->addItem( "12 x 36" );
+ comboDataMatrix->addItem( "16 x 36" );
+ comboDataMatrix->addItem( "16 x 48" );
}
void DataMatrixDlg::setData( Barkode* b )
Modified: trunk/src/barcodeprinterdlg.cpp
===================================================================
--- trunk/src/barcodeprinterdlg.cpp 2008-02-26 21:46:07 UTC (rev 12)
+++ trunk/src/barcodeprinterdlg.cpp 2008-02-26 22:23:37 UTC (rev 13)
@@ -57,18 +57,18 @@
layout->addWidget( label3, 3, 0 );
layout->addMultiCellWidget( comboDevice, 3, 3, 1, 2 );
- comboFormat->insertItem( i18n("TEC Printer (TEC)") );
- comboFormat->insertItem( i18n("Zebra Printer (ZPL)") );
- comboFormat->insertItem( i18n("Intermec Printer (IPL)") );
- comboFormat->insertItem( i18n("EPCL Printer (EPCL)") );
+ comboFormat->addItem( i18n("TEC Printer (TEC)") );
+ comboFormat->addItem( i18n("Zebra Printer (ZPL)") );
+ comboFormat->addItem( i18n("Intermec Printer (IPL)") );
+ comboFormat->addItem( i18n("EPCL Printer (EPCL)") );
// do not translate unix devicenames...
- comboDevice->insertItem( "/dev/lp0" );
- comboDevice->insertItem( "/dev/lp1" );
- comboDevice->insertItem( "/dev/lp2" );
- comboDevice->insertItem( "/dev/usb/lp0" );
- comboDevice->insertItem( "/dev/usb/lp1" );
- comboDevice->insertItem( "/dev/usb/lp2" );
+ comboDevice->addItem( "/dev/lp0" );
+ comboDevice->addItem( "/dev/lp1" );
+ comboDevice->addItem( "/dev/lp2" );
+ comboDevice->addItem( "/dev/usb/lp0" );
+ comboDevice->addItem( "/dev/usb/lp1" );
+ comboDevice->addItem( "/dev/usb/lp2" );
connect( checkFile, SIGNAL( clicked() ), this, SLOT( enableControls() ) );
Modified: trunk/src/batchwizard.cpp
===================================================================
--- trunk/src/batchwizard.cpp 2008-02-26 21:46:07 UTC (rev 12)
+++ trunk/src/batchwizard.cpp 2008-02-26 22:23:37 UTC (rev 13)
@@ -480,8 +480,8 @@
customerId->clear();
customerName->clear();
while ( cur.next() ) {
- customerId->insertItem( cur.value("customer_no" ).toString() );
- customerName->insertItem( cur.value("customer_name" ).toString() );
+ customerId->addItem( cur.value("customer_no" ).toString() );
+ customerName->addItem( cur.value("customer_name" ).toString() );
}
}
Modified: trunk/src/configdialog.cpp
===================================================================
--- trunk/src/configdialog.cpp 2008-02-26 21:46:07 UTC (rev 12)
+++ trunk/src/configdialog.cpp 2008-02-26 22:23:37 UTC (rev 13)
@@ -91,9 +91,9 @@
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding );
printerQuality = new KComboBox( false, box );
- printerQuality->insertItem( i18n("Medium Resolution (300dpi)") );
- printerQuality->insertItem( i18n("High Resolution (600dpi)") );
- printerQuality->insertItem( i18n("Very High Resolution (1200dpi)") );
+ printerQuality->addItem( i18n("Medium Resolution (300dpi)") );
+ printerQuality->addItem( i18n("High Resolution (600dpi)") );
+ printerQuality->addItem( i18n("Very High Resolution (1200dpi)") );
switch( lb->quality ) {
case PrinterSettings::Middle:
@@ -159,21 +159,21 @@
Layout1->addWidget( new QLabel( i18n("File Format:"), box ) );
combo1 = new KComboBox( box );
- combo1->insertItem( i18n("Quantity") );
- combo1->insertItem( i18n("Article Number") );
- combo1->insertItem( i18n("Group") );
+ combo1->addItem( i18n("Quantity") );
+ combo1->addItem( i18n("Article Number") );
+ combo1->addItem( i18n("Group") );
Layout1->addWidget( combo1 );
combo2 = new KComboBox( box );
- combo2->insertItem( i18n("Quantity") );
- combo2->insertItem( i18n("Article Number") );
- combo2->insertItem( i18n("Group") );
+ combo2->addItem( i18n("Quantity") );
+ combo2->addItem( i18n("Article Number") );
+ combo2->addItem( i18n("Group") );
Layout1->addWidget( combo2 );
combo3 = new KComboBox( box );
- combo3->insertItem( i18n("Quantity") );
- combo3->insertItem( i18n("Article Number") );
- combo3->insertItem( i18n("Group") );
+ combo3->addItem( i18n("Quantity") );
+ combo3->addItem( i18n("Article Number") );
+ combo3->addItem( i18n("Group") );
Layout1->addWidget( combo3 );
grid->addMultiCellLayout( Layout1, 4, 4, 0, 2 );
Modified: trunk/src/csvimportdlg.cpp
===================================================================
--- trunk/src/csvimportdlg.cpp 2008-02-26 21:46:07 UTC (rev 12)
+++ trunk/src/csvimportdlg.cpp 2008-02-26 22:23:37 UTC (rev 13)
@@ -102,11 +102,11 @@
requester = new KUrlRequester( box );
comboEncoding = new EncodingCombo( box );
comboSQL = new KComboBox( false, box );
- comboSQL->insertItem( TABLE_BASIC );
- comboSQL->insertItem( TABLE_CUSTOMER );
- comboSQL->insertItem( TABLE_CUSTOMER_TEXT );
- comboSQL->insertItem( TABLE_LABEL_DEF );
- comboSQL->insertItem( i18n("Other table...") );
+ comboSQL->addItem( TABLE_BASIC );
+ comboSQL->addItem( TABLE_CUSTOMER );
+ comboSQL->addItem( TABLE_CUSTOMER_TEXT );
+ comboSQL->addItem( TABLE_LABEL_DEF );
+ comboSQL->addItem( i18n("Other table...") );
databaseName = new KLineEdit( box );
checkLoadAll = new QCheckBox( i18n("&Load complete file into preview"), box );
@@ -305,10 +305,10 @@
QString name = getDatabaseName();
comboField->clear();
- comboField->insertItem( NOFIELD );
+ comboField->add( NOFIELD );
QSqlQuery query( SqlTables::getInstance()->driver()->showColumns( name ) );
while( query.next() )
- comboField->insertItem( query.value( 0 ).toString() );
+ comboField->addItem( query.value( 0 ).toString() );
for( int i = 0; i < table->horizontalHeader()->count(); i++ )
table->horizontalHeader()->setLabel( i, QString::number( i + 1 ) );
Modified: trunk/src/definitiondialog.cpp
===================================================================
--- trunk/src/definitiondialog.cpp 2008-02-26 21:46:07 UTC (rev 12)
+++ trunk/src/definitiondialog.cpp 2008-02-26 22:23:37 UTC (rev 13)
@@ -267,7 +267,7 @@
if( comboProducer->currentText() == comboProducer->text( comboProducer->currentItem() ) )
if( comboProducer->currentItem() < comboProducer->count())
comboType->insertStringList( types[ comboProducer->currentItem() ] );
- comboType->insertItem( i18n( "Custom" ), 0 );
+ comboType->addItem( i18n( "Custom" ), 0 );
}
const Measurements DefinitionDialog::getCurrentMeasure()
Modified: trunk/src/previewdialog.cpp
===================================================================
--- trunk/src/previewdialog.cpp 2008-02-26 21:46:07 UTC (rev 12)
+++ trunk/src/previewdialog.cpp 2008-02-26 22:23:37 UTC (rev 13)
@@ -170,8 +170,8 @@
customerId->clear();
customerName->clear();
while ( cur.next() ) {
- customerId->insertItem( cur.value("customer_no" ).toString() );
- customerName->insertItem( cur.value("customer_name" ).toString() );
+ customerId->addItem( cur.value("customer_no" ).toString() );
+ customerName->addItem( cur.value("customer_name" ).toString() );
}
customerId->setCurrentItem( customer_index );
Modified: trunk/src/printersettings.cpp
===================================================================
--- trunk/src/printersettings.cpp 2008-02-26 21:46:07 UTC (rev 12)
+++ trunk/src/printersettings.cpp 2008-02-26 22:23:37 UTC (rev 13)
@@ -182,7 +182,7 @@
void PrinterSettings::insertPageFormat( KComboBox* combo )
{
for( unsigned int i = 0; i < sizeof( pageFormatInfo ) / sizeof( PageFormatInfo ); i++ )
- combo->insertItem( pageFormatInfo[i].descriptiveName );
+ combo->addItem( pageFormatInfo[i].descriptiveName );
}
double PrinterSettings::pageWidth() const
Modified: trunk/src/propertywidget.cpp
===================================================================
--- trunk/src/propertywidget.cpp 2008-02-26 21:46:07 UTC (rev 12)
+++ trunk/src/propertywidget.cpp 2008-02-26 22:23:37 UTC (rev 13)
@@ -144,10 +144,10 @@
comboRotation = new KComboBox( FALSE, this );
label->setBuddy( comboRotation );
- comboRotation->insertItem( i18n("0") );
- comboRotation->insertItem( i18n("90") );
- comboRotation->insertItem( i18n("180") );
- comboRotation->insertItem( i18n("270") );
+ comboRotation->addItem( i18n("0") );
+ comboRotation->addItem( i18n("90") );
+ comboRotation->addItem( i18n("180") );
+ comboRotation->addItem( i18n("270") );
grid->addWidget( label, 0, 0 );
grid->addWidget( comboRotation, 0, 1 );
@@ -219,17 +219,17 @@
{
QSqlQuery* query = new QSqlQuery("select encoding_type from barcode_basic group by encoding_type");
while( query->next() )
- comboComplex->insertItem( "Main:" + query->value( 0 ).toString() );
+ comboComplex->addItem( "Main:" + query->value( 0 ).toString() );
delete query;
query = new QSqlQuery("select customer_no, encoding_type from customer_text group by customer_no, encoding_type");
while( query->next() )
- comboComplex->insertItem( query->value( 0 ).toString() + ":" + query->value( 1 ).toString() );
+ comboComplex->addItem( query->value( 0 ).toString() + ":" + query->value( 1 ).toString() );
delete query;
}
- comboComplex->insertItem( "Static" );
+ comboComplex->addItem( "Static" );
barcode = new BarcodeWidget( this, "barcode" );
barcode->setTokenProvider( token );
@@ -484,10 +484,10 @@
buttonToken = new KPushButton( i18n("&Insert Data Field..."), imgHBox );
buttonToken->setIconSet( QIcon( SmallIcon("contents") ) );
- comboRotation->insertItem( i18n("0") );
- comboRotation->insertItem( i18n("90") );
- comboRotation->insertItem( i18n("180") );
- comboRotation->insertItem( i18n("270") );
+ comboRotation->addItem( i18n("0") );
+ comboRotation->addItem( i18n("90") );
+ comboRotation->addItem( i18n("180") );
+ comboRotation->addItem( i18n("270") );
Q3VButtonGroup* group = new Q3VButtonGroup( i18n("&Size"), this );
Modified: trunk/src/sqltables.cpp
===================================================================
--- trunk/src/sqltables.cpp 2008-02-26 21:46:07 UTC (rev 12)
+++ trunk/src/sqltables.cpp 2008-02-26 22:23:37 UTC (rev 13)
@@ -565,7 +565,7 @@
QStringList drList = QSqlDatabase::drivers();
QStringList::Iterator it = drList.begin();
while( it != drList.end() ) {
- m_driver->insertItem( *it );
+ m_driver->addItem( *it );
++it;
}
grid->addWidget( m_driver, 4, 1 );
Modified: trunk/src/tokendialog.cpp
===================================================================
--- trunk/src/tokendialog.cpp 2008-02-26 21:46:07 UTC (rev 12)
+++ trunk/src/tokendialog.cpp 2008-02-26 22:23:37 UTC (rev 13)
@@ -338,10 +338,10 @@
unsigned int i, z;
Q3ValueList<tCategories>* categories = TokenProvider::getTokens();
- category->insertItem( i18n("All") );
+ category->addItem( i18n("All") );
for( i = 0; i < categories->count(); i++ )
- category->insertItem( TokenProvider::captionForCategory( (TokenProvider::ECategories)(*categories)[i].category ) );
+ category->addItem( TokenProvider::captionForCategory( (TokenProvider::ECategories)(*categories)[i].category ) );
for( i = 0; i < categories->count(); i++ )
for( z = 0; z < (*categories)[i].tokens.count(); z++ )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X