Menu
▾
▴
kbarcode-svn — KBarcode SVN mailinglist. Every SVN commit will be sent to this list.
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
(17) |
Mar
(24) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(16) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <vz...@us...> - 2008-02-27 21:55:58
|
Revision: 22
http://kbarcode.svn.sourceforge.net/kbarcode/?rev=22&view=rev
Author: vzsolt
Date: 2008-02-27 13:54:25 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
Changed every K3 and Q3 class with their new (probably non-existant) ones.
My aim is to use no support classes.
Modified Paths:
--------------
trunk/src/barcodecombo.cpp
trunk/src/barcodecombo.h
trunk/src/barcodedialog.cpp
trunk/src/barcodedialog.h
trunk/src/barcodedialogs.cpp
trunk/src/barcodedialogs.h
trunk/src/barcodeitem.cpp
trunk/src/barcodeitem.h
trunk/src/barcodeprinterdlg.cpp
trunk/src/barkode.cpp
trunk/src/barkode.h
trunk/src/batchprinter.cpp
trunk/src/batchprinter.h
trunk/src/batchwizard.cpp
trunk/src/batchwizard.h
trunk/src/commands.cpp
trunk/src/commands.h
trunk/src/configdialog.cpp
trunk/src/confwizard.cpp
trunk/src/confwizard.h
trunk/src/csvfile.h
trunk/src/csvimportdlg.cpp
trunk/src/csvimportdlg.h
trunk/src/databasebrowser.cpp
trunk/src/definition.cpp
trunk/src/definition.h
trunk/src/definitiondialog.cpp
trunk/src/definitiondialog.h
trunk/src/documentitem.h
trunk/src/documentitemdlg.cpp
trunk/src/documentitemdlg.h
trunk/src/dsrichtext.cpp
trunk/src/dsrichtext.h
trunk/src/dstextedit.cpp
trunk/src/dstextedit.h
trunk/src/gnubarcode.cpp
trunk/src/imageitem.cpp
trunk/src/imageitem.h
trunk/src/kactionmap.cpp
trunk/src/kactionmap.h
trunk/src/kbarcode.cpp
trunk/src/label.cpp
trunk/src/label.h
trunk/src/labeleditor.cpp
trunk/src/labeleditor.h
trunk/src/labelutils.cpp
trunk/src/lineitem.cpp
trunk/src/lineitem.h
trunk/src/mainwindow.cpp
trunk/src/measurements.cpp
trunk/src/mimesources.cpp
trunk/src/mimesources.h
trunk/src/multilineeditdlg.cpp
trunk/src/mycanvasview.cpp
trunk/src/mycanvasview.h
trunk/src/mydatatable.cpp
trunk/src/mydatatable.h
trunk/src/newlabel.cpp
trunk/src/newlabel.h
trunk/src/pixmapbarcode.cpp
trunk/src/previewdialog.cpp
trunk/src/printlabeldlg.cpp
trunk/src/propertywidget.cpp
trunk/src/propertywidget.h
trunk/src/rectitem.cpp
trunk/src/rectitem.h
trunk/src/rectsettingsdlg.cpp
trunk/src/smalldialogs.cpp
trunk/src/sqltables.cpp
trunk/src/tbarcode2.cpp
trunk/src/tcanvasitem.cpp
trunk/src/tcanvasitem.h
trunk/src/textitem.cpp
trunk/src/textitem.h
trunk/src/textlineedit.cpp
trunk/src/textlineitem.cpp
trunk/src/textlineitem.h
trunk/src/tokendialog.cpp
trunk/src/tokendialog.h
trunk/src/tokenprovider.cpp
trunk/src/tokenprovider.h
trunk/src/xmlutils.h
trunk/src/zplutils.cpp
trunk/src/zplutils.h
Modified: trunk/src/barcodecombo.cpp
===================================================================
--- trunk/src/barcodecombo.cpp 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/barcodecombo.cpp 2008-02-27 21:54:25 UTC (rev 22)
@@ -29,7 +29,7 @@
#include <qregexp.h>
#include <qstring.h>
//Added by qt3to4:
-#include <Q3GridLayout>
+#include <QGridLayout>
#if QT_VERSION >= 0x030100
#include <ktextedit.h>
#else
@@ -122,7 +122,7 @@
{
m_token = NULL;
- Q3GridLayout* grid = new Q3GridLayout( this, 6, 6 );
+ QGridLayout* grid = new QGridLayout( this, 6, 6 );
labelStandard = new QLabel( i18n( "&Encoding Type:" ), this );
grid->addWidget( labelStandard, 1, 0 );
@@ -146,13 +146,13 @@
#if QT_VERSION >= 0x030100
multi = new KTextEdit( this );
#else
- multi = new Q3TextEdit( this );
+ multi = new QTextEdit( this );
#endif
multi->setTextFormat( Qt::PlainText );
- multi->setWordWrap( Q3TextEdit::NoWrap );
+ multi->setWordWrap( QTextEdit::NoWrap );
multi->setEnabled( false );
- multi->setVScrollBarMode( Q3ScrollView::AlwaysOn );
- multi->setHScrollBarMode( Q3ScrollView::AlwaysOn );
+ multi->setVScrollBarMode( QScrollView::AlwaysOn );
+ multi->setHScrollBarMode( QScrollView::AlwaysOn );
multi->hide();
connect( multi, SIGNAL( textChanged() ), this, SLOT( changed() ) );
grid->addMultiCellWidget( multi, 3, 3, 1, 3 );
Modified: trunk/src/barcodecombo.h
===================================================================
--- trunk/src/barcodecombo.h 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/barcodecombo.h 2008-02-27 21:54:25 UTC (rev 22)
@@ -71,7 +71,7 @@
#if QT_VERSION >= 0x030100
class KTextEdit;
#else
- class Q3TextEdit;
+ class QTextEdit;
#endif
class QCheckBox;
class QLabel;
@@ -117,7 +117,7 @@
#if QT_VERSION >= 0x030100
KTextEdit* multi;
#else
- Q3TextEdit* multi;
+ QTextEdit* multi;
#endif
KIntNumInput* spinMargin;
Modified: trunk/src/barcodedialog.cpp
===================================================================
--- trunk/src/barcodedialog.cpp 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/barcodedialog.cpp 2008-02-27 21:54:25 UTC (rev 22)
@@ -40,17 +40,17 @@
#include <q3paintdevicemetrics.h>
#include <q3picture.h>
//Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
BarCodeDialog::BarCodeDialog( QWidget* parent )
: QDialog( parent, false)
{
setCaption( i18n( "Barcode Generator" ) );
- BarCodeDialogLayout = new Q3HBoxLayout( this, 11, 6, "BarCodeDialogLayout");
- Layout5 = new Q3VBoxLayout( 0, 0, 6, "Layout5");
- Layout6 = new Q3VBoxLayout( 0, 0, 6, "Layout2");
+ BarCodeDialogLayout = new QHBoxLayout( this, 11, 6, "BarCodeDialogLayout");
+ Layout5 = new QVBoxLayout( 0, 0, 6, "Layout5");
+ Layout6 = new QVBoxLayout( 0, 0, 6, "Layout2");
widget = new BarcodeWidget( this );
m_token = new TokenProvider( KApplication::desktop() );
@@ -81,7 +81,7 @@
buttonClose->setIconSet( SmallIconSet("fileclose") );
- Q3ScrollView* sv = new Q3ScrollView( this );
+ QScrollView* sv = new QScrollView( this );
barcode = new QLabel( sv->viewport(), "barcode" );
sv->addChild( barcode );
@@ -175,12 +175,12 @@
// unless we can center the barcode
printer->setFullPage( false );
- Q3PaintDeviceMetrics metrics( printer );
+ QPaintDeviceMetrics metrics( printer );
double scalex = (double)metrics.logicalDpiX() / (double)QPaintDevice::x11AppDpiX();
double scaley = (double)metrics.logicalDpiY() / (double)QPaintDevice::x11AppDpiY();
- Q3Picture picture;
+ QPicture picture;
QPainter p( printer );
p.scale( scalex, scaley );
// TODO: center barcode
Modified: trunk/src/barcodedialog.h
===================================================================
--- trunk/src/barcodedialog.h 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/barcodedialog.h 2008-02-27 21:54:25 UTC (rev 22)
@@ -20,10 +20,10 @@
#include <qdialog.h>
//Added by qt3to4:
-#include <Q3VBoxLayout>
-#include <Q3GridLayout>
+#include <QVBoxLayout>
+#include <QGridLayout>
#include <QPixmap>
-#include <Q3HBoxLayout>
+#include <QHBoxLayout>
#include <QLabel>
class BarcodeCombo;
@@ -39,9 +39,9 @@
class QCheckBox;
class QLabel;
class QPixmap;
-class Q3VBoxLayout;
-class Q3HBoxLayout;
-class Q3GridLayout;
+class QVBoxLayout;
+class QHBoxLayout;
+class QGridLayout;
class TokenProvider;
/** This class provides a dialog, where the user can create a single barcode
@@ -77,9 +77,9 @@
void copy();
protected:
- Q3HBoxLayout* BarCodeDialogLayout;
- Q3VBoxLayout* Layout6;
- Q3VBoxLayout* Layout5;
+ QHBoxLayout* BarCodeDialogLayout;
+ QVBoxLayout* Layout6;
+ QVBoxLayout* Layout5;
};
#endif // BARCODEDIALOG_H
Modified: trunk/src/barcodedialogs.cpp
===================================================================
--- trunk/src/barcodedialogs.cpp 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/barcodedialogs.cpp 2008-02-27 21:54:25 UTC (rev 22)
@@ -32,9 +32,9 @@
#include <q3vbox.h>
#include <q3vgroupbox.h>
//Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3GridLayout>
-#include <Q3VBoxLayout>
+#include <QHBoxLayout>
+#include <QGridLayout>
+#include <QVBoxLayout>
// KDE includes
#include <kcombobox.h>
@@ -107,14 +107,14 @@
TBarcodeDlg::TBarcodeDlg(QWidget *parent)
: QWidget( parent )
{
- Q3VBoxLayout* layout = new Q3VBoxLayout( this, 6, 6 );
+ QVBoxLayout* layout = new QVBoxLayout( this, 6, 6 );
- Q3GroupBox* gb = new Q3GroupBox( i18n("TBarcode"), this );
+ QGroupBox* gb = new QGroupBox( i18n("TBarcode"), this );
gb->setColumnLayout(0, Qt::Vertical );
gb->layout()->setSpacing( 6 );
gb->layout()->setMargin( 11 );
gb->setEnabled( Barkode::haveTBarcode() || Barkode::haveTBarcode2() );
- Q3VBoxLayout* gbLayout = new Q3VBoxLayout( gb->layout() );
+ QVBoxLayout* gbLayout = new QVBoxLayout( gb->layout() );
spinModule = new KDoubleNumInput( gb );
spinModule->setLabel( i18n("Module width (mm):"), Qt::AlignLeft | Qt::AlignVCenter );
@@ -133,7 +133,7 @@
QLabel* label = new QLabel( i18n("&Checksum calculation method:"), gb );
label->setBuddy( comboCheckSum );
- Q3HBoxLayout * hbox = new Q3HBoxLayout( 0, 6, 6 );
+ QHBoxLayout * hbox = new QHBoxLayout( 0, 6, 6 );
hbox->addWidget( label );
hbox->addWidget( comboCheckSum );
@@ -257,14 +257,14 @@
PDF417BarcodeDlg::PDF417BarcodeDlg(QWidget *parent)
: QWidget( parent )
{
- Q3VBoxLayout* layout = new Q3VBoxLayout( this, 6, 6 );
+ QVBoxLayout* layout = new QVBoxLayout( this, 6, 6 );
- Q3GroupBox* gpdf = new Q3GroupBox( i18n("PDF417"), this );
+ QGroupBox* gpdf = new QGroupBox( i18n("PDF417"), this );
gpdf->setColumnLayout(0, Qt::Vertical );
gpdf->layout()->setSpacing( 6 );
gpdf->layout()->setMargin( 11 );
gpdf->setEnabled( Barkode::haveTBarcode() || Barkode::havePDFBarcode() );
- Q3VBoxLayout* gpdfLayout = new Q3VBoxLayout( gpdf->layout() );
+ QVBoxLayout* gpdfLayout = new QVBoxLayout( gpdf->layout() );
spinRow = new KIntNumInput( gpdf );
spinRow->setLabel( i18n("Rows:"), Qt::AlignLeft | Qt::AlignVCenter );
@@ -311,7 +311,7 @@
DataMatrixDlg::DataMatrixDlg(QWidget *parent )
: QWidget( parent )
{
- Q3HBoxLayout* datamLayout = new Q3HBoxLayout( this, 6, 6 );
+ QHBoxLayout* datamLayout = new QHBoxLayout( this, 6, 6 );
comboDataMatrix = new KComboBox( false, this );
@@ -365,13 +365,13 @@
SequenceDlg::SequenceDlg( QWidget *parent )
: QWidget( parent )
{
- Q3VBoxLayout* main = new Q3VBoxLayout( this, 6, 6 );
+ QVBoxLayout* main = new QVBoxLayout( this, 6, 6 );
- Q3ButtonGroup* group = new Q3ButtonGroup( i18n("Sequence"), this );
+ QButtonGroup* group = new QButtonGroup( i18n("Sequence"), this );
group->setColumnLayout(0, Qt::Vertical );
group->layout()->setSpacing( 6 );
group->layout()->setMargin( 11 );
- Q3VBoxLayout* layout = new Q3VBoxLayout( group->layout() );
+ QVBoxLayout* layout = new QVBoxLayout( group->layout() );
checkSequence = new QCheckBox( i18n("&Enable sequence"), group );
@@ -443,14 +443,14 @@
}
ColorDlg::ColorDlg(QWidget *parent)
- : Q3VBox( parent )
+ : QVBox( parent )
{
- Q3GroupBox* gb = new Q3GroupBox( i18n("Colors"), this );
+ QGroupBox* gb = new QGroupBox( i18n("Colors"), this );
gb->setColumnLayout(0, Qt::Vertical );
gb->layout()->setSpacing( 6 );
gb->layout()->setMargin( 11 );
gb->setEnabled( Barkode::havePurePostscriptBarcode() );
- Q3GridLayout* gbLayout = new Q3GridLayout( gb->layout() );
+ QGridLayout* gbLayout = new QGridLayout( gb->layout() );
buttonBarColor = new KColorButton( gb );
buttonBackColor = new KColorButton( gb );
@@ -479,9 +479,9 @@
}
PurePostscriptDlg::PurePostscriptDlg(QWidget *parent)
- : Q3VBox( parent )
+ : QVBox( parent )
{
- Q3VGroupBox* gb = new Q3VGroupBox( i18n("Barcode Writer in Pure Postscript"), this );
+ QVGroupBox* gb = new QVGroupBox( i18n("Barcode Writer in Pure Postscript"), this );
gb->setEnabled( Barkode::havePurePostscriptBarcode() );
checkChecksum = new QCheckBox( i18n("Enable &Checksum"), gb );
Modified: trunk/src/barcodedialogs.h
===================================================================
--- trunk/src/barcodedialogs.h 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/barcodedialogs.h 2008-02-27 21:54:25 UTC (rev 22)
@@ -66,7 +66,7 @@
void getData( Barkode* b );
private:
- Q3PtrList<BarcodeDlgBase> list;
+ QPtrList<BarcodeDlgBase> list;
};
/** A configuration widget for TBarcode settings.
@@ -150,7 +150,7 @@
/** A configuration widget for colors in pure postscript barcodes
* @author Dominik Seichter
*/
-class ColorDlg : public Q3VBox, public BarcodeDlgBase {
+class ColorDlg : public QVBox, public BarcodeDlgBase {
Q_OBJECT
public:
ColorDlg(QWidget *parent=0);
@@ -167,7 +167,7 @@
/** A configuration widget for colors in pure postscript barcodes
* @author Dominik Seichter
*/
-class PurePostscriptDlg : public Q3VBox, public BarcodeDlgBase {
+class PurePostscriptDlg : public QVBox, public BarcodeDlgBase {
Q_OBJECT
public:
PurePostscriptDlg(QWidget *parent=0);
Modified: trunk/src/barcodeitem.cpp
===================================================================
--- trunk/src/barcodeitem.cpp 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/barcodeitem.cpp 2008-02-27 21:54:25 UTC (rev 22)
@@ -188,7 +188,7 @@
DocumentItem::drawBorder( painter );
}
-void BarcodeItem::drawZpl( Q3TextStream* stream )
+void BarcodeItem::drawZpl( QTextStream* stream )
{
QString encoding = ZPLUtils::encoding( type() );
if( encoding.isNull() )
@@ -202,7 +202,7 @@
*stream << ZPLUtils::fieldData( value() );
}
-void BarcodeItem::drawIpl( Q3TextStream* stream, IPLUtils* utils )
+void BarcodeItem::drawIpl( QTextStream* stream, IPLUtils* utils )
{
QString encoding = utils->encoding( type() );
@@ -225,7 +225,7 @@
utils->addValue( value() );
}
-void BarcodeItem::drawEPcl( Q3TextStream* stream )
+void BarcodeItem::drawEPcl( QTextStream* stream )
{
QString encoding = EPCLUtils::encoding( type() );
if( encoding.isEmpty() )
Modified: trunk/src/barcodeitem.h
===================================================================
--- trunk/src/barcodeitem.h 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/barcodeitem.h 2008-02-27 21:54:25 UTC (rev 22)
@@ -41,9 +41,9 @@
void loadXML (QDomElement* element);
void saveXML (QDomElement* element);
void draw (QPainter* painter);
- void drawZpl( Q3TextStream* stream );
- void drawIpl( Q3TextStream* stream, IPLUtils* utils );
- void drawEPcl( Q3TextStream* stream );
+ void drawZpl( QTextStream* stream );
+ void drawIpl( QTextStream* stream, IPLUtils* utils );
+ void drawEPcl( QTextStream* stream );
private:
void init();
Modified: trunk/src/barcodeprinterdlg.cpp
===================================================================
--- trunk/src/barcodeprinterdlg.cpp 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/barcodeprinterdlg.cpp 2008-02-27 21:54:25 UTC (rev 22)
@@ -27,13 +27,13 @@
#include <qlayout.h>
#include <qvbuttongroup.h>
//Added by qt3to4:
-#include <Q3GridLayout>
+#include <QGridLayout>
BarcodePrinterDlg::BarcodePrinterDlg(QWidget *parent)
: KDialogBase( KDialogBase::Plain, i18n("Barcode Printer"),
KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent)
{
- Q3GridLayout* layout = new Q3GridLayout( plainPage(), 6, 6 );
+ QGridLayout* layout = new QGridLayout( plainPage(), 6, 6 );
QLabel* label = new QLabel( i18n("&Output Format:"), plainPage() );
comboFormat = new KComboBox( false, plainPage() );
Modified: trunk/src/barkode.cpp
===================================================================
--- trunk/src/barkode.cpp 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/barkode.cpp 2008-02-27 21:54:25 UTC (rev 22)
@@ -27,7 +27,7 @@
#ifdef _ENABLE_NATIVE_GNU_BARCODE
# include <barcode.h>
//Added by qt3to4:
-#include <Q3ValueList>
+#include <QValueList>
#else
#define BARCODE_DEFAULT_FLAGS 0x00000000
@@ -72,7 +72,7 @@
#include <klocale.h>
#include <kstandarddirs.h>
-Q3ValueList<tBarcodeInfo> Barkode::s_info;
+QValueList<tBarcodeInfo> Barkode::s_info;
QStringList* Barkode::s_encoding = NULL;
bool Barkode::s_haveGnuBarcode = false;
bool Barkode::s_havePdfEncode = false;
@@ -199,9 +199,9 @@
return b;
}
-const Q3Picture Barkode::picture()
+const QPicture Barkode::picture()
{
- Q3Picture pic;
+ QPicture pic;
QPainter painter( &pic );
painter.fillRect( 0, 0, size().width(), size().height(), m_background );
Modified: trunk/src/barkode.h
===================================================================
--- trunk/src/barkode.h 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/barkode.h 2008-02-27 21:54:25 UTC (rev 22)
@@ -24,7 +24,7 @@
#include <qcolor.h>
#include <qstring.h>
//Added by qt3to4:
-#include <Q3ValueList>
+#include <QValueList>
#include <QPixmap>
#include "barkodeengine.h"
@@ -84,11 +84,11 @@
QString validatorNot;
};
-typedef Q3ValueList<tBarcodeInfo> TBarcodeInfoList;
+typedef QValueList<tBarcodeInfo> TBarcodeInfoList;
class BarkodeEngine;
class QPainter;
-class Q3Picture;
+class QPicture;
class QSize;
class QPaintDevice;
class TokenProvider;
@@ -118,7 +118,7 @@
const QString parsedValue();
const QPixmap pixmap( double scalex = 1.0, double scaley = 1.0 );
- const Q3Picture picture();
+ const QPicture picture();
const QSize size() const;
bool isValid() const;
Modified: trunk/src/batchprinter.cpp
===================================================================
--- trunk/src/batchprinter.cpp 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/batchprinter.cpp 2008-02-27 21:54:25 UTC (rev 22)
@@ -29,7 +29,7 @@
#include <q3paintdevicemetrics.h>
#include <q3progressdialog.h>
//Added by qt3to4:
-#include <Q3ValueList>
+#include <QValueList>
#include <QPixmap>
// KDE includes
@@ -102,7 +102,7 @@
painter = new QPainter( printer );
m_cur_data_count = 0;
- Q3PaintDeviceMetrics pdm( painter->device() );
+ QPaintDeviceMetrics pdm( painter->device() );
pageh = pdm.height(); // in pixel
@@ -111,7 +111,7 @@
c_h = 0;
c_w = 0;
- Q3ProgressDialog* progress = createProgressDialog( i18n("Printing...") );
+ QProgressDialog* progress = createProgressDialog( i18n("Printing...") );
m_measure = def->getMeasurements();
@@ -126,7 +126,7 @@
delete painter;
}
-void BatchPrinter::startPrintData( Q3ProgressDialog* progress )
+void BatchPrinter::startPrintData( QProgressDialog* progress )
{
labelprinterdata* lpdata = PrinterSettings::getInstance()->getData();
@@ -197,7 +197,7 @@
}
}
-void BatchPrinter::startPrintVarData( Q3ProgressDialog* progress )
+void BatchPrinter::startPrintVarData( QProgressDialog* progress )
{
Label* l;
while( ( l = initLabel() ) != NULL )
@@ -273,7 +273,7 @@
void BatchPrinter::startImages()
{
- Q3ProgressDialog* progress = createProgressDialog( i18n("Creating Images...") );
+ QProgressDialog* progress = createProgressDialog( i18n("Creating Images...") );
int number = 0;
m_cur_data_count = 0;
@@ -341,7 +341,7 @@
return;
}
- Q3ProgressDialog* progress = createProgressDialog( i18n("Printing...") );
+ QProgressDialog* progress = createProgressDialog( i18n("Printing...") );
if( m_bcp_format == PrinterSettings::ZEBRA )
// Zebra printers are printed at 304dpi, this should
@@ -358,7 +358,7 @@
m_paintDevice = new BarcodePrinterDevice( 304.0, 304.0 );
- Q3TextStream stream( &file );
+ QTextStream stream( &file );
Label* l;
while( ( l = initLabel( &number ) ) != NULL )
{
@@ -503,15 +503,15 @@
}
}
-Q3ProgressDialog* BatchPrinter::createProgressDialog( const QString & caption )
+QProgressDialog* BatchPrinter::createProgressDialog( const QString & caption )
{
- Q3ProgressDialog* progress = new Q3ProgressDialog( caption, i18n("&Cancel"), m_labels+1, parent );
+ QProgressDialog* progress = new QProgressDialog( caption, i18n("&Cancel"), m_labels+1, parent );
progress->setProgress( 0 );
progress->show();
return progress;
}
-bool BatchPrinter::checkProgressDialog( Q3ProgressDialog* progress )
+bool BatchPrinter::checkProgressDialog( QProgressDialog* progress )
{
kapp->processEvents( 0 );
progress->setProgress( progress->progress() + 1 );
@@ -522,7 +522,7 @@
return true;
}
-void BatchPrinter::setData( Q3ValueList<data>* list )
+void BatchPrinter::setData( QValueList<data>* list )
{
if( m_data )
delete m_data;
Modified: trunk/src/batchprinter.h
===================================================================
--- trunk/src/batchprinter.h 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/batchprinter.h 2008-02-27 21:54:25 UTC (rev 22)
@@ -33,11 +33,11 @@
class Measurements;
class QBuffer;
class QPainter;
-class Q3ProgressDialog;
+class QProgressDialog;
class QWidget;
class QPaintDevice;
-typedef Q3ValueList< QMap<QString,QString> > TVariableList;
+typedef QValueList< QMap<QString,QString> > TVariableList;
/**
This class is responsible for batch printing of articles.
It is also responsible for creating images of all articles.
@@ -86,7 +86,7 @@
/** set the sql data for the batchprinter
* @p list will be deleted by the batchprinter
*/
- void setData( Q3ValueList<data>* list );
+ void setData( QValueList<data>* list );
/** set the variable data for the batchprinter
* @p list will be deleted by the batchprinter
@@ -140,19 +140,19 @@
/** print the labels using data from the m_data structure
*/
- void startPrintData( Q3ProgressDialog* progress );
+ void startPrintData( QProgressDialog* progress );
/** print the labels using data from the m_vardata or m_addrdata structure
*/
- void startPrintVarData( Q3ProgressDialog* progress );
+ void startPrintVarData( QProgressDialog* progress );
/** Create and return a progressdialog
*/
- Q3ProgressDialog* createProgressDialog( const QString & caption );
- bool checkProgressDialog( Q3ProgressDialog* progress );
+ QProgressDialog* createProgressDialog( const QString & caption );
+ bool checkProgressDialog( QProgressDialog* progress );
Definition* def;
Measurements m_measure;
- Q3ValueList<data>* m_data;
+ QValueList<data>* m_data;
TVariableList* m_vardata;
KABC::AddresseeList* m_addrdata;
Modified: trunk/src/batchwizard.cpp
===================================================================
--- trunk/src/batchwizard.cpp 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/batchwizard.cpp 2008-02-27 21:54:25 UTC (rev 22)
@@ -43,13 +43,13 @@
#include <qvbuttongroup.h>
#include <q3widgetstack.h>
//Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3ValueList>
+#include <QHBoxLayout>
+#include <QValueList>
#include <QSqlQuery>
-#include <Q3SqlCursor>
-#include <Q3Frame>
+#include <QSqlCursor>
+#include <QFrame>
#include <QSqlError>
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
#include <kabc/addressee.h>
#include <kabc/addresseelist.h>
@@ -75,10 +75,10 @@
#define PNG_FORMAT "PNG"
-class AddressListViewItem : public K3ListViewItem {
+class AddressListViewItem : public KListViewItem {
public:
- AddressListViewItem(Q3ListView *parent, KABC::Addressee & addr )
- : K3ListViewItem( parent ), m_address( addr )
+ AddressListViewItem(QListView *parent, KABC::Addressee & addr )
+ : KListViewItem( parent ), m_address( addr )
{
this->setText( 0, m_address.givenName() );
this->setText( 1, m_address.familyName() );
@@ -120,7 +120,7 @@
void BatchWizard::setupPage1()
{
page1 = new QWidget( this );
- Q3VBoxLayout* pageLayout = new Q3VBoxLayout( page1, 11, 6, "pageLayout");
+ QVBoxLayout* pageLayout = new QVBoxLayout( page1, 11, 6, "pageLayout");
QLabel* label = new QLabel( i18n("<qt>This wizard will guide you through the process "
"of printing many labels with KBarcode.<br>The first step "
@@ -148,9 +148,9 @@
void BatchWizard::setupPage2()
{
page2 = new QWidget( this );
- Q3VBoxLayout* pageLayout = new Q3VBoxLayout( page2, 11, 6, "pageLayout");
+ QVBoxLayout* pageLayout = new QVBoxLayout( page2, 11, 6, "pageLayout");
- Q3VButtonGroup* group = new Q3VButtonGroup( page2 );
+ QVButtonGroup* group = new QVButtonGroup( page2 );
radioSimple = new QRadioButton( i18n("Print &labels without data"), group );
radioSqlArticles = new QRadioButton( i18n("Print &articles from KBarcodes SQL database"), group );
@@ -172,7 +172,7 @@
void BatchWizard::setupPage3()
{
- page3 = new Q3WidgetStack( this );
+ page3 = new QWidgetStack( this );
setupStackPage1();
setupStackPage2();
@@ -184,10 +184,10 @@
void BatchWizard::setupPage4()
{
- page4 = new Q3VBox( this );
+ page4 = new QVBox( this );
page4->setSpacing( 5 );
- Q3HBox* hbox = new Q3HBox( page4 );
+ QHBox* hbox = new QHBox( page4 );
hbox->setSpacing( 5 );
buttonTableInsert = new KPushButton( i18n("Insert Row"), hbox );
@@ -195,9 +195,9 @@
buttonTableRemove = new KPushButton( i18n("Delete Row"), hbox );
buttonTableRemove->setIconSet( BarIconSet( "editdelete") );
- m_varTable = new Q3Table( page4 );
+ m_varTable = new QTable( page4 );
m_varTable->setReadOnly( false );
- m_varTable->setSelectionMode( Q3Table::SingleRow );
+ m_varTable->setSelectionMode( QTable::SingleRow );
addPage( page4, i18n("Import Variables") );
@@ -209,7 +209,7 @@
{
TokenProvider serial( this );
- page5 = new Q3VBox( this );
+ page5 = new QVBox( this );
new QLabel( i18n( "<qt>KBarcode has support for placing serial numbers on labels. "
"If you did not use the [serial] token on your label in "
@@ -218,7 +218,7 @@
"number. This number is increased for every printed label on the "
"print out.</qt>"), page5 );
- Q3HBox* hbox = new Q3HBox( page5 );
+ QHBox* hbox = new QHBox( page5 );
hbox->setSpacing( 5 );
new QLabel( i18n( "Serial start:" ), hbox );
@@ -234,26 +234,26 @@
void BatchWizard::setupPage10()
{
page10 = new QWidget( this );
- Q3VBoxLayout* pageLayout = new Q3VBoxLayout( page10, 11, 6, "pageLayout");
+ QVBoxLayout* pageLayout = new QVBoxLayout( page10, 11, 6, "pageLayout");
- Q3VButtonGroup* group = new Q3VButtonGroup( page10 );
+ QVButtonGroup* group = new QVButtonGroup( page10 );
radioPrinter = new QRadioButton( i18n("&Print to a system printer or to a file"), group );
radioImage = new QRadioButton( i18n("&Create images"), group );
- imageBox = new Q3VBox( group );
+ imageBox = new QVBox( group );
imageBox->setMargin( 10 );
radioBarcode = new QRadioButton( i18n("Print to a special &barcode printer"), group );
- Q3HBox* directoryBox = new Q3HBox( imageBox );
+ QHBox* directoryBox = new QHBox( imageBox );
directoryBox->setSpacing( 5 );
QLabel* label = new QLabel( i18n("Output &Directory:"), directoryBox );
imageDirPath = new KUrlRequester( directoryBox );
imageDirPath->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
label->setBuddy( directoryBox );
- Q3HBox* formatBox = new Q3HBox( imageBox );
+ QHBox* formatBox = new QHBox( imageBox );
label = new QLabel( i18n("Output File &Format:"), formatBox );
QStringList formats = KImageIO::types( KImageIO::Writing );
@@ -263,7 +263,7 @@
comboFormat->setCurrentItem( formats.findIndex( PNG_FORMAT ) );
label->setBuddy( comboFormat );
- Q3VButtonGroup* imageNameGroup = new Q3VButtonGroup( i18n("&Filename:"), imageBox );
+ QVButtonGroup* imageNameGroup = new QVButtonGroup( i18n("&Filename:"), imageBox );
radioImageFilenameArticle = new QRadioButton( i18n("Use &article number for filename"), imageNameGroup );
radioImageFilenameBarcode = new QRadioButton( i18n("Use &barcode number for filename"), imageNameGroup );
radioImageFilenameCustom = new QRadioButton( i18n("Use &custom filename:"), imageNameGroup );
@@ -297,17 +297,17 @@
void BatchWizard::setupStackPage1()
{
- stack1 = new Q3VBox( page3, "stack1" );
+ stack1 = new QVBox( page3, "stack1" );
stack1->setSpacing( 5 );
- Q3HBox* hbox = new Q3HBox( stack1 );
+ QHBox* hbox = new QHBox( stack1 );
hbox->setSpacing( 5 );
new QLabel( i18n( "Customer name and no.:" ), hbox );
customerName = new KComboBox( false, hbox );
customerId = new KComboBox( false, hbox );
- Q3HBox* hButtonBox = new Q3HBox( stack1 );
+ QHBox* hButtonBox = new QHBox( stack1 );
hButtonBox->setSpacing( 5 );
buttonAdd = new KPushButton( i18n( "&Add..." ), hButtonBox );
@@ -322,14 +322,14 @@
mnuImport->insertItem( i18n("Import barcode_basic"), this, SLOT( addAllItems() ) );
buttonImport->setPopup( mnuImport );
- sqlList = new K3ListView( stack1 );
+ sqlList = new KListView( stack1 );
sqlList->addColumn( i18n("Index") );
sqlList->addColumn( i18n("Number of Labels") );
sqlList->addColumn( i18n("Article Number") );
sqlList->addColumn( i18n("Group") );
sqlList->setAllColumnsShowFocus( true );
- connect( sqlList, SIGNAL(doubleClicked(Q3ListViewItem*,const QPoint &,int)),
- this, SLOT(changeItem(Q3ListViewItem*,const QPoint &,int)));
+ connect( sqlList, SIGNAL(doubleClicked(QListViewItem*,const QPoint &,int)),
+ this, SLOT(changeItem(QListViewItem*,const QPoint &,int)));
connect( customerName, SIGNAL( activated(int) ), this, SLOT( customerNameChanged(int) ) );
connect( customerId, SIGNAL( activated(int) ), this, SLOT( customerIdChanged(int) ) );
@@ -344,10 +344,10 @@
void BatchWizard::setupStackPage2()
{
- stack2 = new Q3HBox( page3, "stack2" );
+ stack2 = new QHBox( page3, "stack2" );
stack2->setSpacing( 5 );
- Q3VButtonGroup* group = new Q3VButtonGroup( stack2 );
+ QVButtonGroup* group = new QVButtonGroup( stack2 );
radioImportManual = new QRadioButton( i18n("Enter &data manually"), group );
radioImportSql = new QRadioButton( i18n("Import variables from a &SQL table"), group );
labelSqlQuery = new QLabel( i18n("Please enter a sql &query:"), group );
@@ -364,11 +364,11 @@
radioImportManual->setChecked( true );
- Q3VBox* box = new Q3VBox( stack2 );
+ QVBox* box = new QVBox( stack2 );
box->setSpacing( 5 );
new QLabel( i18n("Available Variables:"), box );
- m_varList = new K3ListBox( box );
+ m_varList = new KListBox( box );
connect( radioImportManual, SIGNAL( clicked() ), this, SLOT( enableControls() ) );
connect( radioImportSql, SIGNAL( clicked() ), this, SLOT( enableControls() ) );
@@ -381,7 +381,7 @@
void BatchWizard::setupStackPage3()
{
- stack3 = new Q3VBox( page3, "stack3" );
+ stack3 = new QVBox( page3, "stack3" );
numLabels = new KIntNumInput( 1, stack3 );
numLabels->setRange( 1, 100000, 1, true );
@@ -394,15 +394,15 @@
{
stack4 = new QWidget( page3, "stack4" );
- Q3HBoxLayout* mainLayout = new Q3HBoxLayout( stack4 );
+ QHBoxLayout* mainLayout = new QHBoxLayout( stack4 );
- Q3VBox* list1 = new Q3VBox( stack4 );
- Q3VBox* list2 = new Q3VBox( stack4 );
+ QVBox* list1 = new QVBox( stack4 );
+ QVBox* list2 = new QVBox( stack4 );
- Q3Frame* buttons = new Q3Frame( stack4 );
+ QFrame* buttons = new QFrame( stack4 );
buttons->setMargin( 10 );
- Q3VBoxLayout* layout = new Q3VBoxLayout( buttons );
+ QVBoxLayout* layout = new QVBoxLayout( buttons );
QSpacerItem* spacer1 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding );
QSpacerItem* spacer2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding );
@@ -438,27 +438,27 @@
new QLabel( i18n("All Addresses"), list1 );
new QLabel( i18n("Selected Addresses"), list2 );
- listAddress = new K3ListView( list1 );
+ listAddress = new KListView( list1 );
listAddress->addColumn( i18n("Given Name"), 0 );
listAddress->addColumn( i18n("Family Name"), 1 );
listAddress->addColumn( i18n("Email Address"), 2 );
listAddress->setMultiSelection( true );
listAddress->setAllColumnsShowFocus( true );
- listAddress->setColumnWidthMode( 0, Q3ListView::Maximum );
- listAddress->setColumnWidthMode( 1, Q3ListView::Maximum );
- listAddress->setColumnWidthMode( 2, Q3ListView::Maximum );
+ listAddress->setColumnWidthMode( 0, QListView::Maximum );
+ listAddress->setColumnWidthMode( 1, QListView::Maximum );
+ listAddress->setColumnWidthMode( 2, QListView::Maximum );
- listSelectedAddress = new K3ListView( list2 );
+ listSelectedAddress = new KListView( list2 );
listSelectedAddress->addColumn( i18n("Given Name"), 0 );
listSelectedAddress->addColumn( i18n("Family Name"), 1 );
listSelectedAddress->addColumn( i18n("Email Address"), 2 );
listSelectedAddress->setMultiSelection( true );
listSelectedAddress->setAllColumnsShowFocus( true );
- listSelectedAddress->setColumnWidthMode( 0, Q3ListView::Maximum );
- listSelectedAddress->setColumnWidthMode( 1, Q3ListView::Maximum );
- listSelectedAddress->setColumnWidthMode( 2, Q3ListView::Maximum );
+ listSelectedAddress->setColumnWidthMode( 0, QListView::Maximum );
+ listSelectedAddress->setColumnWidthMode( 1, QListView::Maximum );
+ listSelectedAddress->setColumnWidthMode( 2, QListView::Maximum );
connect( buttonAddAddress, SIGNAL( clicked() ), this, SLOT( slotAddAddress() ) );
connect( buttonRemoveAddress, SIGNAL( clicked() ), this, SLOT( slotRemoveAddress() ) );
@@ -474,7 +474,7 @@
if( !tables->isConnected() )
return;
- Q3SqlCursor cur( TABLE_CUSTOMER );
+ QSqlCursor cur( TABLE_CUSTOMER );
cur.select();
customerId->clear();
customerName->clear();
@@ -663,8 +663,8 @@
sqlList->setSorting( 3, true );
sqlList->sort();
- Q3ValueList<BatchPrinter::data>* dlist = new Q3ValueList<BatchPrinter::data>;
- Q3ListViewItem* item = sqlList->firstChild();
+ QValueList<BatchPrinter::data>* dlist = new QValueList<BatchPrinter::data>;
+ QListViewItem* item = sqlList->firstChild();
while( item )
{
BatchPrinter::data m_data;
@@ -685,7 +685,7 @@
batch->setLabels( numLabels->value() );
// do a dirty drick, TODO: refactor BatchPrinter in the future
- Q3ValueList<BatchPrinter::data>* dlist = new Q3ValueList<BatchPrinter::data>;
+ QValueList<BatchPrinter::data>* dlist = new QValueList<BatchPrinter::data>;
BatchPrinter::data m_data;
m_data.number = numLabels->value();
dlist->append( m_data );
@@ -708,7 +708,7 @@
else if( radioAddressBook->isChecked() )
{
KABC::AddresseeList* list = new KABC::AddresseeList;
- Q3ListViewItem* item = listSelectedAddress->firstChild();
+ QListViewItem* item = listSelectedAddress->firstChild();
while( item )
{
list->append( static_cast<AddressListViewItem*>(item)->address() );
@@ -755,7 +755,7 @@
QString temp;
temp.sprintf("%0*i", 5, sqlList->childCount() + 1 );
- K3ListViewItem* item = new K3ListViewItem( sqlList, temp, QString( "%1" ).arg( count ),
+ KListViewItem* item = new KListViewItem( sqlList, temp, QString( "%1" ).arg( count ),
article, group );
sqlList->insertItem( item );
@@ -789,12 +789,12 @@
void BatchWizard::editItem()
{
- Q3ListViewItem* item = sqlList->selectedItem();
+ QListViewItem* item = sqlList->selectedItem();
if( item )
changeItem( item, QPoint(0,0), 0 );
}
-void BatchWizard::changeItem( Q3ListViewItem* item, const QPoint &, int )
+void BatchWizard::changeItem( QListViewItem* item, const QPoint &, int )
{
if(!item)
return;
@@ -815,12 +815,12 @@
void BatchWizard::removeItem()
{
- Q3ListViewItem* item = sqlList->firstChild();
+ QListViewItem* item = sqlList->firstChild();
while( item )
{
if( item->isSelected() )
{
- Q3ListViewItem* it = item->nextSibling();
+ QListViewItem* it = item->nextSibling();
delete item;
while( it )
@@ -865,7 +865,7 @@
while( query.next() )
{
temp.sprintf("%0*i", 5, sqlList->childCount() + 1 );
- new K3ListViewItem( sqlList, temp, num, query.value( 0 ).toString(), group );
+ new KListViewItem( sqlList, temp, num, query.value( 0 ).toString(), group );
}
enableControls();
@@ -1057,7 +1057,7 @@
{
int y = 0;
int x;
- Q3SqlSelectCursor query( importSqlQuery->text(), SqlTables::getInstance()->database() );
+ QSqlSelectCursor query( importSqlQuery->text(), SqlTables::getInstance()->database() );
query.select();
if( query.lastError().type() != QSqlError::None )
{
@@ -1139,7 +1139,7 @@
void BatchWizard::slotTableRemove()
{
- Q3TableSelection sel = m_varTable->selection( m_varTable->currentSelection() );
+ QTableSelection sel = m_varTable->selection( m_varTable->currentSelection() );
m_varTable->removeRow( sel.topRow() );
}
@@ -1249,10 +1249,10 @@
enableControls();
}
-void BatchWizard::moveAddress( Q3ListView* src, Q3ListView* dst, bool bAll )
+void BatchWizard::moveAddress( QListView* src, QListView* dst, bool bAll )
{
- Q3ListViewItem* item = src->firstChild();
- Q3ListViewItem* cur;
+ QListViewItem* item = src->firstChild();
+ QListViewItem* cur;
while( item )
{
Modified: trunk/src/batchwizard.h
===================================================================
--- trunk/src/batchwizard.h 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/batchwizard.h 2008-02-27 21:54:25 UTC (rev 22)
@@ -27,19 +27,19 @@
class KCompletion;
class KIntNumInput;
class KLineEdit;
-class K3ListBox;
-class K3ListView;
+class KListBox;
+class KListView;
class KPushButton;
class KUrlRequester;
class QCheckBox;
-class Q3HBox;
+class QHBox;
class QLabel;
-class Q3ListView;
-class Q3ListViewItem;
+class QListView;
+class QListViewItem;
class QRadioButton;
-class Q3Table;
-class Q3VBox;
-class Q3WidgetStack;
+class QTable;
+class QVBox;
+class QWidgetStack;
class BatchWizard : public KWizard {
Q_OBJECT
@@ -131,7 +131,7 @@
void customerNameChanged( int index );
void addItem();
bool slotAddItem( const QString & article, const QString & group, int count );
- void changeItem( Q3ListViewItem* item, const QPoint &, int );
+ void changeItem( QListViewItem* item, const QPoint &, int );
void editItem();
void removeItem();
@@ -145,7 +145,7 @@
void slotRemoveAllAddress();
private:
- void moveAddress( Q3ListView* src, Q3ListView* dst, bool bAll = false );
+ void moveAddress( QListView* src, QListView* dst, bool bAll = false );
void fillByteArray();
void fillVarList();
@@ -186,17 +186,17 @@
QWidget* page1;
QWidget* page2;
- Q3WidgetStack* page3;
- Q3VBox* page4;
- Q3VBox* page5;
+ QWidgetStack* page3;
+ QVBox* page4;
+ QVBox* page5;
QWidget* page10;
- Q3VBox* stack1;
- Q3HBox* stack2;
- Q3VBox* stack3;
+ QVBox* stack1;
+ QHBox* stack2;
+ QVBox* stack3;
QWidget* stack4;
- Q3VBox* imageBox;
+ QVBox* imageBox;
QLabel* labelInfo;
QLabel* labelSqlQuery;
@@ -235,13 +235,13 @@
KIntNumInput* serialInc;
KIntNumInput* numLabels;
- Q3Table* m_varTable;
- K3ListBox* m_varList;
+ QTable* m_varTable;
+ KListBox* m_varList;
- K3ListView* listAddress;
- K3ListView* listSelectedAddress;
+ KListView* listAddress;
+ KListView* listSelectedAddress;
- K3ListView* sqlList;
+ KListView* sqlList;
KLineEdit* serialStart;
QCheckBox* checkKeepOpen;
Modified: trunk/src/commands.cpp
===================================================================
--- trunk/src/commands.cpp 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/commands.cpp 2008-02-27 21:54:25 UTC (rev 22)
@@ -36,7 +36,7 @@
#include <QPixmap>
#include <krandom.h>
-QPoint getFreePos( Q3Canvas* c )
+QPoint getFreePos( QCanvas* c )
{
MyCanvas* canvas = (MyCanvas*)c;
@@ -75,7 +75,7 @@
{
if( m_canvas_item && c )
{
- Q3CanvasItemList list = c->allItems();
+ QCanvasItemList list = c->allItems();
for( unsigned int i=0;i<list.count();i++)
if( m_canvas_item == list[i] )
return true;
@@ -100,7 +100,7 @@
}
NewItemCommand::NewItemCommand( MyCanvasView* view, const QString & name )
- : QObject(), K3Command()
+ : QObject(), KCommand()
{
cv = view;
m_name = name;
Modified: trunk/src/commands.h
===================================================================
--- trunk/src/commands.h 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/commands.h 2008-02-27 21:54:25 UTC (rev 22)
@@ -38,7 +38,7 @@
class MyCanvasView;
class CanvasBarcode;
class PictureRectangle;
-class Q3CanvasItem;
+class QCanvasItem;
class QColor;
class QFont;
class QImage;
@@ -66,7 +66,7 @@
void documentItemDeleted();
protected:
- Q3Canvas* c;
+ QCanvas* c;
TCanvasItem* m_canvas_item;
};
@@ -77,11 +77,11 @@
* You have to implement void create() which creates
* a QCanvasItem in item.
* NewItemCommand takes care about possitioning and
- * undo/redo (because of K3Command).
+ * undo/redo (because of KCommand).
*
* @author Dominik Seichter
*/
-class NewItemCommand : public QObject, public K3Command {
+class NewItemCommand : public QObject, public KCommand {
Q_OBJECT
public:
NewItemCommand( MyCanvasView* view, const QString & name );
@@ -124,7 +124,7 @@
QString m_name;
};
-class ResizeCommand : public K3Command, CommandUtils {
+class ResizeCommand : public KCommand, CommandUtils {
public:
ResizeCommand( TCanvasItem* it, bool shift = false )
: CommandUtils( it )
@@ -150,7 +150,7 @@
/** Move a TCanvasItem on the canvas
*/
-class MoveCommand : public K3Command, CommandUtils {
+class MoveCommand : public KCommand, CommandUtils {
public:
/**
* @param cx move in x direction cx mm
@@ -175,7 +175,7 @@
int y;
};
-class ChangeZCommand : public K3Command, CommandUtils {
+class ChangeZCommand : public KCommand, CommandUtils {
public:
ChangeZCommand( int z, TCanvasItem* it );
@@ -189,7 +189,7 @@
int m_z, m_oldz;
};
-class LockCommand : public K3Command, CommandUtils {
+class LockCommand : public KCommand, CommandUtils {
public:
LockCommand( bool lock, TCanvasItem* it )
: CommandUtils( it )
@@ -207,7 +207,7 @@
bool m_locked;
};
-class PictureCommand : public K3Command, CommandUtils {
+class PictureCommand : public KCommand, CommandUtils {
public:
PictureCommand( double r, bool mirrorh, bool mirrorv, EImageScaling s, ImageItem* it );
~PictureCommand() {}
@@ -233,7 +233,7 @@
ImageItem* m_item;
};
-class TextChangeCommand : public K3Command, CommandUtils {
+class TextChangeCommand : public KCommand, CommandUtils {
public:
TextChangeCommand( TextItem* it, QString t );
~TextChangeCommand() { }
@@ -248,7 +248,7 @@
TextItem* m_item;
};
-class TextRotationCommand : public K3Command, protected CommandUtils {
+class TextRotationCommand : public KCommand, protected CommandUtils {
public:
TextRotationCommand( double rot, TextItem* t );
@@ -265,7 +265,7 @@
//NY28
-class TextLineChangeCommand : public K3Command, CommandUtils {
+class TextLineChangeCommand : public KCommand, CommandUtils {
public:
TextLineChangeCommand( TextLineItem* it, QString t, int font, int magvert, int maghor );
~TextLineChangeCommand() { }
@@ -284,7 +284,7 @@
};
//NY28
-class BarcodeCommand : public K3Command, CommandUtils {
+class BarcodeCommand : public KCommand, CommandUtils {
public:
BarcodeCommand( BarcodeItem* bcode, Barkode* d );
~BarcodeCommand() {
@@ -363,7 +363,7 @@
TokenProvider* m_token;
};
-class DeleteCommand : public K3Command, CommandUtils {
+class DeleteCommand : public KCommand, CommandUtils {
public:
DeleteCommand( TCanvasItem* it )
: CommandUtils( it )
@@ -378,7 +378,7 @@
}
};
-class BorderCommand : public K3Command, protected CommandUtils {
+class BorderCommand : public KCommand, protected CommandUtils {
public:
BorderCommand( bool border, const QPen & pen, DocumentItem* item );
@@ -397,7 +397,7 @@
DocumentItem* m_item;
};
-class FillCommand : public K3Command, protected CommandUtils {
+class FillCommand : public KCommand, protected CommandUtils {
public:
FillCommand( QColor c, RectItem* r );
@@ -412,7 +412,7 @@
RectItem* m_item;
};
-class ScriptCommand : public K3Command, CommandUtils {
+class ScriptCommand : public KCommand, CommandUtils {
public:
ScriptCommand( const QString & script, TCanvasItem* it )
: CommandUtils( it )
Modified: trunk/src/configdialog.cpp
===================================================================
--- trunk/src/configdialog.cpp 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/configdialog.cpp 2008-02-27 21:54:25 UTC (rev 22)
@@ -29,10 +29,10 @@
#include <qsqldatabase.h>
#include <qtooltip.h>
//Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3GridLayout>
-#include <Q3Frame>
-#include <Q3VBoxLayout>
+#include <QHBoxLayout>
+#include <QGridLayout>
+#include <QFrame>
+#include <QVBoxLayout>
// KDE includes
#include <kabc/addressee.h>
@@ -70,7 +70,7 @@
void ConfigDialog::setupTab1( )
{
QFrame* box = addPage( i18n("SQL Settings"), "", BarIcon("connect_no") );
- Q3VBoxLayout* layout = new Q3VBoxLayout( box, 6, 6 );
+ QVBoxLayout* layout = new QVBoxLayout( box, 6, 6 );
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding );
sqlwidget = new SqlWidget( false, box, "sqlwidget" );
@@ -85,9 +85,9 @@
QFrame* box = addPage( i18n("Print Settings"), "", BarIcon("fileprint") );
- Q3VBoxLayout* tabLayout = new Q3VBoxLayout( box, 11, 6 );
- Q3HBoxLayout* Layout0 = new Q3HBoxLayout( 0, 6, 6 );
- Q3HBoxLayout* Layout1 = new Q3HBoxLayout( 0, 6, 6 );
+ QVBoxLayout* tabLayout = new QVBoxLayout( box, 11, 6 );
+ QHBoxLayout* Layout0 = new QHBoxLayout( 0, 6, 6 );
+ QHBoxLayout* Layout1 = new QHBoxLayout( 0, 6, 6 );
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding );
printerQuality = new KComboBox( false, box );
@@ -127,7 +127,7 @@
labelprinterdata* lb = PrinterSettings::getInstance()->getData();
QFrame* box = addPage( i18n("Import"), "", BarIcon("fileimport") );
- Q3GridLayout* grid = new Q3GridLayout( box, 2, 2 );
+ QGridLayout* grid = new QGridLayout( box, 2, 2 );
QLabel* label = new QLabel( box );
label->setText( i18n("Comment:") );
@@ -155,7 +155,7 @@
grid->addMultiCellWidget( checkUseCustomNo, 3, 3, 0, 2 );
- Q3HBoxLayout* Layout1 = new Q3HBoxLayout( 0, 6, 6 );
+ QHBoxLayout* Layout1 = new QHBoxLayout( 0, 6, 6 );
Layout1->addWidget( new QLabel( i18n("File Format:"), box ) );
combo1 = new KComboBox( box );
@@ -190,7 +190,7 @@
void ConfigDialog::setupTab4()
{
QFrame* box = addPage( i18n("Label Editor"), "", BarIcon("kbarcode") );
- Q3GridLayout* tabLayout = new Q3GridLayout( box, 11, 6 );
+ QGridLayout* tabLayout = new QGridLayout( box, 11, 6 );
checkNewDlg = new QCheckBox( box );
checkNewDlg->setText( i18n("&Create a new label on startup") );
@@ -220,13 +220,13 @@
labelprinterdata* lb = PrinterSettings::getInstance()->getData();
QFrame* box = addPage( i18n("On New"), "", BarIcon("filenew") );
- Q3VBoxLayout* tabLayout = new Q3VBoxLayout( box, 11, 6 );
+ QVBoxLayout* tabLayout = new QVBoxLayout( box, 11, 6 );
- Q3ButtonGroup* bg = new Q3ButtonGroup( i18n("On New Article"), box );
+ QButtonGroup* bg = new QButtonGroup( i18n("On New Article"), box );
bg->setColumnLayout(0, Qt::Vertical );
bg->layout()->setSpacing( 6 );
bg->layout()->setMargin( 11 );
- Q3GridLayout* bgLayout = new Q3GridLayout( bg->layout() );
+ QGridLayout* bgLayout = new QGridLayout( bg->layout() );
QStringList alist, glist;
alist.append( i18n("No Line Break") );
@@ -263,11 +263,11 @@
bgLayout->addWidget( onNewArticle3, 2, 1 );
bgLayout->addWidget( onNewArticle4, 3, 1 );
- Q3ButtonGroup* bg2 = new Q3ButtonGroup( i18n("On New Group"), box );
+ QButtonGroup* bg2 = new QButtonGroup( i18n("On New Group"), box );
bg2->setColumnLayout(0, Qt::Vertical );
bg2->layout()->setSpacing( 6 );
bg2->layout()->setMargin( 11 );
- Q3GridLayout* bg2Layout = new Q3GridLayout( bg2->layout() );
+ QGridLayout* bg2Layout = new QGridLayout( bg2->layout() );
onNewGroup1 = new KComboBox( false, bg2 );
onNewGroup2 = new KComboBox( false, bg2 );
Modified: trunk/src/confwizard.cpp
===================================================================
--- trunk/src/confwizard.cpp 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/confwizard.cpp 2008-02-27 21:54:25 UTC (rev 22)
@@ -30,8 +30,8 @@
#include <qprinter.h>
#include <q3textbrowser.h>
//Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
#include <QLabel>
// KDE includes
@@ -88,11 +88,11 @@
void ConfWizard::setupPage1()
{
page = new QWidget( this );
- pageLayout = new Q3VBoxLayout( page, 11, 6, "pageLayout");
+ pageLayout = new QVBoxLayout( page, 11, 6, "pageLayout");
- Layout8 = new Q3HBoxLayout( 0, 0, 6, "Layout8");
+ Layout8 = new QHBoxLayout( 0, 0, 6, "Layout8");
- Layout7 = new Q3VBoxLayout( 0, 0, 6, "Layout7");
+ Layout7 = new QVBoxLayout( 0, 0, 6, "Layout7");
logo = new QLabel( page );
logo->setPixmap( locate("data", "kbarcode/logo.png") );
@@ -118,9 +118,9 @@
void ConfWizard::setupPage0()
{
QWidget* page_0 = new QWidget( this );
- Q3VBoxLayout* pageLayout = new Q3VBoxLayout( page_0, 11, 6, "pageLayout");
+ QVBoxLayout* pageLayout = new QVBoxLayout( page_0, 11, 6, "pageLayout");
- Q3TextBrowser* b = new Q3TextBrowser( page_0, "b" );
+ QTextBrowser* b = new QTextBrowser( page_0, "b" );
b->setText( MainWindow::systemCheck() );
pageLayout->addWidget( b );
@@ -131,7 +131,7 @@
void ConfWizard::setupPage2()
{
page_2 = new QWidget( this );
- pageLayout_2 = new Q3VBoxLayout( page_2, 11, 6, "pageLayout_2");
+ pageLayout_2 = new QVBoxLayout( page_2, 11, 6, "pageLayout_2");
checkDatabase = new QCheckBox( page_2 );
checkDatabase->setText( i18n("&Use database with KBarcode") );
@@ -151,14 +151,14 @@
void ConfWizard::setupPage3()
{
page_3 = new QWidget( this );
- pageLayout_3 = new Q3VBoxLayout( page_3, 11, 6, "pageLayout_3");
+ pageLayout_3 = new QVBoxLayout( page_3, 11, 6, "pageLayout_3");
TextLabel1_2 = new QLabel( page_3 );
TextLabel1_2->setText( i18n( "KBarcode can create the required SQL tables for you.<br>KBarcode will add also some Label Definitions to the tables.<br>After that you can fill the tables with some example data." ) );
TextLabel1_2->setAlignment( int( QLabel::WordBreak | Qt::AlignVCenter ) );
pageLayout_3->addWidget( TextLabel1_2 );
- Layout5_2 = new Q3VBoxLayout( 0, 0, 6, "Layout5_2");
+ Layout5_2 = new QVBoxLayout( 0, 0, 6, "Layout5_2");
buttonCreate = new KPushButton( page_3 );
buttonCreate->setText( i18n( "&Create Tables" ) );
@@ -233,7 +233,7 @@
void ConfWizard::showPage( QWidget* page )
{
- Q3Wizard::showPage(page);
+ QWizard::showPage(page);
if( page == page_2 && !sqlwidget->driverCount() ) {
KMessageBox::information( this, i18n(
Modified: trunk/src/confwizard.h
===================================================================
--- trunk/src/confwizard.h 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/confwizard.h 2008-02-27 21:54:25 UTC (rev 22)
@@ -20,16 +20,16 @@
#include <kwizard.h>
//Added by qt3to4:
-#include <Q3GridLayout>
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
#include <QLabel>
-class Q3ButtonGroup;
+class QButtonGroup;
class QCheckBox;
-class Q3VBoxLayout;
-class Q3HBoxLayout;
-class Q3GridLayout;
+class QVBoxLayout;
+class QHBoxLayout;
+class QGridLayout;
class QRadioButton;
class KComboBox;
class KLineEdit;
@@ -89,20 +89,20 @@
QLabel* TextLabel1_2;
KPushButton* buttonCreate;
KPushButton* buttonExample;
- Q3ButtonGroup* groupDatabase;
+ QButtonGroup* groupDatabase;
protected:
- Q3VBoxLayout* pageLayout;
- Q3HBoxLayout* Layout8;
- Q3VBoxLayout* Layout7;
- Q3VBoxLayout* pageLayout_2;
- Q3VBoxLayout* pageLayout_4;
- Q3HBoxLayout* Layout5;
- Q3VBoxLayout* Layout3;
- Q3VBoxLayout* Layout4;
- Q3VBoxLayout* Layout6;
- Q3VBoxLayout* pageLayout_3;
- Q3VBoxLayout* Layout5_2;
+ QVBoxLayout* pageLayout;
+ QHBoxLayout* Layout8;
+ QVBoxLayout* Layout7;
+ QVBoxLayout* pageLayout_2;
+ QVBoxLayout* pageLayout_4;
+ QHBoxLayout* Layout5;
+ QVBoxLayout* Layout3;
+ QVBoxLayout* Layout4;
+ QVBoxLayout* Layout6;
+ QVBoxLayout* pageLayout_3;
+ QVBoxLayout* Layout5_2;
};
#endif // CONFWIZARD_H
Modified: trunk/src/csvfile.h
===================================================================
--- trunk/src/csvfile.h 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/csvfile.h 2008-02-27 21:54:25 UTC (rev 22)
@@ -22,7 +22,7 @@
#include <qstringlist.h>
#include <q3textstream.h>
//Added by qt3to4:
-#include <Q3ValueList>
+#include <QValueList>
class QBuffer;
@@ -67,7 +67,7 @@
/** set the field widths for fixed field width files
*/
- inline void setFieldWidth( const Q3ValueList<int> & width );
+ inline void setFieldWidth( const QValueList<int> & width );
/** sets wether this is a CSV file or
* a file with fixed field width.
@@ -94,13 +94,13 @@
/** the filehandle which is used to access the file
*/
QFile m_file;
- Q3TextStream m_stream;
+ QTextStream m_stream;
QString m_quote;
QString m_separator;
QString m_comment;
- Q3ValueList<int> m_width;
+ QValueList<int> m_width;
bool m_csv;
bool m_eof;
@@ -144,7 +144,7 @@
m_comment = comment;
}
-void CSVFile::setFieldWidth( const Q3ValueList<int> & width )
+void CSVFile::setFieldWidth( const QValueList<int> & width )
{
m_width = width;
}
Modified: trunk/src/csvimportdlg.cpp
===================================================================
--- trunk/src/csvimportdlg.cpp 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/csvimportdlg.cpp 2008-02-27 21:54:25 UTC (rev 22)
@@ -38,10 +38,10 @@
#include <q3textstream.h>
#include <q3vbox.h>
//Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3GridLayout>
-#include <Q3ValueList>
-#include <Q3VBoxLayout>
+#include <QHBoxLayout>
+#include <QGridLayout>
+#include <QValueList>
+#include <QVBoxLayout>
// KDE includes
#include <kapplication.h>
@@ -96,8 +96,8 @@
void CSVImportDlg::createPage1()
{
QFrame* box = addPage( i18n("&Import Data") );
- Q3VBoxLayout* layout = new Q3VBoxLayout( box, 6, 6 );
- Q3GridLayout* grid = new Q3GridLayout( 2 );
+ QVBoxLayout* layout = new QVBoxLayout( box, 6, 6 );
+ QGridLayout* grid = new QGridLayout( 2 );
requester = new KUrlRequester( box );
comboEncoding = new EncodingCombo( box );
@@ -115,11 +115,11 @@
spinLoadOnly->setRange( 0, 10000, 1, false );
checkLoadAll->setChecked( true );
- table = new Q3Table( box );
+ table = new QTable( box );
table->setReadOnly( true );
- frame = new Q3Frame( box );
- Q3HBoxLayout* layout2 = new Q3HBoxLayout( frame, 6, 6 );
+ frame = new QFrame( box );
+ QHBoxLayout* layout2 = new QHBoxLayout( frame, 6, 6 );
spinCol = new KIntNumInput( frame );
spinCol->setLabel( i18n("Column:"), Qt::AlignLeft | Qt::AlignVCenter );
@@ -154,25 +154,25 @@
{
labelprinterdata* lb = PrinterSettings::getInstance()->getData();
QFrame* mainBox = addPage( i18n("&Import Settings") );
- Q3VBoxLayout* layout = new Q3VBoxLayout( mainBox, 6, 6 );
+ QVBoxLayout* layout = new QVBoxLayout( mainBox, 6, 6 );
QSpacerItem* spacer1 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
QSpacerItem* spacer2 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
- Q3HButtonGroup* buttonGroup = new Q3HButtonGroup( i18n("File Format:"), mainBox );
+ QHButtonGroup* buttonGroup = new QHButtonGroup( i18n("File Format:"), mainBox );
radioCSVFile = new QRadioButton( i18n("&CSV File"), buttonGroup );
radioFixedFile = new QRadioButton( i18n("File with &fixed field width"), buttonGroup );
- Q3HBox* hboxFrame = new Q3HBox( mainBox );
+ QHBox* hboxFrame = new QHBox( mainBox );
- groupCSV = new Q3GroupBox( i18n("CSV File"), hboxFrame );
- groupFixed = new Q3GroupBox( i18n("Fixed Field Width File"), hboxFrame );
+ groupCSV = new QGroupBox( i18n("CSV File"), hboxFrame );
+ groupFixed = new QGroupBox( i18n("Fixed Field Width File"), hboxFrame );
groupCSV->setColumnLayout(0, Qt::Vertical );
groupCSV->layout()->setSpacing( 6 );
groupCSV->layout()->setMargin( 11 );
- Q3VBoxLayout* vbox = new Q3VBoxLayout( groupCSV->layout() );
- Q3GridLayout* grid = new Q3GridLayout( 2, 2 );
+ QVBoxLayout* vbox = new QVBoxLayout( groupCSV->layout() );
+ QGridLayout* grid = new QGridLayout( 2, 2 );
grid->setSpacing( 6 );
grid->setMargin( 11 );
@@ -203,10 +203,10 @@
groupFixed->setColumnLayout(0, Qt::Horizontal );
groupFixed->layout()->setSpacing( 6 );
groupFixed->layout()->setMargin( 11 );
- Q3HBoxLayout* groupFixedLayout = new Q3HBoxLayout( groupFixed->layout() );
+ QHBoxLayout* groupFixedLayout = new QHBoxLayout( groupFixed->layout() );
groupFixedLayout->setAlignment( Qt::AlignTop );
- listWidth = new K3ListBox( groupFixed );
+ listWidth = new KListBox( groupFixed );
buttonAdd = new KPushButton( groupFixed );
buttonAdd->setText( i18n( "&Add Field" ) );
@@ -219,7 +219,7 @@
spinNumber->setValue( 1 );
spinNumber->setFocus();
- Q3VBoxLayout* layout2 = new Q3VBoxLayout( 0, 6, 6 );
+ QVBoxLayout* layout2 = new QVBoxLayout( 0, 6, 6 );
layout2->addWidget( buttonAdd );
layout2->addWidget( buttonRemove );
layout2->addWidget( spinNumber );
@@ -335,8 +335,8 @@
void CSVImportDlg::accept()
{
CSVFile file( requester->url() );
- Q3Header* h = table->horizontalHeader();
- Q3ValueList<int> headers;
+ QHeader* h = table->horizontalHeader();
+ QValueList<int> headers;
QStringList list;
QString name = getDatabaseName();
int i = 0;
@@ -409,9 +409,9 @@
settingsChanged();
}
-Q3ValueList<int> CSVImportDlg::getFieldWidth()
+QValueList<int> CSVImportDlg::getFieldWidth()
{
- Q3ValueList<int> list;
+ QValueList<int> list;
for( unsigned int i=0;i<listWidth->count();i++ )
list << listWidth->text( i ).toInt();
@@ -421,7 +421,7 @@
void CSVImportDlg::initCsvFile( CSVFile* file )
{
- Q3ValueList<int> width = getFieldWidth();
+ QValueList<int> width = getFieldWidth();
file->setEncoding( comboEncoding->currentText() );
file->setCSVFile( radioCSVFile->isChecked() );
Modified: trunk/src/csvimportdlg.h
===================================================================
--- trunk/src/csvimportdlg.h 2008-02-27 21:35:23 UTC (rev 21)
+++ trunk/src/csvimportdlg.h 2008-02-27 21:54:25 UTC (rev 22)
@@ -20,8 +20,8 @@
#include <qwidget.h>
//Added by qt3to4:
-#include <Q3Frame>
-#include <Q3ValueList>...
[truncated message content] |
|
From: <vz...@us...> - 2008-02-27 21:35:20
|
Revision: 21
http://kbarcode.svn.sourceforge.net/kbarcode/?rev=21&view=rev
Author: vzsolt
Date: 2008-02-27 13:35:23 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
Removed the name parameter from the constructor calls as well.
Also removed the traces of DCOP.
Modified Paths:
--------------
trunk/src/barcodecombo.cpp
trunk/src/barcodedialog.cpp
trunk/src/batchwizard.cpp
trunk/src/batchwizard.h
trunk/src/confwizard.cpp
trunk/src/databasebrowser.cpp
trunk/src/definitiondialog.cpp
trunk/src/kbarcode.cpp
trunk/src/kbarcode.h
trunk/src/labeleditor.cpp
trunk/src/labeleditor.h
trunk/src/main.cpp
trunk/src/multilineeditdlg.cpp
trunk/src/mycanvasview.h
trunk/src/newlabel.cpp
trunk/src/propertywidget.cpp
trunk/src/sqltables.cpp
trunk/src/textlineedit.cpp
Modified: trunk/src/barcodecombo.cpp
===================================================================
--- trunk/src/barcodecombo.cpp 2008-02-27 20:44:24 UTC (rev 20)
+++ trunk/src/barcodecombo.cpp 2008-02-27 21:35:23 UTC (rev 21)
@@ -127,7 +127,7 @@
labelStandard = new QLabel( i18n( "&Encoding Type:" ), this );
grid->addWidget( labelStandard, 1, 0 );
- comboStandard = new BarcodeCombo( this, "comboStandard" );
+ comboStandard = new BarcodeCombo( this );
connect( comboStandard, SIGNAL( activated(int) ), this, SLOT( encodingChanged() ) );
connect( comboStandard, SIGNAL( activated(int) ), this, SLOT( changed() ) );
grid->addMultiCellWidget( comboStandard, 1, 1, 1, 3 );
@@ -136,7 +136,7 @@
labelData = new QLabel( i18n( "&Value:" ), this );
grid->addWidget( labelData, 2, 0 );
- data = new KLineEdit( this, "data" );
+ data = new KLineEdit( this );
labelData->setBuddy( data );
connect( data, SIGNAL( textChanged( const QString & ) ), this, SLOT( changed() ) );
@@ -171,7 +171,7 @@
buttonToken->setIconSet( QIcon( SmallIcon("contents") ) );
grid->addWidget( buttonToken, 4, 3 );
- spinMargin = new KIntNumInput( this, "spinMargin" );
+ spinMargin = new KIntNumInput( this );
spinMargin->setLabel( i18n( "&Margin:" ), Qt::AlignLeft | Qt::AlignVCenter );
spinMargin->setRange( 0, 10000, 1, false );
spinMargin->setValue( 10 );
@@ -299,7 +299,7 @@
void BarcodeWidget::advanced()
{
- AdvancedBarcodeDialog abd( comboStandard->getEncodingType(), this, "abd" );
+ AdvancedBarcodeDialog abd( comboStandard->getEncodingType(), this );
abd.setData( &m_barcode );
if( abd.exec() == QDialog::Accepted )
abd.getData( &m_barcode );
@@ -307,7 +307,7 @@
void BarcodeWidget::tokens()
{
- TokenDialog tokendlg( m_token, this, "tokendlg" );
+ TokenDialog tokendlg( m_token, this );
if( tokendlg.exec() == QDialog::Accepted )
{
if( data->isEnabled() )
Modified: trunk/src/barcodedialog.cpp
===================================================================
--- trunk/src/barcodedialog.cpp 2008-02-27 20:44:24 UTC (rev 20)
+++ trunk/src/barcodedialog.cpp 2008-02-27 21:35:23 UTC (rev 21)
@@ -51,22 +51,22 @@
BarCodeDialogLayout = new Q3HBoxLayout( this, 11, 6, "BarCodeDialogLayout");
Layout5 = new Q3VBoxLayout( 0, 0, 6, "Layout5");
Layout6 = new Q3VBoxLayout( 0, 0, 6, "Layout2");
- widget = new BarcodeWidget( this, "widget" );
+ widget = new BarcodeWidget( this );
m_token = new TokenProvider( KApplication::desktop() );
widget->setTokenProvider( m_token );
- buttonGenerate = new KPushButton( this, "buttonGenerate" );
+ buttonGenerate = new KPushButton( this );
buttonGenerate->setText( i18n( "&Generate" ) );
buttonGenerate->setEnabled( Barkode::haveBarcode() );
buttonGenerate->setIconSet( SmallIconSet("barcode") );
- buttonSave = new KPushButton( this, "buttonSave" );
+ buttonSave = new KPushButton( this );
buttonSave->setText( i18n( "&Save" ) );
buttonSave->setEnabled( false );
buttonSave->setIconSet( SmallIconSet("filesave") );
- buttonCopy = new KPushButton( this, "buttonCopy" );
+ buttonCopy = new KPushButton( this );
buttonCopy->setText( i18n("&Copy") );
buttonCopy->setEnabled( false );
buttonCopy->setIconSet( SmallIconSet("editcopy") );
@@ -139,7 +139,7 @@
if(!bc.isValid())
{
- KFileDialog fd( ":save_image", KImageIO::pattern( KImageIO::Writing ), this, "fd", true );
+ KFileDialog fd( ":save_image", KImageIO::pattern( KImageIO::Writing ), this, true );
fd.setMode( KFile::File );
fd.setOperationMode( KFileDialog::Saving );
if( fd.exec() == QDialog::Accepted )
Modified: trunk/src/batchwizard.cpp
===================================================================
--- trunk/src/batchwizard.cpp 2008-02-27 20:44:24 UTC (rev 20)
+++ trunk/src/batchwizard.cpp 2008-02-27 21:35:23 UTC (rev 21)
@@ -95,8 +95,7 @@
};
BatchWizard::BatchWizard( QWidget* parent )
- : DCOPObject("BatchPrinting"),
- KWizard( parent )
+ : KWizard( parent )
{
setupPage1();
setupPage2();
@@ -120,7 +119,7 @@
void BatchWizard::setupPage1()
{
- page1 = new QWidget( this, "page1" );
+ page1 = new QWidget( this );
Q3VBoxLayout* pageLayout = new Q3VBoxLayout( page1, 11, 6, "pageLayout");
QLabel* label = new QLabel( i18n("<qt>This wizard will guide you through the process "
@@ -148,7 +147,7 @@
void BatchWizard::setupPage2()
{
- page2 = new QWidget( this, "page2" );
+ page2 = new QWidget( this );
Q3VBoxLayout* pageLayout = new Q3VBoxLayout( page2, 11, 6, "pageLayout");
Q3VButtonGroup* group = new Q3VButtonGroup( page2 );
@@ -173,7 +172,7 @@
void BatchWizard::setupPage3()
{
- page3 = new Q3WidgetStack( this, "page3" );
+ page3 = new Q3WidgetStack( this );
setupStackPage1();
setupStackPage2();
@@ -185,7 +184,7 @@
void BatchWizard::setupPage4()
{
- page4 = new Q3VBox( this, "page4" );
+ page4 = new Q3VBox( this );
page4->setSpacing( 5 );
Q3HBox* hbox = new Q3HBox( page4 );
@@ -210,7 +209,7 @@
{
TokenProvider serial( this );
- page5 = new Q3VBox( this, "page5" );
+ page5 = new Q3VBox( this );
new QLabel( i18n( "<qt>KBarcode has support for placing serial numbers on labels. "
"If you did not use the [serial] token on your label in "
@@ -234,7 +233,7 @@
void BatchWizard::setupPage10()
{
- page10 = new QWidget( this, "page10" );
+ page10 = new QWidget( this );
Q3VBoxLayout* pageLayout = new Q3VBoxLayout( page10, 11, 6, "pageLayout");
Q3VButtonGroup* group = new Q3VButtonGroup( page10 );
@@ -576,7 +575,7 @@
int move = 0;
if( bUserInteraction )
{
- PrintLabelDlg pld( this, "pld" );
+ PrintLabelDlg pld( this );
pld.setLabelsEnabled( false );
if( pld.exec() != QDialog::Accepted )
return;
@@ -732,7 +731,7 @@
void BatchWizard::addItem()
{
- DSSmallDialogs::AddItemsDialog aid( this, "aid" );
+ DSSmallDialogs::AddItemsDialog aid( this );
aid.setGroupCompletion( compGroup );
connect( &aid, SIGNAL( add( const QString &, const QString &, int) ),
this, SLOT( slotAddItem( const QString &, const QString &, int) ) );
@@ -855,7 +854,7 @@
void BatchWizard::addAllItems()
{
- DSSmallDialogs::AddAllDialog* dlg = new DSSmallDialogs::AddAllDialog( this, "dlg" );
+ DSSmallDialogs::AddAllDialog* dlg = new DSSmallDialogs::AddAllDialog( this );
if( dlg->exec() == QDialog::Accepted )
{
QString temp;
Modified: trunk/src/batchwizard.h
===================================================================
--- trunk/src/batchwizard.h 2008-02-27 20:44:24 UTC (rev 20)
+++ trunk/src/batchwizard.h 2008-02-27 21:35:23 UTC (rev 21)
@@ -41,7 +41,7 @@
class Q3VBox;
class Q3WidgetStack;
-class BatchWizard : public KWizard, public BatchIface {
+class BatchWizard : public KWizard {
Q_OBJECT
public:
BatchWizard( QWidget* parent = NULL );
Modified: trunk/src/confwizard.cpp
===================================================================
--- trunk/src/confwizard.cpp 2008-02-27 20:44:24 UTC (rev 20)
+++ trunk/src/confwizard.cpp 2008-02-27 21:35:23 UTC (rev 21)
@@ -87,28 +87,28 @@
void ConfWizard::setupPage1()
{
- page = new QWidget( this, "page" );
+ page = new QWidget( this );
pageLayout = new Q3VBoxLayout( page, 11, 6, "pageLayout");
Layout8 = new Q3HBoxLayout( 0, 0, 6, "Layout8");
Layout7 = new Q3VBoxLayout( 0, 0, 6, "Layout7");
- logo = new QLabel( page, "logo" );
+ logo = new QLabel( page );
logo->setPixmap( locate("data", "kbarcode/logo.png") );
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
pageLayout->addWidget( logo );
Layout7->addItem( spacer );
Layout8->addLayout( Layout7 );
- TextLabel2_2 = new QLabel( page, "TextLabel2_2" );
+ TextLabel2_2 = new QLabel( page );
TextLabel2_2->setText( i18n( "<qt><h1>Welcome to KBarcode</h1><br><br>") +
i18n( description ) + "</qt>" );
Layout8->addWidget( TextLabel2_2 );
pageLayout->addLayout( Layout8 );
- KUrlLabel1 = new KUrlLabel( page, "KUrlLabel1" );
+ KUrlLabel1 = new KUrlLabel( page );
KUrlLabel1->setText( "http://www.kbarcode.net" );
KUrlLabel1->setURL("http://www.kbarcode.net");
pageLayout->addWidget( KUrlLabel1 );
@@ -117,7 +117,7 @@
void ConfWizard::setupPage0()
{
- QWidget* page_0 = new QWidget( this, "page_0" );
+ QWidget* page_0 = new QWidget( this );
Q3VBoxLayout* pageLayout = new Q3VBoxLayout( page_0, 11, 6, "pageLayout");
Q3TextBrowser* b = new Q3TextBrowser( page_0, "b" );
@@ -130,7 +130,7 @@
void ConfWizard::setupPage2()
{
- page_2 = new QWidget( this, "page_2" );
+ page_2 = new QWidget( this );
pageLayout_2 = new Q3VBoxLayout( page_2, 11, 6, "pageLayout_2");
checkDatabase = new QCheckBox( page_2 );
@@ -150,21 +150,21 @@
void ConfWizard::setupPage3()
{
- page_3 = new QWidget( this, "page_3" );
+ page_3 = new QWidget( this );
pageLayout_3 = new Q3VBoxLayout( page_3, 11, 6, "pageLayout_3");
- TextLabel1_2 = new QLabel( page_3, "TextLabel1_2" );
+ TextLabel1_2 = new QLabel( page_3 );
TextLabel1_2->setText( i18n( "KBarcode can create the required SQL tables for you.<br>KBarcode will add also some Label Definitions to the tables.<br>After that you can fill the tables with some example data." ) );
TextLabel1_2->setAlignment( int( QLabel::WordBreak | Qt::AlignVCenter ) );
pageLayout_3->addWidget( TextLabel1_2 );
Layout5_2 = new Q3VBoxLayout( 0, 0, 6, "Layout5_2");
- buttonCreate = new KPushButton( page_3, "buttonCreate" );
+ buttonCreate = new KPushButton( page_3 );
buttonCreate->setText( i18n( "&Create Tables" ) );
Layout5_2->addWidget( buttonCreate );
- buttonExample = new KPushButton( page_3, "buttonExample" );
+ buttonExample = new KPushButton( page_3 );
buttonExample->setEnabled( FALSE );
buttonExample->setText( i18n( "&Add Example Data" ) );
Layout5_2->addWidget( buttonExample );
Modified: trunk/src/databasebrowser.cpp
===================================================================
--- trunk/src/databasebrowser.cpp 2008-02-27 20:44:24 UTC (rev 20)
+++ trunk/src/databasebrowser.cpp 2008-02-27 21:35:23 UTC (rev 21)
@@ -138,7 +138,7 @@
void DatabaseBrowser::find()
{
if( !findDlg )
- findDlg = new KEdFind( this, "findDlg", false );
+ findDlg = new KEdFind( this, false );
findDlg->setText( m_find );
findDlg->setDirection( m_direction );
Modified: trunk/src/definitiondialog.cpp
===================================================================
--- trunk/src/definitiondialog.cpp 2008-02-27 20:44:24 UTC (rev 20)
+++ trunk/src/definitiondialog.cpp 2008-02-27 21:35:23 UTC (rev 21)
@@ -145,42 +145,42 @@
comboType->setEditable( TRUE );
Layout14->addWidget( comboType );
- editWidth = new KRestrictedLine( this, "editWidth" );
+ editWidth = new KRestrictedLine( this );
editWidth->setText( i18n( "0" ) );
editWidth->setValidChars( i18n( "0123456789." ) );
Layout14->addWidget( editWidth );
- editHeight = new KRestrictedLine( this, "editHeight" );
+ editHeight = new KRestrictedLine( this );
editHeight->setText( i18n( "0" ) );
editHeight->setValidChars( i18n( "0123456789." ) );
Layout14->addWidget( editHeight );
- editHGap = new KRestrictedLine( this, "editHGap" );
+ editHGap = new KRestrictedLine( this );
editHGap->setText( i18n( "0" ) );
editHGap->setValidChars( i18n( "0123456789." ) );
Layout14->addWidget( editHGap );
- editVGap = new KRestrictedLine( this, "editVGap" );
+ editVGap = new KRestrictedLine( this );
editVGap->setText( i18n( "0" ) );
editVGap->setValidChars( i18n( "0123456789." ) );
Layout14->addWidget( editVGap );
- editTGap = new KRestrictedLine( this, "editTGap" );
+ editTGap = new KRestrictedLine( this );
editTGap->setText( i18n( "0" ) );
editTGap->setValidChars( i18n( "0123456789." ) );
Layout14->addWidget( editTGap );
- editLGap = new KRestrictedLine( this, "editLGap" );
+ editLGap = new KRestrictedLine( this );
editLGap->setText( i18n( "0" ) );
editLGap->setValidChars( i18n( "0123456789." ) );
Layout14->addWidget( editLGap );
- editNumH = new KRestrictedLine( this, "editNumH" );
+ editNumH = new KRestrictedLine( this );
editNumH->setText( i18n( "0" ) );
editNumH->setValidChars( "0123456789" );
Layout14->addWidget( editNumH );
- editNumV = new KRestrictedLine( this, "editNumV" );
+ editNumV = new KRestrictedLine( this );
editNumV->setText( i18n( "0" ) );
editNumV->setValidChars( "0123456789" );
Layout14->addWidget( editNumV );
@@ -199,11 +199,11 @@
QSpacerItem* spacer_3 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout16->addItem( spacer_3 );
- buttonAdd = new KPushButton( this, "buttonAdd" );
+ buttonAdd = new KPushButton( this );
buttonAdd->setText( i18n( "&Add" ) );
Layout16->addWidget( buttonAdd );
- buttonCancel = new KPushButton( this, "buttonCancel" );
+ buttonCancel = new KPushButton( this );
buttonCancel->setText( i18n( "&Cancel" ) );
Layout16->addWidget( buttonCancel );
DefinitionDialogLayout->addLayout( Layout16 );
Modified: trunk/src/kbarcode.cpp
===================================================================
--- trunk/src/kbarcode.cpp 2008-02-27 20:44:24 UTC (rev 20)
+++ trunk/src/kbarcode.cpp 2008-02-27 21:35:23 UTC (rev 21)
@@ -117,7 +117,7 @@
void KBarcode::startLabelEditor()
{
- LabelEditor* ed = new LabelEditor( NULL, QString::null, "LabelEditorWindow" );
+ LabelEditor* ed = new LabelEditor( NULL, QString::null );
ed->startupDlg( LabelEditor::eCreateNewLabel, QString::null );
}
@@ -128,22 +128,22 @@
void KBarcode::editArticles()
{
- new DatabaseBrowser( TABLE_BASIC, NULL, "basicbrowser" );
+ new DatabaseBrowser( TABLE_BASIC, NULL );
}
void KBarcode::editCustomers()
{
- new DatabaseBrowser( TABLE_CUSTOMER, NULL, "customerbrowser" );
+ new DatabaseBrowser( TABLE_CUSTOMER, NULL );
}
void KBarcode::editCustomerText()
{
- new DatabaseBrowser( TABLE_CUSTOMER_TEXT, NULL, "customertextbrowser" );
+ new DatabaseBrowser( TABLE_CUSTOMER_TEXT, NULL );
}
void KBarcode::editLabelDef()
{
- new DatabaseBrowser( TABLE_LABEL_DEF, NULL, "defbrowser" );
+ new DatabaseBrowser( TABLE_LABEL_DEF, NULL );
}
void KBarcode::enableData()
@@ -266,7 +266,7 @@
void KBarcode::importCSV()
{
- new CSVImportDlg( this, "csvimportdlg" );
+ new CSVImportDlg( this );
}
bool KBarcode::isSQLConnected() const
Modified: trunk/src/kbarcode.h
===================================================================
--- trunk/src/kbarcode.h 2008-02-27 20:44:24 UTC (rev 20)
+++ trunk/src/kbarcode.h 2008-02-27 21:35:23 UTC (rev 21)
@@ -41,7 +41,7 @@
* LabelPrinter (Batchprinting), DatabaseBrowser and BarcodeDialog.
* There are also a few smaller modules.
*/
-class KBarcode: public MainWindow, public KBarcodeIface {
+class KBarcode: public MainWindow {
Q_OBJECT
public:
KBarcode( QWidget *parent=0, Qt::WFlags f = Qt::WType_TopLevel | Qt::WDestructiveClose );
Modified: trunk/src/labeleditor.cpp
===================================================================
--- trunk/src/labeleditor.cpp 2008-02-27 20:44:24 UTC (rev 20)
+++ trunk/src/labeleditor.cpp 2008-02-27 21:35:23 UTC (rev 21)
@@ -107,7 +107,6 @@
#include <kstatusbar.h>
#include <kstandarddirs.h>
#include <ktemporaryfile.h>
-#include <dcopclient.h>
#include <kglobal.h>
#include "tcanvasitem.h"
@@ -497,7 +496,7 @@
copyAct->plug( toolBar() );
pasteAct->plug( toolBar() );
- tools = new KToolBar( this, this->leftDock(), true, "tools" );
+ tools = new KToolBar( this, this->leftDock(), true);
barcodeAct->plug( tools );
pictureAct->plug( tools );
@@ -635,7 +634,7 @@
// DocumentItemList list = cv->getAllItems();
// QStringList vars = m_token->listUserVars( &list );
- TokenDialog dlg( m_token, this, "dlg" );
+ TokenDialog dlg( m_token, this );
if( dlg.exec() == QDialog::Accepted )
insertText( dlg.token() );
}
@@ -687,7 +686,7 @@
void LabelEditor::changeSize()
{
- NewLabel* nl = new NewLabel( this, "nl", true, true );
+ NewLabel* nl = new NewLabel( this, true, true );
nl->setLabelId( d->getId() );
if( nl->exec() == QDialog::Rejected )
{
@@ -760,7 +759,7 @@
void LabelEditor::print()
{
- PrintLabelDlg pld( this, "pld" );
+ PrintLabelDlg pld( this );
if( pld.exec() != QDialog::Accepted )
return;
@@ -792,7 +791,7 @@
void LabelEditor::printImage()
{
- KFileDialog fd( ":save_image", KImageIO::pattern( KImageIO::Writing ), this, "fd", true );
+ KFileDialog fd( ":save_image", KImageIO::pattern( KImageIO::Writing ), this, true );
fd.setMode( KFile::File );
fd.setOperationMode( KFileDialog::Saving );
if( fd.exec() == QDialog::Accepted ) {
@@ -1002,7 +1001,7 @@
void LabelEditor::startEditor()
{
if( isChanged() ) {
- LabelEditor* lb = new LabelEditor( NULL, QString::null, "LabelEditorWindow" );
+ LabelEditor* lb = new LabelEditor( NULL, QString::null );
lb->startupDlg( eCreateNewLabel, QString::null );
} else
newLabel();
@@ -1022,7 +1021,7 @@
}
if( isChanged() )
- new LabelEditor( 0, url.path(), "LabelEditorWindow" );
+ new LabelEditor( 0, url.path() );
else
openUrl( url.path() );
}
@@ -1030,7 +1029,7 @@
void LabelEditor::startLoadEditor()
{
if( isChanged() ) {
- LabelEditor* lb = new LabelEditor( 0, QString::null, "LabelEditorWindow" );
+ LabelEditor* lb = new LabelEditor( 0, QString::null );
lb->startupDlg( eLoadLabel, QString::null );
} else
open();
Modified: trunk/src/labeleditor.h
===================================================================
--- trunk/src/labeleditor.h 2008-02-27 20:44:24 UTC (rev 20)
+++ trunk/src/labeleditor.h 2008-02-27 21:35:23 UTC (rev 21)
@@ -83,7 +83,7 @@
* and save them. Labels can also be printed directly, but without database
* support. Use Batchprinting (LabelPrinter) for this.
*/
-class LabelEditor : public MainWindow, public EditorIface, private LabelUtils, private XMLUtils {
+class LabelEditor : public MainWindow, private LabelUtils, private XMLUtils {
Q_OBJECT
public:
enum ELabelEditorMode {
Modified: trunk/src/main.cpp
===================================================================
--- trunk/src/main.cpp 2008-02-27 20:44:24 UTC (rev 20)
+++ trunk/src/main.cpp 2008-02-27 21:35:23 UTC (rev 21)
@@ -112,7 +112,7 @@
a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()));
- KBarcode* kbc = new KBarcode( 0, "KBarcodeMainWindow" );
+ KBarcode* kbc = new KBarcode( 0 );
if( kbc->parseCmdLine() )
return 0;
Modified: trunk/src/multilineeditdlg.cpp
===================================================================
--- trunk/src/multilineeditdlg.cpp 2008-02-27 20:44:24 UTC (rev 20)
+++ trunk/src/multilineeditdlg.cpp 2008-02-27 21:35:23 UTC (rev 21)
@@ -68,7 +68,7 @@
{
ac = new KActionCollection( this );
- KAction* action_export = new KAction( i18n("Export"), "fileexport", 0, this, SLOT( save() ), ac );
+ KAction* action_export = new KAction( i18n("Export"), 0, this, SLOT( save() ), ac );
//
// Edit Actions
@@ -266,7 +266,7 @@
void MultiLineEditor::insertNewField()
{
- TokenDialog dlg( m_token, this, "dlg" );
+ TokenDialog dlg( m_token, this );
if( dlg.exec() == QDialog::Accepted )
editor->insert( dlg.token() );
}
Modified: trunk/src/mycanvasview.h
===================================================================
--- trunk/src/mycanvasview.h 2008-02-27 20:44:24 UTC (rev 20)
+++ trunk/src/mycanvasview.h 2008-02-27 21:35:23 UTC (rev 21)
@@ -89,7 +89,7 @@
};
public:
- MyCanvasView( Definition* d, MyCanvas *c, QWidget* parent=0, const char* name=0, Qt::WFlags f=0);
+ MyCanvasView( Definition* d, MyCanvas *c, QWidget* parent=0, Qt::WFlags f=0);
~MyCanvasView();
/** return a list of all DocumentItems on the canvas
Modified: trunk/src/newlabel.cpp
===================================================================
--- trunk/src/newlabel.cpp 2008-02-27 20:44:24 UTC (rev 20)
+++ trunk/src/newlabel.cpp 2008-02-27 21:35:23 UTC (rev 21)
@@ -92,8 +92,8 @@
Layout2->addItem( spacer_2 );
NewLabelLayout->addLayout( Layout2 );
- TextLabel4 = new QLabel( this, "TextLabel4" );
- preview = new LabelPreview( this, "preview" );
+ TextLabel4 = new QLabel( this );
+ preview = new LabelPreview( this );
Q3HBoxLayout* hlayout = new Q3HBoxLayout( 0, 6, 6 );
hlayout->addWidget( TextLabel4 );
@@ -104,19 +104,19 @@
Layout1 = new Q3HBoxLayout( 0, 0, 6, "Layout1");
- buttonOwnFormat = new KPushButton( this, "buttonOwnFormat" );
+ buttonOwnFormat = new KPushButton( this );
buttonOwnFormat->setText( i18n( "&Add own Label Definition" ) );
Layout1->addWidget( buttonOwnFormat );
QSpacerItem* spacer_4 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer_4 );
- buttonOk = new KPushButton( this, "buttonOk" );
+ buttonOk = new KPushButton( this );
buttonOk->setText( i18n( "&OK" ) );
buttonOk->setDefault( true );
Layout1->addWidget( buttonOk );
- buttonCancel = new KPushButton( this, "buttonCancel" );
+ buttonCancel = new KPushButton( this );
buttonCancel->setText( i18n( "&Cancel" ) );
Layout1->addWidget( buttonCancel );
NewLabelLayout->addLayout( Layout1 );
Modified: trunk/src/propertywidget.cpp
===================================================================
--- trunk/src/propertywidget.cpp 2008-02-27 20:44:24 UTC (rev 20)
+++ trunk/src/propertywidget.cpp 2008-02-27 21:35:23 UTC (rev 21)
@@ -231,7 +231,7 @@
comboComplex->addItem( "Static" );
- barcode = new BarcodeWidget( this, "barcode" );
+ barcode = new BarcodeWidget( this );
barcode->setTokenProvider( token );
//connect( this, SIGNAL( defaultClicked() ), this, SLOT( defaults() ) );
@@ -293,7 +293,7 @@
PropertyText::PropertyText( TokenProvider* token, QWidget* parent )
: PropertyWidget( parent )
{
- m_editor = new MultiLineEditor( token, this, "m_editor" );
+ m_editor = new MultiLineEditor( token, this );
grid->addWidget( m_editor, 0, 0 );
}
@@ -603,7 +603,7 @@
void PropertyImage::slotTokens()
{
- TokenDialog tokendlg( m_token, this, "tokendlg" );
+ TokenDialog tokendlg( m_token, this );
if( tokendlg.exec() == QDialog::Accepted )
imgExpression->insert( tokendlg.token() );
}
Modified: trunk/src/sqltables.cpp
===================================================================
--- trunk/src/sqltables.cpp 2008-02-27 20:44:24 UTC (rev 20)
+++ trunk/src/sqltables.cpp 2008-02-27 21:35:23 UTC (rev 21)
@@ -574,7 +574,7 @@
m_autoconnect = new QCheckBox( i18n("&Autoconnect on program start"), groupDatabase );
groupDatabaseLayout->addWidget( m_autoconnect );
- buttonTest = new KPushButton( groupDatabase, "buttonTest" );
+ buttonTest = new KPushButton( groupDatabase );
buttonTest->setText( i18n( "&Test Settings" ) );
groupDatabaseLayout->addWidget( buttonTest );
Modified: trunk/src/textlineedit.cpp
===================================================================
--- trunk/src/textlineedit.cpp 2008-02-27 20:44:24 UTC (rev 20)
+++ trunk/src/textlineedit.cpp 2008-02-27 21:35:23 UTC (rev 21)
@@ -131,16 +131,16 @@
textDataAct->plug( tool2Bar );
- action_font_type = new KComboBox(tool2Bar,"font_type") ;
+ action_font_type = new KComboBox(tool2Bar) ;
connect( action_font_type, SIGNAL( activated(int) ), this, SLOT( setFontType(int) ) );
action_font_type->insertStringList(fuentes) ;
QLabel* labelv = new QLabel( i18n("&Mag. Vert.:"), tool3Bar );
- mag_vert = new KIntNumInput( tool3Bar,"magvert" );
+ mag_vert = new KIntNumInput( tool3Bar);
QLabel* labelh = new QLabel( i18n("&Mag. Hor.:"), tool3Bar );
- mag_hor = new KIntNumInput( tool3Bar,"maghor" );
+ mag_hor = new KIntNumInput( tool3Bar );
connect( mag_vert, SIGNAL( activated(int) ), this, SLOT( setVerMag(int) ) );
connect( mag_hor, SIGNAL( activated(int) ), this, SLOT( setHorMag(int) ) );
mag_vert->setRange( 1, 9, 1, false );
@@ -176,7 +176,7 @@
void TextLineEditor::insertNewField()
{
- TokenDialog dlg( m_token, this, "dlg" );
+ TokenDialog dlg( m_token, this);
if( dlg.exec() == QDialog::Accepted )
editor->insert( dlg.token() ) ;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vz...@us...> - 2008-02-27 20:44:45
|
Revision: 20
http://kbarcode.svn.sourceforge.net/kbarcode/?rev=20&view=rev
Author: vzsolt
Date: 2008-02-27 12:44:24 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
Qt4 has dropped the name parameter from QObject's constructor. So did I.
Modified Paths:
--------------
trunk/src/barcodecombo.cpp
trunk/src/barcodecombo.h
trunk/src/barcodedialog.cpp
trunk/src/barcodedialog.h
trunk/src/barcodedialogs.cpp
trunk/src/barcodedialogs.h
trunk/src/barcodeprinterdlg.cpp
trunk/src/barcodeprinterdlg.h
trunk/src/batchwizard.cpp
trunk/src/batchwizard.h
trunk/src/confwizard.cpp
trunk/src/confwizard.h
trunk/src/csvimportdlg.cpp
trunk/src/definitiondialog.cpp
trunk/src/definitiondialog.h
trunk/src/dstextedit.cpp
trunk/src/dstextedit.h
trunk/src/kactionmap.cpp
trunk/src/kactionmap.h
trunk/src/kbarcode.cpp
trunk/src/labeleditor.cpp
trunk/src/mimesources.cpp
trunk/src/mimesources.h
trunk/src/multilineeditdlg.cpp
trunk/src/multilineeditdlg.h
trunk/src/mycanvasview.cpp
trunk/src/mycanvasview.h
trunk/src/mydatatable.cpp
trunk/src/mydatatable.h
trunk/src/newlabel.cpp
trunk/src/newlabel.h
trunk/src/previewdialog.cpp
trunk/src/previewdialog.h
trunk/src/printlabeldlg.cpp
trunk/src/printlabeldlg.h
trunk/src/rectsettingsdlg.cpp
trunk/src/rectsettingsdlg.h
trunk/src/smalldialogs.cpp
trunk/src/smalldialogs.h
trunk/src/textlineedit.cpp
trunk/src/textlineedit.h
trunk/src/tokendialog.cpp
trunk/src/tokendialog.h
Modified: trunk/src/barcodecombo.cpp
===================================================================
--- trunk/src/barcodecombo.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/barcodecombo.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -43,8 +43,8 @@
#include <klocale.h>
#include <kpushbutton.h>
-BarcodeValidator::BarcodeValidator( QObject* parent, const char* name )
- : QValidator( parent, name )
+BarcodeValidator::BarcodeValidator( QObject* parent )
+ : QValidator( parent )
{
m_valid = NULL;
m_notValid = NULL;
@@ -90,8 +90,8 @@
return Acceptable;
}
-BarcodeCombo::BarcodeCombo(QWidget *parent, const char *name )
- : KComboBox( false, parent, name )
+BarcodeCombo::BarcodeCombo(QWidget *parent)
+ : KComboBox( false, parent )
{
this->insertStringList( *Barkode::encodingTypes() );
@@ -117,8 +117,8 @@
}
}
-BarcodeWidget::BarcodeWidget(QWidget *parent, const char *name )
- : QWidget( parent, name ), m_validator( this )
+BarcodeWidget::BarcodeWidget(QWidget *parent)
+ : QWidget( parent ), m_validator( this )
{
m_token = NULL;
Modified: trunk/src/barcodecombo.h
===================================================================
--- trunk/src/barcodecombo.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/barcodecombo.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -31,7 +31,7 @@
*/
class BarcodeValidator : public QValidator {
public:
- BarcodeValidator( QObject* parent = 0, const char* name = 0 );
+ BarcodeValidator( QObject* parent = 0);
QValidator::State validate( QString & input, int & pos ) const;
@@ -58,7 +58,7 @@
class BarcodeCombo : public KComboBox {
Q_OBJECT
public:
- BarcodeCombo(QWidget *parent=0, const char *name=0);
+ BarcodeCombo(QWidget *parent=0);
~BarcodeCombo();
const char* getEncodingType();
@@ -87,7 +87,7 @@
class BarcodeWidget : public QWidget {
Q_OBJECT
public:
- BarcodeWidget(QWidget *parent=0, const char *name=0);
+ BarcodeWidget(QWidget *parent=0);
~BarcodeWidget() { }
void getData( Barkode & barkode );
Modified: trunk/src/barcodedialog.cpp
===================================================================
--- trunk/src/barcodedialog.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/barcodedialog.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -43,8 +43,8 @@
#include <Q3HBoxLayout>
#include <Q3VBoxLayout>
-BarCodeDialog::BarCodeDialog( QWidget* parent, const char* name )
- : QDialog( parent, name, false)
+BarCodeDialog::BarCodeDialog( QWidget* parent )
+ : QDialog( parent, false)
{
setCaption( i18n( "Barcode Generator" ) );
Modified: trunk/src/barcodedialog.h
===================================================================
--- trunk/src/barcodedialog.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/barcodedialog.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -56,7 +56,7 @@
Q_OBJECT
public:
- BarCodeDialog( QWidget* parent = 0, const char* name = 0 );
+ BarCodeDialog( QWidget* parent = 0 );
~BarCodeDialog();
private:
Modified: trunk/src/barcodedialogs.cpp
===================================================================
--- trunk/src/barcodedialogs.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/barcodedialogs.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -43,9 +43,9 @@
#include <kcolorbutton.h>
-AdvancedBarcodeDialog::AdvancedBarcodeDialog( QString type, QWidget* parent, const char* name )
+AdvancedBarcodeDialog::AdvancedBarcodeDialog( QString type, QWidget* parent )
: KDialogBase( KDialogBase::Tabbed, i18n("Barcode Settings"),
- KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent,name)
+ KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent)
{
list.setAutoDelete( false );
@@ -104,8 +104,8 @@
}
}
-TBarcodeDlg::TBarcodeDlg(QWidget *parent, const char *name )
- : QWidget( parent, name )
+TBarcodeDlg::TBarcodeDlg(QWidget *parent)
+ : QWidget( parent )
{
Q3VBoxLayout* layout = new Q3VBoxLayout( this, 6, 6 );
@@ -254,8 +254,8 @@
}
}
-PDF417BarcodeDlg::PDF417BarcodeDlg(QWidget *parent, const char *name )
- : QWidget( parent, name )
+PDF417BarcodeDlg::PDF417BarcodeDlg(QWidget *parent)
+ : QWidget( parent )
{
Q3VBoxLayout* layout = new Q3VBoxLayout( this, 6, 6 );
@@ -308,8 +308,8 @@
}
}
-DataMatrixDlg::DataMatrixDlg(QWidget *parent, const char *name )
- : QWidget( parent, name )
+DataMatrixDlg::DataMatrixDlg(QWidget *parent )
+ : QWidget( parent )
{
Q3HBoxLayout* datamLayout = new Q3HBoxLayout( this, 6, 6 );
@@ -362,8 +362,8 @@
b->setDatamatrixSize( comboDataMatrix->currentItem() );
}
-SequenceDlg::SequenceDlg( QWidget *parent, const char *name )
- : QWidget( parent, name )
+SequenceDlg::SequenceDlg( QWidget *parent )
+ : QWidget( parent )
{
Q3VBoxLayout* main = new Q3VBoxLayout( this, 6, 6 );
@@ -442,8 +442,8 @@
spinStart->setEnabled( checkSequence->isChecked() && radioNumbers->isChecked() );
}
-ColorDlg::ColorDlg(QWidget *parent, const char *name)
- : Q3VBox( parent, name )
+ColorDlg::ColorDlg(QWidget *parent)
+ : Q3VBox( parent )
{
Q3GroupBox* gb = new Q3GroupBox( i18n("Colors"), this );
gb->setColumnLayout(0, Qt::Vertical );
@@ -478,8 +478,8 @@
b->setTextColor( buttonTextColor->color() );
}
-PurePostscriptDlg::PurePostscriptDlg(QWidget *parent, const char *name)
- : Q3VBox( parent, name )
+PurePostscriptDlg::PurePostscriptDlg(QWidget *parent)
+ : Q3VBox( parent )
{
Q3VGroupBox* gb = new Q3VGroupBox( i18n("Barcode Writer in Pure Postscript"), this );
gb->setEnabled( Barkode::havePurePostscriptBarcode() );
Modified: trunk/src/barcodedialogs.h
===================================================================
--- trunk/src/barcodedialogs.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/barcodedialogs.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -59,7 +59,7 @@
class AdvancedBarcodeDialog : public KDialogBase {
Q_OBJECT
public:
- AdvancedBarcodeDialog( QString type, QWidget* parent = 0, const char* name = 0 );
+ AdvancedBarcodeDialog( QString type, QWidget* parent = 0 );
~AdvancedBarcodeDialog();
void setData( Barkode* b );
@@ -75,7 +75,7 @@
class TBarcodeDlg : public QWidget, public BarcodeDlgBase {
Q_OBJECT
public:
- TBarcodeDlg(QWidget *parent=0, const char *name=0);
+ TBarcodeDlg(QWidget *parent=0 );
void setData( Barkode* b );
void getData( Barkode* b ) const;
@@ -97,7 +97,7 @@
class PDF417BarcodeDlg : public QWidget, public BarcodeDlgBase {
Q_OBJECT
public:
- PDF417BarcodeDlg(QWidget *parent=0, const char *name=0);
+ PDF417BarcodeDlg(QWidget *parent=0);
void setData( Barkode* b );
void getData( Barkode* b ) const;
@@ -114,7 +114,7 @@
class DataMatrixDlg : public QWidget, public BarcodeDlgBase {
Q_OBJECT
public:
- DataMatrixDlg(QWidget *parent=0, const char *name=0);
+ DataMatrixDlg(QWidget *parent=0);
void setData( Barkode* b );
void getData( Barkode* b ) const;
@@ -129,7 +129,7 @@
class SequenceDlg : public QWidget, public BarcodeDlgBase {
Q_OBJECT
public:
- SequenceDlg(QWidget *parent=0, const char *name=0);
+ SequenceDlg(QWidget *parent=0);
void setData( Barkode* b );
void getData( Barkode* b ) const;
@@ -153,7 +153,7 @@
class ColorDlg : public Q3VBox, public BarcodeDlgBase {
Q_OBJECT
public:
- ColorDlg(QWidget *parent=0, const char *name=0);
+ ColorDlg(QWidget *parent=0);
void setData( Barkode* b );
void getData( Barkode* b ) const;
@@ -170,7 +170,7 @@
class PurePostscriptDlg : public Q3VBox, public BarcodeDlgBase {
Q_OBJECT
public:
- PurePostscriptDlg(QWidget *parent=0, const char *name=0);
+ PurePostscriptDlg(QWidget *parent=0);
void setData( Barkode* b );
void getData( Barkode* b ) const;
Modified: trunk/src/barcodeprinterdlg.cpp
===================================================================
--- trunk/src/barcodeprinterdlg.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/barcodeprinterdlg.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -29,9 +29,9 @@
//Added by qt3to4:
#include <Q3GridLayout>
-BarcodePrinterDlg::BarcodePrinterDlg(QWidget *parent, const char *name)
+BarcodePrinterDlg::BarcodePrinterDlg(QWidget *parent)
: KDialogBase( KDialogBase::Plain, i18n("Barcode Printer"),
- KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent,name)
+ KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent)
{
Q3GridLayout* layout = new Q3GridLayout( plainPage(), 6, 6 );
Modified: trunk/src/barcodeprinterdlg.h
===================================================================
--- trunk/src/barcodeprinterdlg.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/barcodeprinterdlg.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -33,7 +33,7 @@
{
Q_OBJECT
public:
- BarcodePrinterDlg(QWidget *parent = 0, const char *name = 0);
+ BarcodePrinterDlg(QWidget *parent = 0);
~BarcodePrinterDlg();
int outputFormat() const;
Modified: trunk/src/batchwizard.cpp
===================================================================
--- trunk/src/batchwizard.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/batchwizard.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -94,9 +94,9 @@
};
-BatchWizard::BatchWizard( QWidget* parent, const char* name )
+BatchWizard::BatchWizard( QWidget* parent )
: DCOPObject("BatchPrinting"),
- KWizard( parent, name )
+ KWizard( parent )
{
setupPage1();
setupPage2();
Modified: trunk/src/batchwizard.h
===================================================================
--- trunk/src/batchwizard.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/batchwizard.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -44,7 +44,7 @@
class BatchWizard : public KWizard, public BatchIface {
Q_OBJECT
public:
- BatchWizard( QWidget* parent = NULL, const char* name = NULL );
+ BatchWizard( QWidget* parent = NULL );
~BatchWizard();
/** reimplemented DCOP method from BatchIface
Modified: trunk/src/confwizard.cpp
===================================================================
--- trunk/src/confwizard.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/confwizard.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -57,8 +57,8 @@
"replacement for the creation of barcodes. All major types of barcodes "
"like EAN, UPC, CODE39 and ISBN are supported." );
-ConfWizard::ConfWizard( QWidget* parent, const char* name, bool modal )
- : KWizard( parent, name, modal )
+ConfWizard::ConfWizard( QWidget* parent, bool modal )
+ : KWizard( parent, modal )
{
setCaption( i18n( "Configure KBarcode" ) );
Modified: trunk/src/confwizard.h
===================================================================
--- trunk/src/confwizard.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/confwizard.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -45,7 +45,7 @@
Q_OBJECT
public:
- ConfWizard( QWidget* parent = 0, const char* name = 0, bool modal = true );
+ ConfWizard( QWidget* parent = 0, bool modal = true );
~ConfWizard();
void showPage( QWidget* page );
Modified: trunk/src/csvimportdlg.cpp
===================================================================
--- trunk/src/csvimportdlg.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/csvimportdlg.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -59,9 +59,9 @@
const char* NOFIELD = "<NONE>";
-CSVImportDlg::CSVImportDlg(QWidget *parent, const char *name )
+CSVImportDlg::CSVImportDlg(QWidget *parent )
: KDialogBase( KDialogBase::Tabbed, i18n("Import"),
- KDialogBase::Ok | KDialogBase::Close, KDialogBase::Ok, parent,name,false,true)
+ KDialogBase::Ok | KDialogBase::Close, KDialogBase::Ok, parent,false,true)
{
setButtonOK( i18n("&Import"), i18n("Import the selected file into your tables.") );
Modified: trunk/src/definitiondialog.cpp
===================================================================
--- trunk/src/definitiondialog.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/definitiondialog.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -35,8 +35,8 @@
// KDE includes
#include <klocale.h>
-LabelPreview::LabelPreview( QWidget* parent, const char* name )
- : QWidget( parent, name)
+LabelPreview::LabelPreview( QWidget* parent )
+ : QWidget( parent )
{
// For old DIN A4 preview
PrinterSettings* ps = PrinterSettings::getInstance();
@@ -80,8 +80,8 @@
}
/*****************************************/
-DefinitionDialog::DefinitionDialog( QWidget* parent, const char* name, bool modal, Qt::WFlags fl )
- : QDialog( parent, name, modal, fl )
+DefinitionDialog::DefinitionDialog( QWidget* parent, bool modal, Qt::WFlags fl )
+ : QDialog( parent, modal, fl )
{
resize( 465, 345 );
setCaption( i18n( "Add Label Definition" ) );
Modified: trunk/src/definitiondialog.h
===================================================================
--- trunk/src/definitiondialog.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/definitiondialog.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -28,7 +28,7 @@
class LabelPreview : public QWidget {
Q_OBJECT
public:
- LabelPreview( QWidget* parent = 0, const char* name = 0 );
+ LabelPreview( QWidget* parent = 0 );
~LabelPreview();
void setRect( QRect label ) { size = label; }
@@ -52,7 +52,7 @@
Q_OBJECT
public:
- DefinitionDialog( QWidget* parent = 0, const char* name = 0, bool modal = true, Qt::WFlags fl = 0 );
+ DefinitionDialog( QWidget* parent = 0, bool modal = true, Qt::WFlags fl = 0 );
~DefinitionDialog();
private:
const Measurements getCurrentMeasure();
Modified: trunk/src/dstextedit.cpp
===================================================================
--- trunk/src/dstextedit.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/dstextedit.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -21,8 +21,8 @@
//Added by qt3to4:
#include <Q3ValueList>
-DSTextEdit::DSTextEdit( QWidget* parent, const char* name )
- : TextEditBase( parent, name )
+DSTextEdit::DSTextEdit( QWidget* parent )
+ : TextEditBase( parent )
{
connect( this, SIGNAL( textChanged() ), this, SLOT( fixParagraphs() ) );
}
Modified: trunk/src/dstextedit.h
===================================================================
--- trunk/src/dstextedit.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/dstextedit.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -37,7 +37,7 @@
Q_OBJECT
public:
- DSTextEdit( QWidget* parent, const char* name = 0 );
+ DSTextEdit( QWidget* parent );
//virtual void moveCursor( CursorAction action, bool select );
private slots:
Modified: trunk/src/kactionmap.cpp
===================================================================
--- trunk/src/kactionmap.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/kactionmap.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -89,8 +89,8 @@
KAction* m_action;
};
-KActionMapDlg::KActionMapDlg( KActionCollection* actions, QWidget* parent, const char* name )
- : KDialogBase( parent, name, false, i18n("Action Map"), KDialogBase::Close, KDialogBase::Close )
+KActionMapDlg::KActionMapDlg( KActionCollection* actions, QWidget* parent )
+ : KDialogBase( parent, false, i18n("Action Map"), KDialogBase::Close, KDialogBase::Close )
{
KVBox *page = makeVBoxMainWidget();
@@ -105,8 +105,8 @@
m_map->updateEnabledState();
}
-KActionMap::KActionMap( KActionCollection* actions, QWidget* parent, const char* name )
- : QWidget( parent, name ), m_actions( actions ), m_showMenuTree( true ), m_grayOutItems( false )
+KActionMap::KActionMap( KActionCollection* actions, QWidget* parent )
+ : QWidget( parent ), m_actions( actions ), m_showMenuTree( true ), m_grayOutItems( false )
{
Q3VBoxLayout* layout = new Q3VBoxLayout( this );
Modified: trunk/src/kactionmap.h
===================================================================
--- trunk/src/kactionmap.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/kactionmap.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -34,7 +34,7 @@
*/
class KActionMapDlg : public KDialogBase {
public:
- KActionMapDlg( KActionCollection* actions, QWidget* parent = NULL, const char* name = NULL );
+ KActionMapDlg( KActionCollection* actions, QWidget* parent = NULL );
/** Call this function whenever you changed the enabled/disalbed state of an action
* in your application.
@@ -74,7 +74,7 @@
* @param parent the parent
* @param name the name
*/
- KActionMap( KActionCollection* actions, QWidget* parent = NULL, const char* name = NULL );
+ KActionMap( KActionCollection* actions, QWidget* parent = NULL );
~KActionMap();
public slots:
Modified: trunk/src/kbarcode.cpp
===================================================================
--- trunk/src/kbarcode.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/kbarcode.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -41,9 +41,8 @@
#include <kpushbutton.h>
#include <kmessagebox.h>
-KBarcode::KBarcode( QWidget *parent, const char *name, Qt::WFlags f)
- : DCOPObject("KBarcode"),
- MainWindow( parent, name, f )
+KBarcode::KBarcode( QWidget *parent, Qt::WFlags f)
+ : MainWindow( parent, f )
{
Q3GroupBox* w = new Q3GroupBox( this );
w->setColumnLayout(0, Qt::Vertical );
Modified: trunk/src/labeleditor.cpp
===================================================================
--- trunk/src/labeleditor.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/labeleditor.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -129,9 +129,8 @@
using namespace KABC;
-LabelEditor::LabelEditor( QWidget *parent, QString _filename, const char *name, Qt::WFlags f )
- : DCOPObject( "LabelEditor" ),
- MainWindow( parent, f )
+LabelEditor::LabelEditor( QWidget *parent, QString _filename, Qt::WFlags f )
+ : MainWindow( parent, f )
{
undoAct =
redoAct = NULL;
Modified: trunk/src/mimesources.cpp
===================================================================
--- trunk/src/mimesources.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/mimesources.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -46,8 +46,8 @@
-DocumentItemDrag::DocumentItemDrag( QWidget* dragSource, const char* name )
- : Q3StoredDrag( DocumentItemDrag::mimeType(), dragSource, name )
+DocumentItemDrag::DocumentItemDrag( QWidget* dragSource )
+ : Q3StoredDrag( DocumentItemDrag::mimeType(), dragSource )
{
}
Modified: trunk/src/mimesources.h
===================================================================
--- trunk/src/mimesources.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/mimesources.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -28,7 +28,7 @@
class DocumentItemDrag : public Q3StoredDrag {
Q_OBJECT
public:
- DocumentItemDrag( QWidget* dragSource = NULL, const char* name = 0 );
+ DocumentItemDrag( QWidget* dragSource = NULL );
static QString mimeType();
Modified: trunk/src/multilineeditdlg.cpp
===================================================================
--- trunk/src/multilineeditdlg.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/multilineeditdlg.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -35,8 +35,8 @@
//Added by qt3to4:
#include <Q3VBoxLayout>
-MultiLineEditor::MultiLineEditor( TokenProvider* token, QWidget *parent, const char *name )
- : QWidget( parent, name ), m_token( token )
+MultiLineEditor::MultiLineEditor( TokenProvider* token, QWidget *parent )
+ : QWidget( parent ), m_token( token )
{
Q3VBoxLayout* layout = new Q3VBoxLayout( this, 6, 6 );
Modified: trunk/src/multilineeditdlg.h
===================================================================
--- trunk/src/multilineeditdlg.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/multilineeditdlg.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -34,7 +34,7 @@
class MultiLineEditor : public QWidget {
Q_OBJECT
public:
- MultiLineEditor( TokenProvider* token, QWidget *parent=0, const char *name=0);
+ MultiLineEditor( TokenProvider* token, QWidget *parent=0 );
~MultiLineEditor();
QString text();
void setText( const QString & t );
Modified: trunk/src/mycanvasview.cpp
===================================================================
--- trunk/src/mycanvasview.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/mycanvasview.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -33,8 +33,8 @@
#include <kruler.h>
#include <kstatusbar.h>
-MyCanvas::MyCanvas( QObject* parent, const char* name )
- : Q3Canvas( parent, name )
+MyCanvas::MyCanvas( QObject* parent )
+ : Q3Canvas( parent )
{
m_grid = false;
@@ -77,8 +77,8 @@
}
}
-MyCanvasView::MyCanvasView( Definition* d, MyCanvas* c, QWidget* parent, const char* name, Qt::WFlags f)
- : Q3CanvasView(c,parent,name,f)
+MyCanvasView::MyCanvasView( Definition* d, MyCanvas* c, QWidget* parent, Qt::WFlags f)
+ : Q3CanvasView(c,parent,f)
{
statusbar = 0;
m_commov = 0;
Modified: trunk/src/mycanvasview.h
===================================================================
--- trunk/src/mycanvasview.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/mycanvasview.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -37,7 +37,7 @@
Q_OBJECT
public:
- MyCanvas( QObject* parent, const char* name = 0 );
+ MyCanvas( QObject* parent );
~MyCanvas();
void setRect( QRect r ) {
Modified: trunk/src/mydatatable.cpp
===================================================================
--- trunk/src/mydatatable.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/mydatatable.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -17,8 +17,8 @@
#include "mydatatable.h"
-MyDataTable::MyDataTable(QWidget *parent, const char *name )
- : Q3DataTable(parent,name)
+MyDataTable::MyDataTable(QWidget *parent )
+ : Q3DataTable(parent)
{ }
MyDataTable::~MyDataTable()
Modified: trunk/src/mydatatable.h
===================================================================
--- trunk/src/mydatatable.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/mydatatable.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -26,7 +26,7 @@
class MyDataTable : public Q3DataTable {
Q_OBJECT
public:
- MyDataTable(QWidget *parent=0, const char *name=0);
+ MyDataTable(QWidget *parent=0);
~MyDataTable();
bool update();
Modified: trunk/src/newlabel.cpp
===================================================================
--- trunk/src/newlabel.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/newlabel.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -39,8 +39,8 @@
#define I2S(x) QString("%1").arg(x)
#endif // I2S
-NewLabel::NewLabel( QWidget* parent, const char* name, bool change, Qt::WFlags fl )
- : QDialog( parent, name, true, fl )
+NewLabel::NewLabel( QWidget* parent, bool change, Qt::WFlags fl )
+ : QDialog( parent, true, fl )
{
setCaption( i18n( "New Label" ) );
curid = 0;
Modified: trunk/src/newlabel.h
===================================================================
--- trunk/src/newlabel.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/newlabel.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -42,7 +42,7 @@
{
Q_OBJECT
public:
- NewLabel( QWidget* parent = 0, const char* name = 0, bool change = FALSE, Qt::WFlags fl = 0 );
+ NewLabel( QWidget* parent = 0, bool change = FALSE, Qt::WFlags fl = 0 );
~NewLabel();
int labelId() const { return curid; }
Modified: trunk/src/previewdialog.cpp
===================================================================
--- trunk/src/previewdialog.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/previewdialog.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -52,8 +52,8 @@
QString PreviewDialog::group = "";
QString PreviewDialog::article = "";
-PreviewDialog::PreviewDialog( QIODevice* device, Definition* d, QString filename, QWidget *parent, const char *name )
- : QDialog( parent, name, true, Qt::WDestructiveClose )
+PreviewDialog::PreviewDialog( QIODevice* device, Definition* d, QString filename, QWidget *parent)
+ : QDialog( parent, true, Qt::WDestructiveClose )
{
file = device;
def = d;
Modified: trunk/src/previewdialog.h
===================================================================
--- trunk/src/previewdialog.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/previewdialog.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -34,7 +34,7 @@
class PreviewDialog : public QDialog {
Q_OBJECT
public:
- PreviewDialog( QIODevice* device, Definition* d, QString filename, QWidget *parent=0, const char *name=0);
+ PreviewDialog( QIODevice* device, Definition* d, QString filename, QWidget *parent=0);
~PreviewDialog();
private slots:
Modified: trunk/src/printlabeldlg.cpp
===================================================================
--- trunk/src/printlabeldlg.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/printlabeldlg.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -28,9 +28,9 @@
#include <knuminput.h>
#include <klocale.h>
-PrintLabelDlg::PrintLabelDlg(QWidget *parent, const char *name )
+PrintLabelDlg::PrintLabelDlg(QWidget *parent )
: KDialogBase( KDialogBase::Plain, i18n("Print"),
- KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent,name)
+ KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent)
{
Q3VBoxLayout* box = new Q3VBoxLayout( plainPage() );
Modified: trunk/src/printlabeldlg.h
===================================================================
--- trunk/src/printlabeldlg.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/printlabeldlg.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -34,7 +34,7 @@
class PrintLabelDlg : public KDialogBase {
Q_OBJECT
public:
- PrintLabelDlg(QWidget *parent=0, const char *name=0);
+ PrintLabelDlg(QWidget *parent=0);
~PrintLabelDlg();
/**
Modified: trunk/src/rectsettingsdlg.cpp
===================================================================
--- trunk/src/rectsettingsdlg.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/rectsettingsdlg.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -54,9 +54,9 @@
}
}
-RectSettingsDlg::RectSettingsDlg(QWidget *parent, const char *name )
+RectSettingsDlg::RectSettingsDlg(QWidget *parent )
: KDialogBase( KDialogBase::Plain, i18n("Settings"),
- KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent,name)
+ KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent)
{
QFrame* frame = plainPage();
Q3GridLayout* grid = new Q3GridLayout( frame, 6, 6 );
@@ -145,9 +145,9 @@
return checkBorder->isChecked() ? comboLine->currentItem() + 1 : 0;
}
-LineSettingsDlg::LineSettingsDlg(QWidget *parent, const char *name )
+LineSettingsDlg::LineSettingsDlg(QWidget *parent )
: KDialogBase( KDialogBase::Plain, i18n("Settings"),
- KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent,name)
+ KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent)
{
QFrame* frame = plainPage();
Q3GridLayout* grid = new Q3GridLayout( frame, 6, 6 );
Modified: trunk/src/rectsettingsdlg.h
===================================================================
--- trunk/src/rectsettingsdlg.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/rectsettingsdlg.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -27,7 +27,7 @@
class RectSettingsDlg : public KDialogBase {
Q_OBJECT
public:
- RectSettingsDlg(QWidget *parent=0, const char *name=0);
+ RectSettingsDlg(QWidget *parent=0);
~RectSettingsDlg();
void setBorderColor( const QColor & c );
@@ -57,7 +57,7 @@
class LineSettingsDlg : public KDialogBase {
Q_OBJECT
public:
- LineSettingsDlg(QWidget *parent=0, const char *name=0);
+ LineSettingsDlg(QWidget *parent=0);
~LineSettingsDlg();
void setPen( const QPen p );
Modified: trunk/src/smalldialogs.cpp
===================================================================
--- trunk/src/smalldialogs.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/smalldialogs.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -36,9 +36,9 @@
using namespace DSSmallDialogs;
-AddAllDialog::AddAllDialog(QWidget *parent, const char *name )
+AddAllDialog::AddAllDialog(QWidget *parent)
: KDialogBase( KDialogBase::Plain, i18n("Add Barcode_basic"),
- KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent,name)
+ KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent)
{
Q3VBoxLayout* layout = new Q3VBoxLayout( plainPage(), 6, 6 );
@@ -62,16 +62,16 @@
return number->value();
}
-AddItemsDialog::AddItemsDialog(QWidget *parent, const char *name )
+AddItemsDialog::AddItemsDialog(QWidget *parent)
: KDialogBase( KDialogBase::Plain, i18n("Add Items"),
- KDialogBase::User1 | KDialogBase::Close, KDialogBase::User1, parent,name)
+ KDialogBase::User1 | KDialogBase::Close, KDialogBase::User1, parent)
{
init();
}
-AddItemsDialog::AddItemsDialog( const QString & a, const QString & g, int c, QWidget* parent, const char* name )
+AddItemsDialog::AddItemsDialog( const QString & a, const QString & g, int c, QWidget* parent)
: KDialogBase( KDialogBase::Plain, i18n("Edit Item"),
- KDialogBase::Ok| KDialogBase::Close, KDialogBase::Ok, parent,name)
+ KDialogBase::Ok| KDialogBase::Close, KDialogBase::Ok, parent)
{
init();
article->setText( a );
Modified: trunk/src/smalldialogs.h
===================================================================
--- trunk/src/smalldialogs.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/smalldialogs.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -30,7 +30,7 @@
class AddAllDialog : public KDialogBase {
Q_OBJECT
public:
- AddAllDialog(QWidget *parent=0, const char *name=0);
+ AddAllDialog(QWidget *parent=0);
QString groupName() const;
int numberLabels() const;
@@ -43,8 +43,8 @@
class AddItemsDialog : public KDialogBase {
Q_OBJECT
public:
- AddItemsDialog( QWidget* parent = 0, const char* name = 0 );
- AddItemsDialog( const QString & a, const QString & g, int c, QWidget* parent = 0, const char* name = 0 );
+ AddItemsDialog( QWidget* parent = 0 );
+ AddItemsDialog( const QString & a, const QString & g, int c, QWidget* parent = 0 );
void setGroupCompletion( KCompletion* c );
Modified: trunk/src/textlineedit.cpp
===================================================================
--- trunk/src/textlineedit.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/textlineedit.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -36,8 +36,8 @@
#include <qlabel.h>
#include <qlayout.h>
-TextLineEditor::TextLineEditor( TokenProvider* token, QWidget *parent, const char *name )
- : QWidget( parent, name ), m_token( token )
+TextLineEditor::TextLineEditor( TokenProvider* token, QWidget *parent )
+ : QWidget( parent ), m_token( token )
{
Q3VBoxLayout* layout = new Q3VBoxLayout( this, 6, 6 );
Modified: trunk/src/textlineedit.h
===================================================================
--- trunk/src/textlineedit.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/textlineedit.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -35,7 +35,7 @@
class TextLineEditor : public QWidget {
Q_OBJECT
public:
- TextLineEditor( TokenProvider* token, QWidget *parent=0, const char *name=0);
+ TextLineEditor( TokenProvider* token, QWidget *parent=0);
~TextLineEditor();
QString text();
KIntNumInput* mag_vert;
Modified: trunk/src/tokendialog.cpp
===================================================================
--- trunk/src/tokendialog.cpp 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/tokendialog.cpp 2008-02-27 20:44:24 UTC (rev 20)
@@ -41,8 +41,8 @@
#include <q3textbrowser.h>
#include <kpushbutton.h>
-TokenDialog::TokenDialog(TokenProvider* token ,QWidget *parent, const char *name)
- : QWizard( parent, name ), m_token( token )
+TokenDialog::TokenDialog(TokenProvider* token ,QWidget *parent)
+ : QWizard( parent ), m_token( token )
{
m_custom_tokens = m_token->listUserVars();
Modified: trunk/src/tokendialog.h
===================================================================
--- trunk/src/tokendialog.h 2008-02-27 20:15:27 UTC (rev 19)
+++ trunk/src/tokendialog.h 2008-02-27 20:44:24 UTC (rev 20)
@@ -44,7 +44,7 @@
Q_OBJECT
public:
- TokenDialog( TokenProvider* token, QWidget *parent = 0, const char *name = 0 );
+ TokenDialog( TokenProvider* token, QWidget *parent = 0 );
inline const QString & token() const { return m_result; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vz...@us...> - 2008-02-27 20:15:30
|
Revision: 19
http://kbarcode.svn.sourceforge.net/kbarcode/?rev=19&view=rev
Author: vzsolt
Date: 2008-02-27 12:15:27 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
Removed the header includes for DCOP.
Modified Paths:
--------------
trunk/src/batchwizard.h
trunk/src/kbarcode.h
trunk/src/labeleditor.h
trunk/src/tec.h
Modified: trunk/src/batchwizard.h
===================================================================
--- trunk/src/batchwizard.h 2008-02-27 19:31:52 UTC (rev 18)
+++ trunk/src/batchwizard.h 2008-02-27 20:15:27 UTC (rev 19)
@@ -19,8 +19,6 @@
#define BATCHWIZARD_H
#include <kwizard.h>
-#include "batchiface.h"
-//Added by qt3to4:
#include <QLabel>
class BatchPrinter;
Modified: trunk/src/kbarcode.h
===================================================================
--- trunk/src/kbarcode.h 2008-02-27 19:31:52 UTC (rev 18)
+++ trunk/src/kbarcode.h 2008-02-27 20:15:27 UTC (rev 19)
@@ -33,7 +33,6 @@
};
#include "mainwindow.h"
-#include "kbarcodeiface.h"
class KAction;
class KPushButton;
Modified: trunk/src/labeleditor.h
===================================================================
--- trunk/src/labeleditor.h 2008-02-27 19:31:52 UTC (rev 18)
+++ trunk/src/labeleditor.h 2008-02-27 20:15:27 UTC (rev 19)
@@ -27,7 +27,6 @@
#include "definition.h"
#include "mainwindow.h"
#include "xmlutils.h"
-#include "editoriface.h"
#include <kdialogbase.h>
#include <qdialog.h>
Modified: trunk/src/tec.h
===================================================================
--- trunk/src/tec.h 2008-02-27 19:31:52 UTC (rev 18)
+++ trunk/src/tec.h 2008-02-27 20:15:27 UTC (rev 19)
@@ -15,7 +15,6 @@
#include "labelutils.h"
#include "xmlutils.h"
#include "definition.h"
-#include "batchiface.h"
// Other includes
#include <stdlib.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vz...@us...> - 2008-02-27 19:31:48
|
Revision: 18
http://kbarcode.svn.sourceforge.net/kbarcode/?rev=18&view=rev
Author: vzsolt
Date: 2008-02-27 11:31:52 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
Removed the I18N_NOOP macros, updated the KCmdLineArgs and KAboutData stuff to the KDE4 way.
Modified Paths:
--------------
trunk/src/main.cpp
Modified: trunk/src/main.cpp
===================================================================
--- trunk/src/main.cpp 2008-02-27 17:44:12 UTC (rev 17)
+++ trunk/src/main.cpp 2008-02-27 19:31:52 UTC (rev 18)
@@ -30,26 +30,6 @@
#define VERSION "Unknown Version"
#endif
-static KCmdLineOptions options[] =
-{
- { "+[file]", I18N_NOOP("Load the file in KBarcode (if --batch is specified, the file will be used in batchprinting mode)"), 0},
- { "print", I18N_NOOP("Print any loaded files immediately on the default printer "
- "or on the printer specified by the --printer commandline option and exit afterwards"), 0 },
- { "printer <printer>", I18N_NOOP("Printer/destination to print on"), 0},
- { ":", I18N_NOOP("KBarcode Modes:"), 0 },
- { "barcode", I18N_NOOP("Start KBarcode as xbarcode replacement"), 0 },
- { "label", I18N_NOOP("Open the label editor"), 0 },
- { "batch", I18N_NOOP("Start directly in batchprinting mode"), 0 },
- { ":", I18N_NOOP("Additional options for batchprinting (--batch):"), 0 },
- { "output <mode>", I18N_NOOP("Output format where mode is one of POSTSCRIPT|IMAGE|BARCODE"), "POSTSCRIPT" },
- { "serialnumber <value>", I18N_NOOP("Set the serial number to be used"), 0 },
- { "serialinc <value>", I18N_NOOP("Increase a previously specified serial number using this value for each printed label"), 0 },
- { "numlabels <value>", I18N_NOOP("Print <value> labels without any data"), 0 },
- { "importsql <query>", I18N_NOOP("Import variable data from a specified sql query"), 0 },
- { "importcsv <csvfile>", I18N_NOOP("Import variable data from a specified csv file"), 0 },
- KCmdLineLastOption
-};
-
void setupDirs()
{
if( locate("data", "kbarcode/logo.png").isEmpty() ) {
@@ -72,37 +52,57 @@
int main(int argc, char *argv[])
{
- KAboutData aboutData( "kbarcode", I18N_NOOP("KBarcode"), VERSION, I18N_NOOP(
- "KBarcode is a barcode and label printing application for KDE 3."
- ), KAboutData::License_GPL, "KBarcode Build:\n" __DATE__ " " __TIME__
- , "(c) 2001-2006, Dominik Seichter\n\n",
+ KAboutData aboutData( "kbarcode", "kbarcode", ki18n("KBarcode"), VERSION,
+ ki18n("KBarcode4 is a barcode and label printing application for KDE 4."),
+ KAboutData::License_GPL, ki18n("(c) 2001-2008, Dominik Seichter"), KLocalizedString()
"http://www.kbarcode.net", "kba...@li..." );
- aboutData.addAuthor("Dominik Seichter", I18N_NOOP("Programmer"), "dom...@we...");
- aboutData.addAuthor("Stefan \"Stonki\" Onken",
- I18N_NOOP("Project Manager"),
+ aboutData.addAuthor(ki18n("Dominik Seichter"), ki18n("Programmer"), "dom...@we...");
+ aboutData.addAuthor(ki18n("Stefan \"Stonki\" Onken"),
+ ki18n("Project Manager"),
"su...@st...", "http://www.stonki.de" );
+ aboutData.addAuthor(ki18n("Váradi Zsolt Gyula"), ki18n("KBarcode4 Developer"), "vz...@us...");
- aboutData.addCredit("Alessandro Rubini", I18N_NOOP("Wrote GNU Barcode on which kbarcode is based."),
+ aboutData.addCredit(ki18n("Alessandro Rubini"), ki18n("Wrote GNU Barcode on which kbarcode is based."),
"ru...@pr...", "http://arcana.linux.it/" );
- aboutData.addCredit("Terry Burton", I18N_NOOP("Author of Barcode Writer in Pure Postscript"),
+ aboutData.addCredit(ki18n("Terry Burton"), ki18n("Author of Barcode Writer in Pure Postscript"),
"te...@te...", "http://www.terryburton.co.uk/" );
- aboutData.addCredit("Daniele Medri", I18N_NOOP("Italian translation"), "ma...@li..." );
- aboutData.addCredit("Anton Vaaranmaa",
- I18N_NOOP("Finnish and Swedish translation, created the KBarcode icon"), "an...@po..." );
- aboutData.addCredit("Miguel Revilla Rodr�uez", I18N_NOOP("Spanish translation"), "yo...@mi..." );
- aboutData.addCredit("Sandor Jager", I18N_NOOP("Hungarian translation"), "ja...@pu..." );
- aboutData.addCredit("Daniel Etzold",
- I18N_NOOP("Tab icon code stolen from his excellent app qtella."), "de...@qt..." );
- aboutData.addCredit("Richard J. Moore", I18N_NOOP("Wrote the RichText KPart"), "ri...@kd...", "http://xmelegance.org/" );
- aboutData.addCredit("Yann Bouan", I18N_NOOP("French Translation"), "ya...@bo..." );
- aboutData.addCredit("Erich Kitzmüller", I18N_NOOP("Help with ZPL and IPL code"), "kit...@me..." );
- aboutData.addCredit("Dag Nygren", I18N_NOOP("Wrote many patches to improve KBarcode"), "da...@ne..." );
- aboutData.addCredit("Frank Schoolmeesters", I18N_NOOP("Made the Netherlands translation"), "fra...@fa..." );
- aboutData.addCredit("John Volpe", I18N_NOOP("Added lot's of useful data fields to kbarcode"), "jt...@ca..." );
- aboutData.addCredit("Nyssa s.r.l.", I18N_NOOP("Added TEC barcode printer support"), "imo...@ny...", "http://www.nyssa.com.ar" );
- aboutData.addCredit("Brian Glass", I18N_NOOP("Added EPCL barcode printer support"), "br...@gl...", "http://www.glassbrian.com" );
+ aboutData.addCredit(ki18n("Daniele Medri"), ki18n("Italian translation"), "ma...@li..." );
+ aboutData.addCredit(ki18n("Anton Vaaranmaa"),
+ ki18n("Finnish and Swedish translation, created the KBarcode icon"), "an...@po..." );
+ aboutData.addCredit(ki18n("Miguel Revilla Rodr�uez"), ki18n("Spanish translation"), "yo...@mi..." );
+ aboutData.addCredit(ki18n("Sandor Jager"), ki18n("Hungarian translation"), "ja...@pu..." );
+ aboutData.addCredit(ki18n("Daniel Etzold"),
+ ki18n("Tab icon code stolen from his excellent app qtella."), "de...@qt..." );
+ aboutData.addCredit(ki18n("Richard J. Moore"), ki18n("Wrote the RichText KPart"), "ri...@kd...", "http://xmelegance.org/" );
+ aboutData.addCredit(ki18n("Yann Bouan"), ki18n("French Translation"), "ya...@bo..." );
+ aboutData.addCredit(ki18n("Erich Kitzmüller"), ki18n("Help with ZPL and IPL code"), "kit...@me..." );
+ aboutData.addCredit(ki18n("Dag Nygren"), ki18n("Wrote many patches to improve KBarcode"), "da...@ne..." );
+ aboutData.addCredit(ki18n("Frank Schoolmeesters"), ki18n("Made the Netherlands translation"), "fra...@fa..." );
+ aboutData.addCredit(ki18n("John Volpe"), ki18n("Added lot's of useful data fields to kbarcode"), "jt...@ca..." );
+ aboutData.addCredit(ki18n("Nyssa s.r.l."), ki18n("Added TEC barcode printer support"), "imo...@ny...", "http://www.nyssa.com.ar" );
+ aboutData.addCredit(ki18n("Brian Glass"), ki18n("Added EPCL barcode printer support"), "br...@gl...", "http://www.glassbrian.com" );
+
KCmdLineArgs::init( argc, argv, &aboutData );
+
+ KCmdLineOptions options;
+
+ options.add( "+[file]", ki18n("Load the file in KBarcode (if --batch is specified, the file will be used in batchprinting mode)"), 0);
+ options.add( "print", ki18n("Print any loaded files immediately on the default printer "
+ "or on the printer specified by the --printer commandline option and exit afterwards"), 0 );
+ options.add( "printer <printer>", ki18n("Printer/destination to print on"), 0);
+ options.add( ":", ki18n("KBarcode Modes:"), 0 );
+ options.add( "barcode", ki18n("Start KBarcode as xbarcode replacement"), 0 );
+ options.add( "label", ki18n("Open the label editor"), 0 );
+ options.add( "batch", ki18n("Start directly in batchprinting mode"), 0 );
+ options.add( ":", ki18n("Additional options for batchprinting (--batch):"), 0 );
+ options.add( "output <mode>", ki18n("Output format where mode is one of POSTSCRIPT|IMAGE|BARCODE"), "POSTSCRIPT" );
+ options.add( "serialnumber <value>", ki18n("Set the serial number to be used"), 0 );
+ options.add( "serialinc <value>", ki18n("Increase a previously specified serial number using this value for each printed label"), 0 );
+ options.add( "numlabels <value>", ki18n("Print <value> labels without any data"), 0 );
+ options.add( "importsql <query>", ki18n("Import variable data from a specified sql query"), 0 );
+ options.add( "importcsv <csvfile>", ki18n("Import variable data from a specified csv file"), 0 );
+
KCmdLineArgs::addCmdLineOptions( options );
KApplication a;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vz...@us...> - 2008-02-27 17:44:07
|
Revision: 17
http://kbarcode.svn.sourceforge.net/kbarcode/?rev=17&view=rev
Author: vzsolt
Date: 2008-02-27 09:44:12 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
This one shouldn't be here.
Removed Paths:
-------------
trunk/src/encodingcombo.moc.cpp
Deleted: trunk/src/encodingcombo.moc.cpp
===================================================================
--- trunk/src/encodingcombo.moc.cpp 2008-02-27 17:39:01 UTC (rev 16)
+++ trunk/src/encodingcombo.moc.cpp 2008-02-27 17:44:12 UTC (rev 17)
@@ -1,92 +0,0 @@
-/****************************************************************************
-** EncodingCombo meta object code from reading C++ file 'encodingcombo.h'
-**
-** Created: Sat Sep 29 10:38:06 2007
-** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.7 edited Oct 19 16:22 $)
-**
-** WARNING! All changes made in this file will be lost!
-*****************************************************************************/
-
-#undef QT_NO_COMPAT
-#include "encodingcombo.h"
-#include <qmetaobject.h>
-#include <qapplication.h>
-
-#include <private/qucomextra_p.h>
-#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
-#error "This file was generated using the moc from 3.3.7. It"
-#error "cannot be used with the include files from this version of Qt."
-#error "(The moc has changed too much.)"
-#endif
-
-const char *EncodingCombo::className() const
-{
- return "EncodingCombo";
-}
-
-QMetaObject *EncodingCombo::metaObj = 0;
-static QMetaObjectCleanUp cleanUp_EncodingCombo( "EncodingCombo", &EncodingCombo::staticMetaObject );
-
-#ifndef QT_NO_TRANSLATION
-QString EncodingCombo::tr( const char *s, const char *c )
-{
- if ( qApp )
- return qApp->translate( "EncodingCombo", s, c, QApplication::DefaultCodec );
- else
- return QString::fromLatin1( s );
-}
-#ifndef QT_NO_TRANSLATION_UTF8
-QString EncodingCombo::trUtf8( const char *s, const char *c )
-{
- if ( qApp )
- return qApp->translate( "EncodingCombo", s, c, QApplication::UnicodeUTF8 );
- else
- return QString::fromUtf8( s );
-}
-#endif // QT_NO_TRANSLATION_UTF8
-
-#endif // QT_NO_TRANSLATION
-
-QMetaObject* EncodingCombo::staticMetaObject()
-{
- if ( metaObj )
- return metaObj;
- QMetaObject* parentObject = KComboBox::staticMetaObject();
- metaObj = QMetaObject::new_metaobject(
- "EncodingCombo", parentObject,
- 0, 0,
- 0, 0,
-#ifndef QT_NO_PROPERTIES
- 0, 0,
- 0, 0,
-#endif // QT_NO_PROPERTIES
- 0, 0 );
- cleanUp_EncodingCombo.setMetaObject( metaObj );
- return metaObj;
-}
-
-void* EncodingCombo::qt_cast( const char* clname )
-{
- if ( !qstrcmp( clname, "EncodingCombo" ) )
- return this;
- return KComboBox::qt_cast( clname );
-}
-
-bool EncodingCombo::qt_invoke( int _id, QUObject* _o )
-{
- return KComboBox::qt_invoke(_id,_o);
-}
-
-bool EncodingCombo::qt_emit( int _id, QUObject* _o )
-{
- return KComboBox::qt_emit(_id,_o);
-}
-#ifndef QT_NO_PROPERTIES
-
-bool EncodingCombo::qt_property( int id, int f, QVariant* v)
-{
- return KComboBox::qt_property( id, f, v);
-}
-
-bool EncodingCombo::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
-#endif // QT_NO_PROPERTIES
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vz...@us...> - 2008-02-27 17:39:02
|
Revision: 16
http://kbarcode.svn.sourceforge.net/kbarcode/?rev=16&view=rev
Author: vzsolt
Date: 2008-02-27 09:39:01 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
One more DCOP interface axed.
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Removed Paths:
-------------
trunk/src/editoriface.h
trunk/src/editoriface_skel.cpp
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2008-02-27 17:30:57 UTC (rev 15)
+++ trunk/src/CMakeLists.txt 2008-02-27 17:39:01 UTC (rev 16)
@@ -30,9 +30,7 @@
documentitemdlg.cpp
dsrichtext.cpp
dstextedit.cpp
- editoriface_skel.cpp
encodingcombo.cpp
- encodingcombo.moc.cpp
gnubarcode.cpp
gnubarkodeengine.cpp
imageitem.cpp
Deleted: trunk/src/editoriface.h
===================================================================
--- trunk/src/editoriface.h 2008-02-27 17:30:57 UTC (rev 15)
+++ trunk/src/editoriface.h 2008-02-27 17:39:01 UTC (rev 16)
@@ -1,55 +0,0 @@
-/***************************************************************************
- editoriface.h - description
- -------------------
- begin : Sat Dec 27 09:53:28 CET 2003
- copyright : (C) 2003 by Dominik Seichter
- email : dom...@we...
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-
-#ifndef EDITORIFACE_H
-#define EDITORIFACE_H
-
-#include <dcopobject.h>
-
-class EditorIface : virtual public DCOPObject
-{
- K_DCOP
-
- public:
- k_dcop:
-
- virtual const QString fileName() const = 0;
- virtual bool isChanged() = 0;
- virtual void print() = 0;
- virtual bool newLabel() = 0;
-
- virtual void insertBarcode() = 0;
- virtual void insertPicture() = 0;
- virtual void insertText() = 0;
- virtual void insertRect() = 0;
- virtual void insertCircle() = 0;
- virtual void insertLine() = 0;
-
- virtual void changeDes() = 0;
- virtual void changeSize() = 0;
-
- virtual void preview() = 0;
- virtual void toggleGrid() = 0;
-
- virtual void closeLabel() = 0;
-
- virtual bool openUrl( const QString & url ) = 0;
- virtual bool save( QString url ) = 0;
-
-};
-
-#endif /* EDITORIFACE_H */
Deleted: trunk/src/editoriface_skel.cpp
===================================================================
--- trunk/src/editoriface_skel.cpp 2008-02-27 17:30:57 UTC (rev 15)
+++ trunk/src/editoriface_skel.cpp 2008-02-27 17:39:01 UTC (rev 16)
@@ -1,176 +0,0 @@
-/****************************************************************************
-**
-** DCOP Skeleton generated by dcopidl2cpp from editoriface.kidl
-**
-** WARNING! All changes made in this file will be lost!
-**
-*****************************************************************************/
-
-#include "/home/dominik/Desktop/Programming/kbarcode/kbarcode/editoriface.h"
-
-#include <kdatastream.h>
-#include <q3asciidict.h>
-//Added by qt3to4:
-#include <Q3CString>
-
-
-static const int EditorIface_fhash = 19;
-static const char* const EditorIface_ftable[18][3] = {
- { "QString", "fileName()", "fileName()" },
- { "bool", "isChanged()", "isChanged()" },
- { "void", "print()", "print()" },
- { "bool", "newLabel()", "newLabel()" },
- { "void", "insertBarcode()", "insertBarcode()" },
- { "void", "insertPicture()", "insertPicture()" },
- { "void", "insertText()", "insertText()" },
- { "void", "insertRect()", "insertRect()" },
- { "void", "insertCircle()", "insertCircle()" },
- { "void", "insertLine()", "insertLine()" },
- { "void", "changeDes()", "changeDes()" },
- { "void", "changeSize()", "changeSize()" },
- { "void", "preview()", "preview()" },
- { "void", "toggleGrid()", "toggleGrid()" },
- { "void", "closeLabel()", "closeLabel()" },
- { "bool", "openUrl(QString)", "openUrl(QString url)" },
- { "bool", "save(QString)", "save(QString url)" },
- { 0, 0, 0 }
-};
-static const int EditorIface_ftable_hiddens[17] = {
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
-};
-
-bool EditorIface::process(const Q3CString &fun, const QByteArray &data, Q3CString& replyType, QByteArray &replyData)
-{
- static Q3AsciiDict<int>* fdict = 0;
- if ( !fdict ) {
- fdict = new Q3AsciiDict<int>( EditorIface_fhash, true, false );
- for ( int i = 0; EditorIface_ftable[i][1]; i++ )
- fdict->insert( EditorIface_ftable[i][1], new int( i ) );
- }
- int* fp = fdict->find( fun );
- switch ( fp?*fp:-1) {
- case 0: { // QString fileName()
- replyType = EditorIface_ftable[0][0];
- QDataStream _replyStream( replyData, QIODevice::WriteOnly );
- _replyStream << fileName( );
- } break;
- case 1: { // bool isChanged()
- replyType = EditorIface_ftable[1][0];
- QDataStream _replyStream( replyData, QIODevice::WriteOnly );
- _replyStream << isChanged( );
- } break;
- case 2: { // void print()
- replyType = EditorIface_ftable[2][0];
- print( );
- } break;
- case 3: { // bool newLabel()
- replyType = EditorIface_ftable[3][0];
- QDataStream _replyStream( replyData, QIODevice::WriteOnly );
- _replyStream << newLabel( );
- } break;
- case 4: { // void insertBarcode()
- replyType = EditorIface_ftable[4][0];
- insertBarcode( );
- } break;
- case 5: { // void insertPicture()
- replyType = EditorIface_ftable[5][0];
- insertPicture( );
- } break;
- case 6: { // void insertText()
- replyType = EditorIface_ftable[6][0];
- insertText( );
- } break;
- case 7: { // void insertRect()
- replyType = EditorIface_ftable[7][0];
- insertRect( );
- } break;
- case 8: { // void insertCircle()
- replyType = EditorIface_ftable[8][0];
- insertCircle( );
- } break;
- case 9: { // void insertLine()
- replyType = EditorIface_ftable[9][0];
- insertLine( );
- } break;
- case 10: { // void changeDes()
- replyType = EditorIface_ftable[10][0];
- changeDes( );
- } break;
- case 11: { // void changeSize()
- replyType = EditorIface_ftable[11][0];
- changeSize( );
- } break;
- case 12: { // void preview()
- replyType = EditorIface_ftable[12][0];
- preview( );
- } break;
- case 13: { // void toggleGrid()
- replyType = EditorIface_ftable[13][0];
- toggleGrid( );
- } break;
- case 14: { // void closeLabel()
- replyType = EditorIface_ftable[14][0];
- closeLabel( );
- } break;
- case 15: { // bool openUrl(QString)
- QString arg0;
- QDataStream arg( data, QIODevice::ReadOnly );
- if (arg.atEnd()) return false;
- arg >> arg0;
- replyType = EditorIface_ftable[15][0];
- QDataStream _replyStream( replyData, QIODevice::WriteOnly );
- _replyStream << openUrl(arg0 );
- } break;
- case 16: { // bool save(QString)
- QString arg0;
- QDataStream arg( data, QIODevice::ReadOnly );
- if (arg.atEnd()) return false;
- arg >> arg0;
- replyType = EditorIface_ftable[16][0];
- QDataStream _replyStream( replyData, QIODevice::WriteOnly );
- _replyStream << save(arg0 );
- } break;
- default:
- return DCOPObject::process( fun, data, replyType, replyData );
- }
- return true;
-}
-
-QCStringList EditorIface::interfaces()
-{
- QCStringList ifaces = DCOPObject::interfaces();
- ifaces += "EditorIface";
- return ifaces;
-}
-
-QCStringList EditorIface::functions()
-{
- QCStringList funcs = DCOPObject::functions();
- for ( int i = 0; EditorIface_ftable[i][2]; i++ ) {
- if (EditorIface_ftable_hiddens[i])
- continue;
- Q3CString func = EditorIface_ftable[i][0];
- func += ' ';
- func += EditorIface_ftable[i][2];
- funcs << func;
- }
- return funcs;
-}
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vz...@us...> - 2008-02-27 17:30:51
|
Revision: 15
http://kbarcode.svn.sourceforge.net/kbarcode/?rev=15&view=rev
Author: vzsolt
Date: 2008-02-27 09:30:57 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
DCOP is dead. Removed the interface files from the source.
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Removed Paths:
-------------
trunk/src/batchiface.h
trunk/src/batchiface_skel.cpp
trunk/src/kbarcodeiface.h
trunk/src/kbarcodeiface_skel.cpp
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2008-02-27 17:18:28 UTC (rev 14)
+++ trunk/src/CMakeLists.txt 2008-02-27 17:30:57 UTC (rev 15)
@@ -16,7 +16,6 @@
barcodeprinterdlg.cpp
barkode.cpp
barkodeengine.cpp
- batchiface_skel.cpp
batchprinter.cpp
batchwizard.cpp
commands.cpp
@@ -39,7 +38,6 @@
imageitem.cpp
kactionmap.cpp
kbarcode.cpp
- kbarcodeiface_skel.cpp
kbarcodesettings.cpp
label.cpp
labeleditor.cpp
Deleted: trunk/src/batchiface.h
===================================================================
--- trunk/src/batchiface.h 2008-02-27 17:18:28 UTC (rev 14)
+++ trunk/src/batchiface.h 2008-02-27 17:30:57 UTC (rev 15)
@@ -1,46 +0,0 @@
-/***************************************************************************
- batchiface.h - description
- -------------------
- begin : Sat Dec 27 23:54:28 CET 2003
- copyright : (C) 2003 by Dominik Seichter
- email : dom...@we...
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-
-#ifndef BATCHIFACE_H
-#define BATCHIFACE_H
-
-#include <dcopobject.h>
-#include <qstringlist.h>
-#include "batchprinter.h"
-
-class BatchIface : virtual public DCOPObject
-{
- K_DCOP
-
- public:
- k_dcop:
- virtual void setFilename( const QString & url ) = 0;
- virtual void setImportCsvFile( const QString & filename ) = 0;
- virtual void setImportSqlQuery( const QString & query ) = 0;
- virtual void setNumLabels( const int n ) = 0;
- virtual void setOutputFormat( const int e ) = 0;
- virtual void setSerialNumber( const QString & val, int inc ) = 0;
-
- virtual bool addItem( const QString & article, const QString & group, int count = 1, bool msg = true ) = 0;
- virtual bool existsArticle( const QString & article ) = 0;
- virtual void loadFromFile( const QString & url ) = 0;
- virtual void loadFromClipboard() = 0;
- virtual void printNow( const QString & printer, bool bUserInteraction = true ) = 0;
-};
-
-#endif /* BATCHIFACE_H */
-
Deleted: trunk/src/batchiface_skel.cpp
===================================================================
--- trunk/src/batchiface_skel.cpp 2008-02-27 17:18:28 UTC (rev 14)
+++ trunk/src/batchiface_skel.cpp 2008-02-27 17:30:57 UTC (rev 15)
@@ -1,184 +0,0 @@
-/****************************************************************************
-**
-** DCOP Skeleton generated by dcopidl2cpp from batchiface.kidl
-**
-** WARNING! All changes made in this file will be lost!
-**
-*****************************************************************************/
-
-#include "/home/dominik/Desktop/Programming/kbarcode/kbarcode/batchiface.h"
-
-#include <kdatastream.h>
-#include <q3asciidict.h>
-//Added by qt3to4:
-#include <Q3CString>
-
-
-static const int BatchIface_fhash = 13;
-static const char* const BatchIface_ftable[12][3] = {
- { "void", "setFilename(QString)", "setFilename(QString url)" },
- { "void", "setImportCsvFile(QString)", "setImportCsvFile(QString filename)" },
- { "void", "setImportSqlQuery(QString)", "setImportSqlQuery(QString query)" },
- { "void", "setNumLabels(int)", "setNumLabels(int n)" },
- { "void", "setOutputFormat(int)", "setOutputFormat(int e)" },
- { "void", "setSerialNumber(QString,int)", "setSerialNumber(QString val,int inc)" },
- { "bool", "addItem(QString,QString,int,bool)", "addItem(QString article,QString group,int count,bool msg)" },
- { "bool", "existsArticle(QString)", "existsArticle(QString article)" },
- { "void", "loadFromFile(QString)", "loadFromFile(QString url)" },
- { "void", "loadFromClipboard()", "loadFromClipboard()" },
- { "void", "printNow(QString,bool)", "printNow(QString printer,bool bUserInteraction)" },
- { 0, 0, 0 }
-};
-static const int BatchIface_ftable_hiddens[11] = {
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
-};
-
-bool BatchIface::process(const Q3CString &fun, const QByteArray &data, Q3CString& replyType, QByteArray &replyData)
-{
- static Q3AsciiDict<int>* fdict = 0;
- if ( !fdict ) {
- fdict = new Q3AsciiDict<int>( BatchIface_fhash, true, false );
- for ( int i = 0; BatchIface_ftable[i][1]; i++ )
- fdict->insert( BatchIface_ftable[i][1], new int( i ) );
- }
- int* fp = fdict->find( fun );
- switch ( fp?*fp:-1) {
- case 0: { // void setFilename(QString)
- QString arg0;
- QDataStream arg( data, QIODevice::ReadOnly );
- if (arg.atEnd()) return false;
- arg >> arg0;
- replyType = BatchIface_ftable[0][0];
- setFilename(arg0 );
- } break;
- case 1: { // void setImportCsvFile(QString)
- QString arg0;
- QDataStream arg( data, QIODevice::ReadOnly );
- if (arg.atEnd()) return false;
- arg >> arg0;
- replyType = BatchIface_ftable[1][0];
- setImportCsvFile(arg0 );
- } break;
- case 2: { // void setImportSqlQuery(QString)
- QString arg0;
- QDataStream arg( data, QIODevice::ReadOnly );
- if (arg.atEnd()) return false;
- arg >> arg0;
- replyType = BatchIface_ftable[2][0];
- setImportSqlQuery(arg0 );
- } break;
- case 3: { // void setNumLabels(int)
- int arg0;
- QDataStream arg( data, QIODevice::ReadOnly );
- if (arg.atEnd()) return false;
- arg >> arg0;
- replyType = BatchIface_ftable[3][0];
- setNumLabels(arg0 );
- } break;
- case 4: { // void setOutputFormat(int)
- int arg0;
- QDataStream arg( data, QIODevice::ReadOnly );
- if (arg.atEnd()) return false;
- arg >> arg0;
- replyType = BatchIface_ftable[4][0];
- setOutputFormat(arg0 );
- } break;
- case 5: { // void setSerialNumber(QString,int)
- QString arg0;
- int arg1;
- QDataStream arg( data, QIODevice::ReadOnly );
- if (arg.atEnd()) return false;
- arg >> arg0;
- if (arg.atEnd()) return false;
- arg >> arg1;
- replyType = BatchIface_ftable[5][0];
- setSerialNumber(arg0, arg1 );
- } break;
- case 6: { // bool addItem(QString,QString,int,bool)
- QString arg0;
- QString arg1;
- int arg2;
- bool arg3;
- QDataStream arg( data, QIODevice::ReadOnly );
- if (arg.atEnd()) return false;
- arg >> arg0;
- if (arg.atEnd()) return false;
- arg >> arg1;
- if (arg.atEnd()) return false;
- arg >> arg2;
- if (arg.atEnd()) return false;
- arg >> arg3;
- replyType = BatchIface_ftable[6][0];
- QDataStream _replyStream( replyData, QIODevice::WriteOnly );
- _replyStream << addItem(arg0, arg1, arg2, arg3 );
- } break;
- case 7: { // bool existsArticle(QString)
- QString arg0;
- QDataStream arg( data, QIODevice::ReadOnly );
- if (arg.atEnd()) return false;
- arg >> arg0;
- replyType = BatchIface_ftable[7][0];
- QDataStream _replyStream( replyData, QIODevice::WriteOnly );
- _replyStream << existsArticle(arg0 );
- } break;
- case 8: { // void loadFromFile(QString)
- QString arg0;
- QDataStream arg( data, QIODevice::ReadOnly );
- if (arg.atEnd()) return false;
- arg >> arg0;
- replyType = BatchIface_ftable[8][0];
- loadFromFile(arg0 );
- } break;
- case 9: { // void loadFromClipboard()
- replyType = BatchIface_ftable[9][0];
- loadFromClipboard( );
- } break;
- case 10: { // void printNow(QString,bool)
- QString arg0;
- bool arg1;
- QDataStream arg( data, QIODevice::ReadOnly );
- if (arg.atEnd()) return false;
- arg >> arg0;
- if (arg.atEnd()) return false;
- arg >> arg1;
- replyType = BatchIface_ftable[10][0];
- printNow(arg0, arg1 );
- } break;
- default:
- return DCOPObject::process( fun, data, replyType, replyData );
- }
- return true;
-}
-
-QCStringList BatchIface::interfaces()
-{
- QCStringList ifaces = DCOPObject::interfaces();
- ifaces += "BatchIface";
- return ifaces;
-}
-
-QCStringList BatchIface::functions()
-{
- QCStringList funcs = DCOPObject::functions();
- for ( int i = 0; BatchIface_ftable[i][2]; i++ ) {
- if (BatchIface_ftable_hiddens[i])
- continue;
- Q3CString func = BatchIface_ftable[i][0];
- func += ' ';
- func += BatchIface_ftable[i][2];
- funcs << func;
- }
- return funcs;
-}
-
-
Deleted: trunk/src/kbarcodeiface.h
===================================================================
--- trunk/src/kbarcodeiface.h 2008-02-27 17:18:28 UTC (rev 14)
+++ trunk/src/kbarcodeiface.h 2008-02-27 17:30:57 UTC (rev 15)
@@ -1,46 +0,0 @@
-/***************************************************************************
- kbarcodeiface.h - description
- -------------------
- begin : Sat Dec 27 23:53:28 CET 2003
- copyright : (C) 2003 by Dominik Seichter
- email : dom...@we...
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-
-#ifndef KBARCODEIFACE_H
-#define KBARCODEIFACE_H
-
-#include <dcopobject.h>
-
-class KBarcodeIface : virtual public DCOPObject
-{
- K_DCOP
-
- public:
- k_dcop:
- virtual void startBarcode() = 0;
- virtual void startLabelEditor() = 0;
- virtual void startBatchPrint() = 0;
-
- virtual void editArticles() = 0;
- virtual void editCustomers() = 0;
- virtual void editCustomerText() = 0;
- virtual void editLabelDef() = 0;
-
- virtual void importCSV() = 0;
-
- virtual bool isSQLConnected() const = 0;
- virtual bool connectSQL() = 0;
- virtual void showWizard() = 0;
- virtual void showConfigure() = 0;
-};
-
-#endif /* KBARCODEIFACE_H */
Deleted: trunk/src/kbarcodeiface_skel.cpp
===================================================================
--- trunk/src/kbarcodeiface_skel.cpp 2008-02-27 17:18:28 UTC (rev 14)
+++ trunk/src/kbarcodeiface_skel.cpp 2008-02-27 17:30:57 UTC (rev 15)
@@ -1,135 +0,0 @@
-/****************************************************************************
-**
-** DCOP Skeleton generated by dcopidl2cpp from kbarcodeiface.kidl
-**
-** WARNING! All changes made in this file will be lost!
-**
-*****************************************************************************/
-
-#include "/home/dominik/Desktop/Programming/kbarcode/kbarcode/kbarcodeiface.h"
-
-#include <kdatastream.h>
-#include <q3asciidict.h>
-//Added by qt3to4:
-#include <Q3CString>
-
-
-static const int KBarcodeIface_fhash = 13;
-static const char* const KBarcodeIface_ftable[13][3] = {
- { "void", "startBarcode()", "startBarcode()" },
- { "void", "startLabelEditor()", "startLabelEditor()" },
- { "void", "startBatchPrint()", "startBatchPrint()" },
- { "void", "editArticles()", "editArticles()" },
- { "void", "editCustomers()", "editCustomers()" },
- { "void", "editCustomerText()", "editCustomerText()" },
- { "void", "editLabelDef()", "editLabelDef()" },
- { "void", "importCSV()", "importCSV()" },
- { "bool", "isSQLConnected()", "isSQLConnected()" },
- { "bool", "connectSQL()", "connectSQL()" },
- { "void", "showWizard()", "showWizard()" },
- { "void", "showConfigure()", "showConfigure()" },
- { 0, 0, 0 }
-};
-static const int KBarcodeIface_ftable_hiddens[12] = {
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
-};
-
-bool KBarcodeIface::process(const Q3CString &fun, const QByteArray &data, Q3CString& replyType, QByteArray &replyData)
-{
- static Q3AsciiDict<int>* fdict = 0;
- if ( !fdict ) {
- fdict = new Q3AsciiDict<int>( KBarcodeIface_fhash, true, false );
- for ( int i = 0; KBarcodeIface_ftable[i][1]; i++ )
- fdict->insert( KBarcodeIface_ftable[i][1], new int( i ) );
- }
- int* fp = fdict->find( fun );
- switch ( fp?*fp:-1) {
- case 0: { // void startBarcode()
- replyType = KBarcodeIface_ftable[0][0];
- startBarcode( );
- } break;
- case 1: { // void startLabelEditor()
- replyType = KBarcodeIface_ftable[1][0];
- startLabelEditor( );
- } break;
- case 2: { // void startBatchPrint()
- replyType = KBarcodeIface_ftable[2][0];
- startBatchPrint( );
- } break;
- case 3: { // void editArticles()
- replyType = KBarcodeIface_ftable[3][0];
- editArticles( );
- } break;
- case 4: { // void editCustomers()
- replyType = KBarcodeIface_ftable[4][0];
- editCustomers( );
- } break;
- case 5: { // void editCustomerText()
- replyType = KBarcodeIface_ftable[5][0];
- editCustomerText( );
- } break;
- case 6: { // void editLabelDef()
- replyType = KBarcodeIface_ftable[6][0];
- editLabelDef( );
- } break;
- case 7: { // void importCSV()
- replyType = KBarcodeIface_ftable[7][0];
- importCSV( );
- } break;
- case 8: { // bool isSQLConnected()
- replyType = KBarcodeIface_ftable[8][0];
- QDataStream _replyStream( replyData, QIODevice::WriteOnly );
- _replyStream << isSQLConnected( );
- } break;
- case 9: { // bool connectSQL()
- replyType = KBarcodeIface_ftable[9][0];
- QDataStream _replyStream( replyData, QIODevice::WriteOnly );
- _replyStream << connectSQL( );
- } break;
- case 10: { // void showWizard()
- replyType = KBarcodeIface_ftable[10][0];
- showWizard( );
- } break;
- case 11: { // void showConfigure()
- replyType = KBarcodeIface_ftable[11][0];
- showConfigure( );
- } break;
- default:
- return DCOPObject::process( fun, data, replyType, replyData );
- }
- return true;
-}
-
-QCStringList KBarcodeIface::interfaces()
-{
- QCStringList ifaces = DCOPObject::interfaces();
- ifaces += "KBarcodeIface";
- return ifaces;
-}
-
-QCStringList KBarcodeIface::functions()
-{
- QCStringList funcs = DCOPObject::functions();
- for ( int i = 0; KBarcodeIface_ftable[i][2]; i++ ) {
- if (KBarcodeIface_ftable_hiddens[i])
- continue;
- Q3CString func = KBarcodeIface_ftable[i][0];
- func += ' ';
- func += KBarcodeIface_ftable[i][2];
- funcs << func;
- }
- return funcs;
-}
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vz...@us...> - 2008-02-27 17:18:22
|
Revision: 14
http://kbarcode.svn.sourceforge.net/kbarcode/?rev=14&view=rev
Author: vzsolt
Date: 2008-02-27 09:18:28 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
Cleaned up the Qt::Align[something] constants and some related method names. They were borked by the scripts presumably.
Modified Paths:
--------------
trunk/src/barcodecombo.cpp
trunk/src/batchwizard.cpp
trunk/src/multilineeditdlg.cpp
trunk/src/multilineeditdlg.h
trunk/src/printlabeldlg.cpp
trunk/src/smalldialogs.cpp
Modified: trunk/src/barcodecombo.cpp
===================================================================
--- trunk/src/barcodecombo.cpp 2008-02-26 22:23:37 UTC (rev 13)
+++ trunk/src/barcodecombo.cpp 2008-02-27 17:18:28 UTC (rev 14)
@@ -172,28 +172,28 @@
grid->addWidget( buttonToken, 4, 3 );
spinMargin = new KIntNumInput( this, "spinMargin" );
- spinMargin->setLabel( i18n( "&Margin:" ), KNumInput::Qt::AlignLeft | KNumInput::Qt::AlignVCenter );
+ spinMargin->setLabel( i18n( "&Margin:" ), Qt::AlignLeft | Qt::AlignVCenter );
spinMargin->setRange( 0, 10000, 1, false );
spinMargin->setValue( 10 );
connect( spinMargin, SIGNAL( valueChanged(int) ), this, SLOT( changed() ) );
grid->addMultiCellWidget( spinMargin, 5, 5, 0, 1 );
spinRotation = new KIntNumInput( this );
- spinRotation->setLabel( i18n( "&Rotation:" ), KNumInput::Qt::AlignLeft | KNumInput::Qt::AlignVCenter );
+ spinRotation->setLabel( i18n( "&Rotation:" ), Qt::AlignLeft | Qt::AlignVCenter );
spinRotation->setRange( 0, 360, 90, false );
spinRotation->setValue( 0 );
connect( spinRotation, SIGNAL( valueChanged(int) ), this, SLOT( changed() ) );
grid->addMultiCellWidget( spinRotation, 5, 5, 2, 3 );
spinScale = new KIntNumInput( spinMargin, 1000, this );
- spinScale->setLabel( i18n("&Scale (in permille):"), KNumInput::Qt::AlignLeft | KNumInput::Qt::AlignVCenter );
+ spinScale->setLabel( i18n("&Scale (in permille):"), Qt::AlignLeft | Qt::AlignVCenter );
spinScale->setRange( 100, 10000, 100, false );
spinScale->setValue( 1000 );
connect( spinScale, SIGNAL( valueChanged(int) ), this, SLOT( changed() ) );
grid->addMultiCellWidget( spinScale, 6, 6, 0, 1 );
spinCut = new KIntNumInput( spinRotation, 100, this );
- spinCut->setLabel( i18n("&Crop:"), KNumInput::Qt::AlignLeft | KNumInput::Qt::AlignVCenter );
+ spinCut->setLabel( i18n("&Crop:"), Qt::AlignLeft | Qt::AlignVCenter );
spinCut->setRange( 1, 100, 1, false );
connect( spinCut, SIGNAL( valueChanged(int) ), this, SLOT( changed() ) );
grid->addMultiCellWidget( spinCut, 6, 6, 2, 3 );
Modified: trunk/src/batchwizard.cpp
===================================================================
--- trunk/src/batchwizard.cpp 2008-02-26 22:23:37 UTC (rev 13)
+++ trunk/src/batchwizard.cpp 2008-02-27 17:18:28 UTC (rev 14)
@@ -226,7 +226,7 @@
serialStart = new KLineEdit( serial.serial(), hbox );
serialInc = new KIntNumInput( 1, hbox );
- serialInc->setLabel( i18n( "Serial increment:" ), KNumInput::Qt::AlignLeft | KNumInput::Qt::AlignVCenter );
+ serialInc->setLabel( i18n( "Serial increment:" ), Qt::AlignLeft | Qt::AlignVCenter );
serialInc->setRange( 1, 10000, 1, false );
addPage( page5, i18n("Serial Number") );
Modified: trunk/src/multilineeditdlg.cpp
===================================================================
--- trunk/src/multilineeditdlg.cpp 2008-02-26 22:23:37 UTC (rev 13)
+++ trunk/src/multilineeditdlg.cpp 2008-02-27 17:18:28 UTC (rev 14)
@@ -119,13 +119,13 @@
// Alignment
//
action_align_left = new KToggleAction( i18n("Align &Left"), "text_left", 0, ac, "format_align_left" );
- connect( action_align_left, SIGNAL( toggled(bool) ), this, SLOT( setQt::AlignLeft(bool) ) );
+ connect( action_align_left, SIGNAL( toggled(bool) ), this, SLOT( setAlignLeft(bool) ) );
action_align_center = new KToggleAction( i18n("Align &Center"), "text_center", 0, ac, "format_align_center" );
- connect( action_align_center, SIGNAL( toggled(bool) ), this, SLOT( setQt::AlignCenter(bool) ) );
+ connect( action_align_center, SIGNAL( toggled(bool) ), this, SLOT( setAlignCenter(bool) ) );
action_align_right = new KToggleAction( i18n("Align &Right"), "text_right", 0, ac, "format_align_right" );
- connect( action_align_right, SIGNAL( toggled(bool) ), this, SLOT( setQt::AlignRight(bool) ) );
+ connect( action_align_right, SIGNAL( toggled(bool) ), this, SLOT( setAlignRight(bool) ) );
action_align_justify = new KToggleAction( i18n("&Justify"), "text_block", 0, ac, "format_align_justify" );
connect( action_align_justify, SIGNAL( toggled(bool) ), this, SLOT( setAlignJustify(bool) ) );
@@ -240,19 +240,19 @@
editor->setColor( col );
}
-void MultiLineEditor::setQt::AlignLeft( bool yes )
+void MultiLineEditor::setAlignLeft( bool yes )
{
if ( yes )
editor->setAlignment( Qt::AlignLeft );
}
-void MultiLineEditor::setQt::AlignRight( bool yes )
+void MultiLineEditor::setAlignRight( bool yes )
{
if ( yes )
editor->setAlignment( Qt::AlignRight );
}
-void MultiLineEditor::setQt::AlignCenter( bool yes )
+void MultiLineEditor::setAlignCenter( bool yes )
{
if ( yes )
editor->setAlignment( Qt::AlignCenter );
Modified: trunk/src/multilineeditdlg.h
===================================================================
--- trunk/src/multilineeditdlg.h 2008-02-26 22:23:37 UTC (rev 13)
+++ trunk/src/multilineeditdlg.h 2008-02-27 17:18:28 UTC (rev 14)
@@ -50,9 +50,9 @@
void updateAligment();
void formatColor();
void checkSpelling();
- void setQt::AlignLeft( bool yes );
- void setQt::AlignRight( bool yes );
- void setQt::AlignCenter( bool yes );
+ void setAlignLeft( bool yes );
+ void setAlignRight( bool yes );
+ void setAlignCenter( bool yes );
void setAlignJustify( bool yes );
void insertNewField();
Modified: trunk/src/printlabeldlg.cpp
===================================================================
--- trunk/src/printlabeldlg.cpp 2008-02-26 22:23:37 UTC (rev 13)
+++ trunk/src/printlabeldlg.cpp 2008-02-27 17:18:28 UTC (rev 14)
@@ -35,11 +35,11 @@
Q3VBoxLayout* box = new Q3VBoxLayout( plainPage() );
numLabels = new KIntNumInput( plainPage() );
- numLabels->setLabel( i18n("Number of labels:" ), KNumInput::Qt::AlignLeft | KNumInput::Qt::AlignVCenter );
+ numLabels->setLabel( i18n("Number of labels:" ), Qt::AlignLeft | Qt::AlignVCenter );
numLabels->setRange( 1, 100000, 1, false );
numPos = new KIntNumInput( numLabels, 1, plainPage() );
- numPos->setLabel( i18n("Start at label position:" ), KNumInput::Qt::AlignLeft | KNumInput::Qt::AlignVCenter );
+ numPos->setLabel( i18n("Start at label position:" ), Qt::AlignLeft | Qt::AlignVCenter );
numPos->setRange( 1, 100, 1, false );
checkBorder = new QCheckBox( i18n("&Print crop marks (borders)"), plainPage() );
Modified: trunk/src/smalldialogs.cpp
===================================================================
--- trunk/src/smalldialogs.cpp 2008-02-26 22:23:37 UTC (rev 13)
+++ trunk/src/smalldialogs.cpp 2008-02-27 17:18:28 UTC (rev 14)
@@ -90,7 +90,7 @@
article = new KLineEdit( plainPage() );
number = new KIntNumInput( plainPage() );
- number->setLabel( i18n( "Number of labels:" ), KNumInput::Qt::AlignLeft | KNumInput::Qt::AlignVCenter );
+ number->setLabel( i18n( "Number of labels:" ), Qt::AlignLeft | Qt::AlignVCenter );
number->setRange( 1, 10000, 1, false );
layout->addWidget( number );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Dominik S. <dom...@we...> - 2008-02-27 08:27:24
|
Great job! :-D Am Dienstag, 26. Februar 2008 schrieb vz...@us...: > Revision: 12 > http://kbarcode.svn.sourceforge.net/kbarcode/?rev=12&view=rev > Author: vzsolt > Date: 2008-02-26 13:46:07 -0800 (Tue, 26 Feb 2008) > > Log Message: > ----------- > As a first manual step, I've replaced KPrinter with QPrinter everywhere. > With this simple change, the number of build errors went down from 3400 to > 3000 :) > > Modified Paths: > -------------- > trunk/src/barcodedialog.cpp > trunk/src/barkode.cpp > trunk/src/batchprinter.cpp > trunk/src/batchprinter.h > trunk/src/batchwizard.cpp > trunk/src/label.cpp > trunk/src/label.h > trunk/src/labeleditor.cpp > trunk/src/labeleditor.h > trunk/src/labelutils.h > trunk/src/printersettings.cpp > trunk/src/printersettings.h > trunk/src/tec.cpp > trunk/src/tec.h > > Modified: trunk/src/barcodedialog.cpp > =================================================================== > --- trunk/src/barcodedialog.cpp 2008-02-09 13:35:39 UTC (rev 11) > +++ trunk/src/barcodedialog.cpp 2008-02-26 21:46:07 UTC (rev 12) > @@ -29,7 +29,7 @@ > #include <kimageio.h> > #include <klocale.h> > #include <kmessagebox.h> > -#include <kprinter.h> > +#include <qprinter.h> > #include <kpushbutton.h> > > // Qt includes > @@ -168,7 +168,7 @@ > if( d.isValid() ) > return; > > - KPrinter* printer = PrinterSettings::getInstance()->setupPrinter( > "kbarcode", this ); + QPrinter* printer = > PrinterSettings::getInstance()->setupPrinter( "kbarcode", this ); if( > !printer ) > return; > > > Modified: trunk/src/barkode.cpp > =================================================================== > --- trunk/src/barkode.cpp 2008-02-09 13:35:39 UTC (rev 11) > +++ trunk/src/barkode.cpp 2008-02-26 21:46:07 UTC (rev 12) > @@ -693,6 +693,7 @@ > s_havePurePostscript = !KStandardDirs::findExe( "gs" ).isNull() > && > PurePostscriptBarcode::hasPurePostscriptBarcode(); > > +// TODO: I think this functionality should be moved to the engines. - > VZsolt if( s_haveGnuBarcode ) > { > s_info.append( createInfo( "128raw", i18n("Raw code 128"), > GNU_BARCODE, 0, BARCODE_128RAW ) ); > > Modified: trunk/src/batchprinter.cpp > =================================================================== > --- trunk/src/batchprinter.cpp 2008-02-09 13:35:39 UTC (rev 11) > +++ trunk/src/batchprinter.cpp 2008-02-26 21:46:07 UTC (rev 12) > @@ -40,7 +40,7 @@ > #include <kimageio.h> > #include <klocale.h> > #include <kmessagebox.h> > -#include <kprinter.h> > +#include <qprinter.h> > > // Other includes > #include <stdlib.h> > @@ -49,7 +49,7 @@ > #include <krun.h> > #define MAXDATASIZE 32550 > > -BatchPrinter::BatchPrinter( KPrinter* p, QWidget* _parent ) > +BatchPrinter::BatchPrinter( QPrinter* p, QWidget* _parent ) > > : printer( p ), parent( _parent ) > > { > m_events = true; > > Modified: trunk/src/batchprinter.h > =================================================================== > --- trunk/src/batchprinter.h 2008-02-09 13:35:39 UTC (rev 11) > +++ trunk/src/batchprinter.h 2008-02-26 21:46:07 UTC (rev 12) > @@ -29,7 +29,7 @@ > > class Definition; > class Label; > -class KPrinter; > +class QPrinter; > class Measurements; > class QBuffer; > class QPainter; > @@ -58,7 +58,7 @@ > /** Use this constructor if you want to print to > * a printer. > */ > - BatchPrinter( KPrinter* p, QWidget* _parent ); > + BatchPrinter( QPrinter* p, QWidget* _parent ); > /** This constructor is used in image gernaration mode. > * @p path is the path to an existing directory where > * the images are saved. > @@ -202,7 +202,7 @@ > QPaintDevice* m_paintDevice; > > QBuffer* buffer; > - KPrinter* printer; > + QPrinter* printer; > QPainter* painter; > /** parent for dialogs > */ > > Modified: trunk/src/batchwizard.cpp > =================================================================== > --- trunk/src/batchwizard.cpp 2008-02-09 13:35:39 UTC (rev 11) > +++ trunk/src/batchwizard.cpp 2008-02-26 21:46:07 UTC (rev 12) > @@ -561,7 +561,7 @@ > void BatchWizard::printNow( const QString & printer, bool bUserInteraction > ) { > BatchPrinter* batch = NULL; > - KPrinter* prn = NULL; > + QPrinter* prn = NULL; > int batchType = 0; > > // let's check if the label file does even exist! > > Modified: trunk/src/label.cpp > =================================================================== > --- trunk/src/label.cpp 2008-02-09 13:35:39 UTC (rev 11) > +++ trunk/src/label.cpp 2008-02-26 21:46:07 UTC (rev 12) > @@ -41,7 +41,7 @@ > // KDE includes > #include <kapplication.h> > #include <klocale.h> > -#include <kprinter.h> > +#include <qprinter.h> > > Label::Label( Definition* _def, QIODevice* device, QString labelname, > QPaintDevice* _printer, QString customer_id, QString _article_no, QString > _group ) > > : TokenProvider( _printer ) > > Modified: trunk/src/label.h > =================================================================== > --- trunk/src/label.h 2008-02-09 13:35:39 UTC (rev 11) > +++ trunk/src/label.h 2008-02-26 21:46:07 UTC (rev 12) > @@ -33,7 +33,7 @@ > class QPainter; > class QPaintDevice; > class Q3TextStream; > -class KPrinter; > +class QPrinter; > /** Creates a QPicture from the XML KBarcode file. If a SQL connections is > available * the data from the SQL tables will be used, too. > */ > @@ -52,7 +52,7 @@ > int getId() const; > static void getXLabel( double x, double y, double width, double > height, QPainter* painter, int mode, QString value = "" ); > > - //void setPrinter( KPrinter* p ) { m_printer = p; } > + //void setPrinter( QPrinter* p ) { m_printer = p; } > > /** reimplemented from TokenProvider > * returns wether this label has to be regenerated everytime > > Modified: trunk/src/labeleditor.cpp > =================================================================== > --- trunk/src/labeleditor.cpp 2008-02-09 13:35:39 UTC (rev 11) > +++ trunk/src/labeleditor.cpp 2008-02-26 21:46:07 UTC (rev 12) > @@ -101,7 +101,7 @@ > #include <knuminput.h> > #include <kmenu.h> > #include <kpushbutton.h> > -#include <kprinter.h> > +#include <qprinter.h> > #include <krun.h> > #include <kspell.h> > #include <kstatusbar.h> > @@ -767,7 +767,7 @@ > > PrinterSettings::getInstance()->getData()->border = pld.border(); > > - KPrinter* printer = PrinterSettings::getInstance()->setupPrinter( > KUrl( filename ), this ); + QPrinter* printer = > PrinterSettings::getInstance()->setupPrinter( KUrl( filename ), this ); if( > !printer ) > return; > > > Modified: trunk/src/labeleditor.h > =================================================================== > --- trunk/src/labeleditor.h 2008-02-09 13:35:39 UTC (rev 11) > +++ trunk/src/labeleditor.h 2008-02-26 21:46:07 UTC (rev 12) > @@ -72,7 +72,7 @@ > class QPaintDevice; > class QString; > class KPushButton; > -class KPrinter; > +class QPrinter; > class Q3CanvasItem; > class TCanvasItem; > class RectItem; > > Modified: trunk/src/labelutils.h > =================================================================== > --- trunk/src/labelutils.h 2008-02-09 13:35:39 UTC (rev 11) > +++ trunk/src/labelutils.h 2008-02-26 21:46:07 UTC (rev 12) > @@ -22,7 +22,7 @@ > #define LABELUTILS_H > > class Definition; > -class KPrinter; > +class QPrinter; > class QDomElement; > class QFont; > class QImage; > > Modified: trunk/src/printersettings.cpp > =================================================================== > --- trunk/src/printersettings.cpp 2008-02-09 13:35:39 UTC (rev 11) > +++ trunk/src/printersettings.cpp 2008-02-26 21:46:07 UTC (rev 12) > @@ -36,35 +36,35 @@ > > const PageFormatInfo pageFormatInfo[]= > { > - { KPrinter::A3, "A3", I18N_NOOP("ISO A3"), > 297.0, 420.0 }, - { KPrinter::A4, "A4", > I18N_NOOP("ISO A4"), 210.0, 297.0 }, - { KPrinter::A5, > "A5", I18N_NOOP("ISO A5"), 148.0, 210.0 }, - { > KPrinter::Letter, "Letter", I18N_NOOP("US Letter"), 216.0, > 279.0 }, // should be 215.9 mm x 279.4 mm - { KPrinter::Legal, > "Legal", I18N_NOOP("US Legal"), 216.0, 356.0 }, // should be > 215.9 mm x 335.6 mm - { KPrinter::A4, "Screen", > I18N_NOOP("Screen"), 297.0, 210.0 }, // Custom, so fall back to A4 - > { KPrinter::A4, "Custom", I18N_NOOP("Custom"), > 210.0, 297.0 }, // Custom, so fall back to A4 - { KPrinter::B5, > "B5", I18N_NOOP("ISO B5"), 182.0, 257.0 }, - { > KPrinter::Executive, "Executive", I18N_NOOP("US Executive"), 191.0, > 254.0 }, // should be 190.5 mm x 254.0 mm - { KPrinter::A0, > "A0", I18N_NOOP("ISO A0"), 841.0, 1189.0 }, - { > KPrinter::A1, "A1", I18N_NOOP("ISO A1"), 594.0, > 841.0 }, - { KPrinter::A2, "A2", I18N_NOOP("ISO > A2"), 420.0, 594.0 }, - { KPrinter::A6, "A6", > I18N_NOOP("ISO A6"), 105.0, 148.0 }, - { KPrinter::A7, > "A7", I18N_NOOP("ISO A7"), 74.0, 105.0 }, - { > KPrinter::A8, "A8", I18N_NOOP("ISO A8"), 52.0, > 74.0 }, - { KPrinter::A9, "A9", I18N_NOOP("ISO A9"), > 37.0, 52.0 }, - { KPrinter::B0, "B0", > I18N_NOOP("ISO B0"), 1030.0, 1456.0 }, - { KPrinter::B1, > "B1", I18N_NOOP("ISO B1"), 728.0, 1030.0 }, - { > KPrinter::B10, "B10", I18N_NOOP("ISO B10"), 32.0, > 45.0 }, - { KPrinter::B2, "B2", I18N_NOOP("ISO B2"), > 515.0, 728.0 }, - { KPrinter::B3, "B3", > I18N_NOOP("ISO B3"), 364.0, 515.0 }, - { KPrinter::B4, > "B4", I18N_NOOP("ISO B4"), 257.0, 364.0 }, - { > KPrinter::B6, "B6", I18N_NOOP("ISO B6"), 128.0, > 182.0 }, - { KPrinter::C5E, "C5", I18N_NOOP("ISO > C5"), 163.0, 229.0 }, // Some sources tells: 162 mm x 228 mm - { > KPrinter::Comm10E, "Comm10", I18N_NOOP("US Common 10"), 105.0, > 241.0 }, // should be 104.775 mm x 241.3 mm - { KPrinter::DLE, > "DL", I18N_NOOP("ISO DL"), 110.0, 220.0 }, - { > KPrinter::Folio, "Folio", I18N_NOOP("US Folio"), 210.0, > 330.0 }, // should be 209.54 mm x 330.2 mm - { KPrinter::Ledger, > "Ledger", I18N_NOOP("US Ledger"), 432.0, 279.0 }, // should be > 431.8 mm x 297.4 mm - { KPrinter::Tabloid, "Tabloid", > I18N_NOOP("US Tabloid"), 279.0, 432.0 } // should be 297.4 mm x 431.8 > mm + { QPrinter::A3, "A3", I18N_NOOP("ISO A3"), > 297.0, 420.0 }, + { QPrinter::A4, "A4", > I18N_NOOP("ISO A4"), 210.0, 297.0 }, + { QPrinter::A5, > "A5", I18N_NOOP("ISO A5"), 148.0, 210.0 }, + { > QPrinter::Letter, "Letter", I18N_NOOP("US Letter"), 216.0, > 279.0 }, // should be 215.9 mm x 279.4 mm + { QPrinter::Legal, > "Legal", I18N_NOOP("US Legal"), 216.0, 356.0 }, // should be > 215.9 mm x 335.6 mm + { QPrinter::A4, "Screen", > I18N_NOOP("Screen"), 297.0, 210.0 }, // Custom, so fall back to A4 + > { QPrinter::A4, "Custom", I18N_NOOP("Custom"), > 210.0, 297.0 }, // Custom, so fall back to A4 + { QPrinter::B5, > "B5", I18N_NOOP("ISO B5"), 182.0, 257.0 }, + { > QPrinter::Executive, "Executive", I18N_NOOP("US Executive"), 191.0, > 254.0 }, // should be 190.5 mm x 254.0 mm + { QPrinter::A0, > "A0", I18N_NOOP("ISO A0"), 841.0, 1189.0 }, + { > QPrinter::A1, "A1", I18N_NOOP("ISO A1"), 594.0, > 841.0 }, + { QPrinter::A2, "A2", I18N_NOOP("ISO > A2"), 420.0, 594.0 }, + { QPrinter::A6, "A6", > I18N_NOOP("ISO A6"), 105.0, 148.0 }, + { QPrinter::A7, > "A7", I18N_NOOP("ISO A7"), 74.0, 105.0 }, + { > QPrinter::A8, "A8", I18N_NOOP("ISO A8"), 52.0, > 74.0 }, + { QPrinter::A9, "A9", I18N_NOOP("ISO A9"), > 37.0, 52.0 }, + { QPrinter::B0, "B0", > I18N_NOOP("ISO B0"), 1030.0, 1456.0 }, + { QPrinter::B1, > "B1", I18N_NOOP("ISO B1"), 728.0, 1030.0 }, + { > QPrinter::B10, "B10", I18N_NOOP("ISO B10"), 32.0, > 45.0 }, + { QPrinter::B2, "B2", I18N_NOOP("ISO B2"), > 515.0, 728.0 }, + { QPrinter::B3, "B3", > I18N_NOOP("ISO B3"), 364.0, 515.0 }, + { QPrinter::B4, > "B4", I18N_NOOP("ISO B4"), 257.0, 364.0 }, + { > QPrinter::B6, "B6", I18N_NOOP("ISO B6"), 128.0, > 182.0 }, + { QPrinter::C5E, "C5", I18N_NOOP("ISO > C5"), 163.0, 229.0 }, // Some sources tells: 162 mm x 228 mm + { > QPrinter::Comm10E, "Comm10", I18N_NOOP("US Common 10"), 105.0, > 241.0 }, // should be 104.775 mm x 241.3 mm + { QPrinter::DLE, > "DL", I18N_NOOP("ISO DL"), 110.0, 220.0 }, + { > QPrinter::Folio, "Folio", I18N_NOOP("US Folio"), 210.0, > 330.0 }, // should be 209.54 mm x 330.2 mm + { QPrinter::Ledger, > "Ledger", I18N_NOOP("US Ledger"), 432.0, 279.0 }, // should be > 431.8 mm x 297.4 mm + { QPrinter::Tabloid, "Tabloid", > I18N_NOOP("US Tabloid"), 279.0, 432.0 } // should be 297.4 mm x 431.8 > mm }; > // end stolen > > @@ -119,7 +119,7 @@ > // get default page size from KDE > if( lpdata->format == -1 ) > for( unsigned int i = 0; i < sizeof( pageFormatInfo ) / sizeof( > PageFormatInfo ); i++ ) - if( pageFormatInfo[i].kprinter == > KGlobal::locale()->pageSize() ) { + if( > pageFormatInfo[i].qprinter == KGlobal::locale()->pageSize() ) { > lpdata->format = i; > break; > } > @@ -157,9 +157,9 @@ > return lpdata->quality == Middle || lpdata->quality == VeryHigh? High > : lpdata->quality; }; > > -KPrinter* PrinterSettings::setupPrinter( const KUrl & url, QWidget* > parent, bool immediately, const QString & prn ) +QPrinter* > PrinterSettings::setupPrinter( const KUrl & url, QWidget* parent, bool > immediately, const QString & prn ) { > - KPrinter* printer = new KPrinter( true, (enum > QPrinter::PrinterMode)getQuality() ); + QPrinter* printer = new > QPrinter( true, (enum QPrinter::PrinterMode)getQuality() ); if( > getData()->quality == Middle ) > printer->setResolution( 300 ); > else if( getData()->quality == VeryHigh ) > > Modified: trunk/src/printersettings.h > =================================================================== > --- trunk/src/printersettings.h 2008-02-09 13:35:39 UTC (rev 11) > +++ trunk/src/printersettings.h 2008-02-26 21:46:07 UTC (rev 12) > @@ -20,7 +20,7 @@ > > #include <qobject.h> > #include <qstring.h> > -#include <kprinter.h> > +#include <qprinter.h> > > class KUrl; > > @@ -48,14 +48,14 @@ > > typedef struct PageFormatInfo > { > - KPrinter::PageSize kprinter; > + QPrinter::PageSize qprinter; > const char* shortName; // Short name > const char* descriptiveName; // Full name, which will be translated > double width; // in mm > double height; // in mm > }; > > -class KPrinter; > +class QPrinter; > class KComboBox; > class PrinterSettings: public QObject { > Q_OBJECT > @@ -80,7 +80,7 @@ > static PrinterSettings* getInstance(); > > // don't forget to delete printer > - KPrinter* setupPrinter( const KUrl & url, QWidget* parent, bool > immediately = false, const QString & prn = QString::null ); + > QPrinter* setupPrinter( const KUrl & url, QWidget* parent, bool immediately > = false, const QString & prn = QString::null ); > > public slots: > void loadConfig(); > > Modified: trunk/src/tec.cpp > =================================================================== > --- trunk/src/tec.cpp 2008-02-09 13:35:39 UTC (rev 11) > +++ trunk/src/tec.cpp 2008-02-26 21:46:07 UTC (rev 12) > @@ -47,7 +47,7 @@ > #include <kmessagebox.h> > #include <kmenu.h> > #include <knuminput.h> > -#include <kprinter.h> > +#include <qprinter.h> > #include <kurlrequester.h> > > #define MAXDATASIZE 32550 > > Modified: trunk/src/tec.h > =================================================================== > --- trunk/src/tec.h 2008-02-09 13:35:39 UTC (rev 11) > +++ trunk/src/tec.h 2008-02-26 21:46:07 UTC (rev 12) > @@ -45,7 +45,7 @@ > #include <kmessagebox.h> > #include <kmenu.h> > #include <knuminput.h> > -#include <kprinter.h> > +#include <qprinter.h> > #include <kurlrequester.h> > > QString tec452(const QString &file, int count, const QString &art, const > QString &group, const QString &id); > > > This was sent by the SourceForge.net collaborative development platform, > the world's largest Open Source development site. > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Microsoft > Defy all challenges. Microsoft(R) Visual Studio 2008. > http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ > _______________________________________________ > Kbarcode-svn mailing list > Kba...@li... > https://lists.sourceforge.net/lists/listinfo/kbarcode-svn -- ********************************************************************** Dominik Seichter - dom...@we... KRename - http://www.krename.net - Powerful batch renamer for KDE KBarcode - http://www.kbarcode.net - Barcode and label printing PoDoFo - http://podofo.sf.net - PDF generation and parsing library SchafKopf - http://schafkopf.berlios.de - Schafkopf, a card game, for KDE Alan - http://alan.sf.net - A Turing Machine in Java ********************************************************************** |
|
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.
|
|
From: <vz...@us...> - 2008-02-26 21:46:02
|
Revision: 12
http://kbarcode.svn.sourceforge.net/kbarcode/?rev=12&view=rev
Author: vzsolt
Date: 2008-02-26 13:46:07 -0800 (Tue, 26 Feb 2008)
Log Message:
-----------
As a first manual step, I've replaced KPrinter with QPrinter everywhere.
With this simple change, the number of build errors went down from 3400 to 3000 :)
Modified Paths:
--------------
trunk/src/barcodedialog.cpp
trunk/src/barkode.cpp
trunk/src/batchprinter.cpp
trunk/src/batchprinter.h
trunk/src/batchwizard.cpp
trunk/src/label.cpp
trunk/src/label.h
trunk/src/labeleditor.cpp
trunk/src/labeleditor.h
trunk/src/labelutils.h
trunk/src/printersettings.cpp
trunk/src/printersettings.h
trunk/src/tec.cpp
trunk/src/tec.h
Modified: trunk/src/barcodedialog.cpp
===================================================================
--- trunk/src/barcodedialog.cpp 2008-02-09 13:35:39 UTC (rev 11)
+++ trunk/src/barcodedialog.cpp 2008-02-26 21:46:07 UTC (rev 12)
@@ -29,7 +29,7 @@
#include <kimageio.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kprinter.h>
+#include <qprinter.h>
#include <kpushbutton.h>
// Qt includes
@@ -168,7 +168,7 @@
if( d.isValid() )
return;
- KPrinter* printer = PrinterSettings::getInstance()->setupPrinter( "kbarcode", this );
+ QPrinter* printer = PrinterSettings::getInstance()->setupPrinter( "kbarcode", this );
if( !printer )
return;
Modified: trunk/src/barkode.cpp
===================================================================
--- trunk/src/barkode.cpp 2008-02-09 13:35:39 UTC (rev 11)
+++ trunk/src/barkode.cpp 2008-02-26 21:46:07 UTC (rev 12)
@@ -693,6 +693,7 @@
s_havePurePostscript = !KStandardDirs::findExe( "gs" ).isNull()
&& PurePostscriptBarcode::hasPurePostscriptBarcode();
+// TODO: I think this functionality should be moved to the engines. - VZsolt
if( s_haveGnuBarcode )
{
s_info.append( createInfo( "128raw", i18n("Raw code 128"), GNU_BARCODE, 0, BARCODE_128RAW ) );
Modified: trunk/src/batchprinter.cpp
===================================================================
--- trunk/src/batchprinter.cpp 2008-02-09 13:35:39 UTC (rev 11)
+++ trunk/src/batchprinter.cpp 2008-02-26 21:46:07 UTC (rev 12)
@@ -40,7 +40,7 @@
#include <kimageio.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kprinter.h>
+#include <qprinter.h>
// Other includes
#include <stdlib.h>
@@ -49,7 +49,7 @@
#include <krun.h>
#define MAXDATASIZE 32550
-BatchPrinter::BatchPrinter( KPrinter* p, QWidget* _parent )
+BatchPrinter::BatchPrinter( QPrinter* p, QWidget* _parent )
: printer( p ), parent( _parent )
{
m_events = true;
Modified: trunk/src/batchprinter.h
===================================================================
--- trunk/src/batchprinter.h 2008-02-09 13:35:39 UTC (rev 11)
+++ trunk/src/batchprinter.h 2008-02-26 21:46:07 UTC (rev 12)
@@ -29,7 +29,7 @@
class Definition;
class Label;
-class KPrinter;
+class QPrinter;
class Measurements;
class QBuffer;
class QPainter;
@@ -58,7 +58,7 @@
/** Use this constructor if you want to print to
* a printer.
*/
- BatchPrinter( KPrinter* p, QWidget* _parent );
+ BatchPrinter( QPrinter* p, QWidget* _parent );
/** This constructor is used in image gernaration mode.
* @p path is the path to an existing directory where
* the images are saved.
@@ -202,7 +202,7 @@
QPaintDevice* m_paintDevice;
QBuffer* buffer;
- KPrinter* printer;
+ QPrinter* printer;
QPainter* painter;
/** parent for dialogs
*/
Modified: trunk/src/batchwizard.cpp
===================================================================
--- trunk/src/batchwizard.cpp 2008-02-09 13:35:39 UTC (rev 11)
+++ trunk/src/batchwizard.cpp 2008-02-26 21:46:07 UTC (rev 12)
@@ -561,7 +561,7 @@
void BatchWizard::printNow( const QString & printer, bool bUserInteraction )
{
BatchPrinter* batch = NULL;
- KPrinter* prn = NULL;
+ QPrinter* prn = NULL;
int batchType = 0;
// let's check if the label file does even exist!
Modified: trunk/src/label.cpp
===================================================================
--- trunk/src/label.cpp 2008-02-09 13:35:39 UTC (rev 11)
+++ trunk/src/label.cpp 2008-02-26 21:46:07 UTC (rev 12)
@@ -41,7 +41,7 @@
// KDE includes
#include <kapplication.h>
#include <klocale.h>
-#include <kprinter.h>
+#include <qprinter.h>
Label::Label( Definition* _def, QIODevice* device, QString labelname, QPaintDevice* _printer, QString customer_id, QString _article_no, QString _group )
: TokenProvider( _printer )
Modified: trunk/src/label.h
===================================================================
--- trunk/src/label.h 2008-02-09 13:35:39 UTC (rev 11)
+++ trunk/src/label.h 2008-02-26 21:46:07 UTC (rev 12)
@@ -33,7 +33,7 @@
class QPainter;
class QPaintDevice;
class Q3TextStream;
-class KPrinter;
+class QPrinter;
/** Creates a QPicture from the XML KBarcode file. If a SQL connections is available
* the data from the SQL tables will be used, too.
*/
@@ -52,7 +52,7 @@
int getId() const;
static void getXLabel( double x, double y, double width, double height, QPainter* painter, int mode, QString value = "" );
- //void setPrinter( KPrinter* p ) { m_printer = p; }
+ //void setPrinter( QPrinter* p ) { m_printer = p; }
/** reimplemented from TokenProvider
* returns wether this label has to be regenerated everytime
Modified: trunk/src/labeleditor.cpp
===================================================================
--- trunk/src/labeleditor.cpp 2008-02-09 13:35:39 UTC (rev 11)
+++ trunk/src/labeleditor.cpp 2008-02-26 21:46:07 UTC (rev 12)
@@ -101,7 +101,7 @@
#include <knuminput.h>
#include <kmenu.h>
#include <kpushbutton.h>
-#include <kprinter.h>
+#include <qprinter.h>
#include <krun.h>
#include <kspell.h>
#include <kstatusbar.h>
@@ -767,7 +767,7 @@
PrinterSettings::getInstance()->getData()->border = pld.border();
- KPrinter* printer = PrinterSettings::getInstance()->setupPrinter( KUrl( filename ), this );
+ QPrinter* printer = PrinterSettings::getInstance()->setupPrinter( KUrl( filename ), this );
if( !printer )
return;
Modified: trunk/src/labeleditor.h
===================================================================
--- trunk/src/labeleditor.h 2008-02-09 13:35:39 UTC (rev 11)
+++ trunk/src/labeleditor.h 2008-02-26 21:46:07 UTC (rev 12)
@@ -72,7 +72,7 @@
class QPaintDevice;
class QString;
class KPushButton;
-class KPrinter;
+class QPrinter;
class Q3CanvasItem;
class TCanvasItem;
class RectItem;
Modified: trunk/src/labelutils.h
===================================================================
--- trunk/src/labelutils.h 2008-02-09 13:35:39 UTC (rev 11)
+++ trunk/src/labelutils.h 2008-02-26 21:46:07 UTC (rev 12)
@@ -22,7 +22,7 @@
#define LABELUTILS_H
class Definition;
-class KPrinter;
+class QPrinter;
class QDomElement;
class QFont;
class QImage;
Modified: trunk/src/printersettings.cpp
===================================================================
--- trunk/src/printersettings.cpp 2008-02-09 13:35:39 UTC (rev 11)
+++ trunk/src/printersettings.cpp 2008-02-26 21:46:07 UTC (rev 12)
@@ -36,35 +36,35 @@
const PageFormatInfo pageFormatInfo[]=
{
- { KPrinter::A3, "A3", I18N_NOOP("ISO A3"), 297.0, 420.0 },
- { KPrinter::A4, "A4", I18N_NOOP("ISO A4"), 210.0, 297.0 },
- { KPrinter::A5, "A5", I18N_NOOP("ISO A5"), 148.0, 210.0 },
- { KPrinter::Letter, "Letter", I18N_NOOP("US Letter"), 216.0, 279.0 }, // should be 215.9 mm x 279.4 mm
- { KPrinter::Legal, "Legal", I18N_NOOP("US Legal"), 216.0, 356.0 }, // should be 215.9 mm x 335.6 mm
- { KPrinter::A4, "Screen", I18N_NOOP("Screen"), 297.0, 210.0 }, // Custom, so fall back to A4
- { KPrinter::A4, "Custom", I18N_NOOP("Custom"), 210.0, 297.0 }, // Custom, so fall back to A4
- { KPrinter::B5, "B5", I18N_NOOP("ISO B5"), 182.0, 257.0 },
- { KPrinter::Executive, "Executive", I18N_NOOP("US Executive"), 191.0, 254.0 }, // should be 190.5 mm x 254.0 mm
- { KPrinter::A0, "A0", I18N_NOOP("ISO A0"), 841.0, 1189.0 },
- { KPrinter::A1, "A1", I18N_NOOP("ISO A1"), 594.0, 841.0 },
- { KPrinter::A2, "A2", I18N_NOOP("ISO A2"), 420.0, 594.0 },
- { KPrinter::A6, "A6", I18N_NOOP("ISO A6"), 105.0, 148.0 },
- { KPrinter::A7, "A7", I18N_NOOP("ISO A7"), 74.0, 105.0 },
- { KPrinter::A8, "A8", I18N_NOOP("ISO A8"), 52.0, 74.0 },
- { KPrinter::A9, "A9", I18N_NOOP("ISO A9"), 37.0, 52.0 },
- { KPrinter::B0, "B0", I18N_NOOP("ISO B0"), 1030.0, 1456.0 },
- { KPrinter::B1, "B1", I18N_NOOP("ISO B1"), 728.0, 1030.0 },
- { KPrinter::B10, "B10", I18N_NOOP("ISO B10"), 32.0, 45.0 },
- { KPrinter::B2, "B2", I18N_NOOP("ISO B2"), 515.0, 728.0 },
- { KPrinter::B3, "B3", I18N_NOOP("ISO B3"), 364.0, 515.0 },
- { KPrinter::B4, "B4", I18N_NOOP("ISO B4"), 257.0, 364.0 },
- { KPrinter::B6, "B6", I18N_NOOP("ISO B6"), 128.0, 182.0 },
- { KPrinter::C5E, "C5", I18N_NOOP("ISO C5"), 163.0, 229.0 }, // Some sources tells: 162 mm x 228 mm
- { KPrinter::Comm10E, "Comm10", I18N_NOOP("US Common 10"), 105.0, 241.0 }, // should be 104.775 mm x 241.3 mm
- { KPrinter::DLE, "DL", I18N_NOOP("ISO DL"), 110.0, 220.0 },
- { KPrinter::Folio, "Folio", I18N_NOOP("US Folio"), 210.0, 330.0 }, // should be 209.54 mm x 330.2 mm
- { KPrinter::Ledger, "Ledger", I18N_NOOP("US Ledger"), 432.0, 279.0 }, // should be 431.8 mm x 297.4 mm
- { KPrinter::Tabloid, "Tabloid", I18N_NOOP("US Tabloid"), 279.0, 432.0 } // should be 297.4 mm x 431.8 mm
+ { QPrinter::A3, "A3", I18N_NOOP("ISO A3"), 297.0, 420.0 },
+ { QPrinter::A4, "A4", I18N_NOOP("ISO A4"), 210.0, 297.0 },
+ { QPrinter::A5, "A5", I18N_NOOP("ISO A5"), 148.0, 210.0 },
+ { QPrinter::Letter, "Letter", I18N_NOOP("US Letter"), 216.0, 279.0 }, // should be 215.9 mm x 279.4 mm
+ { QPrinter::Legal, "Legal", I18N_NOOP("US Legal"), 216.0, 356.0 }, // should be 215.9 mm x 335.6 mm
+ { QPrinter::A4, "Screen", I18N_NOOP("Screen"), 297.0, 210.0 }, // Custom, so fall back to A4
+ { QPrinter::A4, "Custom", I18N_NOOP("Custom"), 210.0, 297.0 }, // Custom, so fall back to A4
+ { QPrinter::B5, "B5", I18N_NOOP("ISO B5"), 182.0, 257.0 },
+ { QPrinter::Executive, "Executive", I18N_NOOP("US Executive"), 191.0, 254.0 }, // should be 190.5 mm x 254.0 mm
+ { QPrinter::A0, "A0", I18N_NOOP("ISO A0"), 841.0, 1189.0 },
+ { QPrinter::A1, "A1", I18N_NOOP("ISO A1"), 594.0, 841.0 },
+ { QPrinter::A2, "A2", I18N_NOOP("ISO A2"), 420.0, 594.0 },
+ { QPrinter::A6, "A6", I18N_NOOP("ISO A6"), 105.0, 148.0 },
+ { QPrinter::A7, "A7", I18N_NOOP("ISO A7"), 74.0, 105.0 },
+ { QPrinter::A8, "A8", I18N_NOOP("ISO A8"), 52.0, 74.0 },
+ { QPrinter::A9, "A9", I18N_NOOP("ISO A9"), 37.0, 52.0 },
+ { QPrinter::B0, "B0", I18N_NOOP("ISO B0"), 1030.0, 1456.0 },
+ { QPrinter::B1, "B1", I18N_NOOP("ISO B1"), 728.0, 1030.0 },
+ { QPrinter::B10, "B10", I18N_NOOP("ISO B10"), 32.0, 45.0 },
+ { QPrinter::B2, "B2", I18N_NOOP("ISO B2"), 515.0, 728.0 },
+ { QPrinter::B3, "B3", I18N_NOOP("ISO B3"), 364.0, 515.0 },
+ { QPrinter::B4, "B4", I18N_NOOP("ISO B4"), 257.0, 364.0 },
+ { QPrinter::B6, "B6", I18N_NOOP("ISO B6"), 128.0, 182.0 },
+ { QPrinter::C5E, "C5", I18N_NOOP("ISO C5"), 163.0, 229.0 }, // Some sources tells: 162 mm x 228 mm
+ { QPrinter::Comm10E, "Comm10", I18N_NOOP("US Common 10"), 105.0, 241.0 }, // should be 104.775 mm x 241.3 mm
+ { QPrinter::DLE, "DL", I18N_NOOP("ISO DL"), 110.0, 220.0 },
+ { QPrinter::Folio, "Folio", I18N_NOOP("US Folio"), 210.0, 330.0 }, // should be 209.54 mm x 330.2 mm
+ { QPrinter::Ledger, "Ledger", I18N_NOOP("US Ledger"), 432.0, 279.0 }, // should be 431.8 mm x 297.4 mm
+ { QPrinter::Tabloid, "Tabloid", I18N_NOOP("US Tabloid"), 279.0, 432.0 } // should be 297.4 mm x 431.8 mm
};
// end stolen
@@ -119,7 +119,7 @@
// get default page size from KDE
if( lpdata->format == -1 )
for( unsigned int i = 0; i < sizeof( pageFormatInfo ) / sizeof( PageFormatInfo ); i++ )
- if( pageFormatInfo[i].kprinter == KGlobal::locale()->pageSize() ) {
+ if( pageFormatInfo[i].qprinter == KGlobal::locale()->pageSize() ) {
lpdata->format = i;
break;
}
@@ -157,9 +157,9 @@
return lpdata->quality == Middle || lpdata->quality == VeryHigh? High : lpdata->quality;
};
-KPrinter* PrinterSettings::setupPrinter( const KUrl & url, QWidget* parent, bool immediately, const QString & prn )
+QPrinter* PrinterSettings::setupPrinter( const KUrl & url, QWidget* parent, bool immediately, const QString & prn )
{
- KPrinter* printer = new KPrinter( true, (enum QPrinter::PrinterMode)getQuality() );
+ QPrinter* printer = new QPrinter( true, (enum QPrinter::PrinterMode)getQuality() );
if( getData()->quality == Middle )
printer->setResolution( 300 );
else if( getData()->quality == VeryHigh )
Modified: trunk/src/printersettings.h
===================================================================
--- trunk/src/printersettings.h 2008-02-09 13:35:39 UTC (rev 11)
+++ trunk/src/printersettings.h 2008-02-26 21:46:07 UTC (rev 12)
@@ -20,7 +20,7 @@
#include <qobject.h>
#include <qstring.h>
-#include <kprinter.h>
+#include <qprinter.h>
class KUrl;
@@ -48,14 +48,14 @@
typedef struct PageFormatInfo
{
- KPrinter::PageSize kprinter;
+ QPrinter::PageSize qprinter;
const char* shortName; // Short name
const char* descriptiveName; // Full name, which will be translated
double width; // in mm
double height; // in mm
};
-class KPrinter;
+class QPrinter;
class KComboBox;
class PrinterSettings: public QObject {
Q_OBJECT
@@ -80,7 +80,7 @@
static PrinterSettings* getInstance();
// don't forget to delete printer
- KPrinter* setupPrinter( const KUrl & url, QWidget* parent, bool immediately = false, const QString & prn = QString::null );
+ QPrinter* setupPrinter( const KUrl & url, QWidget* parent, bool immediately = false, const QString & prn = QString::null );
public slots:
void loadConfig();
Modified: trunk/src/tec.cpp
===================================================================
--- trunk/src/tec.cpp 2008-02-09 13:35:39 UTC (rev 11)
+++ trunk/src/tec.cpp 2008-02-26 21:46:07 UTC (rev 12)
@@ -47,7 +47,7 @@
#include <kmessagebox.h>
#include <kmenu.h>
#include <knuminput.h>
-#include <kprinter.h>
+#include <qprinter.h>
#include <kurlrequester.h>
#define MAXDATASIZE 32550
Modified: trunk/src/tec.h
===================================================================
--- trunk/src/tec.h 2008-02-09 13:35:39 UTC (rev 11)
+++ trunk/src/tec.h 2008-02-26 21:46:07 UTC (rev 12)
@@ -45,7 +45,7 @@
#include <kmessagebox.h>
#include <kmenu.h>
#include <knuminput.h>
-#include <kprinter.h>
+#include <qprinter.h>
#include <kurlrequester.h>
QString tec452(const QString &file, int count, const QString &art, const QString &group, const QString &id);
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