From 11833e51efabe194db59640c2d0ccea0a33c11ce Mon Sep 17 00:00:00 2001
From: drw <drw>
Date: Wed, 04 May 2005 23:22:17 +0000
Subject: Resource -> OResource

---
diff --git a/noncore/net/opieirc/ircchannellist.cpp b/noncore/net/opieirc/ircchannellist.cpp
index 8cf144e..3982f30 100644
--- a/noncore/net/opieirc/ircchannellist.cpp
+++ b/noncore/net/opieirc/ircchannellist.cpp
@@ -1,4 +1,4 @@
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 
 #include "ircchannellist.h"
 #include "ircchannelperson.h"
@@ -8,9 +8,9 @@ IRCChannelList::IRCChannelList(IRCChannel *channel, QWidget *parent, const char
 }
 
 void IRCChannelList::update() {
-    QPixmap op = Resource::loadPixmap("opieirc/op");
-    QPixmap hop = Resource::loadPixmap("opieirc/hop");
-    QPixmap voice = Resource::loadPixmap("opieirc/voice");
+    QPixmap op = Opie::Core::OResource::loadPixmap( "opieirc/op" );
+    QPixmap hop = Opie::Core::OResource::loadPixmap( "opieirc/hop" );
+    QPixmap voice = Opie::Core::OResource::loadPixmap( "opieirc/voice" );
     QListIterator<IRCChannelPerson> it = m_channel->people();
     clear();
     for (; it.current(); ++it) {
diff --git a/noncore/net/opieirc/ircchanneltab.cpp b/noncore/net/opieirc/ircchanneltab.cpp
index 3272a8a..707e17f 100644
--- a/noncore/net/opieirc/ircchanneltab.cpp
+++ b/noncore/net/opieirc/ircchanneltab.cpp
@@ -1,4 +1,4 @@
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 #include <qwhatsthis.h>
 #include <qhbox.h>
 #include <qdict.h>
@@ -43,11 +43,15 @@ IRCChannelTab::IRCChannelTab(IRCChannel *channel, IRCServerTab *parentTab, MainW
     connect(m_list, SIGNAL(mouseButtonPressed(int,QListBoxItem*,const QPoint&)), this, SLOT(mouseButtonPressed(int,QListBoxItem*,const QPoint&)));
     /* Construct the popup menu */
     //QPopupMenu *ctcpMenu = new QPopupMenu(m_list);
-    m_popup->insertItem(Resource::loadPixmap("opieirc/query"), tr("Query"), this, SLOT(popupQuery()));
+    m_popup->insertItem(Opie::Core::OResource::loadPixmap("opieirc/query",Opie::Core::OResource::SmallIcon),
+                        tr("Query"), this, SLOT(popupQuery()));
     m_popup->insertSeparator();
-    m_popup->insertItem(Resource::loadPixmap("opieirc/ping"), tr("Ping"), this, SLOT(popupPing()));
-    m_popup->insertItem(Resource::loadPixmap("opieirc/version"), tr("Version"), this, SLOT(popupVersion()));
-    m_popup->insertItem(Resource::loadPixmap("opieirc/whois"), tr("Whois"), this, SLOT(popupWhois()));
+    m_popup->insertItem(Opie::Core::OResource::loadPixmap("opieirc/ping",Opie::Core::OResource::SmallIcon),
+                        tr("Ping"), this, SLOT(popupPing()));
+    m_popup->insertItem(Opie::Core::OResource::loadPixmap("opieirc/version",Opie::Core::OResource::SmallIcon),
+                        tr("Version"), this, SLOT(popupVersion()));
+    m_popup->insertItem(Opie::Core::OResource::loadPixmap("opieirc/whois",Opie::Core::OResource::SmallIcon),
+                        tr("Whois"), this, SLOT(popupWhois()));
     //m_popup->insertItem(ctcpMenu, "CTCP");
     connect(m_mainWindow, SIGNAL(updateScroll()), this, SLOT(scrolling()));
     m_layout->add(hbox);
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
@@ -2,10 +2,9 @@
 #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>
@@ -44,10 +43,9 @@ IRCTab::IRCTab(QWidget *parent, const char *name, WFlags f) : QWidget(parent, na
     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);
diff --git a/noncore/net/opieirc/mainwindow.cpp b/noncore/net/opieirc/mainwindow.cpp
index 3d60107..5edcf66 100644
--- a/noncore/net/opieirc/mainwindow.cpp
+++ b/noncore/net/opieirc/mainwindow.cpp
@@ -1,8 +1,8 @@
-#include <qmenubar.h>
-#include <qpe/resource.h>
 
 #include <opie2/odebug.h>
+#include <opie2/oresource.h>
 
+#include <qmenubar.h>
 #include <qwhatsthis.h>
 
 #include "mainwindow.h"
@@ -29,11 +29,15 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(
     QMenuBar *menuBar = new QMenuBar(this);
     QPopupMenu *irc = new QPopupMenu(this);
     menuBar->insertItem(tr("IRC"), irc);
-    QAction *a = new QAction(tr("New connection"), Resource::loadPixmap("pass"), QString::null, 0, this, 0);
+    QAction *a = new QAction( tr("New connection"),
+                              Opie::Core::OResource::loadPixmap( "pass", Opie::Core::OResource::SmallIcon ),
+                              QString::null, 0, this, 0 );
     connect(a, SIGNAL(activated()), this, SLOT(newConnection()));
     a->setWhatsThis(tr("Create a new connection to an IRC server"));
     a->addTo(irc);
-    a = new QAction(tr("Settings"), Resource::loadPixmap("SettingsIcon"), QString::null, 0, this, 0);
+    a = new QAction( tr("Settings"),
+                     Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ),
+                     QString::null, 0, this, 0 );
     a->setWhatsThis(tr("Configure OpieIRC's behavior and appearance"));
     connect(a, SIGNAL(activated()), this, SLOT(settings()));
     a->addTo(irc);
--
cgit v0.9.0.2