From bce2a9995fa423f9fc796b46c548e47a45c9d247 Mon Sep 17 00:00:00 2001 From: drw Date: Mon, 23 Feb 2004 18:27:31 +0000 Subject: AdvancedFM: libopie->libopie2 --- diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index 9c13e53..5148172 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp @@ -12,12 +12,6 @@ #define DEVELOPERS_VERSION #include "advancedfm.h" - -// #include -// #include - -#include - #include #include #include @@ -108,113 +102,113 @@ void AdvancedFm::tabChanged(QWidget *) { void AdvancedFm::populateView() { // qWarning("PopulateView"); - QPixmap pm; - QListView *thisView = CurrentView(); - QDir *thisDir = CurrentDir(); - QString path = thisDir->canonicalPath(); + QPixmap pm; + QListView *thisView = CurrentView(); + QDir *thisDir = CurrentDir(); + QString path = thisDir->canonicalPath(); //qWarning("path is "+path); - thisView->clear(); - thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); - thisDir->setMatchAllDirs(TRUE); - thisDir->setNameFilter(filterStr); - QString fileL, fileS, fileDate; - QString fs= getFileSystemType((const QString &) path); - setCaption(tr("AdvancedFm :: ")+fs+" :: " - +checkDiskSpace((const QString &) path)+ tr(" kB free") ); - bool isDir=FALSE; - const QFileInfoList *list = thisDir->entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); - QFileInfoListIterator it(*list); - QFileInfo *fi; - while ( (fi=it.current()) ) { - if (fi->isSymLink() ) { - QString symLink=fi->readLink(); - QFileInfo sym( symLink); - fileS.sprintf( "%10i", sym.size() ); - fileL = fi->fileName() +" -> " + sym.filePath().data(); - fileDate = sym.lastModified().toString(); - } else { - fileS.sprintf( "%10i", fi->size() ); - fileL = fi->fileName(); - fileDate= fi->lastModified().toString(); - if( QDir(QDir::cleanDirPath( path +"/"+fileL)).exists() ) { + thisView->clear(); + thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); + thisDir->setMatchAllDirs(TRUE); + thisDir->setNameFilter(filterStr); + QString fileL, fileS, fileDate; + QString fs= getFileSystemType((const QString &) path); + setCaption(tr("AdvancedFm :: ")+fs+" :: " + +checkDiskSpace((const QString &) path)+ tr(" kB free") ); + bool isDir=FALSE; + const QFileInfoList *list = thisDir->entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); + QFileInfoListIterator it(*list); + QFileInfo *fi; + while ( (fi=it.current()) ) { + if (fi->isSymLink() ) { + QString symLink=fi->readLink(); + QFileInfo sym( symLink); + fileS.sprintf( "%10i", sym.size() ); + fileL = fi->fileName() +" -> " + sym.filePath().data(); + fileDate = sym.lastModified().toString(); + } else { + fileS.sprintf( "%10i", fi->size() ); + fileL = fi->fileName(); + fileDate= fi->lastModified().toString(); + if( QDir(QDir::cleanDirPath( path +"/"+fileL)).exists() ) { // if(fileL == "..") - fileL += "/"; - isDir=TRUE; - } - } - QFileInfo fileInfo( path + "/" + fileL); - - if(fileL !="./" && fi->exists()) { - item = new QListViewItem( thisView, fileL, fileS , fileDate); - - if(isDir || fileL.find("/",0,TRUE) != -1) { - - if( !QDir( fi->filePath() ).isReadable()) //is directory - pm = Resource::loadPixmap( "lockedfolder" ); - else - pm= Resource::loadPixmap( "folder" ); - } - else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) { - pm = Resource::loadPixmap( "exec"); - } - else if( (fileInfo.permission( QFileInfo::ExeUser) - | fileInfo.permission( QFileInfo::ExeGroup) - | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) { - pm = Resource::loadPixmap( "exec"); - } - else if( !fi->isReadable() ) { - pm = Resource::loadPixmap( "locked" ); - } - else { //everything else goes by mimetype - MimeType mt(fi->filePath()); - pm=mt.pixmap(); //sets the correct pixmap for mimetype - if(pm.isNull()) { - pm = unknownXpm; - } - } - if( fi->isSymLink() || fileL.find("->",0,TRUE) != -1) { - // qDebug(" overlay link image"); - pm= Resource::loadPixmap( "advancedfm/symlink" ); - // pm= Resource::loadPixmap( "folder" ); + fileL += "/"; + isDir=TRUE; + } + } + QFileInfo fileInfo( path + "/" + fileL); + + if(fileL !="./" && fi->exists()) { + item = new QListViewItem( thisView, fileL, fileS , fileDate); + + if(isDir || fileL.find("/",0,TRUE) != -1) { + + if( !QDir( fi->filePath() ).isReadable()) //is directory + pm = Resource::loadPixmap( "lockedfolder" ); + else + pm= Resource::loadPixmap( "folder" ); + } + else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) { + pm = Resource::loadPixmap( "exec"); + } + else if( (fileInfo.permission( QFileInfo::ExeUser) + | fileInfo.permission( QFileInfo::ExeGroup) + | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) { + pm = Resource::loadPixmap( "exec"); + } + else if( !fi->isReadable() ) { + pm = Resource::loadPixmap( "locked" ); + } + else { //everything else goes by mimetype + MimeType mt(fi->filePath()); + pm=mt.pixmap(); //sets the correct pixmap for mimetype + if(pm.isNull()) { + pm = unknownXpm; + } + } + if( fi->isSymLink() || fileL.find("->",0,TRUE) != -1) { + // qDebug(" overlay link image"); + pm= Resource::loadPixmap( "advancedfm/symlink" ); + // pm= Resource::loadPixmap( "folder" ); // QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); // QPainter painter( &pm ); // painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); // pm.setMask( pm.createHeuristicMask( FALSE ) ); - } - item->setPixmap( 0,pm); - - } - isDir=FALSE; - ++it; - } - - if( path.find("dev",0,TRUE) != -1) { - struct stat buf; - dev_t devT; - DIR *dir; - struct dirent *mydirent; - - if((dir = opendir( path.latin1())) != NULL) - while ((mydirent = readdir(dir)) != NULL) { - lstat( mydirent->d_name, &buf); + } + item->setPixmap( 0,pm); + + } + isDir=FALSE; + ++it; + } + + if( path.find("dev",0,TRUE) != -1) { + struct stat buf; + dev_t devT; + DIR *dir; + struct dirent *mydirent; + + if((dir = opendir( path.latin1())) != NULL) + while ((mydirent = readdir(dir)) != NULL) { + lstat( mydirent->d_name, &buf); // qDebug(mydirent->d_name); - fileL.sprintf("%s", mydirent->d_name); - devT = buf.st_dev; - fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF); - fileDate.sprintf("%s", ctime( &buf.st_mtime)); - if( fileL.find(".") == -1 ) { - item= new QListViewItem( thisView, fileL, fileS, fileDate); - pm = unknownXpm; - item->setPixmap( 0,pm); - } - } + fileL.sprintf("%s", mydirent->d_name); + devT = buf.st_dev; + fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF); + fileDate.sprintf("%s", ctime( &buf.st_mtime)); + if( fileL.find(".") == -1 ) { + item= new QListViewItem( thisView, fileL, fileS, fileDate); + pm = unknownXpm; + item->setPixmap( 0,pm); + } + } - closedir(dir); - } + closedir(dir); + } - thisView->setSorting( 3,FALSE); - fillCombo( (const QString &) path ); + thisView->setSorting( 3,FALSE); + fillCombo( (const QString &) path ); } void AdvancedFm::rePopulate() { @@ -783,7 +777,7 @@ void AdvancedFm::gotoCustomDir(const QString &dir) { } QDir *AdvancedFm::CurrentDir() { - + if ( whichTab == 1) { return ¤tDir; } else { @@ -824,7 +818,7 @@ void AdvancedFm::setOtherTabCurrent() { TabWidget->setCurrentWidget(0); } OtherView()->setFocus(); - OtherView()->setSelected( CurrentView()->firstChild(), true); + OtherView()->setSelected( CurrentView()->firstChild(), true); } void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) { @@ -864,7 +858,7 @@ void AdvancedFm::gotoDirectory(const QString &file) { } findFile(file); } - + } void AdvancedFm::findFile(const QString &fileName) { diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h index bfefa77..547fa7c 100644 --- a/noncore/apps/advancedfm/advancedfm.h +++ b/noncore/apps/advancedfm/advancedfm.h @@ -14,8 +14,8 @@ #define QTOPIA_INTERNAL_FSLP // to get access to fileproperties #define QT_QWS_OPIE -//#include -#include +#include +#include #include #include @@ -30,7 +30,8 @@ #include #include -class OSplitter; +using Opie::OSplitter; + class QVBoxLayout; class QHBoxLayout; class QGridLayout; @@ -40,7 +41,6 @@ class QListviewItem; class QLabel; class QProgressBar; class QSpinBox; -class QTabWidget; class QWidget; class QPopupMenu; class QFile; @@ -161,7 +161,7 @@ protected slots: void fileBeamFinished( Ir *); bool copyDirectory( const QString & , const QString & ); // void navigateToSelected(); - bool moveDirectory( const QString & , const QString & ); + bool moveDirectory( const QString & , const QString & ); // void slotSwitchtoLocal(int); private: @@ -186,7 +186,7 @@ private slots: void gotoCustomDir(const QString &); void qcopReceive(const QCString&, const QByteArray&); void setDocument(const QString &); - + }; #endif // ADVANCEDFM_H diff --git a/noncore/apps/advancedfm/advancedfm.pro b/noncore/apps/advancedfm/advancedfm.pro index 70db018..ca9856b 100644 --- a/noncore/apps/advancedfm/advancedfm.pro +++ b/noncore/apps/advancedfm/advancedfm.pro @@ -6,12 +6,12 @@ SOURCES = advancedfm.cpp advancedfmData.cpp advancedfmMenu.cpp filePermissions TARGET = advancedfm INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 -lopieui2 TRANSLATIONS = ../../../i18n/de/advancedfm.ts \ - ../../../i18n/nl/advancedfm.ts \ - ../../../i18n/da/advancedfm.ts \ - ../../../i18n/xx/advancedfm.ts \ + ../../../i18n/nl/advancedfm.ts \ + ../../../i18n/da/advancedfm.ts \ + ../../../i18n/xx/advancedfm.ts \ ../../../i18n/en/advancedfm.ts \ ../../../i18n/es/advancedfm.ts \ ../../../i18n/fr/advancedfm.ts \ @@ -27,7 +27,7 @@ TRANSLATIONS = ../../../i18n/de/advancedfm.ts \ ../../../i18n/zh_TW/advancedfm.ts -!contains(CONFIG,quick-app) { +!contains(CONFIG,quick-app) { DESTDIR = $(OPIEDIR)/bin DEFINES += NOQUICKLAUNCH } diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp index ddaa39a..763ae34 100644 --- a/noncore/apps/advancedfm/advancedfmData.cpp +++ b/noncore/apps/advancedfm/advancedfmData.cpp @@ -11,9 +11,7 @@ ***************************************************************************/ #include "advancedfm.h" -#include #include - #include #include #include @@ -129,7 +127,7 @@ void AdvancedFm::init() { currentPathCombo = new QComboBox( FALSE, lineBox, "currentPathCombo" ); currentPathCombo->setEditable(TRUE); currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); - currentPathCombo->setFocusPolicy(NoFocus); + currentPathCombo->setFocusPolicy(NoFocus); layout->addWidget( lineBox ); @@ -153,7 +151,7 @@ void AdvancedFm::init() { Local_View->setSelectionMode(QListView::Extended); Local_View->setFocusPolicy(StrongFocus); Local_View->installEventFilter( this ); - + QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); tabLayout->addWidget( Local_View, 0, 0 ); @@ -177,7 +175,7 @@ void AdvancedFm::init() { Remote_View->setSelectionMode(QListView::Extended); Remote_View->setFocusPolicy(StrongFocus); Remote_View->installEventFilter( this ); - + QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); tabLayout_2->addWidget( Remote_View, 0, 0 ); @@ -211,7 +209,7 @@ void AdvancedFm::init() { if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" )) zaurusDevice=TRUE; - else + else zaurusDevice=FALSE; diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index 78f9da2..18bbd43 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp @@ -13,9 +13,6 @@ #include "output.h" #include "filePermissions.h" -#include -#include - #include #include #include @@ -69,7 +66,7 @@ void AdvancedFm::showMenuHidden() { fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); } b = !b; - populateView(); + populateView(); } void AdvancedFm::showHidden() { @@ -80,7 +77,7 @@ void AdvancedFm::showHidden() { CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); } - populateView(); + populateView(); } QString AdvancedFm::dealWithSymName(const QString &fileName) { @@ -146,7 +143,7 @@ void AdvancedFm::makeDir() { QString filename = fileDlg->LineEdit1->text(); thisDir->mkdir( thisDir->canonicalPath()+"/"+filename); } - populateView(); + populateView(); } void AdvancedFm::doDelete() { @@ -183,7 +180,7 @@ void AdvancedFm::doDelete() { if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) { //if file is a directory - switch ( QMessageBox::warning( this, tr("Delete Directory?"), + switch ( QMessageBox::warning( this, tr("Delete Directory?"), tr("Really delete %1\nand all it's contents ?" ).arg( f ) , tr("Yes"), tr("No"), 0, 0, 1) ) { case 0: @@ -191,7 +188,7 @@ void AdvancedFm::doDelete() { f=f.left(f.length()-1); QString cmd="rm -rf "+f; startProcess( (const QString)cmd.latin1() ); - populateView(); + populateView(); } break; case 1: @@ -209,13 +206,13 @@ void AdvancedFm::doDelete() { break; }; } - + QString cmd="rm "+f; QFile file(f); QFileInfo fi(myFile); if( fi.fileName().find("../",0,TRUE)==-1) { // qDebug("remove link files "+myFile); - + // DocLnk lnk(f); DocLnk *lnk; lnk = new DocLnk(f); @@ -228,7 +225,7 @@ void AdvancedFm::doDelete() { } } } - populateView(); + populateView(); } void AdvancedFm::filePerms() { @@ -244,7 +241,7 @@ void AdvancedFm::filePerms() { if( filePerm ) delete filePerm; } - populateView(); + populateView(); } void AdvancedFm::doProperties() { @@ -276,7 +273,7 @@ void AdvancedFm::upDir() { chdir( current.latin1() ); thisDir->cd( current, TRUE); - populateView(); + populateView(); update(); } @@ -337,8 +334,8 @@ void AdvancedFm::copy() { return; } } - setOtherTabCurrent(); - rePopulate(); + setOtherTabCurrent(); + rePopulate(); } } @@ -387,8 +384,8 @@ void AdvancedFm::copyAs() { delete fileDlg; } - rePopulate(); - setOtherTabCurrent(); + rePopulate(); + setOtherTabCurrent(); } void AdvancedFm::copySameDir() { @@ -436,7 +433,7 @@ void AdvancedFm::copySameDir() { } delete fileDlg; } - rePopulate(); + rePopulate(); } void AdvancedFm::move() { @@ -459,80 +456,80 @@ void AdvancedFm::move() { curFile = thisDir->canonicalPath(); if(curFile.right(1).find("/",0,TRUE) == -1) - curFile +="/"; + curFile +="/"; curFile+= item; // qDebug("CurrentFile file is " + curFile); if(QFileInfo(curFile).isDir()) { - moveDirectory( curFile, destFile ); - rePopulate(); - return; + moveDirectory( curFile, destFile ); + rePopulate(); + return; } - QFile f( curFile); + QFile f( curFile); if( f.exists()) { - if( !copyFile( curFile, destFile) ) { - QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile); - return; + if( !copyFile( curFile, destFile) ) { + QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile); + return; } else - QFile::remove(curFile); + QFile::remove(curFile); } - } + } } - rePopulate(); - setOtherTabCurrent(); + rePopulate(); + setOtherTabCurrent(); } bool AdvancedFm::moveDirectory( const QString & src, const QString & dest ) { - int err = 0; - if( copyDirectory( src, dest ) ) { QString cmd = "rm -rf " + src; - err = system((const char*)cmd); - } else - err = -1; - - if(err!=0) { - QMessageBox::message(tr("Note"),tr("Could not move\n") + src); - return false; - } - return true; + int err = 0; + if( copyDirectory( src, dest ) ) { QString cmd = "rm -rf " + src; + err = system((const char*)cmd); + } else + err = -1; + + if(err!=0) { + QMessageBox::message(tr("Note"),tr("Could not move\n") + src); + return false; + } + return true; } bool AdvancedFm::copyDirectory( const QString & src, const QString & dest ) { - QString cmd = "/bin/cp -fpR " + src + " " + dest; + QString cmd = "/bin/cp -fpR " + src + " " + dest; qWarning(cmd); - int err = system( (const char *) cmd ); - if ( err != 0 ) { - QMessageBox::message("AdvancedFm", - tr( "Could not copy \n%1 \nto \n%2").arg( src ).arg( dest ) ); - return false; - } + int err = system( (const char *) cmd ); + if ( err != 0 ) { + QMessageBox::message("AdvancedFm", + tr( "Could not copy \n%1 \nto \n%2").arg( src ).arg( dest ) ); + return false; + } - return true; + return true; } - + bool AdvancedFm::copyFile( const QString & src, const QString & dest ) { - - if(QFileInfo(src).isDir()) { - if( copyDirectory( src, dest )) { - setOtherTabCurrent(); - populateView(); - return true; - } - else - return false; - } - - - bool success = true; - struct stat status; - QFile srcFile(src); - QFile destFile(dest); - int err=0; - int read_fd=0; + + if(QFileInfo(src).isDir()) { + if( copyDirectory( src, dest )) { + setOtherTabCurrent(); + populateView(); + return true; + } + else + return false; + } + + + bool success = true; + struct stat status; + QFile srcFile(src); + QFile destFile(dest); + int err=0; + int read_fd=0; int write_fd=0; struct stat stat_buf; off_t offset = 0; @@ -547,7 +544,7 @@ bool AdvancedFm::copyFile( const QString & src, const QString & dest ) { // qWarning("destfile open failed"); return success = false; } - write_fd = destFile.handle(); + write_fd = destFile.handle(); if(write_fd != -1) { err = sendfile(write_fd, read_fd, &offset, stat_buf.st_size); if( err == -1) { @@ -677,9 +674,9 @@ void AdvancedFm::mkSym() { // qDebug(cmd); startProcess( (const QString)cmd ); } - rePopulate(); - setOtherTabCurrent(); - } + rePopulate(); + setOtherTabCurrent(); + } } void AdvancedFm::doBeam() { @@ -731,7 +728,7 @@ void AdvancedFm::startProcess(const QString & cmd) { } void AdvancedFm::processEnded(OProcess *) { - rePopulate(); + rePopulate(); } void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) { @@ -797,7 +794,7 @@ void AdvancedFm::doRename(QListView * view) { r = QRect( view->viewportToContents( r.topLeft() ), r.size() ); r.setX( view->contentsX() ); - if ( r.width() > view->visibleWidth() ) + if ( r.width() > view->visibleWidth() ) r.setWidth( view->visibleWidth() ); renameBox = new QLineEdit( view->viewport(), "qt_renamebox" ); @@ -810,19 +807,19 @@ void AdvancedFm::doRename(QListView * view) { view->addChild( renameBox, r.x(), r.y() ); - renameBox->resize( r.size() ); + renameBox->resize( r.size() ); - view->viewport()->setFocusProxy( renameBox ); + view->viewport()->setFocusProxy( renameBox ); - renameBox->setFocus(); + renameBox->setFocus(); renameBox->show(); } void AdvancedFm::renameIt() { - if( !CurrentView()->currentItem()) return; + if( !CurrentView()->currentItem()) return; - QListView *thisView = CurrentView(); + QListView *thisView = CurrentView(); oldName = thisView->currentItem()->text(0); doRename( thisView ); } @@ -831,8 +828,8 @@ void AdvancedFm::okRename() { if( !CurrentView()->currentItem()) return; QString newName = renameBox->text(); - cancelRename(); - QListView * view = CurrentView(); + cancelRename(); + QListView * view = CurrentView(); QString path = CurrentDir()->canonicalPath() + "/"; oldName = path + oldName; newName = path + newName; @@ -842,7 +839,7 @@ void AdvancedFm::okRename() { oldName = ""; view->takeItem( view->currentItem() ); delete view->currentItem(); - rePopulate(); + rePopulate(); } void AdvancedFm::openSearch() { diff --git a/noncore/apps/advancedfm/config.in b/noncore/apps/advancedfm/config.in index 72a1f1b..0ba1487 100644 --- a/noncore/apps/advancedfm/config.in +++ b/noncore/apps/advancedfm/config.in @@ -1,4 +1,4 @@ config ADVANCEDFM boolean "opie-advancedfm (advanced file manager)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI diff --git a/noncore/apps/advancedfm/main.cpp b/noncore/apps/advancedfm/main.cpp index 51e38dc..3c1a164 100644 --- a/noncore/apps/advancedfm/main.cpp +++ b/noncore/apps/advancedfm/main.cpp @@ -10,13 +10,13 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * ***************************************************************************/ -#include - - #include "advancedfm.h" #ifdef NOQUICKLAUNCH + +#include + int main(int argc, char *argv[]) { QPEApplication a(argc, argv); @@ -26,7 +26,7 @@ int main(int argc, char *argv[]) return a.exec(); } #else -#include +#include OPIE_EXPORT_APP( OApplicationFactory ) diff --git a/noncore/apps/advancedfm/opie-advancedfm.control b/noncore/apps/advancedfm/opie-advancedfm.control index 5bab6ab..bb311c1 100644 --- a/noncore/apps/advancedfm/opie-advancedfm.control +++ b/noncore/apps/advancedfm/opie-advancedfm.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/applications Maintainer: L.J. Potter Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2, libopieui2 Description: Advanced File Manager The advanced file manager for the Opie environment. Version: $QPE_VERSION$EXTRAVERSION diff --git a/noncore/apps/advancedfm/output.cpp b/noncore/apps/advancedfm/output.cpp index 33abdfc..7dc2416 100644 --- a/noncore/apps/advancedfm/output.cpp +++ b/noncore/apps/advancedfm/output.cpp @@ -5,8 +5,6 @@ ****************************************************************************/ #include "output.h" -#include - #include #include diff --git a/noncore/apps/advancedfm/output.h b/noncore/apps/advancedfm/output.h index 199a684..26c0fa0 100644 --- a/noncore/apps/advancedfm/output.h +++ b/noncore/apps/advancedfm/output.h @@ -16,15 +16,15 @@ #include #include -#include +#include -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; +class QVBoxLayout; +class QHBoxLayout; +class QGridLayout; class QMultiLineEdit; class Output : public QDialog -{ +{ Q_OBJECT public: @@ -44,11 +44,11 @@ protected slots: void processFinished(); private: QString cmmd; - + }; class InputDialog : public QDialog -{ +{ Q_OBJECT public: @@ -56,10 +56,10 @@ public: ~InputDialog(); QString inputText; QLineEdit* LineEdit1; - void setInputText(const QString &); + void setInputText(const QString &); private slots: void returned(); - + }; #endif // OUTPUT_H -- cgit v0.9.0.2