Resource -> OResource

1 files changed, 4 insertions, 6 deletions

diff --git a/noncore/net/opieirc/irctab.cpp b/noncore/net/opieirc/irctab.cpp
index aee33c4..2f459a9 100644
--- a/noncore/net/opieirc/irctab.cpp
+++ b/noncore/net/opieirc/irctab.cpp
@@ -1,14 +1,13 @@
 #include "irctab.h"
 #include "mainwindow.h"
 
 #include <opie2/okeyconfigmanager.h>
+#include <opie2/oresource.h>
 
 #include <qpe/applnk.h>
-#include <qpe/resource.h>
-
 
 #include <qpushbutton.h>
 #include <qwhatsthis.h>
 
 
 QString IRCTab::m_errorColor;
@@ -41,16 +40,15 @@ IRCTab::IRCTab(QWidget *parent, const char *name, WFlags f) : QWidget(parent, na
     QHBoxLayout *descLayout = new QHBoxLayout(m_layout);
     descLayout->setMargin(5);
     m_description = new QLabel(tr("Missing description"), this);
     QWhatsThis::add(m_description, tr("Description of the tab's content"));
     descLayout->addWidget(m_description);
     descLayout->setStretchFactor(m_description, 5);
-    QPixmap pic;
-    pic.convertFromImage( Resource::loadImage( "close" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    QPushButton *close = new QPushButton(pic, QString::null, this);
-    close->setMaximumWidth( close->height() );
+    QPushButton *close = new QPushButton( Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ),
+                                          QString::null, this);
+    close->setFixedSize( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
     QWhatsThis::add(close, tr("Close this tab"));
     connect(close, SIGNAL(clicked()), this, SLOT(remove()));
     descLayout->addWidget(close);
     descLayout->setStretchFactor(m_description, 1);
 }