fixed small bug in desktop version, where conversion dat wasn't being found.

1 files changed, 2 insertions, 2 deletions

diff --git a/noncore/tools/calculator/calculatorimpl.cpp b/noncore/tools/calculator/calculatorimpl.cpp
index 1b93c7f..3a6efe4 100644
--- a/noncore/tools/calculator/calculatorimpl.cpp
+++ b/noncore/tools/calculator/calculatorimpl.cpp
@@ -1,318 +1,318 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 /*
  * 01/14/2002 Charles-Edouard Ruault <ce@ruault.com>
  * Added support for Temperature conversions.
  */
 
 #include "calculatorimpl.h"
 
 #include <qpe/resource.h>
 #include <qpe/qmath.h>
 #include <qpe/qpeapplication.h>
 
 #include <qpushbutton.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qfont.h>
 #include <qlayout.h>
 #include <qstringlist.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qmessagebox.h>
 #include <math.h>
 
 CalculatorImpl::CalculatorImpl( QWidget * parent, const char * name,
 				WFlags f )
     : Calculator( parent, name, f )
 {
     xtopowerofy = Resource::loadPixmap("xtopowerofy");
     ythrootofx = Resource::loadPixmap("ythrootofx");
     oneoverx = Resource::loadPixmap("oneoverx");
 
     memMark = new QLabel( "m", LCD );
     memMark->setFont( QFont( "helvetica", 12, QFont::Bold, TRUE ) );
     memMark->resize( 12, 12 );
     memMark->move( 4, 2 );
     memMark->hide();
     mem = 0;
 
     PushButtonMR->setEnabled( FALSE );
 
     current_mode = max_mode = conversion_mode_count = 0;
     last_conversion = -1;
 
 //bgr_command.insert( PushButtonFunction);
     bgr_command.insert( PushButtonMPlus);
     bgr_command.insert( PushButtonMR);
     bgr_command.insert( PushButtonMC);
     bgr_command.insert( PushButtonCE);
     connect( &bgr_command, SIGNAL(clicked(int) ), this, SLOT(command_buttons(int)));
 
     bgr_digits.insert(PushButton0);
     bgr_digits.insert(PushButton1);
     bgr_digits.insert(PushButton2);
     bgr_digits.insert(PushButton3);
     bgr_digits.insert(PushButton4);
     bgr_digits.insert(PushButton5);
     bgr_digits.insert(PushButton6);
     bgr_digits.insert(PushButton7);
     bgr_digits.insert(PushButton8);
     bgr_digits.insert(PushButton9);
     connect( &bgr_digits, SIGNAL(clicked(int) ), this, SLOT(enterNumber(int)));
 
 
     bgr_std.insert(PushButtonEquals);
     bgr_std.insert(PushButtonDecimal);
     bgr_std.insert(PushButtonAdd);
     bgr_std.insert(PushButtonMinus);
     bgr_std.insert(PushButtonDivide);
     bgr_std.insert(PushButtonTimes);
     connect( &bgr_std, SIGNAL(clicked(int) ), this, SLOT(std_buttons(int)));
 
 // change the / to a proper division signal
     PushButtonDivide->setText(QChar(0xF7));
 
     func_buttons[0] = PushButtonF1;
     func_buttons[1] = PushButtonF2;
     func_buttons[2] = PushButtonF3;
     func_buttons[3] = PushButtonF4;
     func_buttons[4] = PushButtonF5;
     func_buttons[5] = PushButtonF6;
     func_buttons[6] = PushButtonF7;
     func_buttons[7] = PushButtonF8;
     func_buttons[8] = PushButtonF9;
     func_buttons[9] = PushButtonF10;
     func_buttons[10] = PushButtonF11;
     func_buttons[11] = PushButtonF12;
 
     for ( int x = 0 ; x < func_button_count ; x++ ) {
         QPushButton* tmpbutton = func_buttons[x];
         faces << tmpbutton->text();
         bgr_function.insert(tmpbutton);
     }
     connect( &bgr_function, SIGNAL(clicked(int) ) , this, SLOT(do_convert(int) ) );
     connect( &bgr_function, SIGNAL(clicked(int) ) , this, SLOT(std_funcs (int) ) );
 
     connect(ComboBoxFunction, SIGNAL(activated(int) ), this, SLOT(function_button(int) ) );
 
     captions.append("Standard");
     ComboBoxFunction->insertItem(captions.last());
 
     // now add in the conversion modes
     // when the menu gets done, these should be in a submenu
     QString tmp = QPEApplication::qpeDir();
-    tmp += "/etc/unit_conversion.dat";
+    tmp += "etc/unit_conversion.dat";
     QFile myfile(tmp);
     if ( !myfile.open( IO_Translate | IO_ReadOnly ) ) {
-        // QMessageBox::warning(this, "Warning", "Data file\nunit_conversion.dat\nnot found\nNo conversion\nfeatures will\nbe available");
+        qDebug("Data file unit_conversion.dat not found\nNo conversion features will be available\n"+tmp);
         // disable the f button if no conv file available
         ComboBoxFunction->setEnabled(FALSE);
     }
     else {
         QString line, line2;
         QTextStream ts(&myfile);
 
         // first pass, see how many conversion types there are in order to allocate for them
         while ( ! ts.eof() ) {
             line = ts.readLine();
             if ( line.contains ("STARTTYPE" ) )
                 conversion_mode_count++;
         }
 
         entry_list = new double[conversion_mode_count*func_button_count];
 		preoffset_list = new double[conversion_mode_count*func_button_count];
 		postoffset_list = new double[conversion_mode_count*func_button_count];
         myfile.close();
         myfile.open( IO_Translate | IO_ReadOnly );
         QTextStream ts2(&myfile);
 
         // second pass, read in values
         int x = 0;
         while ( ! ts2.eof() ) {
                 line = ts2.readLine();
                 if ( line.contains("STARTTYPE") ) {
                         captions << line.remove(0,10);
 			ComboBoxFunction->insertItem(captions.last());
                         while ( !line.contains("ENDTYPE") ) {
                             line = ts2.readLine();
                             if ( line.contains("NAME") ) {
                                 faces << line.remove(0,5);
                                 line2 = ts2.readLine();
                                 line2.remove(0,6);
                                 entry_list[x] = line2.toDouble();
 								line2 = ts2.readLine();
                                 line2.remove(0,7);
                                 preoffset_list[x] = line2.toDouble();
 								line2 = ts2.readLine();
                                 line2.remove(0,8);
                                 postoffset_list[x] = line2.toDouble();
                                 x++;
                             }
                         }
                 }
         }
     }
     myfile.close();
     clear();
     max_mode = pre_conv_modes_count + conversion_mode_count + post_conv_modes_count - 1;
     display_pixmap_faces();
 
     qApp->installEventFilter( this );
 }
 
 bool CalculatorImpl::eventFilter( QObject *o, QEvent *e )
 {
     if ( e->type() == QEvent::KeyPress && state != sError ) {
 	QKeyEvent *k = (QKeyEvent*)e;
 	if ( k->key() >= Key_0 && k->key() <= Key_9 ) {
 	    enterNumber( k->key() - Key_0 );
 	    return true;
 	} else {
 	    switch ( k->key() ) {
 		case Key_Equal:
 		    std_buttons(0);
 		    return true;
 		case Key_Period:
 		    std_buttons(1);
 		    return true;
 		case Key_Plus:
 		    std_buttons(2);
 		    return true;
 		case Key_Minus:
 		    std_buttons(3);
 		    return true;
 		case Key_Slash:
 		    std_buttons(4);
 		    return true;
 		case Key_Asterisk:
 		    std_buttons(5);
 		    return true;
 		case Key_Percent:
 		    execOp( oPercent );
 		    return true;
 		case Key_ParenLeft:
 		    if ( current_mode <  pre_conv_modes_count )
 			execOp( oOpenBrace );
 		    return true;
 		case Key_ParenRight:
 		    if ( current_mode <  pre_conv_modes_count )
 			execOp( oCloseBrace );
 		    return true;
 		default:
 		    break;
 	    }
 	}
     }
     return Calculator::eventFilter( o, e );
 }
 
 void CalculatorImpl::do_convert(int button) {
     if ( state == sError )
 	return;
     if ( current_mode >= pre_conv_modes_count && current_mode <= (max_mode - post_conv_modes_count) &&
 	button < changeable_func_button_count ) {
         if ( last_conversion > -1 ) {
             if( state == sNewNumber ){
 			  acc = (num+ preoffset_list[(current_mode - pre_conv_modes_count) * func_button_count + last_conversion])
                     / (entry_list[(current_mode - pre_conv_modes_count) * func_button_count + last_conversion])
                     * (entry_list[(current_mode - pre_conv_modes_count) * func_button_count + button]) 
 				+postoffset_list[(current_mode - pre_conv_modes_count) * func_button_count + button];
 		num = acc;
                 LCD->display( acc );
             } else {
                 state = sNewNumber;
                 num = (num+ preoffset_list[(current_mode - pre_conv_modes_count) * func_button_count + last_conversion])
                     / (entry_list[(current_mode - pre_conv_modes_count) * func_button_count + last_conversion])
                     * (entry_list[(current_mode - pre_conv_modes_count) * func_button_count + button]) 
 				  + postoffset_list[(current_mode - pre_conv_modes_count) * func_button_count + button];;
                 LCD->display( num );
                 acc = num;
             }
         }
         last_conversion = button;
     }
 }
 
 
 void CalculatorImpl::function_button(int mode){
     if ( state == sError ) 
 	clear();
     // dont need the next line when using a popup menu
     current_mode = mode;
 
     // reset the last conv
     last_conversion = -1;
 
     // set the caption
     this->setCaption( captions[current_mode] );
 
     reset_conv();
 
     for ( int x = 0 ; x < changeable_func_button_count ; x++ ) {
         QPushButton* tmpbutton = func_buttons[x];
 
          // if its a conversion , make it a toggle button
         if ( current_mode >= pre_conv_modes_count && current_mode <= (max_mode - post_conv_modes_count) ) {
             tmpbutton->setToggleButton(TRUE);
         } else {
             tmpbutton->setToggleButton(FALSE);
         }
         tmpbutton->setText( faces[current_mode * func_button_count + x] );
     }
 
     if ( current_mode == 0 ) display_pixmap_faces();
 
     if ( current_mode >= pre_conv_modes_count && current_mode <= (max_mode - post_conv_modes_count) ) {
             bgr_function.setExclusive(TRUE);
     } else {
             bgr_function.setExclusive(FALSE);
     }
 }
 
 void CalculatorImpl::display_pixmap_faces() {
     QPushButton* tmpbutton = func_buttons[5];
     tmpbutton->setPixmap(xtopowerofy);
 
     tmpbutton = func_buttons[6];
     tmpbutton->setPixmap(ythrootofx);
 
     tmpbutton = func_buttons[3];
     tmpbutton->setPixmap(oneoverx);
 }
 
 void CalculatorImpl::clear() {
     acc = num = 0;
     operationStack.clear();
     state = sStart;
     numDecimals = 0;
     numOpenBraces = 0;
     flPoint = FALSE;
     LCD->display( 0 );
     fake = QString::null;
 
     reset_conv();
 }
 
 void CalculatorImpl::reset_conv() {
     for ( int x = 0 ; x < changeable_func_button_count ; x++ ) {
         QPushButton* tmpbutton = func_buttons[x];