author | zecke <zecke> | 2002-11-03 11:03:20 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-11-03 11:03:20 (UTC) |
commit | 207f7430db6c90e88825ea2bedc9ae1bf68e3d99 (patch) (unidiff) | |
tree | fb69b58f130c0b0a17224989f26aa4af5939b33e /libopie/ofileselector | |
parent | 485fae36510cb42690c9df55fae64312b1e656ae (diff) | |
download | opie-207f7430db6c90e88825ea2bedc9ae1bf68e3d99.zip opie-207f7430db6c90e88825ea2bedc9ae1bf68e3d99.tar.gz opie-207f7430db6c90e88825ea2bedc9ae1bf68e3d99.tar.bz2 |
Patch by Simon Hausmann to suit gcc3 needs
many thanks
-rw-r--r-- | libopie/ofileselector/odefaultfactories.cpp | 4 | ||||
-rw-r--r-- | libopie/ofileselector/odefaultfactories.h | 1 | ||||
-rw-r--r-- | libopie/ofileselector/ofileselector.cpp | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/libopie/ofileselector/odefaultfactories.cpp b/libopie/ofileselector/odefaultfactories.cpp index c8efffb..2f8ef9b 100644 --- a/libopie/ofileselector/odefaultfactories.cpp +++ b/libopie/ofileselector/odefaultfactories.cpp | |||
@@ -1,19 +1,15 @@ | |||
1 | #include "ofilelistview.h" | 1 | #include "ofilelistview.h" |
2 | #include "ofileiconview.h" | ||
3 | #include "olocallister.h" | 2 | #include "olocallister.h" |
4 | 3 | ||
5 | 4 | ||
6 | #include "odefaultfactories.h" | 5 | #include "odefaultfactories.h" |
7 | 6 | ||
8 | extern "C" { | 7 | extern "C" { |
9 | 8 | ||
10 | 9 | ||
11 | OFileView* newFileIconView( OFileSelector* sel, QWidget* parent ) { | ||
12 | return new OFileIconView( parent, sel ); | ||
13 | } | ||
14 | 10 | ||
15 | OFileView* newFileListView( OFileSelector* sel, QWidget* par ) { | 11 | OFileView* newFileListView( OFileSelector* sel, QWidget* par ) { |
16 | return new OFileListView(par, sel ); | 12 | return new OFileListView(par, sel ); |
17 | } | 13 | } |
18 | 14 | ||
19 | OLister* newLocalLister( OFileSelector* sel) { | 15 | OLister* newLocalLister( OFileSelector* sel) { |
diff --git a/libopie/ofileselector/odefaultfactories.h b/libopie/ofileselector/odefaultfactories.h index b4c35af..0cc90e5 100644 --- a/libopie/ofileselector/odefaultfactories.h +++ b/libopie/ofileselector/odefaultfactories.h | |||
@@ -2,13 +2,12 @@ | |||
2 | #define OPIE_DEFAULT_FACTORIES_H | 2 | #define OPIE_DEFAULT_FACTORIES_H |
3 | 3 | ||
4 | #include "ofilefactory.h" | 4 | #include "ofilefactory.h" |
5 | 5 | ||
6 | extern "C" { | 6 | extern "C" { |
7 | 7 | ||
8 | OFileView* newFileIconView( OFileSelector*, QWidget* parent ); | ||
9 | OFileView* newFileListView( OFileSelector*, QWidget* parent ); | 8 | OFileView* newFileListView( OFileSelector*, QWidget* parent ); |
10 | 9 | ||
11 | OLister* newLocalLister(OFileSelector* ); | 10 | OLister* newLocalLister(OFileSelector* ); |
12 | 11 | ||
13 | 12 | ||
14 | }; | 13 | }; |
diff --git a/libopie/ofileselector/ofileselector.cpp b/libopie/ofileselector/ofileselector.cpp index c6e923f..abc2889 100644 --- a/libopie/ofileselector/ofileselector.cpp +++ b/libopie/ofileselector/ofileselector.cpp | |||
@@ -973,13 +973,14 @@ void OFileSelector::setView( const QString& lis ) { | |||
973 | * the factory | 973 | * the factory |
974 | */ | 974 | */ |
975 | void OFileSelector::initFactory() { | 975 | void OFileSelector::initFactory() { |
976 | m_fileFactory = new OFileFactory(); | 976 | m_fileFactory = new OFileFactory(); |
977 | m_fileFactory->addLister(tr("Files"), newLocalLister ); | 977 | m_fileFactory->addLister(tr("Files"), newLocalLister ); |
978 | m_fileFactory->addView(tr("List View"), newFileListView ); | 978 | m_fileFactory->addView(tr("List View"), newFileListView ); |
979 | m_fileFactory->addView(tr("Documents"), newFileIconView ); | 979 | /* dummy entry */ |
980 | m_fileFactory->addView(tr("Documents"), newFileListView ); | ||
980 | } | 981 | } |
981 | 982 | ||
982 | void OFileSelector::fillList() { | 983 | void OFileSelector::fillList() { |
983 | qWarning("fill list"); | 984 | qWarning("fill list"); |
984 | if (!m_viewCheck ) | 985 | if (!m_viewCheck ) |
985 | return; | 986 | return; |