[Kbarcode-svn] SF.net SVN: kbarcode: [14] trunk/src

[<vz...@us...>]

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.