-rw-r--r-- | noncore/net/opieirc/ircchannellist.cpp | 8 | ||||
-rw-r--r-- | noncore/net/opieirc/ircchanneltab.cpp | 14 | ||||
-rw-r--r-- | noncore/net/opieirc/irctab.cpp | 10 | ||||
-rw-r--r-- | noncore/net/opieirc/mainwindow.cpp | 12 |
4 files changed, 25 insertions, 19 deletions
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,2 +1,2 @@ -#include <qpe/resource.h> +#include <opie2/oresource.h> @@ -10,5 +10,5 @@ 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(); 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,2 +1,2 @@ -#include <qpe/resource.h> +#include <opie2/oresource.h> #include <qwhatsthis.h> @@ -45,7 +45,11 @@ IRCChannelTab::IRCChannelTab(IRCChannel *channel, IRCServerTab *parentTab, MainW //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"); 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 @@ -4,6 +4,5 @@ #include <opie2/okeyconfigmanager.h> +#include <opie2/oresource.h> #include <qpe/applnk.h> -#include <qpe/resource.h> - @@ -46,6 +45,5 @@ IRCTab::IRCTab(QWidget *parent, const char *name, WFlags f) : QWidget(parent, na 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")); 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,6 +1,6 @@ -#include <qmenubar.h> -#include <qpe/resource.h> #include <opie2/odebug.h> +#include <opie2/oresource.h> +#include <qmenubar.h> #include <qwhatsthis.h> @@ -31,3 +31,5 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow( 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())); @@ -35,3 +37,5 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow( 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")); |