author | drw <drw> | 2004-02-23 18:27:31 (UTC) |
---|---|---|
committer | drw <drw> | 2004-02-23 18:27:31 (UTC) |
commit | bce2a9995fa423f9fc796b46c548e47a45c9d247 (patch) (side-by-side diff) | |
tree | d6af972e78fa2ca9721172a14ce2d83bae35c2bd | |
parent | 398c7d54acfc203ec90644d6c63e5b200391e906 (diff) | |
download | opie-bce2a9995fa423f9fc796b46c548e47a45c9d247.zip opie-bce2a9995fa423f9fc796b46c548e47a45c9d247.tar.gz opie-bce2a9995fa423f9fc796b46c548e47a45c9d247.tar.bz2 |
AdvancedFM: libopie->libopie2
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 206 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.h | 12 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.pro | 10 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmData.cpp | 10 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 161 | ||||
-rw-r--r-- | noncore/apps/advancedfm/config.in | 2 | ||||
-rw-r--r-- | noncore/apps/advancedfm/main.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/advancedfm/opie-advancedfm.control | 2 | ||||
-rw-r--r-- | noncore/apps/advancedfm/output.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/advancedfm/output.h | 18 |
10 files changed, 209 insertions, 222 deletions
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 @@ -14,8 +14,2 @@ - -// #include <opie/ofileselector.h> -// #include <opie/ofiledialog.h> - -#include <opie/osplitter.h> - #include <qpe/filemanager.h> @@ -110,71 +104,71 @@ 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" ); @@ -183,36 +177,36 @@ void AdvancedFm::populateView() { // 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 ); } @@ -785,3 +779,3 @@ void AdvancedFm::gotoCustomDir(const QString &dir) { QDir *AdvancedFm::CurrentDir() { - + if ( whichTab == 1) { @@ -826,3 +820,3 @@ void AdvancedFm::setOtherTabCurrent() { OtherView()->setFocus(); - OtherView()->setSelected( CurrentView()->firstChild(), true); + OtherView()->setSelected( CurrentView()->firstChild(), true); } @@ -866,3 +860,3 @@ void AdvancedFm::gotoDirectory(const QString &file) { } - + } 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 @@ -16,4 +16,4 @@ -//#include <opie/otabwidget.h> -#include <opie/oprocess.h> +#include <opie2/oprocess.h> +#include <opie2/osplitter.h> @@ -32,3 +32,4 @@ -class OSplitter; +using Opie::OSplitter; + class QVBoxLayout; @@ -42,3 +43,2 @@ class QProgressBar; class QSpinBox; -class QTabWidget; class QWidget; @@ -163,3 +163,3 @@ protected slots: // void navigateToSelected(); - bool moveDirectory( const QString & , const QString & ); + bool moveDirectory( const QString & , const QString & ); // void slotSwitchtoLocal(int); @@ -188,3 +188,3 @@ private slots: void setDocument(const QString &); - + }; 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 @@ -8,8 +8,8 @@ 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 \ @@ -29,3 +29,3 @@ TRANSLATIONS = ../../../i18n/de/advancedfm.ts \ -!contains(CONFIG,quick-app) { +!contains(CONFIG,quick-app) { DESTDIR = $(OPIEDIR)/bin 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 @@ -13,5 +13,3 @@ -#include <opie/osplitter.h> #include <qpe/storage.h> - #include <qpe/qpeapplication.h> @@ -131,3 +129,3 @@ void AdvancedFm::init() { currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); - currentPathCombo->setFocusPolicy(NoFocus); + currentPathCombo->setFocusPolicy(NoFocus); layout->addWidget( lineBox ); @@ -155,3 +153,3 @@ void AdvancedFm::init() { Local_View->installEventFilter( this ); - + QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); @@ -179,3 +177,3 @@ void AdvancedFm::init() { Remote_View->installEventFilter( this ); - + QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); @@ -213,3 +211,3 @@ void AdvancedFm::init() { 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 @@ -15,5 +15,2 @@ -#include <opie/otabwidget.h>
-#include <opie/oprocess.h>
-
#include <qpe/lnkproperties.h>
@@ -71,3 +68,3 @@ void AdvancedFm::showMenuHidden() { b = !b;
- populateView();
+ populateView();
}
@@ -82,3 +79,3 @@ void AdvancedFm::showHidden() { }
- populateView();
+ populateView();
}
@@ -148,3 +145,3 @@ void AdvancedFm::makeDir() { }
- populateView();
+ populateView();
}
@@ -185,3 +182,3 @@ void AdvancedFm::doDelete() { - 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 ) ,
@@ -193,3 +190,3 @@ void AdvancedFm::doDelete() { startProcess( (const QString)cmd.latin1() );
- populateView();
+ populateView();
}
@@ -211,3 +208,3 @@ void AdvancedFm::doDelete() { }
-
+
QString cmd="rm "+f;
@@ -217,3 +214,3 @@ void AdvancedFm::doDelete() { // qDebug("remove link files "+myFile);
-
+
// DocLnk lnk(f);
@@ -230,3 +227,3 @@ void AdvancedFm::doDelete() { }
- populateView();
+ populateView();
}
@@ -246,3 +243,3 @@ void AdvancedFm::filePerms() { }
- populateView();
+ populateView();
}
@@ -278,3 +275,3 @@ void AdvancedFm::upDir() { - populateView();
+ populateView();
update();
@@ -339,4 +336,4 @@ void AdvancedFm::copy() { }
- setOtherTabCurrent();
- rePopulate();
+ setOtherTabCurrent();
+ rePopulate();
}
@@ -389,4 +386,4 @@ void AdvancedFm::copyAs() { }
- rePopulate();
- setOtherTabCurrent();
+ rePopulate();
+ setOtherTabCurrent();
}
@@ -438,3 +435,3 @@ void AdvancedFm::copySameDir() { }
- rePopulate();
+ rePopulate();
}
@@ -461,3 +458,3 @@ void AdvancedFm::move() { if(curFile.right(1).find("/",0,TRUE) == -1)
- curFile +="/";
+ curFile +="/";
curFile+= item;
@@ -466,20 +463,20 @@ void AdvancedFm::move() { 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();
}
@@ -487,13 +484,13 @@ void AdvancedFm::move() { 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;
}
@@ -502,14 +499,14 @@ 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;
}
-
+
@@ -517,20 +514,20 @@ 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;
@@ -549,3 +546,3 @@ bool AdvancedFm::copyFile( const QString & src, const QString & dest ) { }
- write_fd = destFile.handle();
+ write_fd = destFile.handle();
if(write_fd != -1) {
@@ -679,5 +676,5 @@ void AdvancedFm::mkSym() { }
- rePopulate();
- setOtherTabCurrent();
- }
+ rePopulate();
+ setOtherTabCurrent();
+ }
}
@@ -733,3 +730,3 @@ void AdvancedFm::startProcess(const QString & cmd) { void AdvancedFm::processEnded(OProcess *) {
- rePopulate();
+ rePopulate();
}
@@ -799,3 +796,3 @@ void AdvancedFm::doRename(QListView * view) { - if ( r.width() > view->visibleWidth() )
+ if ( r.width() > view->visibleWidth() )
r.setWidth( view->visibleWidth() );
@@ -812,7 +809,7 @@ void AdvancedFm::doRename(QListView * view) { - renameBox->resize( r.size() );
+ renameBox->resize( r.size() );
- view->viewport()->setFocusProxy( renameBox );
+ view->viewport()->setFocusProxy( renameBox );
- renameBox->setFocus();
+ renameBox->setFocus();
renameBox->show();
@@ -822,5 +819,5 @@ void AdvancedFm::doRename(QListView * view) { void AdvancedFm::renameIt() {
- if( !CurrentView()->currentItem()) return;
+ if( !CurrentView()->currentItem()) return;
- QListView *thisView = CurrentView();
+ QListView *thisView = CurrentView();
oldName = thisView->currentItem()->text(0);
@@ -833,4 +830,4 @@ void AdvancedFm::okRename() { QString newName = renameBox->text();
- cancelRename();
- QListView * view = CurrentView();
+ cancelRename();
+ QListView * view = CurrentView();
QString path = CurrentDir()->canonicalPath() + "/";
@@ -844,3 +841,3 @@ void AdvancedFm::okRename() { delete view->currentItem();
- rePopulate();
+ rePopulate();
}
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 @@ -3,2 +3,2 @@ 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 @@ -12,5 +12,2 @@ ***************************************************************************/ -#include <qpe/qpeapplication.h> - - @@ -19,2 +16,5 @@ #ifdef NOQUICKLAUNCH + +#include <qpe/qpeapplication.h> + int main(int argc, char *argv[]) @@ -28,3 +28,3 @@ int main(int argc, char *argv[]) #else -#include <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> 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 @@ -6,3 +6,3 @@ Maintainer: L.J. Potter <lpotter@trolltech.com> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2, libopieui2 Description: Advanced File Manager 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 @@ -7,4 +7,2 @@ -#include <opie/oprocess.h> - #include <qpe/qpeapplication.h> 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 @@ -18,7 +18,7 @@ -#include <opie/oprocess.h> +#include <opie2/oprocess.h> -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; +class QVBoxLayout; +class QHBoxLayout; +class QGridLayout; class QMultiLineEdit; @@ -26,3 +26,3 @@ class QMultiLineEdit; class Output : public QDialog -{ +{ Q_OBJECT @@ -46,3 +46,3 @@ protected slots: QString cmmd; - + }; @@ -50,3 +50,3 @@ protected slots: class InputDialog : public QDialog -{ +{ Q_OBJECT @@ -58,6 +58,6 @@ public: QLineEdit* LineEdit1; - void setInputText(const QString &); + void setInputText(const QString &); private slots: void returned(); - + }; |