summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-06-24 12:51:12 (UTC)
committer mickeyl <mickeyl>2005-06-24 12:51:12 (UTC)
commit0fa3d7e26d0c1571e27cd05916043c72dc254077 (patch) (unidiff)
tree561ddc2d965411f9ca629b912e522f9f481c90d4
parentfac3dd32424a22ae6ded78a8d9eaaaf318aae2f3 (diff)
downloadopie-0fa3d7e26d0c1571e27cd05916043c72dc254077.zip
opie-0fa3d7e26d0c1571e27cd05916043c72dc254077.tar.gz
opie-0fa3d7e26d0c1571e27cd05916043c72dc254077.tar.bz2
s,cardmon/pcmcia,pcmcia,
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp2
-rw-r--r--libopie2/opieui/fileselector/ofileselector.cpp2
-rw-r--r--noncore/apps/advancedfm/advancedfmData.cpp2
-rw-r--r--noncore/graphics/opie-eye/gui/filesystem.cpp2
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp2
-rw-r--r--noncore/unsupported/libopie/ofileselector.cpp2
6 files changed, 6 insertions, 6 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 11ce880..2a66494 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -50,9 +50,9 @@ using namespace Opie::Ui;
50#endif 50#endif
51 51
52CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ) 52CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent )
53{ 53{
54 pm = Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ); 54 pm = Opie::Core::OResource::loadPixmap( "pcmcia", Opie::Core::OResource::SmallIcon );
55 55
56 QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this ); 56 QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this );
57 connect( pcmciaChannel, 57 connect( pcmciaChannel,
58 SIGNAL( received(const QCString&,const QByteArray&) ), this, 58 SIGNAL( received(const QCString&,const QByteArray&) ), this,
diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp
index a30bd8b..02404e5 100644
--- a/libopie2/opieui/fileselector/ofileselector.cpp
+++ b/libopie2/opieui/fileselector/ofileselector.cpp
@@ -368,9 +368,9 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st
368 selector(), SIGNAL(closeMe() ) ); 368 selector(), SIGNAL(closeMe() ) );
369 369
370 btn = new QToolButton( box ); 370 btn = new QToolButton( box );
371 btn->setUsesBigPixmap(bigicons); 371 btn->setUsesBigPixmap(bigicons);
372 btn->setPixmap( Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ) ); 372 btn->setPixmap( Opie::Core::OResource::loadPixmap( "pcmcia", Opie::Core::OResource::SmallIcon ) );
373 373
374 m_fsButton = btn; 374 m_fsButton = btn;
375 /* let's fill device parts */ 375 /* let's fill device parts */
376 QPopupMenu* pop = new QPopupMenu(this); 376 QPopupMenu* pop = new QPopupMenu(this);
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index aa9db52..feda198 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -67,9 +67,9 @@ void AdvancedFm::init() {
67 menuBar->insertItem( qpeDirButton ); 67 menuBar->insertItem( qpeDirButton );
68 68
69 cfButton = new QToolButton( 0, "CFButton"); 69 cfButton = new QToolButton( 0, "CFButton");
70 cfButton->setUsesBigPixmap( useBigIcon ); 70 cfButton->setUsesBigPixmap( useBigIcon );
71 cfButton->setPixmap( Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ) ); 71 cfButton->setPixmap( Opie::Core::OResource::loadPixmap( "pcmcia", Opie::Core::OResource::SmallIcon ) );
72 cfButton->setAutoRaise( true ); 72 cfButton->setAutoRaise( true );
73 menuBar->insertItem( cfButton ); 73 menuBar->insertItem( cfButton );
74 74
75 sdButton = new QToolButton( 0, "SDButton"); 75 sdButton = new QToolButton( 0, "SDButton");
diff --git a/noncore/graphics/opie-eye/gui/filesystem.cpp b/noncore/graphics/opie-eye/gui/filesystem.cpp
index d84e9f8..9448843 100644
--- a/noncore/graphics/opie-eye/gui/filesystem.cpp
+++ b/noncore/graphics/opie-eye/gui/filesystem.cpp
@@ -15,9 +15,9 @@
15 15
16PFileSystem::PFileSystem( QToolBar* bar) 16PFileSystem::PFileSystem( QToolBar* bar)
17 : QToolButton( bar ) 17 : QToolButton( bar )
18{ 18{
19 setIconSet( Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ) ); 19 setIconSet( Opie::Core::OResource::loadPixmap( "pcmcia", Opie::Core::OResource::SmallIcon ) );
20 20
21 m_pop = new QPopupMenu( this ); 21 m_pop = new QPopupMenu( this );
22 connect( m_pop, SIGNAL( activated( int ) ), 22 connect( m_pop, SIGNAL( activated( int ) ),
23 this, SLOT(slotSelectDir( int ) ) ); 23 this, SLOT(slotSelectDir( int ) ) );
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index d4c5b42..2cf687b 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -744,9 +744,9 @@ void PMainWindow::setupMenu()
744 fileMenu->insertSeparator(); 744 fileMenu->insertSeparator();
745 m_aDirUp->addTo( fileMenu ); 745 m_aDirUp->addTo( fileMenu );
746 746
747 fsMenu = new QPopupMenu(fileMenu); 747 fsMenu = new QPopupMenu(fileMenu);
748 fileMenu->insertItem(Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ), 748 fileMenu->insertItem(Opie::Core::OResource::loadPixmap( "pcmcia", Opie::Core::OResource::SmallIcon ),
749 tr("Select filesystem"),fsMenu); 749 tr("Select filesystem"),fsMenu);
750 connect( fsMenu, SIGNAL( activated( int ) ), this, SLOT(slotSelectDir( int ) ) ); 750 connect( fsMenu, SIGNAL( activated( int ) ), this, SLOT(slotSelectDir( int ) ) );
751 dirChanged(); 751 dirChanged();
752 752
diff --git a/noncore/unsupported/libopie/ofileselector.cpp b/noncore/unsupported/libopie/ofileselector.cpp
index 2a6aed0..3bb85e0 100644
--- a/noncore/unsupported/libopie/ofileselector.cpp
+++ b/noncore/unsupported/libopie/ofileselector.cpp
@@ -231,9 +231,9 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st
231 connect(m_btnClose, SIGNAL(clicked() ), 231 connect(m_btnClose, SIGNAL(clicked() ),
232 selector(), SIGNAL(closeMe() ) ); 232 selector(), SIGNAL(closeMe() ) );
233 233
234 btn = new QToolButton( box ); 234 btn = new QToolButton( box );
235 btn->setIconSet( Resource::loadIconSet("cardmon/pcmcia") ); 235 btn->setIconSet( Resource::loadIconSet("pcmcia") );
236 236
237 /* let's fill device parts */ 237 /* let's fill device parts */
238 QPopupMenu* pop = new QPopupMenu(this); 238 QPopupMenu* pop = new QPopupMenu(this);
239 connect(pop, SIGNAL( activated(int) ), 239 connect(pop, SIGNAL( activated(int) ),