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
@@ -44,35 +44,33 @@ void SyntaxDocument::setIdentifier(const QString& identifier)
#warning FIXME delete m_root;
m_root=Opie::Core::XMLElement::load(identifier);
if (!m_root) KMessageBox::error( 0L, i18n("Can't open %1").arg(identifier) );
}
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 )
{
QString Group="Highlighting_Cache"+path+*it;
if ((config->hasGroup(Group)) && (!force))
{
config->setGroup(Group);
syntaxModeListItem *mli=new syntaxModeListItem;
mli->name = config->readEntry("name","");
mli->section = config->readEntry("section","");
mli->mimetype = config->readEntry("mimetype","");
mli->extension = config->readEntry("extension","");
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
@@ -190,56 +190,55 @@ TinyKate::~TinyKate( )
}
}
void TinyKate::slotOpen( )
{
QString filename = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL,
QString::null);
if (!filename.isEmpty())
{
open(filename);
}
}
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"),
tr("Linked Document"), 0, 1, 1 ) )
{
case 0: //desktop
realFileName = filename;
break;
case 1: //linked
DocLnk docLnk( filename );
realFileName = docLnk.file();
break;
};
} 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++;
}
void TinyKate::setDocument(const QString& fileref)
{
open( fileref );
}
void TinyKate::slotCurrentChanged( QWidget * view)
{
if (currentView)
{
@@ -265,37 +264,36 @@ void TinyKate::slotCurrentChanged( QWidget * view)
connect(editPaste,SIGNAL(clicked()),currentView,SLOT(paste()));
connect(editUndo,SIGNAL(clicked()),currentView,SLOT(undo()));
connect(editRedo,SIGNAL(clicked()),currentView,SLOT(redo()));
connect(editFind,SIGNAL(activated()),currentView,SLOT(find()));
connect(editReplace,SIGNAL(activated()),currentView,SLOT(replace()));
connect(editGotoLine,SIGNAL(activated()),currentView,SLOT(gotoLine()));
connect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes()));
connect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes()));
connect(hlmenu,SIGNAL(activated(int)), currentView,SLOT(setHl(int)));
connect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog()));
}
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() {
if (currentView==0) return true;
KateView *kv = (KateView*) currentView;
if(kv->isModified()) {
KateDocument *kd = (KateDocument*) kv->document();
switch( QMessageBox::information( 0, (tr("TinyKATE")),
(tr("Do you want to save\n"
"changes to the document\n"
"%1?\n").arg(kd->docName())),
(tr("Save")), (tr("Don't Save")), (tr("&Cancel")), 2, 2 ) )
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
@@ -105,40 +105,37 @@ QString DCIM_DirLister::dirUp( const QString& p )const {
}
/* down cases */
owarn << " New String " << str << " old path " << m_mode << oendl;
m_path = str;
return str;
}
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
m_mode = ListingStart;
return lst;
}
QStringList DCIM_DirLister::findAlbums()const {
QStringList lst = QDir( m_path ).entryList( QDir::Dirs );
lst.remove( "." );
lst.remove( ".." );