summaryrefslogtreecommitdiff
path: root/noncore
Side-by-side diff
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp2
-rw-r--r--noncore/apps/tinykate/mainwindow/tinykate.cpp6
-rw-r--r--noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp11
3 files changed, 6 insertions, 13 deletions
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
@@ -54,15 +54,13 @@ SyntaxDocument::~SyntaxDocument()
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);
QStringList list=dir.entryList("*.xml");
for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
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
@@ -200,13 +200,12 @@ 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 ) {
switch ( QMessageBox::warning( this, tr( "TinyKATE" ),
tr("TinyKATE has detected<BR>you selected a <B>.desktop</B> file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?" ),
tr(".desktop File"),
@@ -223,13 +222,13 @@ void TinyKate::open(const QString & filename)
} else {
realFileName = 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);
kd->open( realFileName );
viewCount++;
}
@@ -275,17 +274,16 @@ 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++;
}
bool TinyKate::checkSave() {
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
@@ -115,20 +115,17 @@ QStringList DCIM_DirLister::findCameras()const {
QStringList lst;
StorageInfo inf;
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() ) {
m_mode = ListingUnknown;
lst << QObject::tr("Error no Camera Dir found");
}else