TQt4 port kbarcode

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kbarcode@1233956 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 11 insertions, 11 deletions

diff --git a/kbarcode/measurements.cpp b/kbarcode/measurements.cpp
index 07044ec..a945406 100644
--- a/kbarcode/measurements.cpp
+++ b/kbarcode/measurements.cpp
@@ -17,8 +17,8 @@
 
 #include "measurements.h"
 
-// Qt includes
-#include <qpaintdevicemetrics.h>
+// TQt includes
+#include <tqpaintdevicemetrics.h>
 
 // KDE includes
 #include <kglobal.h>
@@ -41,7 +41,7 @@ Measurements::Measurements( const Measurements & rhs )
 Measurements::~Measurements() {}
 
 int Measurements::m_system = None;
-QString Measurements::m_string = QString::null;
+TQString Measurements::m_string = TQString();
 
 void Measurements::init()
 {
@@ -77,35 +77,35 @@ void Measurements::operator=( const Measurements & m ) {
     m_height = m.m_height;
 }
 
-double Measurements::mmToPixel( double mm, const QPaintDevice* device, int mode ) const {
-    QPaintDeviceMetrics pdm( device );
+double Measurements::mmToPixel( double mm, const TQPaintDevice* device, int mode ) const {
+    TQPaintDeviceMetrics pdm( device );
     if( mode == DpiX )
         return (mm / 25.4) * pdm.logicalDpiX();
     else
         return (mm / 25.4 ) * pdm.logicalDpiY();
 }
 
-double Measurements::gapLeft( const QPaintDevice* device ) const {
+double Measurements::gapLeft( const TQPaintDevice* device ) const {
     return mmToPixel( gap_left, device, DpiX );
 }
 
-double Measurements::gapTop( const QPaintDevice* device ) const {
+double Measurements::gapTop( const TQPaintDevice* device ) const {
     return mmToPixel( gap_top, device, DpiY );
 }
 
-double Measurements::gapV( const QPaintDevice* device ) const {
+double Measurements::gapV( const TQPaintDevice* device ) const {
     return mmToPixel( gap_v, device, DpiX );
 }
 
-double Measurements::gapH( const QPaintDevice* device ) const {
+double Measurements::gapH( const TQPaintDevice* device ) const {
     return mmToPixel( gap_h, device, DpiY );
 }
 
-double Measurements::width( const QPaintDevice* device ) const {
+double Measurements::width( const TQPaintDevice* device ) const {
     return mmToPixel( m_width, device, DpiX );
 }
 
-double Measurements::height( const QPaintDevice* device ) const {
+double Measurements::height( const TQPaintDevice* device ) const {
     return mmToPixel( m_height, device, DpiY );
 }