moved inputDialog to fileBrowser

5 files changed, 41 insertions, 77 deletions

diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp
index ebb78d1..f3e4e1e 100644
--- a/core/apps/textedit/fileBrowser.cpp
+++ b/core/apps/textedit/fileBrowser.cpp
@@ -9,13 +9,13 @@
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ****************************************************************************/
 #include "fileBrowser.h"
-#include "inputDialog.h"
+//#include "inputDialog.h"
 
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qpe/fileselector.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/menubutton.h>
@@ -550,6 +550,27 @@ void fileBrowser::fillCombo(const QString &currentPath) {
     if( dirPathStringList.grep(currentPath,TRUE).isEmpty() ) {
         dirPathCombo->clear();
         dirPathStringList.prepend(currentPath );
         dirPathCombo->insertStringList( dirPathStringList,-1);
     }
 }
+
+
+InputDialog::InputDialog( QWidget* parent,  const char* name, bool modal, WFlags fl )
+    : QDialog( parent, name, modal, fl )
+{
+    if ( !name )
+  setName( "InputDialog" );
+    resize( 234, 50 ); 
+    setMaximumSize( QSize( 240, 50 ) );
+    setCaption( tr(name ) );
+
+    LineEdit1 = new QLineEdit( this, "LineEdit1" );
+    LineEdit1->setGeometry( QRect( 10, 10, 216, 22 ) ); 
+}
+
+InputDialog::~InputDialog()
+{
+    inputText= LineEdit1->text();
+  
+}
+
diff --git a/core/apps/textedit/fileBrowser.h b/core/apps/textedit/fileBrowser.h
index bac3d2e..42f93b6 100644
--- a/core/apps/textedit/fileBrowser.h
+++ b/core/apps/textedit/fileBrowser.h
@@ -23,12 +23,16 @@ copyright Sun 02-17-2002 22:28:23 L. J. Potter ljp@llornkcor.com
 #include <qlabel.h>
 #include <qstring.h>
 #include <qdict.h>
 
 #include <qpe/filemanager.h>
 
+#include <qvariant.h>
+#include <qdialog.h>
+class QLineEdit;
+
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
 class QListView;
 class QListViewItem;
 class QPushButton;
@@ -95,7 +99,20 @@ private slots:
 protected slots:
 
 protected:
 
 };
 
+
+class InputDialog : public QDialog
+{ 
+    Q_OBJECT
+
+public:
+    InputDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    ~InputDialog();
+    QString inputText;
+    QLineEdit* LineEdit1;
+
+};
+
 #endif // FILEBROWSER_H
diff --git a/core/apps/textedit/inputDialog.cpp b/core/apps/textedit/inputDialog.cpp
deleted file mode 100644
index 22205d3..0000000
--- a/core/apps/textedit/inputDialog.cpp
+++ b/dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
-   inputDialog.cpp  
-                             -------------------
-** Created: Sat Mar 9 23:33:09 2002
-    copyright            : (C) 2002 by ljp
-    email                : ljp@llornkcor.com
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- ***************************************************************************/
-
-#include "inputDialog.h"
-
-#include <qlineedit.h>
-#include <qlayout.h>
-#include <qvariant.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-
-InputDialog::InputDialog( QWidget* parent,  const char* name, bool modal, WFlags fl )
-    : QDialog( parent, name, modal, fl )
-{
-    if ( !name )
-  setName( "InputDialog" );
-    resize( 234, 50 ); 
-    setMaximumSize( QSize( 240, 50 ) );
-    setCaption( tr(name ) );
-
-    LineEdit1 = new QLineEdit( this, "LineEdit1" );
-    LineEdit1->setGeometry( QRect( 10, 10, 216, 22 ) ); 
-}
-
-InputDialog::~InputDialog()
-{
-    inputText= LineEdit1->text();
-  
-}
-
diff --git a/core/apps/textedit/inputDialog.h b/core/apps/textedit/inputDialog.h
deleted file mode 100644
index 2cd8285..0000000
--- a/core/apps/textedit/inputDialog.h
+++ b/dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************
-   inputDialog.h
-                             -------------------
-** Created: Sat Mar 9 23:33:09 2002
-    copyright            : (C) 2002 by ljp
-    email                : ljp@llornkcor.com
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- ***************************************************************************/
-#ifndef INPUTDIALOG_H
-#define INPUTDIALOG_H
-
-#include <qvariant.h>
-#include <qdialog.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QLineEdit;
-
-class InputDialog : public QDialog
-{ 
-    Q_OBJECT
-
-public:
-    InputDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
-    ~InputDialog();
-    QString inputText;
-    QLineEdit* LineEdit1;
-
-};
-
-#endif // INPUTDIALOG_H
diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro
index 37ddf15..9b743d3 100644
--- a/core/apps/textedit/textedit.pro
+++ b/core/apps/textedit/textedit.pro
@@ -1,12 +1,12 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 
 DESTDIR   = $(OPIEDIR)/bin
-HEADERS = textedit.h fileBrowser.h fontDialog.h fileSaver.h filePermissions.h inputDialog.h
-SOURCES = main.cpp textedit.cpp fileBrowser.cpp fontDialog.cpp fileSaver.cpp filePermissions.cpp inputDialog.cpp
+HEADERS = textedit.h fileBrowser.h fontDialog.h fileSaver.h filePermissions.h 
+SOURCES = main.cpp textedit.cpp fileBrowser.cpp fontDialog.cpp fileSaver.cpp filePermissions.cpp
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe
 
 TARGET    = textedit