From daef74a7e852855f781765fad7969b6c83e2e9c6 Mon Sep 17 00:00:00 2001 From: mickeyl Date: Sun, 04 Apr 2004 17:03:27 +0000 Subject: s/Opie::Core::odebug/odebug/ (same with oerr,owarn,ofatal) --- diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp index 8216d6f..b81a3b9 100644 --- a/core/pim/addressbook/ablabel.cpp +++ b/core/pim/addressbook/ablabel.cpp @@ -95,15 +95,15 @@ void AbLabel::keyPressEvent( QKeyEvent *e ) if ( !m_empty ){ switch( e->key() ) { case Qt::Key_Left: - Opie::Core::owarn << "Left.." << oendl; + owarn << "Left.." << oendl; case Qt::Key_Right: - Opie::Core::owarn << "Right.." << oendl; + owarn << "Right.." << oendl; case Qt::Key_F33: - Opie::Core::owarn << "OK.." << oendl; + owarn << "OK.." << oendl; emit signalOkPressed(); break; case Qt::Key_Up: - Opie::Core::owarn << "Up.." << oendl; + owarn << "Up.." << oendl; if ( ( visibleHeight() < contentsHeight() ) && ( verticalScrollBar()->value() > verticalScrollBar()->minValue() ) ) scrollBy( 0, -(visibleHeight()-20) ); @@ -117,9 +117,9 @@ void AbLabel::keyPressEvent( QKeyEvent *e ) break; case Qt::Key_Down: - Opie::Core::owarn << "Down.." << oendl; -// Opie::Core::owarn << "Visible: " << visibleHeight() << ", content: " << contentHeight() << oendl; -// Opie::Core::owarn << "Value: " << verticalScrollBar()->value() + owarn << "Down.." << oendl; +// owarn << "Visible: " << visibleHeight() << ", content: " << contentHeight() << oendl; +// owarn << "Value: " << verticalScrollBar()->value() // << ", barMaxValue: " << verticalScrollBar()->maxValue() << oendl; if ( ( visibleHeight() < contentsHeight() ) && ( verticalScrollBar()->value() < verticalScrollBar()->maxValue() ) ) diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp index cb57342..3fb2214 100644 --- a/core/pim/addressbook/abtable.cpp +++ b/core/pim/addressbook/abtable.cpp @@ -121,7 +121,7 @@ AbTable::AbTable( const QValueList order, QWidget *parent, const char *name columnVisible( true ), countNested( 0 ) { - // Opie::Core::owarn << "C'tor start" << oendl; + // owarn << "C'tor start" << oendl; setSelectionMode( NoSelection ); init(); setSorting( TRUE ); @@ -129,7 +129,7 @@ AbTable::AbTable( const QValueList order, QWidget *parent, const char *name this, SLOT(itemClicked(int,int)) ); // contactList.clear(); - // Opie::Core::owarn << "C'tor end" << oendl; + // owarn << "C'tor end" << oendl; } AbTable::~AbTable() @@ -151,7 +151,7 @@ void AbTable::init() void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList ) { - Opie::Core::owarn << "AbTable::setContacts()" << oendl; + owarn << "AbTable::setContacts()" << oendl; clear(); m_viewList = viewList; @@ -183,13 +183,13 @@ void AbTable::setOrderedList( const QValueList ordered ) bool AbTable::selectContact( int UID ) { - Opie::Core::owarn << "AbTable::selectContact( " << UID << " )" << oendl; + owarn << "AbTable::selectContact( " << UID << " )" << oendl; int rows = numRows(); Opie::OPimContact* foundContact = 0l; bool found = false; setPaintingEnabled( FALSE ); - Opie::Core::owarn << "Search start" << oendl; + owarn << "Search start" << oendl; for ( int r = 0; r < rows; ++r ) { if ( m_viewList.uidAt( r ) == UID ){ ensureCellVisible( r, 0 ); @@ -198,7 +198,7 @@ bool AbTable::selectContact( int UID ) break; } } - Opie::Core::owarn << "Search end" << oendl; + owarn << "Search end" << oendl; if ( !found ){ ensureCellVisible( 0,0 ); @@ -213,7 +213,7 @@ bool AbTable::selectContact( int UID ) #if 0 void AbTable::insertIntoTable( const Opie::OPimContact& cnt, int row ) { - Opie::Core::owarn << "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, " + owarn << "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, " << row << " )" << oendl; QString strName; ContactItem contactItem; @@ -257,7 +257,7 @@ void AbTable::columnClicked( int col ) void AbTable::resort() { - Opie::Core::owarn << "void AbTable::resort() NOT POSSIBLE !!" << oendl; + owarn << "void AbTable::resort() NOT POSSIBLE !!" << oendl; #if 0 setPaintingEnabled( FALSE ); if ( sorting() ) { @@ -283,7 +283,7 @@ int AbTable::currentEntry_UID() void AbTable::clear() { - Opie::Core::owarn << "void AbTable::clear()" << oendl; + owarn << "void AbTable::clear()" << oendl; // contactList.clear(); setPaintingEnabled( FALSE ); @@ -301,7 +301,7 @@ void AbTable::clear() // Refresh updates column 2 if the contactsettings changed void AbTable::refresh() { - Opie::Core::owarn << "void AbTable::refresh() NOT IMPLEMENTED !!" << oendl; + owarn << "void AbTable::refresh() NOT IMPLEMENTED !!" << oendl; #if 0 int rows = numRows(); @@ -334,7 +334,7 @@ void AbTable::keyPressEvent( QKeyEvent *e ) if ( key >= 'A' && key <= 'Z' ) moveTo( key ); - // Opie::Core::owarn << "Received key .." << oendl; + // owarn << "Received key .." << oendl; switch( e->key() ) { case Qt::Key_Space: case Qt::Key_Return: @@ -342,11 +342,11 @@ void AbTable::keyPressEvent( QKeyEvent *e ) emit signalSwitch(); break; // case Qt::Key_Up: -// Opie::Core::owarn << "a" << oendl; +// owarn << "a" << oendl; // emit signalKeyUp(); // break; // case Qt::Key_Down: -// Opie::Core::owarn << "b" << oendl; +// owarn << "b" << oendl; // emit signalKeyDown(); // break; default: @@ -357,7 +357,7 @@ void AbTable::keyPressEvent( QKeyEvent *e ) void AbTable::moveTo( char c ) { - Opie::Core::owarn << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl; + owarn << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl; #if 0 int rows = numRows(); @@ -423,7 +423,7 @@ void AbTable::resizeRows() { void AbTable::realignTable() { - // Opie::Core::owarn << "void AbTable::realignTable()" << oendl; + // owarn << "void AbTable::realignTable()" << oendl; setPaintingEnabled( FALSE ); @@ -473,7 +473,7 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch ) void AbTable::fitColumns() { - Opie::Core::owarn << "void AbTable::fitColumns()" << oendl; + owarn << "void AbTable::fitColumns()" << oendl; int contentsWidth = visibleWidth() / 2; // Fix to better value // contentsWidth = 130; @@ -485,7 +485,7 @@ void AbTable::fitColumns() columnVisible = true; } - // Opie::Core::owarn << "Width: " << contentsWidth << oendl; + // owarn << "Width: " << contentsWidth << oendl; setColumnWidth( 0, contentsWidth ); adjustColumn(1); @@ -497,7 +497,7 @@ void AbTable::fitColumns() void AbTable::show() { - // Opie::Core::owarn << "void AbTable::show()" << oendl; + // owarn << "void AbTable::show()" << oendl; realignTable(); QTable::show(); } @@ -521,11 +521,11 @@ void AbTable::setChoiceNames( const QStringList& list) void AbTable::itemClicked(int,int col) { - // Opie::Core::owarn << "AbTable::itemClicked(int, col: " << col << ")" << oendl; + // owarn << "AbTable::itemClicked(int, col: " << col << ")" << oendl; if ( col == 2 ) { return; } else { - // Opie::Core::owarn << "Emitting signalSwitch()" << oendl; + // owarn << "Emitting signalSwitch()" << oendl; emit signalSwitch(); } } @@ -562,7 +562,7 @@ QStringList AbTable::choiceSelection(int /*index*/) const void AbTable::updateVisible() { - // Opie::Core::owarn << "void AbTable::updateVisible()" << oendl; + // owarn << "void AbTable::updateVisible()" << oendl; int visible, totalRows, @@ -598,7 +598,7 @@ void AbTable::updateVisible() void AbTable::setPaintingEnabled( bool e ) { - // Opie::Core::owarn << "IN void AbTable::setPaintingEnabled( " << e << " )->Nested: " + // owarn << "IN void AbTable::setPaintingEnabled( " << e << " )->Nested: " // << countNested << oendl; if ( e ) { @@ -615,12 +615,12 @@ void AbTable::setPaintingEnabled( bool e ) enablePainting = false; setUpdatesEnabled( false ); } - // Opie::Core::owarn << "OUT void AbTable::setPaintingEnabled( " << e << " )->Nested: " + // owarn << "OUT void AbTable::setPaintingEnabled( " << e << " )->Nested: " // << countNested << oendl; } void AbTable::viewportPaintEvent( QPaintEvent* e ) { - // Opie::Core::owarn << "void AbTable::viewportPaintEvent( QPaintEvent* e ) -> " + // owarn << "void AbTable::viewportPaintEvent( QPaintEvent* e ) -> " // << enablePainting << oendl; if ( enablePainting ) QTable::viewportPaintEvent( e ); @@ -631,7 +631,7 @@ void AbTable::paintCell(QPainter* p, int row, int col, const QRect& cr, bool ) p->save(); - // Opie::Core::owarn << "Paint row: " << row << oendl; + // owarn << "Paint row: " << row << oendl; Opie::OPimContact act_contact = m_viewList[row]; diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp index 52e5f59..7a5b6d4 100644 --- a/core/pim/addressbook/abview.cpp +++ b/core/pim/addressbook/abview.cpp @@ -52,7 +52,7 @@ AbView::AbView ( QWidget* parent, const QValueList& ordered ): m_abTable( 0l ), m_orderedFields( ordered ) { - Opie::Core::owarn << "AbView::c'tor" << oendl; + owarn << "AbView::c'tor" << oendl; // Load default database and handle syncing myself.. ! m_contactdb = new Opie::OPimContactAccess ( "addressbook", 0l, 0l, false ); m_contactdb -> setReadAhead( 16 ); // Use ReadAhead-Cache if available @@ -100,28 +100,28 @@ AbView::~AbView() void AbView::setView( Views view ) { - Opie::Core::owarn << "AbView::setView( Views view )" << oendl; + owarn << "AbView::setView( Views view )" << oendl; m_curr_View = view; load(); } void AbView::addEntry( const Opie::OPimContact &newContact ) { - Opie::Core::owarn << "AbView::AddContact" << oendl; + owarn << "AbView::AddContact" << oendl; m_contactdb->add ( newContact ); load(); } void AbView::removeEntry( const int UID ) { - Opie::Core::owarn << "AbView;:RemoveContact" << oendl; + owarn << "AbView;:RemoveContact" << oendl; m_contactdb->remove( UID ); load(); } void AbView::replaceEntry( const Opie::OPimContact &contact ) { - Opie::Core::owarn << "AbView::ReplaceContact" << oendl; + owarn << "AbView::ReplaceContact" << oendl; m_contactdb->replace( contact ); load(); @@ -145,14 +145,14 @@ Opie::OPimContact AbView::currentEntry() bool AbView::save() { - // Opie::Core::owarn << "AbView::Save data" << oendl; + // owarn << "AbView::Save data" << oendl; return m_contactdb->save(); } void AbView::load() { - Opie::Core::owarn << "AbView::Load data" << oendl; + owarn << "AbView::Load data" << oendl; // Letter Search is stopped at this place emit signalClearLetterPicker(); @@ -166,7 +166,7 @@ void AbView::load() clearForCategory(); } - Opie::Core::owarn << "Number of contacts: " << m_list.count() << oendl; + owarn << "Number of contacts: " << m_list.count() << oendl; updateView( true ); @@ -174,7 +174,7 @@ void AbView::load() void AbView::reload() { - Opie::Core::owarn << "AbView::::reload()" << oendl; + owarn << "AbView::::reload()" << oendl; m_contactdb->reload(); load(); @@ -187,7 +187,7 @@ void AbView::clear() void AbView::setShowByCategory( const QString& cat ) { - Opie::Core::owarn << "AbView::setShowCategory( const QString& cat )" << oendl; + owarn << "AbView::setShowCategory( const QString& cat )" << oendl; int intCat = 0; @@ -199,7 +199,7 @@ void AbView::setShowByCategory( const QString& cat ) // Just do anything if we really change the category if ( intCat != m_curr_category ){ - // Opie::Core::owarn << "Categories: Selected " << cat << ".. Number: " + // owarn << "Categories: Selected " << cat << ".. Number: " // << m_curr_category << oendl; m_curr_category = intCat; @@ -212,10 +212,10 @@ void AbView::setShowByCategory( const QString& cat ) void AbView::setShowToView( Views view ) { - Opie::Core::owarn << "void AbView::setShowToView( View " << view << " )" << oendl; + owarn << "void AbView::setShowToView( View " << view << " )" << oendl; if ( m_curr_View != view ){ - Opie::Core::owarn << "Change the View (Category is: " << m_curr_category << ")" << oendl; + owarn << "Change the View (Category is: " << m_curr_category << ")" << oendl; m_prev_View = m_curr_View; m_curr_View = view; @@ -226,7 +226,7 @@ void AbView::setShowToView( Views view ) void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode ) { - Opie::Core::owarn << "void AbView::setShowByLetter( " << c << ", " << mode << " )" << oendl; + owarn << "void AbView::setShowByLetter( " << c << ", " << mode << " )" << oendl; assert( mode < AbConfig::LASTELEMENT ); @@ -249,7 +249,7 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode ) query.setFileAs( QString("%1*").arg(c) ); break; default: - Opie::Core::owarn << "Unknown Searchmode for AbView::setShowByLetter ! -> " << mode << oendl + owarn << "Unknown Searchmode for AbView::setShowByLetter ! -> " << mode << oendl << "I will ignore it.." << oendl; return; } @@ -279,7 +279,7 @@ QString AbView::showCategory() const void AbView::showPersonal( bool personal ) { - Opie::Core::owarn << "void AbView::showPersonal( " << personal << " )" << oendl; + owarn << "void AbView::showPersonal( " << personal << " )" << oendl; if ( personal ){ @@ -335,7 +335,7 @@ QStringList AbView::categories() void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, bool , QString cat ) { - // Opie::Core::owarn << "void AbView::slotDoFind" << oendl; + // owarn << "void AbView::slotDoFind" << oendl; // We reloading the data: Deselect Letterpicker emit signalClearLetterPicker(); @@ -349,7 +349,7 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, category = mCat.id("Contacts", cat ); } - // Opie::Core::owarn << "Find in Category " << category << oendl; + // owarn << "Find in Category " << category << oendl; QRegExp r( str ); r.setCaseSensitive( caseSensitive ); @@ -358,7 +358,7 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, // Get all matching entries out of the database m_list = m_contactdb->matchRegexp( r ); - // Opie::Core::owarn << "Found: " << m_list.count() << oendl; + // owarn << "Found: " << m_list.count() << oendl; if ( m_list.count() == 0 ){ emit signalNotFound(); return; @@ -382,16 +382,16 @@ void AbView::offSearch() } void AbView::slotSwitch(){ - // Opie::Core::owarn << "AbView::slotSwitch()" << oendl; + // owarn << "AbView::slotSwitch()" << oendl; m_prev_View = m_curr_View; switch ( (int) m_curr_View ){ case TableView: - Opie::Core::owarn << "Switching to CardView" << oendl; + owarn << "Switching to CardView" << oendl; m_curr_View = CardView; break; case CardView: - Opie::Core::owarn << "Switching to TableView" << oendl; + owarn << "Switching to TableView" << oendl; m_curr_View = TableView; break; } @@ -410,7 +410,7 @@ void AbView::clearForCategory() if ( m_curr_category != -1 ){ for ( it = allList.begin(); it != allList.end(); ++it ){ if ( !contactCompare( *it, m_curr_category ) ){ - //Opie::Core::owarn << "Removing " << (*it).uid() << oendl; + //owarn << "Removing " << (*it).uid() << oendl; m_list.remove( (*it).uid() ); } } @@ -420,14 +420,14 @@ void AbView::clearForCategory() bool AbView::contactCompare( const Opie::OPimContact &cnt, int category ) { - // Opie::Core::owarn << "bool AbView::contactCompare( const Opie::OPimContact &cnt, " + // owarn << "bool AbView::contactCompare( const Opie::OPimContact &cnt, " // << category << " )" << oendl; bool returnMe; QArray cats; cats = cnt.categories(); - // Opie::Core::owarn << "Number of categories: " << cats.count() << oendl; + // owarn << "Number of categories: " << cats.count() << oendl; returnMe = false; if ( cats.count() == 0 && category == 0 ) @@ -436,14 +436,14 @@ bool AbView::contactCompare( const Opie::OPimContact &cnt, int category ) else { int i; for ( i = 0; i < int(cats.count()); i++ ) { - //Opie::Core::owarn << "Comparing " << cats[i] << " with " << category << oendl; + //owarn << "Comparing " << cats[i] << " with " << category << oendl; if ( cats[i] == category ) { returnMe = true; break; } } } - // Opie::Core::owarn << "Return: " << returnMe << oendl; + // owarn << "Return: " << returnMe << oendl; return returnMe; } @@ -456,7 +456,7 @@ void AbView::updateListinViews() void AbView::updateView( bool newdata ) { - // Opie::Core::owarn << "AbView::updateView()" << oendl; + // owarn << "AbView::updateView()" << oendl; if ( m_viewStack -> visibleWidget() ){ m_viewStack -> visibleWidget() -> clearFocus(); diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 94c0a13..35d0f41 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp @@ -251,7 +251,7 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, setCentralWidget(listContainer); - // Opie::Core::odebug << "adressbook contrsuction: t=" << t.elapsed() << oendl; + // odebug << "adressbook contrsuction: t=" << t.elapsed() << oendl; connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) ); connect( qApp, SIGNAL( reload() ), this, SLOT( reload() ) ); connect( qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ), @@ -267,10 +267,10 @@ void AddressbookWindow::slotConfig() ConfigDlg* dlg = new ConfigDlg( this, "Config" ); dlg -> setConfig( m_config ); if ( QPEApplication::execDialog( dlg ) ) { - Opie::Core::owarn << "Config Dialog accepted!" << oendl; + owarn << "Config Dialog accepted!" << oendl; m_config = dlg -> getConfig(); if ( m_curFontSize != m_config.fontSize() ){ - Opie::Core::owarn << "Font was changed!" << oendl; + owarn << "Font was changed!" << oendl; m_curFontSize = m_config.fontSize(); emit slotSetFont( m_curFontSize ); } @@ -283,7 +283,7 @@ void AddressbookWindow::slotConfig() void AddressbookWindow::slotSetFont( int size ) { - Opie::Core::owarn << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl; + owarn << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl; if (size > 2 || size < 0) size = 1; @@ -325,10 +325,10 @@ void AddressbookWindow::importvCard() { } void AddressbookWindow::exportvCard() { - Opie::Core::owarn << "void AddressbookWindow::exportvCard()" << oendl; + owarn << "void AddressbookWindow::exportvCard()" << oendl; QString filename = Opie::Ui::OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this ); if( !filename.isEmpty() && ( filename[filename.length()-1] != '/' ) ){ - Opie::Core::owarn << " Save to file " << filename << ", (" << filename.length()-1 << ")" << oendl; + owarn << " Save to file " << filename << ", (" << filename.length()-1 << ")" << oendl; Opie::OPimContact curCont = m_abView->currentEntry(); if ( !curCont.isEmpty() ){ Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, @@ -350,7 +350,7 @@ void AddressbookWindow::exportvCard() void AddressbookWindow::setDocument( const QString &filename ) { - Opie::Core::owarn << "void AddressbookWindow::setDocument( " << filename << " )" << oendl; + owarn << "void AddressbookWindow::setDocument( " << filename << " )" << oendl; if ( filename.find(".vcf") != int(filename.length()) - 4 ){ @@ -362,10 +362,10 @@ void AddressbookWindow::setDocument( const QString &filename ) 0, // Enter == button 0 2 ) ) { // Escape == button 2 case 0: - Opie::Core::owarn << "YES clicked" << oendl; + owarn << "YES clicked" << oendl; break; case 1: - Opie::Core::owarn << "NO clicked" << oendl; + owarn << "NO clicked" << oendl; return; break; } @@ -375,7 +375,7 @@ void AddressbookWindow::setDocument( const QString &filename ) filename ); Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true ); Opie::OPimContactAccess::List allList = access->allRecords(); - Opie::Core::owarn << "Found number of contacts in File: " << allList.count() << oendl; + owarn << "Found number of contacts in File: " << allList.count() << oendl; if ( !allList.count() ) { QMessageBox::information( this, "Import VCard", @@ -386,7 +386,7 @@ void AddressbookWindow::setDocument( const QString &filename ) bool doAsk = true; Opie::OPimContactAccess::List::Iterator it; for ( it = allList.begin(); it != allList.end(); ++it ){ - Opie::Core::owarn << "Adding Contact from: " << (*it).fullName() << oendl; + owarn << "Adding Contact from: " << (*it).fullName() << oendl; if ( doAsk ){ switch( QMessageBox::information( this, tr ( "Add Contact?" ), tr( "Do you really want add contact for \n%1?" ) @@ -395,14 +395,14 @@ void AddressbookWindow::setDocument( const QString &filename ) 0, // Enter == button 0 2 ) ) { // Escape == button 2 case 0: - Opie::Core::owarn << "YES clicked" << oendl; + owarn << "YES clicked" << oendl; m_abView->addEntry( *it ); break; case 1: - Opie::Core::owarn << "NO clicked" << oendl; + owarn << "NO clicked" << oendl; break; case 2: - Opie::Core::owarn << "YesAll clicked" << oendl; + owarn << "YesAll clicked" << oendl; doAsk = false; break; } @@ -538,9 +538,9 @@ void AddressbookWindow::writeMail() // Try to access the preferred. If not possible, try to // switch to the other one.. if ( m_config.useQtMail() ){ - Opie::Core::owarn << "Accessing: " << (basepath + "/bin/qtmail") << oendl; + owarn << "Accessing: " << (basepath + "/bin/qtmail") << oendl; if ( QFile::exists( basepath + "/bin/qtmail" ) ){ - Opie::Core::owarn << "QCop" << oendl; + owarn << "QCop" << oendl; QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)"); e << name << email; return; @@ -548,9 +548,9 @@ void AddressbookWindow::writeMail() m_config.setUseOpieMail( true ); } if ( m_config.useOpieMail() ){ - Opie::Core::owarn << "Accessing: " << (basepath + "/bin/opiemail") << oendl; + owarn << "Accessing: " << (basepath + "/bin/opiemail") << oendl; if ( QFile::exists( basepath + "/bin/opiemail" ) ){ - Opie::Core::owarn << "QCop" << oendl; + owarn << "QCop" << oendl; QCopEnvelope e("QPE/Application/opiemail", "writeMail(QString,QString)"); e << name << email; return; @@ -592,7 +592,7 @@ void AddressbookWindow::slotBeam() beamFilename = beamfile; } - Opie::Core::owarn << "Beaming: " << beamFilename << oendl; + owarn << "Beaming: " << beamFilename << oendl; Ir *ir = new Ir( this ); connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) ); @@ -639,7 +639,7 @@ static void parseName( const QString& name, QString *first, QString *middle, void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) { bool needShow = FALSE; - Opie::Core::owarn << "Receiving QCop-Call with message " << msg << oendl; + owarn << "Receiving QCop-Call with message " << msg << oendl; if (msg == "editPersonal()") { @@ -655,7 +655,7 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) Opie::OPimContact cnt; QString fn, mn, ln; parseName( name, &fn, &mn, &ln ); - // Opie::Core::odebug << " " << fn << " - " << mn " - " << ln << oendl; + // odebug << " " << fn << " - " << mn " - " << ln << oendl; cnt.setFirstName( fn ); cnt.setMiddleName( mn ); cnt.setLastName( ln ); @@ -682,7 +682,7 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) int uid; stream >> uid; - Opie::Core::owarn << "Showing uid: " << uid << oendl; + owarn << "Showing uid: " << uid << oendl; // Deactivate Personal View.. if ( actionPersonal->isOn() ){ @@ -762,7 +762,7 @@ void AddressbookWindow::editPersonal() // Switch to personal view if not selected // but take care of the menu, too if ( ! actionPersonal->isOn() ){ - Opie::Core::owarn << "*** ++++" << oendl; + owarn << "*** ++++" << oendl; actionPersonal->setOn( true ); slotPersonalView(); } @@ -781,10 +781,10 @@ void AddressbookWindow::editPersonal() void AddressbookWindow::slotPersonalView() { - Opie::Core::owarn << "slotPersonalView()" << oendl; + owarn << "slotPersonalView()" << oendl; if (!actionPersonal->isOn()) { // we just turned it off - Opie::Core::owarn << "slotPersonalView()-> OFF" << oendl; + owarn << "slotPersonalView()-> OFF" << oendl; setCaption( tr("Contacts") ); actionNew->setEnabled(TRUE); actionTrash->setEnabled(TRUE); @@ -797,7 +797,7 @@ void AddressbookWindow::slotPersonalView() return; } - Opie::Core::owarn << "slotPersonalView()-> ON" << oendl; + owarn << "slotPersonalView()-> ON" << oendl; // XXX need to disable some QActions. actionNew->setEnabled(FALSE); actionTrash->setEnabled(FALSE); @@ -887,7 +887,7 @@ void AddressbookWindow::slotSave() void AddressbookWindow::slotNotFound() { - Opie::Core::owarn << "Got not found signal!" << oendl; + owarn << "Got not found signal!" << oendl; QMessageBox::information( this, tr( "Not Found" ), "" + tr( "Unable to find a contact for this search pattern!" ) + "" ); @@ -895,7 +895,7 @@ void AddressbookWindow::slotNotFound() } void AddressbookWindow::slotWrapAround() { - Opie::Core::owarn << "Got wrap signal!" << oendl; + owarn << "Got wrap signal!" << oendl; // if ( doNotifyWrapAround ) // QMessageBox::information( this, tr( "End of list" ), // tr( "End of list. Wrap around now...!" ) + "\n" ); @@ -904,7 +904,7 @@ void AddressbookWindow::slotWrapAround() void AddressbookWindow::slotSetCategory( int c ) { - Opie::Core::owarn << "void AddressbookWindow::slotSetCategory( " << c << " ) from " + owarn << "void AddressbookWindow::slotSetCategory( " << c << " ) from " << catMenu->count() << oendl; QString cat, book; @@ -940,7 +940,7 @@ void AddressbookWindow::slotSetCategory( int c ) cat = QString::null; }else if ( i == (unsigned int)catMenu->count() - 1 ){ // last menu option (seperator is counted, too) will be Unfiled cat = "Unfiled"; - Opie::Core::owarn << "Unfiled selected!" << oendl; + owarn << "Unfiled selected!" << oendl; }else{ cat = m_abView->categories()[i - 4]; } @@ -963,7 +963,7 @@ void AddressbookWindow::slotSetCategory( int c ) void AddressbookWindow::slotViewSwitched( int view ) { - Opie::Core::owarn << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl; + owarn << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl; int menu = 0; // Switch to selected view diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp index 094dbda..22f7291 100644 --- a/core/pim/addressbook/configdlg.cpp +++ b/core/pim/addressbook/configdlg.cpp @@ -43,7 +43,7 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name): void ConfigDlg::slotItemUp() { - Opie::Core::owarn << "void ConfigDlg::slotItemUp()" << oendl; + owarn << "void ConfigDlg::slotItemUp()" << oendl; int i = fieldListBox->currentItem(); if ( i > 0 ) { @@ -57,7 +57,7 @@ void ConfigDlg::slotItemUp() void ConfigDlg::slotItemDown() { - Opie::Core::owarn << "void ConfigDlg::slotItemDown()" << oendl; + owarn << "void ConfigDlg::slotItemDown()" << oendl; int i = fieldListBox->currentItem(); if ( i < (int)fieldListBox->count() - 1 ) { @@ -70,19 +70,19 @@ void ConfigDlg::slotItemDown() void ConfigDlg::slotItemAdd() { - Opie::Core::owarn << "void ConfigDlg::slotItemAdd()" << oendl; + owarn << "void ConfigDlg::slotItemAdd()" << oendl; int i = allFieldListBox->currentItem(); if ( i > 0 ) { QString item = allFieldListBox->currentText(); - Opie::Core::owarn << "Adding " << item << oendl; + owarn << "Adding " << item << oendl; fieldListBox->insertItem( item ); } } void ConfigDlg::slotItemRemove() { - Opie::Core::owarn << "void ConfigDlg::slotItemRemove()" << oendl; + owarn << "void ConfigDlg::slotItemRemove()" << oendl; int i = fieldListBox->currentItem(); if ( i > 0 ) { diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index e496387..72c8bd3 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp @@ -78,7 +78,7 @@ ContactEditor::~ContactEditor() { } void ContactEditor::init() { - Opie::Core::owarn << "init() START" << oendl; + owarn << "init() START" << oendl; uint i = 0; @@ -687,18 +687,18 @@ void ContactEditor::init() { setPersonalView ( m_personalView ); - Opie::Core::owarn << "init() END" << oendl; + owarn << "init() END" << oendl; } void ContactEditor::defaultEmailChanged(int i){ - Opie::Core::odebug << "defaultEmailChanged" << oendl; + odebug << "defaultEmailChanged" << oendl; // was sollte das ? (se) // int index = cmbChooserField1->currentItem(); // slChooserValues[index] = cmbDefaultEmail->text(i); defaultEmail = cmbDefaultEmail->text(i); - Opie::Core::odebug << "Changed to: " << defaultEmail << oendl; + odebug << "Changed to: " << defaultEmail << oendl; } @@ -717,12 +717,12 @@ void ContactEditor::populateDefaultEmailCmb(){ // Select default email in combo.. bool found = false; for ( int i = 0; i < cmbDefaultEmail->count(); i++){ - Opie::Core::odebug << " populateDefaultEmailCmb text >" << cmbDefaultEmail->text( i ) + odebug << " populateDefaultEmailCmb text >" << cmbDefaultEmail->text( i ) << "< defaultEmail >" << defaultEmail << "<" << oendl; if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){ cmbDefaultEmail->setCurrentItem( i ); - Opie::Core::odebug << "set" << oendl; + odebug << "set" << oendl; found = true; } } @@ -738,7 +738,7 @@ void ContactEditor::populateDefaultEmailCmb(){ // be handled by something else.. bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int widgetPos ) { QString type = slChooserNames[index]; - Opie::Core::owarn << "ContactEditor::cmbChooserChange -> Type: " << type + owarn << "ContactEditor::cmbChooserChange -> Type: " << type << ", WidgetPos: " << widgetPos << oendl; if ( !initializing ) @@ -746,7 +746,7 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w // Create and connect combobox for selecting the default email if ( type == "Default Email"){ - Opie::Core::owarn << "Choosing default-email (defaultEmailChooserPosition= " + owarn << "Choosing default-email (defaultEmailChooserPosition= " << defaultEmailChooserPosition << ") " << oendl; // More than one default-email chooser is not allowed ! @@ -780,7 +780,7 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w } else { // Something else was selected: Hide combo.. - Opie::Core::owarn << " Hiding default-email combo" << oendl; + owarn << " Hiding default-email combo" << oendl; if ( defaultEmailChooserPosition == widgetPos ){ defaultEmailChooserPosition = -1; } @@ -805,7 +805,7 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w // Currently accessed when we select default-email more than once ! void ContactEditor::chooserError( int index ) { - Opie::Core::owarn << "ContactEditor::chooserError( " << index << " )" << oendl; + owarn << "ContactEditor::chooserError( " << index << " )" << oendl; QMessageBox::warning( this, "Chooser Error", "Multiple selection of this\n" "Item is not allowed !\n\n" @@ -841,18 +841,18 @@ void ContactEditor::chooserChange( const QString &textChanged, int index, QLineEdit* , int widgetPos ) { QString type = slChooserNames[index]; // :SX - Opie::Core::odebug << "ContactEditor::chooserChange( type=>" << type << "<, textChanged=>" + odebug << "ContactEditor::chooserChange( type=>" << type << "<, textChanged=>" << textChanged << "< index=" << index << ", widgetPos=" << widgetPos << " )" << oendl; if ( type == "Default Email"){ - Opie::Core::owarn << "??? Wozu??: " << textChanged << oendl; + owarn << "??? Wozu??: " << textChanged << oendl; defaultEmail = textChanged; populateDefaultEmailCmb(); }else if (type == "Emails"){ - Opie::Core::odebug << "emails" << oendl; + odebug << "emails" << oendl; QString de; emails = QStringList::split (",", textChanged ); @@ -865,23 +865,23 @@ void ContactEditor::chooserChange( const QString &textChanged, int index, } void ContactEditor::slotChooser1Change( const QString &textChanged ) { - Opie::Core::owarn << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl; + owarn << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl; chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1); } void ContactEditor::slotChooser2Change( const QString &textChanged ) { - Opie::Core::owarn << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl; + owarn << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl; chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2); } void ContactEditor::slotChooser3Change( const QString &textChanged ) { - Opie::Core::owarn << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl; + owarn << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl; chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3); } void ContactEditor::slotChooser4Change( const QString &textChanged ) { - Opie::Core::owarn << "ContactEditor::slotChooser4Change( " << textChanged << " )" << oendl; + owarn << "ContactEditor::slotChooser4Change( " << textChanged << " )" << oendl; chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4); } @@ -951,7 +951,7 @@ void ContactEditor::slotCountryChange( const QString &textChanged ) { void ContactEditor::slotCmbChooser1Change( int index ) { - Opie::Core::owarn << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl; + owarn << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl; if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){ txtChooserField1->setText( slChooserValues[index] ); @@ -962,7 +962,7 @@ void ContactEditor::slotCmbChooser1Change( int index ) { } void ContactEditor::slotCmbChooser2Change( int index ) { - Opie::Core::owarn << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl; + owarn << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl; if ( !cmbChooserChange( cmbChooserField2->currentItem(), m_widgetStack2, 2) ){ @@ -973,7 +973,7 @@ void ContactEditor::slotCmbChooser2Change( int index ) { } void ContactEditor::slotCmbChooser3Change( int index ) { - Opie::Core::owarn << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl; + owarn << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl; if ( !cmbChooserChange( cmbChooserField3->currentItem(), m_widgetStack3, 3) ){ @@ -984,7 +984,7 @@ void ContactEditor::slotCmbChooser3Change( int index ) { } void ContactEditor::slotCmbChooser4Change( int index ) { - Opie::Core::owarn << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl; + owarn << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl; if ( !cmbChooserChange( cmbChooserField4->currentItem(), m_widgetStack4, 4) ){ @@ -1029,7 +1029,7 @@ void ContactEditor::slotAddressTypeChange( int index ) { void ContactEditor::slotFullNameChange( const QString &textChanged ) { - Opie::Core::owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl; + owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl; int index = cmbFileAs->currentItem(); @@ -1053,7 +1053,7 @@ void ContactEditor::slotSuffixChange( const QString& ) { } void ContactEditor::slotOrganizationChange( const QString &textChanged ){ - Opie::Core::owarn << "ContactEditor::slotOrganizationChange( " << textChanged << " )" << oendl; + owarn << "ContactEditor::slotOrganizationChange( " << textChanged << " )" << oendl; // Special handling for storing Companies: // If no Fullname is given, we store the Company-Name as lastname // to handle it like a person.. @@ -1135,11 +1135,11 @@ QString ContactEditor::parseName( const QString fullName, int type ) { int commapos; bool haveLastName = false; - Opie::Core::owarn << "Fullname: " << simplifiedName << oendl; + owarn << "Fullname: " << simplifiedName << oendl; commapos = simplifiedName.find( ',', 0, TRUE); if ( commapos >= 0 ) { - Opie::Core::owarn << " Commapos: " << commapos << oendl; + owarn << " Commapos: " << commapos << oendl; // A comma (",") separates the lastname from one or // many first names. Thus, remove the lastname from the @@ -1148,7 +1148,7 @@ QString ContactEditor::parseName( const QString fullName, int type ) { strLastName = simplifiedName.left( commapos ); simplifiedName= simplifiedName.mid( commapos + 1 ); haveLastName = true; - Opie::Core::owarn << "Fullname without ',': " << simplifiedName << oendl; + owarn << "Fullname without ',': " << simplifiedName << oendl; // If we have any lastname, we should now split all first names. // The first one will be the used as first, the rest as "middle names" @@ -1182,10 +1182,10 @@ QString ContactEditor::parseName( const QString fullName, int type ) { if ( strFirstName == strLastName ) strFirstName = ""; - Opie::Core::owarn << "strFirstName: " << strFirstName << oendl; - Opie::Core::owarn << "strMiddletName: " << strMiddleName << oendl; - Opie::Core::owarn << "strLastName: " << strLastName << oendl; - Opie::Core::owarn << "strTitle: " << strTitle << oendl; + owarn << "strFirstName: " << strFirstName << oendl; + owarn << "strMiddletName: " << strMiddleName << oendl; + owarn << "strLastName: " << strLastName << oendl; + owarn << "strTitle: " << strTitle << oendl; switch (type) { case NAME_FL: @@ -1268,7 +1268,7 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) { emails = QStringList(ent.emailList()); defaultEmail = ent.defaultEmail(); if (defaultEmail.isEmpty()) defaultEmail = emails[0]; - Opie::Core::odebug << "default email=" << defaultEmail << oendl; + odebug << "default email=" << defaultEmail << oendl; txtFirstName->setText( ent.firstName() ); txtMiddleName->setText( ent.middleName() ); @@ -1328,7 +1328,7 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) { QListIterator itLE( listValue ); for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) { - Opie::Core::owarn << " Filling dynamic Field: " << (*it) << oendl; + owarn << " Filling dynamic Field: " << (*it) << oendl; if ( *it == "Department" ) (*itLE)->setText( ent.department() ); @@ -1352,7 +1352,7 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) { (*itLE)->setText( ent.spouse() ); if ( *it == "Nickname" ){ - Opie::Core::owarn << "**** Nichname: " << ent.nickname() << oendl; + owarn << "**** Nichname: " << ent.nickname() << oendl; (*itLE)->setText( ent.nickname() ); } @@ -1585,8 +1585,8 @@ void ContactEditor::saveEntry() { QString defaultmail; parseEmailFrom( emails.join(","), defaultmail, allemail ); if ( defaultEmail.isEmpty() ){ - Opie::Core::owarn << "Default email was not set by user!" << oendl; - Opie::Core::owarn << "Using first email in list: " << defaultmail << oendl; + owarn << "Default email was not set by user!" << oendl; + owarn << "Using first email in list: " << defaultmail << oendl; ent.setDefaultEmail( defaultmail ); } ent.setEmails( allemail ); @@ -1738,14 +1738,14 @@ void ContactEditor::slotBirthdayDateChanged( int year, int month, int day) void ContactEditor::slotRemoveBirthday() { - Opie::Core::owarn << "void ContactEditor::slotRemoveBirthday()" << oendl; + owarn << "void ContactEditor::slotRemoveBirthday()" << oendl; ent.setBirthday( QDate() ); updateDatePicker(); } void ContactEditor::slotRemoveAnniversary() { - Opie::Core::owarn << "void ContactEditor::slotRemoveAnniversary()" << oendl; + owarn << "void ContactEditor::slotRemoveAnniversary()" << oendl; ent.setAnniversary( QDate() ); updateDatePicker(); } diff --git a/core/pim/addressbook/picker.cpp b/core/pim/addressbook/picker.cpp index df3d6ac..8a9c85b 100644 --- a/core/pim/addressbook/picker.cpp +++ b/core/pim/addressbook/picker.cpp @@ -239,7 +239,7 @@ void LetterPicker::clear() void LetterPicker::newLetter( char letter ) { - Opie::Core::owarn << "LetterClicked" << oendl; + owarn << "LetterClicked" << oendl; emit letterClicked( letter ); } -- cgit v0.9.0.2