-rw-r--r-- | core/settings/citytime/opie-citytime.control | 2 | ||||
-rw-r--r-- | core/settings/citytime/zonemap.cpp | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/core/settings/citytime/opie-citytime.control b/core/settings/citytime/opie-citytime.control index 03fa555..71ee7d0 100644 --- a/core/settings/citytime/opie-citytime.control +++ b/core/settings/citytime/opie-citytime.control | |||
@@ -6,3 +6,3 @@ Maintainer: Maximilian Reiss <harlekin@handhelds.org> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal, libopiecore2 |
8 | Description: Time-zone / world clock settings | 8 | Description: Time-zone / world clock settings |
diff --git a/core/settings/citytime/zonemap.cpp b/core/settings/citytime/zonemap.cpp index e4a25ef..7edc45f 100644 --- a/core/settings/citytime/zonemap.cpp +++ b/core/settings/citytime/zonemap.cpp | |||
@@ -26,5 +26,6 @@ | |||
26 | /* OPIE */ | 26 | /* OPIE */ |
27 | #include <qpe/resource.h> | ||
28 | #include <qpe/qpeapplication.h> | ||
29 | #include <opie2/odebug.h> | 27 | #include <opie2/odebug.h> |
28 | #include <opie2/oresource.h> | ||
29 | |||
30 | #include <qpe/qpeapplication.h> | ||
30 | 31 | ||
@@ -162,5 +163,6 @@ ZoneMap::ZoneMap( QWidget *parent, const char* name ) | |||
162 | 163 | ||
163 | QPixmap pixZoom = Resource::loadPixmap( "mag" ); | 164 | QPixmap pixZoom = Opie::Core::OResource::loadPixmap( "mag", Opie::Core::OResource::SmallIcon ); |
164 | 165 | ||
165 | cmdZoom = new QToolButton( this, "Zoom command" ); | 166 | cmdZoom = new QToolButton( this, "Zoom command" ); |
167 | cmdZoom->setUsesBigPixmap( qApp->desktop()->size().width() > 330 ); | ||
166 | cmdZoom->setPixmap( pixZoom ); | 168 | cmdZoom->setPixmap( pixZoom ); |
@@ -604,3 +606,3 @@ void ZoneMap::makeMap( int w, int h ) | |||
604 | { | 606 | { |
605 | QImage imgOrig = Resource::loadImage( strMAP ); | 607 | QImage imgOrig = Opie::Core::OResource::loadImage( strMAP ); |
606 | if ( imgOrig.isNull() ) { | 608 | if ( imgOrig.isNull() ) { |