-rw-r--r-- | libqtaux/qsplitter.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/tinykate/mainwindow/tinykate.cpp | 6 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp | 11 |
4 files changed, 7 insertions, 14 deletions
diff --git a/libqtaux/qsplitter.cpp b/libqtaux/qsplitter.cpp index 39321f8..959d5e1 100644 --- a/libqtaux/qsplitter.cpp +++ b/libqtaux/qsplitter.cpp | |||
@@ -727,7 +727,7 @@ void QSplitter::recalc( bool update ) | |||
727 | for ( int i = 0; i< n; i++ ) { | 727 | for ( int i = 0; i< n; i++ ) { |
728 | QSplitterLayoutStruct *s = data->list.at(i); | 728 | QSplitterLayoutStruct *s = data->list.at(i); |
729 | if ( !s->isSplitter ) { | 729 | if ( !s->isSplitter ) { |
730 | QSplitterLayoutStruct *p = (i > 0) ? p = data->list.at( i-1 ) : 0; | 730 | QSplitterLayoutStruct *p = (i > 0) ? data->list.at( i-1 ) : 0; |
731 | if ( p && p->isSplitter ) | 731 | if ( p && p->isSplitter ) |
732 | if ( first || s->wid->isHidden() ) | 732 | if ( first || s->wid->isHidden() ) |
733 | p->wid->hide(); //may trigger new recalc | 733 | p->wid->hide(); //may trigger new recalc |
diff --git a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp index 9fa4452..d8f5aa7 100644 --- a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp +++ b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp | |||
@@ -57,9 +57,7 @@ void SyntaxDocument::setupModeList(bool force) | |||
57 | if (myModeList.count() > 0) return; | 57 | if (myModeList.count() > 0) return; |
58 | 58 | ||
59 | KateConfig *config=KGlobal::config(); | 59 | KateConfig *config=KGlobal::config(); |
60 | KStandardDirs *dirs = KGlobal::dirs(); | ||
61 | 60 | ||
62 | // QStringList list=dirs->findAllResources("data","kate/syntax/*.xml",false,true); | ||
63 | QString path=QPEApplication::qpeDir() +"share/tinykate/syntax/"; | 61 | QString path=QPEApplication::qpeDir() +"share/tinykate/syntax/"; |
64 | 62 | ||
65 | QDir dir(path); | 63 | QDir dir(path); |
diff --git a/noncore/apps/tinykate/mainwindow/tinykate.cpp b/noncore/apps/tinykate/mainwindow/tinykate.cpp index e87464e..e920d5b 100644 --- a/noncore/apps/tinykate/mainwindow/tinykate.cpp +++ b/noncore/apps/tinykate/mainwindow/tinykate.cpp | |||
@@ -203,7 +203,6 @@ void TinyKate::slotOpen( ) | |||
203 | void TinyKate::open(const QString & filename) | 203 | void TinyKate::open(const QString & filename) |
204 | { | 204 | { |
205 | KateDocument *kd= new KateDocument(false, false, this,0,this); | 205 | KateDocument *kd= new KateDocument(false, false, this,0,this); |
206 | KTextEditor::View *kv; | ||
207 | QString realFileName; | 206 | QString realFileName; |
208 | //check if filename is a .desktop file | 207 | //check if filename is a .desktop file |
209 | if ( filename.find( ".desktop", 0, true ) != -1 ) { | 208 | if ( filename.find( ".desktop", 0, true ) != -1 ) { |
@@ -226,7 +225,7 @@ void TinyKate::open(const QString & filename) | |||
226 | 225 | ||
227 | QFileInfo fileInfo( realFileName ); | 226 | QFileInfo fileInfo( realFileName ); |
228 | QString filenamed = fileInfo.fileName(); | 227 | QString filenamed = fileInfo.fileName(); |
229 | tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate", filenamed ); | 228 | tabwidget->addTab(kd->createView(tabwidget,"Unnamed kateview"),"tinykate/tinykate", filenamed ); |
230 | odebug << realFileName << oendl; | 229 | odebug << realFileName << oendl; |
231 | 230 | ||
232 | kd->setDocName( filenamed); | 231 | kd->setDocName( filenamed); |
@@ -278,11 +277,10 @@ void TinyKate::slotCurrentChanged( QWidget * view) | |||
278 | void TinyKate::slotNew( ) | 277 | void TinyKate::slotNew( ) |
279 | { | 278 | { |
280 | KateDocument *kd= new KateDocument(false, false, this,0,this); | 279 | KateDocument *kd= new KateDocument(false, false, this,0,this); |
281 | KTextEditor::View *kv; | ||
282 | 280 | ||
283 | kd->setDocName(tr("Unnamed %1").arg(nextUnnamed++)); | 281 | kd->setDocName(tr("Unnamed %1").arg(nextUnnamed++)); |
284 | kd->setNewDoc(true); | 282 | kd->setNewDoc(true); |
285 | tabwidget->addTab(kv=kd->createView(tabwidget,"BLAH"), | 283 | tabwidget->addTab(kd->createView(tabwidget,"Unnamed"), |
286 | "tinykate/tinykate", | 284 | "tinykate/tinykate", |
287 | kd->docName()); | 285 | kd->docName()); |
288 | viewCount++; | 286 | viewCount++; |
diff --git a/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp b/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp index 147eb9c..d4f9943 100644 --- a/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp +++ b/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp | |||
@@ -118,14 +118,11 @@ QStringList DCIM_DirLister::findCameras()const { | |||
118 | m_map.clear(); | 118 | m_map.clear(); |
119 | 119 | ||
120 | const QList<FileSystem> &list = inf.fileSystems(); | 120 | const QList<FileSystem> &list = inf.fileSystems(); |
121 | QListIterator<FileSystem> it( list ); | ||
122 | 121 | ||
123 | 122 | for ( QListIterator<FileSystem> it( list ); it.current()!=0 ; ++it ) | |
124 | FileSystem *sys; | 123 | if ( QFileInfo( it.current()->path() + "/dcim/" ).exists() ) { |
125 | for ( sys = it.current(); (sys=it.current())!=0 ; ++it ) | 124 | lst << it.current()->name(); |
126 | if ( QFileInfo( sys->path() + "/dcim/" ).exists() ) { | 125 | m_map.insert( it.current()->name(), it.current()->path() ); |
127 | lst << sys->name(); | ||
128 | m_map.insert( sys->name(), sys->path() ); | ||
129 | } | 126 | } |
130 | 127 | ||
131 | if ( lst.isEmpty() ) { | 128 | if ( lst.isEmpty() ) { |