From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 14 Apr 2011 20:16:30 +0000
Subject: Enable kdepim compilation under Qt4 This will likely break Qt3
 compilation temporarily, which is an unintended side effect. A third and
 final kdepim commit will repair Qt3 compilation shortly.

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kaddressbook/geowidget.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'kaddressbook/geowidget.cpp')

diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp
index 4837a1ef..5dc43286 100644
--- a/kaddressbook/geowidget.cpp
+++ b/kaddressbook/geowidget.cpp
@@ -67,7 +67,7 @@ GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *nam
 
   mLatitudeBox = new KDoubleSpinBox( -90, 90, 1, 0, 6, this );
   mLatitudeBox->setEnabled( false );
-  mLatitudeBox->setSuffix( "°" );
+  mLatitudeBox->setSuffix( "�" );
   topLayout->addWidget( mLatitudeBox, 1, 2 );
   label->setBuddy( mLatitudeBox );
 
@@ -76,7 +76,7 @@ GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *nam
 
   mLongitudeBox = new KDoubleSpinBox( -180, 180, 1, 0, 6, this );
   mLongitudeBox->setEnabled( false );
-  mLongitudeBox->setSuffix( "°" );
+  mLongitudeBox->setSuffix( "�" );
   topLayout->addWidget( mLongitudeBox, 2, 2 );
   label->setBuddy( mLongitudeBox );
 
@@ -174,7 +174,7 @@ GeoDialog::GeoDialog( TQWidget *tqparent, const char *name )
   mCityCombo = new KComboBox( page );
   topLayout->addWidget( mCityCombo, 0, 1 );
 
-  TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, Vertical, i18n( "Sexagesimal" ), page );
+  TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, Qt::Vertical, i18n( "Sexagesimal" ), page );
   TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->tqlayout(),
                                                     2, 5, spacingHint() );
 
@@ -182,7 +182,7 @@ GeoDialog::GeoDialog( TQWidget *tqparent, const char *name )
   sexagesimalLayout->addWidget( label, 0, 0 );
 
   mLatDegrees = new TQSpinBox( 0, 90, 1, sexagesimalGroup );
-  mLatDegrees->setSuffix( "°" );
+  mLatDegrees->setSuffix( "�" );
   mLatDegrees->setWrapping( false );
   label->setBuddy( mLatDegrees );
   sexagesimalLayout->addWidget( mLatDegrees, 0, 1 );
@@ -204,7 +204,7 @@ GeoDialog::GeoDialog( TQWidget *tqparent, const char *name )
   sexagesimalLayout->addWidget( label, 1, 0 );
 
   mLongDegrees = new TQSpinBox( 0, 180, 1, sexagesimalGroup );
-  mLongDegrees->setSuffix( "°" );
+  mLongDegrees->setSuffix( "�" );
   label->setBuddy( mLongDegrees );
   sexagesimalLayout->addWidget( mLongDegrees, 1, 1 );
 
@@ -537,7 +537,7 @@ void GeoMapWidget::paintEvent( TQPaintEvent* )
 
   TQPixmap pm( w, h );
   TQPainter p;
-  p.begin( &pm, this );
+  p.tqbegin( &pm, this );
 
   p.setPen( TQColor( 255, 0, 0 ) );
   p.setBrush( TQColor( 255, 0, 0 ) );
-- 
cgit v1.2.3