author | simon <simon> | 2002-12-02 14:38:47 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 14:38:47 (UTC) |
commit | 46d64cdfe9a3d949e91ea6a72828405d03337225 (patch) (unidiff) | |
tree | 992e6fd74384ed4b7126b73b3313d599b5035949 | |
parent | 77d55b631fa3cf26bfdf809c17ee3252d3c80ac0 (diff) | |
download | opie-46d64cdfe9a3d949e91ea6a72828405d03337225.zip opie-46d64cdfe9a3d949e91ea6a72828405d03337225.tar.gz opie-46d64cdfe9a3d949e91ea6a72828405d03337225.tar.bz2 |
- two const fixlets
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index ce9faac..11a7b5c 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -1113,58 +1113,58 @@ void PlayListWidget::populateSkinsMenu() { | |||
1113 | const QFileInfoList *skinslist = skinsDir.entryInfoList(); | 1113 | const QFileInfoList *skinslist = skinsDir.entryInfoList(); |
1114 | QFileInfoListIterator it( *skinslist ); | 1114 | QFileInfoListIterator it( *skinslist ); |
1115 | QFileInfo *fi; | 1115 | QFileInfo *fi; |
1116 | while ( ( fi = it.current() ) ) { | 1116 | while ( ( fi = it.current() ) ) { |
1117 | skinName = fi->fileName(); | 1117 | skinName = fi->fileName(); |
1118 | // qDebug( fi->fileName() ); | 1118 | // qDebug( fi->fileName() ); |
1119 | if( skinName != "." && skinName != ".." && skinName !="CVS" ) { | 1119 | if( skinName != "." && skinName != ".." && skinName !="CVS" ) { |
1120 | item = skinsMenu->insertItem( fi->fileName() ) ; | 1120 | item = skinsMenu->insertItem( fi->fileName() ) ; |
1121 | } | 1121 | } |
1122 | if( skinName == "default" ) { | 1122 | if( skinName == "default" ) { |
1123 | defaultSkinIndex = item; | 1123 | defaultSkinIndex = item; |
1124 | } | 1124 | } |
1125 | if( skinName == skin ) { | 1125 | if( skinName == skin ) { |
1126 | skinsMenu->setItemChecked( item, TRUE ); | 1126 | skinsMenu->setItemChecked( item, TRUE ); |
1127 | } | 1127 | } |
1128 | ++it; | 1128 | ++it; |
1129 | } | 1129 | } |
1130 | } | 1130 | } |
1131 | 1131 | ||
1132 | void PlayListWidget::skinsMenuActivated( int item ) { | 1132 | void PlayListWidget::skinsMenuActivated( int item ) { |
1133 | for(unsigned int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) { | 1133 | for(unsigned int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) { |
1134 | skinsMenu->setItemChecked( i, FALSE ); | 1134 | skinsMenu->setItemChecked( i, FALSE ); |
1135 | } | 1135 | } |
1136 | skinsMenu->setItemChecked( item, TRUE ); | 1136 | skinsMenu->setItemChecked( item, TRUE ); |
1137 | 1137 | ||
1138 | Config cfg( "OpiePlayer" ); | 1138 | Config cfg( "OpiePlayer" ); |
1139 | cfg.setGroup("Options"); | 1139 | cfg.setGroup("Options"); |
1140 | cfg.writeEntry("Skin", skinsMenu->text( item ) ); | 1140 | cfg.writeEntry("Skin", skinsMenu->text( item ) ); |
1141 | QMessageBox::warning( this, tr( "OpiePlayer" ), | 1141 | QMessageBox::warning( this, tr( "OpiePlayer" ), |
1142 | tr( "You must <b>restart</b> Opieplayer<br>to see your changes." ) ); | 1142 | tr( "You must <b>restart</b> Opieplayer<br>to see your changes." ) ); |
1143 | } | 1143 | } |
1144 | 1144 | ||
1145 | int PlayListWidget::whichList() { | 1145 | int PlayListWidget::whichList() const { |
1146 | return tabWidget->currentPageIndex(); | 1146 | return tabWidget->currentPageIndex(); |
1147 | } | 1147 | } |
1148 | 1148 | ||
1149 | PlayListWidget::TabType PlayListWidget::currentTab() const | 1149 | PlayListWidget::TabType PlayListWidget::currentTab() const |
1150 | { | 1150 | { |
1151 | static const TabType indexToTabType[ NumTabTypes ] = | 1151 | static const TabType indexToTabType[ NumTabTypes ] = |
1152 | { CurrentPlayList, AudioFiles, VideoFiles, PlayLists }; | 1152 | { CurrentPlayList, AudioFiles, VideoFiles, PlayLists }; |
1153 | 1153 | ||
1154 | int index = tabWidget->currentPageIndex(); | 1154 | int index = tabWidget->currentPageIndex(); |
1155 | assert( index < NumTabTypes && index >= 0 ); | 1155 | assert( index < NumTabTypes && index >= 0 ); |
1156 | 1156 | ||
1157 | return indexToTabType[ index ]; | 1157 | return indexToTabType[ index ]; |
1158 | } | 1158 | } |
1159 | 1159 | ||
1160 | QString PlayListWidget::currentFileListPathName() { | 1160 | QString PlayListWidget::currentFileListPathName() const { |
1161 | switch (whichList()) { | 1161 | switch (whichList()) { |
1162 | case 1: | 1162 | case 1: |
1163 | return audioView->currentItem()->text(3); | 1163 | return audioView->currentItem()->text(3); |
1164 | break; | 1164 | break; |
1165 | case 2: | 1165 | case 2: |
1166 | return videoView->currentItem()->text(3); | 1166 | return videoView->currentItem()->text(3); |
1167 | break; | 1167 | break; |
1168 | }; | 1168 | }; |
1169 | return ""; | 1169 | return ""; |
1170 | } | 1170 | } |
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h index 05d53a4..7044abe 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.h +++ b/noncore/multimedia/opieplayer2/playlistwidget.h | |||
@@ -39,74 +39,74 @@ | |||
39 | #include <qtabwidget.h> | 39 | #include <qtabwidget.h> |
40 | #include <qpe/fileselector.h> | 40 | #include <qpe/fileselector.h> |
41 | #include <qpushbutton.h> | 41 | #include <qpushbutton.h> |
42 | #include <qpopupmenu.h> | 42 | #include <qpopupmenu.h> |
43 | 43 | ||
44 | #include "playlistwidgetgui.h" | 44 | #include "playlistwidgetgui.h" |
45 | 45 | ||
46 | 46 | ||
47 | //class PlayListWidgetPrivate; | 47 | //class PlayListWidgetPrivate; |
48 | class Config; | 48 | class Config; |
49 | class QListViewItem; | 49 | class QListViewItem; |
50 | class QListView; | 50 | class QListView; |
51 | class QPoint; | 51 | class QPoint; |
52 | class QAction; | 52 | class QAction; |
53 | class QLabel; | 53 | class QLabel; |
54 | 54 | ||
55 | class PlayListWidget : public PlayListWidgetGui { | 55 | class PlayListWidget : public PlayListWidgetGui { |
56 | Q_OBJECT | 56 | Q_OBJECT |
57 | public: | 57 | public: |
58 | enum TabType { CurrentPlayList, AudioFiles, VideoFiles, PlayLists, NumTabTypes = 4 }; | 58 | enum TabType { CurrentPlayList, AudioFiles, VideoFiles, PlayLists, NumTabTypes = 4 }; |
59 | 59 | ||
60 | PlayListWidget( QWidget* parent=0, const char* name=0, WFlags fl=0 ); | 60 | PlayListWidget( QWidget* parent=0, const char* name=0, WFlags fl=0 ); |
61 | ~PlayListWidget(); | 61 | ~PlayListWidget(); |
62 | DocLnkSet files; | 62 | DocLnkSet files; |
63 | DocLnkSet vFiles; | 63 | DocLnkSet vFiles; |
64 | bool fromSetDocument; | 64 | bool fromSetDocument; |
65 | bool insanityBool; | 65 | bool insanityBool; |
66 | QString setDocFileRef, currentPlayList; | 66 | QString setDocFileRef, currentPlayList; |
67 | // retrieve the current playlist entry (media file link) | 67 | // retrieve the current playlist entry (media file link) |
68 | const DocLnk *current(); | 68 | const DocLnk *current(); |
69 | void useSelectedDocument(); | 69 | void useSelectedDocument(); |
70 | int selected; | 70 | int selected; |
71 | int whichList(); | 71 | int whichList() const; |
72 | TabType currentTab() const; | 72 | TabType currentTab() const; |
73 | 73 | ||
74 | public slots: | 74 | public slots: |
75 | bool first(); | 75 | bool first(); |
76 | bool last(); | 76 | bool last(); |
77 | bool next(); | 77 | bool next(); |
78 | bool prev(); | 78 | bool prev(); |
79 | void writeDefaultPlaylist( ); | 79 | void writeDefaultPlaylist( ); |
80 | QString currentFileListPathName(); | 80 | QString currentFileListPathName() const; |
81 | protected: | 81 | protected: |
82 | void keyReleaseEvent( QKeyEvent *e); | 82 | void keyReleaseEvent( QKeyEvent *e); |
83 | 83 | ||
84 | private: | 84 | private: |
85 | int defaultSkinIndex; | 85 | int defaultSkinIndex; |
86 | bool audioScan, videoScan, audioPopulated, videoPopulated; | 86 | bool audioScan, videoScan, audioPopulated, videoPopulated; |
87 | void readm3u(const QString &); | 87 | void readm3u(const QString &); |
88 | void readPls(const QString &); | 88 | void readPls(const QString &); |
89 | void initializeStates(); | 89 | void initializeStates(); |
90 | void populateAudioView(); | 90 | void populateAudioView(); |
91 | void populateVideoView(); | 91 | void populateVideoView(); |
92 | 92 | ||
93 | private slots: | 93 | private slots: |
94 | void populateSkinsMenu(); | 94 | void populateSkinsMenu(); |
95 | void skinsMenuActivated(int); | 95 | void skinsMenuActivated(int); |
96 | void pmViewActivated(int); | 96 | void pmViewActivated(int); |
97 | void writem3u(); | 97 | void writem3u(); |
98 | void writeCurrentM3u(); | 98 | void writeCurrentM3u(); |
99 | void scanForAudio(); | 99 | void scanForAudio(); |
100 | void scanForVideo(); | 100 | void scanForVideo(); |
101 | void openFile(); | 101 | void openFile(); |
102 | void setDocument( const QString& fileref ); | 102 | void setDocument( const QString& fileref ); |
103 | void addToSelection( const DocLnk& ); // Add a media file to the playlist | 103 | void addToSelection( const DocLnk& ); // Add a media file to the playlist |
104 | void addToSelection( QListViewItem* ); // Add a media file to the playlist | 104 | void addToSelection( QListViewItem* ); // Add a media file to the playlist |
105 | void setPlaylist( bool ); // Show/Hide the playlist | 105 | void setPlaylist( bool ); // Show/Hide the playlist |
106 | void clearList(); | 106 | void clearList(); |
107 | void addAllToList(); | 107 | void addAllToList(); |
108 | void addAllMusicToList(); | 108 | void addAllMusicToList(); |
109 | void addAllVideoToList(); | 109 | void addAllVideoToList(); |
110 | void saveList(); // Save the playlist | 110 | void saveList(); // Save the playlist |
111 | void loadList( const DocLnk &); // Load a playlist | 111 | void loadList( const DocLnk &); // Load a playlist |
112 | void playIt( QListViewItem *); | 112 | void playIt( QListViewItem *); |