1 files changed, 37 insertions, 37 deletions

diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 3fe9040..0a475d8 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -1,25 +1,25 @@
 #include <assert.h>
 
 #include <qaction.h>
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qmessagebox.h>
 #include <qwhatsthis.h>
 #include <qfileinfo.h>
 
 #include <qpe/filemanager.h>
 #include <qpe/qpeapplication.h>
 
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
 
 #include "TEmulation.h"
 #include "profileeditordialog.h"
 #include "configdialog.h"
 #include "default.h"
 #include "profilemanager.h"
 #include "mainwindow.h"
 #include "tabwidget.h"
 #include "transferdialog.h"
 #include "function_keyboard.h"
 #include "emulation_handler.h"
 #include "script.h"
@@ -324,25 +324,25 @@ void MainWindow::slotRecordScript() {
         currentSession()->emulationHandler()->startRecording();
         m_saveScript->setEnabled(true);
         m_recordScript->setEnabled(false);
     }
 }
 
 void MainWindow::slotSaveScript() {
     if (currentSession() && currentSession()->emulationHandler()->isRecording()) {
         QMap<QString, QStringList> map;
         QStringList text;
         text << "text/plain";
         map.insert(tr("Script"), text );
-        QString filename = OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map);
+        QString filename = Opie::OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map);
         if (!filename.isEmpty()) {
             QFileInfo info(filename);
             if (info.extension(FALSE) != "script")
                 filename += ".script";
             DocLnk nf;
             nf.setType("text/plain");
             nf.setFile(filename);
             nf.setName(info.fileName());
             FileManager fm;
             fm.saveFile(nf, currentSession()->emulationHandler()->script()->script());
             currentSession()->emulationHandler()->clearScript();
             m_saveScript->setEnabled(false);
@@ -438,26 +438,26 @@ void MainWindow::slotConfigure() {
  * we will remove
  * this window from the tabwidget
  * remove it from the list
  * delete it
  * and set the currentSession()
  */
 void MainWindow::slotClose() {
     if (!currentSession() )
         return;
 
     Session* ses = currentSession();
     qWarning("removing! currentSession %s", currentSession()->name().latin1() );
-        /* set to NULL to be safe, if its needed slotSessionChanged resets it automatically */
-        m_curSession = NULL;
+    /* set to NULL to be safe, if its needed slotSessionChanged resets it automatically */
+    m_curSession = NULL;
     tabWidget()->remove( /*currentSession()*/ses );
     /*it's autodelete */
     m_sessions.remove( ses );
     qWarning("after remove!!");
 
     if (!currentSession() ) {
         m_connect->setEnabled( false );
         m_disconnect->setEnabled( false );
         m_terminate->setEnabled( false );
         m_transfer->setEnabled( false );
         m_recordScript->setEnabled( false );
         m_saveScript->setEnabled( false );
@@ -474,37 +474,37 @@ void MainWindow::slotClose() {
  * We will get the name
  * Then the profile
  * and then we will make a profile
  */
 void MainWindow::slotProfile( int id) {
     Profile prof = manager()->profile( m_sessionsPop->text( id)  );
     create( prof );
 }
 
 
 
 void MainWindow::create( const Profile& prof ) {
-        if(m_curSession)
-                if(m_curSession->transferDialog()) m_curSession->transferDialog()->hide();
+    if(m_curSession)
+        if(m_curSession->transferDialog()) m_curSession->transferDialog()->hide();
 
     Session *ses = manager()->fromProfile( prof, tabWidget() );
 
     if((!ses) || (!ses->layer()) || (!ses->widgetStack()))
-        {
-                QMessageBox::warning(this,
-                        QObject::tr("Session failed"),
-                        QObject::tr("<qt>Cannot open session: Not all components were found.</qt>"));
-                //if(ses) delete ses;
-                return;
-        }
+    {
+        QMessageBox::warning(this,
+            QObject::tr("Session failed"),
+            QObject::tr("<qt>Cannot open session: Not all components were found.</qt>"));
+        //if(ses) delete ses;
+        return;
+    }
 
     m_sessions.append( ses );
     tabWidget()->add( ses );
     tabWidget()->repaint();
     m_curSession = ses;
 
     // dicide if its a local term ( then no connction and no tranfer), maybe make a wrapper method out of it
     m_connect->setEnabled( true );
     m_disconnect->setEnabled( false );
     m_terminate->setEnabled( true );
     m_fullscreen->setEnabled( true );
     m_wrap->setEnabled( true );
@@ -527,34 +527,34 @@ void MainWindow::create( const Profile& prof ) {
     if(currentSession()->profile().readNumEntry("Wrap", 80)){
         m_isWrapped = true;
     } else {
         m_isWrapped = false;
     }
 
     m_kb->load(currentSession()->profile());
 }
 
 void MainWindow::slotTransfer()
 {
     if ( currentSession() ) {
-        Session *mysession = currentSession();
-        TransferDialog dlg(/*mysession->widgetStack()*/this, this);
-        mysession->setTransferDialog(&dlg);
-        //dlg.reparent(mysession->widgetStack(), QPoint(0, 0));
-        //dlg.showMaximized();
-        currentSession()->widgetStack()->addWidget(&dlg, -1);
-        dlg.show();
-        //dlg.exec();
-        while(dlg.isRunning()) qApp->processEvents();
-        mysession->setTransferDialog(0l);
+    Session *mysession = currentSession();
+    TransferDialog dlg(/*mysession->widgetStack()*/this, this);
+    mysession->setTransferDialog(&dlg);
+    //dlg.reparent(mysession->widgetStack(), QPoint(0, 0));
+    //dlg.showMaximized();
+    currentSession()->widgetStack()->addWidget(&dlg, -1);
+    dlg.show();
+    //dlg.exec();
+    while(dlg.isRunning()) qApp->processEvents();
+    mysession->setTransferDialog(0l);
     }
 }
 
 
 void MainWindow::slotOpenKeb(bool state) {
 
     if (state) m_keyBar->show();
     else m_keyBar->hide();
 
 }
 
 
@@ -563,28 +563,28 @@ void MainWindow::slotOpenButtons( bool state ) {
     if ( state ) {
         m_buttonBar->show();
     } else {
         m_buttonBar->hide();
     }
 }
 
 
 
 void MainWindow::slotSessionChanged( Session* ses ) {
     qWarning("changed!");
 
-        if(m_curSession)
-                if(m_curSession->transferDialog()) m_curSession->transferDialog()->hide();
-        if(ses)
-                if(ses->transferDialog()) ses->transferDialog()->show();
+    if(m_curSession)
+        if(m_curSession->transferDialog()) m_curSession->transferDialog()->hide();
+    if(ses)
+        if(ses->transferDialog()) ses->transferDialog()->show();
 
     if ( ses ) {
         m_curSession = ses;
         qDebug(QString("is connected : %1").arg(  m_curSession->layer()->isConnected() ) );
         if ( m_curSession->layer()->isConnected() ) {
             m_connect->setEnabled( false );
             m_disconnect->setEnabled( true );
             m_recordScript->setEnabled(!m_curSession->emulationHandler()->isRecording());
             m_saveScript->setEnabled(m_curSession->emulationHandler()->isRecording());
             m_scripts->setItemEnabled(m_runScript_id, true);
         } else {
             m_connect->setEnabled( true );
@@ -612,33 +612,33 @@ void MainWindow::slotSessionChanged( Session* ses ) {
         m_kb->load(currentSession()->profile());
     }
 }
 
 void MainWindow::slotWrap()
 {
     if(m_curSession)
     {
         EmulationHandler *e = m_curSession->emulationHandler();
         if(e)
         {
             if(m_isWrapped)
-                        {
-                                e->setWrap(80);
-                                m_isWrapped = false;
-                        }
-                        else
-                        {
-                                e->setWrap(0);
-                                m_isWrapped = true;
-                        }
+            {
+                e->setWrap(80);
+                m_isWrapped = false;
+            }
+            else
+            {
+                e->setWrap(0);
+                m_isWrapped = true;
+            }
         }
     }
 }
 
 void MainWindow::slotFullscreen() {
 
 
 
     if ( m_isFullscreen ) {
         ( m_curSession->widgetStack() )->reparent(  savedParentFullscreen, 0, QPoint(0,0), true );
         ( m_curSession->widgetStack() )->resize( savedParentFullscreen->width(), savedParentFullscreen->height() );
         ( m_curSession->emulationHandler() )->cornerButton()->hide();
@@ -697,25 +697,25 @@ void MainWindow::slotSaveSession() {
                                           tr("<qt>There is no Connection.</qt>"), 1 );
       return;
     }
     manager()->add( currentSession()->profile() );
     manager()->save();
     populateProfiles();
 }
 void MainWindow::slotSaveHistory() {
     QMap<QString, QStringList> map;
     QStringList text;
     text << "text/plain";
     map.insert(tr("History"), text );
-    QString filename = OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map);
+    QString filename = Opie::OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map);
     if (filename.isEmpty() ) return;
 
     QFileInfo info(filename);
 
     DocLnk nf;
     nf.setType("text/plain");
     nf.setFile(filename);
     nf.setName(info.fileName());
 
 
     QFile file(filename);
     file.open(IO_WriteOnly );