| -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 ) for ( int i = 0; i< n; i++ ) { QSplitterLayoutStruct *s = data->list.at(i); if ( !s->isSplitter ) { - QSplitterLayoutStruct *p = (i > 0) ? p = data->list.at( i-1 ) : 0; + QSplitterLayoutStruct *p = (i > 0) ? data->list.at( i-1 ) : 0; if ( p && p->isSplitter ) if ( first || s->wid->isHidden() ) 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) if (myModeList.count() > 0) return; KateConfig *config=KGlobal::config(); - KStandardDirs *dirs = KGlobal::dirs(); -// QStringList list=dirs->findAllResources("data","kate/syntax/*.xml",false,true); QString path=QPEApplication::qpeDir() +"share/tinykate/syntax/"; 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( ) void TinyKate::open(const QString & filename) { KateDocument *kd= new KateDocument(false, false, this,0,this); - KTextEditor::View *kv; QString realFileName; //check if filename is a .desktop file if ( filename.find( ".desktop", 0, true ) != -1 ) { @@ -226,7 +225,7 @@ void TinyKate::open(const QString & filename) QFileInfo fileInfo( realFileName ); QString filenamed = fileInfo.fileName(); - tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate", filenamed ); + tabwidget->addTab(kd->createView(tabwidget,"Unnamed kateview"),"tinykate/tinykate", filenamed ); odebug << realFileName << oendl; kd->setDocName( filenamed); @@ -278,11 +277,10 @@ void TinyKate::slotCurrentChanged( QWidget * view) void TinyKate::slotNew( ) { KateDocument *kd= new KateDocument(false, false, this,0,this); - KTextEditor::View *kv; kd->setDocName(tr("Unnamed %1").arg(nextUnnamed++)); kd->setNewDoc(true); - tabwidget->addTab(kv=kd->createView(tabwidget,"BLAH"), + tabwidget->addTab(kd->createView(tabwidget,"Unnamed"), "tinykate/tinykate", kd->docName()); 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 { m_map.clear(); const QList<FileSystem> &list = inf.fileSystems(); - QListIterator<FileSystem> it( list ); - - FileSystem *sys; - for ( sys = it.current(); (sys=it.current())!=0 ; ++it ) - if ( QFileInfo( sys->path() + "/dcim/" ).exists() ) { - lst << sys->name(); - m_map.insert( sys->name(), sys->path() ); + for ( QListIterator<FileSystem> it( list ); it.current()!=0 ; ++it ) + if ( QFileInfo( it.current()->path() + "/dcim/" ).exists() ) { + lst << it.current()->name(); + m_map.insert( it.current()->name(), it.current()->path() ); } if ( lst.isEmpty() ) { |