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
@@ -42,25 +42,25 @@ using namespace Opie::Ui;
42#include <stdio.h> 42#include <stdio.h>
43#include <unistd.h> 43#include <unistd.h>
44#include <stdlib.h> 44#include <stdlib.h>
45#include <string.h> 45#include <string.h>
46#include <fcntl.h> 46#include <fcntl.h>
47#if defined(_OS_LINUX_) || defined(Q_OS_LINUX) 47#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
48#include <sys/vfs.h> 48#include <sys/vfs.h>
49#include <mntent.h> 49#include <mntent.h>
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,
59 SLOT( cardMessage(const QCString&,const QByteArray&) ) ); 59 SLOT( cardMessage(const QCString&,const QByteArray&) ) );
60 60
61 QCopChannel *sdChannel = new QCopChannel( "QPE/Card", this ); 61 QCopChannel *sdChannel = new QCopChannel( "QPE/Card", this );
62 connect( sdChannel, 62 connect( sdChannel,
63 SIGNAL( received(const QCString&,const QByteArray&) ), this, 63 SIGNAL( received(const QCString&,const QByteArray&) ), this,
64 SLOT( cardMessage(const QCString&,const QByteArray&) ) ); 64 SLOT( cardMessage(const QCString&,const QByteArray&) ) );
65 65
66 cardInPcmcia0 = FALSE; 66 cardInPcmcia0 = FALSE;
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
@@ -360,25 +360,25 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st
360 connect(m_btnNew, SIGNAL(clicked() ), 360 connect(m_btnNew, SIGNAL(clicked() ),
361 this, SLOT(slotNew() ) ); 361 this, SLOT(slotNew() ) );
362 362
363 363
364 m_btnClose = new QToolButton( box ); 364 m_btnClose = new QToolButton( box );
365 m_btnClose->setUsesBigPixmap(bigicons); 365 m_btnClose->setUsesBigPixmap(bigicons);
366 m_btnClose->setPixmap( Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ) ); 366 m_btnClose->setPixmap( Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ) );
367 connect(m_btnClose, SIGNAL(clicked() ), 367 connect(m_btnClose, SIGNAL(clicked() ),
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);
377 connect(pop, SIGNAL( activated(int) ), 377 connect(pop, SIGNAL( activated(int) ),
378 this, SLOT(slotFSActivated(int) ) ); 378 this, SLOT(slotFSActivated(int) ) );
379 379
380 StorageInfo storage; 380 StorageInfo storage;
381 const QList<FileSystem> &fs = storage.fileSystems(); 381 const QList<FileSystem> &fs = storage.fileSystems();
382 QListIterator<FileSystem> it(fs); 382 QListIterator<FileSystem> it(fs);
383 for ( ; it.current(); ++it ) 383 for ( ; it.current(); ++it )
384 { 384 {
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
@@ -59,25 +59,25 @@ void AdvancedFm::init() {
59 cdUpButton->setPixmap( Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ) ); 59 cdUpButton->setPixmap( Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ) );
60 cdUpButton->setAutoRaise( true ); 60 cdUpButton->setAutoRaise( true );
61 menuBar->insertItem( cdUpButton ); 61 menuBar->insertItem( cdUpButton );
62 62
63 qpeDirButton= new QToolButton( 0,"QPEButton"); 63 qpeDirButton= new QToolButton( 0,"QPEButton");
64 qpeDirButton->setUsesBigPixmap( useBigIcon ); 64 qpeDirButton->setUsesBigPixmap( useBigIcon );
65 qpeDirButton->setPixmap( Opie::Core::OResource::loadPixmap( "logo/opielogo", Opie::Core::OResource::SmallIcon ) ); 65 qpeDirButton->setPixmap( Opie::Core::OResource::loadPixmap( "logo/opielogo", Opie::Core::OResource::SmallIcon ) );
66 qpeDirButton->setAutoRaise( true ); 66 qpeDirButton->setAutoRaise( true );
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");
76 sdButton->setUsesBigPixmap( useBigIcon ); 76 sdButton->setUsesBigPixmap( useBigIcon );
77 sdButton->setPixmap( Opie::Core::OResource::loadPixmap( "advancedfm/sdcard", Opie::Core::OResource::SmallIcon ) ); 77 sdButton->setPixmap( Opie::Core::OResource::loadPixmap( "advancedfm/sdcard", Opie::Core::OResource::SmallIcon ) );
78 sdButton->setAutoRaise( true ); 78 sdButton->setAutoRaise( true );
79 menuBar->insertItem( sdButton ); 79 menuBar->insertItem( sdButton );
80 80
81 docButton = new QToolButton( 0,"docsButton"); 81 docButton = new QToolButton( 0,"docsButton");
82 docButton->setUsesBigPixmap( useBigIcon ); 82 docButton->setUsesBigPixmap( useBigIcon );
83 docButton->setPixmap( Opie::Core::OResource::loadPixmap( "DocsIcon", Opie::Core::OResource::SmallIcon ) ); 83 docButton->setPixmap( Opie::Core::OResource::loadPixmap( "DocsIcon", Opie::Core::OResource::SmallIcon ) );
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
@@ -7,25 +7,25 @@
7#include <qtoolbar.h> 7#include <qtoolbar.h>
8 8
9#include <opie2/oresource.h> 9#include <opie2/oresource.h>
10 10
11#include <qpe/storage.h> 11#include <qpe/storage.h>
12 12
13 13
14#include "filesystem.h" 14#include "filesystem.h"
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 ) ) );
24 24
25 m_storage = new StorageInfo(); 25 m_storage = new StorageInfo();
26 connect(m_storage, SIGNAL(disksChanged() ), 26 connect(m_storage, SIGNAL(disksChanged() ),
27 this, SLOT( changed() ) ); 27 this, SLOT( changed() ) );
28 changed(); 28 changed();
29 29
30 connect(this,SIGNAL(pressed()),SLOT(slotPopUp())); 30 connect(this,SIGNAL(pressed()),SLOT(slotPopUp()));
31} 31}
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
@@ -736,25 +736,25 @@ void PMainWindow::setupMenu()
736 menuBar()->insertItem( tr( "Show" ), dispMenu ); 736 menuBar()->insertItem( tr( "Show" ), dispMenu );
737 settingsMenu = new QPopupMenu( menuBar() ); 737 settingsMenu = new QPopupMenu( menuBar() );
738 menuBar()->insertItem( tr( "Settings" ), settingsMenu ); 738 menuBar()->insertItem( tr( "Settings" ), settingsMenu );
739 739
740 m_aViewfile->addTo(fileMenu); 740 m_aViewfile->addTo(fileMenu);
741 m_aShowInfo->addTo(fileMenu); 741 m_aShowInfo->addTo(fileMenu);
742 m_aStartSlide->addTo(fileMenu); 742 m_aStartSlide->addTo(fileMenu);
743 743
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
753 if ( m_aBeam ) { 753 if ( m_aBeam ) {
754 fileMenu->insertSeparator(); 754 fileMenu->insertSeparator();
755 m_aBeam->addTo( fileMenu ); 755 m_aBeam->addTo( fileMenu );
756 } 756 }
757 fileMenu->insertSeparator(); 757 fileMenu->insertSeparator();
758 m_aTrash->addTo(fileMenu); 758 m_aTrash->addTo(fileMenu);
759 759
760 listviewMenu = new QPopupMenu(dispMenu); 760 listviewMenu = new QPopupMenu(dispMenu);
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
@@ -223,25 +223,25 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st
223 m_btnNew = new QToolButton( box ); 223 m_btnNew = new QToolButton( box );
224 m_btnNew->setIconSet( Resource::loadIconSet("new") ); 224 m_btnNew->setIconSet( Resource::loadIconSet("new") );
225 connect(m_btnNew, SIGNAL(clicked() ), 225 connect(m_btnNew, SIGNAL(clicked() ),
226 this, SLOT(slotNew() ) ); 226 this, SLOT(slotNew() ) );
227 227
228 228
229 m_btnClose = new QToolButton( box ); 229 m_btnClose = new QToolButton( box );
230 m_btnClose->setIconSet( Resource::loadIconSet("close") ); 230 m_btnClose->setIconSet( Resource::loadIconSet("close") );
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) ),
240 this, SLOT(slotFSActivated(int) ) ); 240 this, SLOT(slotFSActivated(int) ) );
241 241
242 StorageInfo storage; 242 StorageInfo storage;
243 const QList<FileSystem> &fs = storage.fileSystems(); 243 const QList<FileSystem> &fs = storage.fileSystems();
244 QListIterator<FileSystem> it(fs); 244 QListIterator<FileSystem> it(fs);
245 for ( ; it.current(); ++it ) { 245 for ( ; it.current(); ++it ) {
246 const QString disk = (*it)->name(); 246 const QString disk = (*it)->name();
247 const QString path = (*it)->path(); 247 const QString path = (*it)->path();