summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-04 17:03:27 (UTC)
committer mickeyl <mickeyl>2004-04-04 17:03:27 (UTC)
commitdaef74a7e852855f781765fad7969b6c83e2e9c6 (patch) (side-by-side diff)
treef635b437ba9f6d144c34c5ee58d37954bacc3c6e
parent100def2936503dedc8138d738d68b69d5de66766 (diff)
downloadopie-daef74a7e852855f781765fad7969b6c83e2e9c6.zip
opie-daef74a7e852855f781765fad7969b6c83e2e9c6.tar.gz
opie-daef74a7e852855f781765fad7969b6c83e2e9c6.tar.bz2
s/Opie::Core::odebug/odebug/ (same with oerr,owarn,ofatal)
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/addressbook/ablabel.cpp14
-rw-r--r--core/pim/addressbook/abtable.cpp50
-rw-r--r--core/pim/addressbook/abview.cpp56
-rw-r--r--core/pim/addressbook/addressbook.cpp62
-rw-r--r--core/pim/addressbook/configdlg.cpp10
-rw-r--r--core/pim/addressbook/contacteditor.cpp74
-rw-r--r--core/pim/addressbook/picker.cpp2
7 files changed, 134 insertions, 134 deletions
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
@@ -96,13 +96,13 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
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() ) )
@@ -118,7 +118,7 @@ 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() ) &&
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
@@ -122,5 +122,5 @@ AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name
countNested( 0 )
{
- // Opie::Core::owarn << "C'tor start" << oendl;
+ // owarn << "C'tor start" << oendl;
setSelectionMode( NoSelection );
init();
@@ -130,5 +130,5 @@ AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name
// contactList.clear();
- // Opie::Core::owarn << "C'tor end" << oendl;
+ // owarn << "C'tor end" << oendl;
}
@@ -152,5 +152,5 @@ void AbTable::init()
void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
{
- Opie::Core::owarn << "AbTable::setContacts()" << oendl;
+ owarn << "AbTable::setContacts()" << oendl;
clear();
@@ -184,5 +184,5 @@ void AbTable::setOrderedList( const QValueList<int> 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;
@@ -190,5 +190,5 @@ bool AbTable::selectContact( int UID )
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 ){
@@ -199,5 +199,5 @@ bool AbTable::selectContact( int UID )
}
}
- Opie::Core::owarn << "Search end" << oendl;
+ owarn << "Search end" << oendl;
if ( !found ){
@@ -214,5 +214,5 @@ bool AbTable::selectContact( int UID )
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;
@@ -258,5 +258,5 @@ 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 );
@@ -284,5 +284,5 @@ int AbTable::currentEntry_UID()
void AbTable::clear()
{
- Opie::Core::owarn << "void AbTable::clear()" << oendl;
+ owarn << "void AbTable::clear()" << oendl;
// contactList.clear();
@@ -302,5 +302,5 @@ void AbTable::clear()
void AbTable::refresh()
{
- Opie::Core::owarn << "void AbTable::refresh() NOT IMPLEMENTED !!" << oendl;
+ owarn << "void AbTable::refresh() NOT IMPLEMENTED !!" << oendl;
#if 0
@@ -335,5 +335,5 @@ void AbTable::keyPressEvent( QKeyEvent *e )
moveTo( key );
- // Opie::Core::owarn << "Received key .." << oendl;
+ // owarn << "Received key .." << oendl;
switch( e->key() ) {
case Qt::Key_Space:
@@ -343,9 +343,9 @@ void AbTable::keyPressEvent( QKeyEvent *e )
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;
@@ -358,5 +358,5 @@ 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
@@ -424,5 +424,5 @@ void AbTable::resizeRows() {
void AbTable::realignTable()
{
- // Opie::Core::owarn << "void AbTable::realignTable()" << oendl;
+ // owarn << "void AbTable::realignTable()" << oendl;
setPaintingEnabled( FALSE );
@@ -474,5 +474,5 @@ 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
@@ -486,5 +486,5 @@ void AbTable::fitColumns()
}
- // Opie::Core::owarn << "Width: " << contentsWidth << oendl;
+ // owarn << "Width: " << contentsWidth << oendl;
setColumnWidth( 0, contentsWidth );
@@ -498,5 +498,5 @@ void AbTable::fitColumns()
void AbTable::show()
{
- // Opie::Core::owarn << "void AbTable::show()" << oendl;
+ // owarn << "void AbTable::show()" << oendl;
realignTable();
QTable::show();
@@ -522,9 +522,9 @@ 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();
}
@@ -563,5 +563,5 @@ QStringList AbTable::choiceSelection(int /*index*/) const
void AbTable::updateVisible()
{
- // Opie::Core::owarn << "void AbTable::updateVisible()" << oendl;
+ // owarn << "void AbTable::updateVisible()" << oendl;
int visible,
@@ -599,5 +599,5 @@ 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;
@@ -616,10 +616,10 @@ void AbTable::setPaintingEnabled( bool e )
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 )
@@ -632,5 +632,5 @@ 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
@@ -53,5 +53,5 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
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 );
@@ -101,5 +101,5 @@ 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();
@@ -108,5 +108,5 @@ void AbView::setView( Views view )
void AbView::addEntry( const Opie::OPimContact &newContact )
{
- Opie::Core::owarn << "AbView::AddContact" << oendl;
+ owarn << "AbView::AddContact" << oendl;
m_contactdb->add ( newContact );
load();
@@ -115,5 +115,5 @@ void AbView::addEntry( const Opie::OPimContact &newContact )
void AbView::removeEntry( const int UID )
{
- Opie::Core::owarn << "AbView;:RemoveContact" << oendl;
+ owarn << "AbView;:RemoveContact" << oendl;
m_contactdb->remove( UID );
load();
@@ -122,5 +122,5 @@ void AbView::removeEntry( const int UID )
void AbView::replaceEntry( const Opie::OPimContact &contact )
{
- Opie::Core::owarn << "AbView::ReplaceContact" << oendl;
+ owarn << "AbView::ReplaceContact" << oendl;
m_contactdb->replace( contact );
load();
@@ -146,5 +146,5 @@ Opie::OPimContact AbView::currentEntry()
bool AbView::save()
{
- // Opie::Core::owarn << "AbView::Save data" << oendl;
+ // owarn << "AbView::Save data" << oendl;
return m_contactdb->save();
@@ -153,5 +153,5 @@ bool AbView::save()
void AbView::load()
{
- Opie::Core::owarn << "AbView::Load data" << oendl;
+ owarn << "AbView::Load data" << oendl;
// Letter Search is stopped at this place
@@ -167,5 +167,5 @@ void AbView::load()
}
- Opie::Core::owarn << "Number of contacts: " << m_list.count() << oendl;
+ owarn << "Number of contacts: " << m_list.count() << oendl;
updateView( true );
@@ -175,5 +175,5 @@ void AbView::load()
void AbView::reload()
{
- Opie::Core::owarn << "AbView::::reload()" << oendl;
+ owarn << "AbView::::reload()" << oendl;
m_contactdb->reload();
@@ -188,5 +188,5 @@ 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;
@@ -200,5 +200,5 @@ 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;
@@ -213,8 +213,8 @@ 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;
@@ -227,5 +227,5 @@ 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 );
@@ -250,5 +250,5 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
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;
@@ -280,5 +280,5 @@ 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 ){
@@ -336,5 +336,5 @@ 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
@@ -350,5 +350,5 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
}
- // Opie::Core::owarn << "Find in Category " << category << oendl;
+ // owarn << "Find in Category " << category << oendl;
QRegExp r( str );
@@ -359,5 +359,5 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
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();
@@ -383,14 +383,14 @@ 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;
@@ -411,5 +411,5 @@ void AbView::clearForCategory()
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() );
}
@@ -421,5 +421,5 @@ 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;
@@ -428,5 +428,5 @@ bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
cats = cnt.categories();
- // Opie::Core::owarn << "Number of categories: " << cats.count() << oendl;
+ // owarn << "Number of categories: " << cats.count() << oendl;
returnMe = false;
@@ -437,5 +437,5 @@ bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
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;
@@ -444,5 +444,5 @@ bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
}
}
- // Opie::Core::owarn << "Return: " << returnMe << oendl;
+ // owarn << "Return: " << returnMe << oendl;
return returnMe;
}
@@ -457,5 +457,5 @@ void AbView::updateListinViews()
void AbView::updateView( bool newdata )
{
- // Opie::Core::owarn << "AbView::updateView()" << oendl;
+ // owarn << "AbView::updateView()" << oendl;
if ( m_viewStack -> visibleWidget() ){
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
@@ -252,5 +252,5 @@ 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() ) );
@@ -268,8 +268,8 @@ void AddressbookWindow::slotConfig()
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 );
@@ -284,5 +284,5 @@ 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)
@@ -326,8 +326,8 @@ 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() ){
@@ -351,5 +351,5 @@ 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 ){
@@ -363,8 +363,8 @@ void AddressbookWindow::setDocument( const QString &filename )
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;
@@ -376,5 +376,5 @@ void AddressbookWindow::setDocument( const QString &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() ) {
@@ -387,5 +387,5 @@ void AddressbookWindow::setDocument( const QString &filename )
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?" ),
@@ -396,12 +396,12 @@ void AddressbookWindow::setDocument( const QString &filename )
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;
@@ -539,7 +539,7 @@ void AddressbookWindow::writeMail()
// 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;
@@ -549,7 +549,7 @@ void AddressbookWindow::writeMail()
}
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;
@@ -593,5 +593,5 @@ void AddressbookWindow::slotBeam()
}
- Opie::Core::owarn << "Beaming: " << beamFilename << oendl;
+ owarn << "Beaming: " << beamFilename << oendl;
Ir *ir = new Ir( this );
@@ -640,5 +640,5 @@ 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;
@@ -656,5 +656,5 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
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 );
@@ -683,5 +683,5 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
stream >> uid;
- Opie::Core::owarn << "Showing uid: " << uid << oendl;
+ owarn << "Showing uid: " << uid << oendl;
// Deactivate Personal View..
@@ -763,5 +763,5 @@ void AddressbookWindow::editPersonal()
// but take care of the menu, too
if ( ! actionPersonal->isOn() ){
- Opie::Core::owarn << "*** ++++" << oendl;
+ owarn << "*** ++++" << oendl;
actionPersonal->setOn( true );
slotPersonalView();
@@ -782,8 +782,8 @@ 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);
@@ -798,5 +798,5 @@ void AddressbookWindow::slotPersonalView()
}
- Opie::Core::owarn << "slotPersonalView()-> ON" << oendl;
+ owarn << "slotPersonalView()-> ON" << oendl;
// XXX need to disable some QActions.
actionNew->setEnabled(FALSE);
@@ -888,5 +888,5 @@ 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" ),
"<qt>" + tr( "Unable to find a contact for this search pattern!" ) + "</qt>" );
@@ -896,5 +896,5 @@ 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" ),
@@ -905,5 +905,5 @@ 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;
@@ -941,5 +941,5 @@ void AddressbookWindow::slotSetCategory( int c )
}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];
@@ -964,5 +964,5 @@ 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;
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
@@ -44,5 +44,5 @@ 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();
@@ -58,5 +58,5 @@ void ConfigDlg::slotItemUp()
void ConfigDlg::slotItemDown()
{
- Opie::Core::owarn << "void ConfigDlg::slotItemDown()" << oendl;
+ owarn << "void ConfigDlg::slotItemDown()" << oendl;
int i = fieldListBox->currentItem();
@@ -71,10 +71,10 @@ 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 );
}
@@ -83,5 +83,5 @@ void ConfigDlg::slotItemAdd()
void ConfigDlg::slotItemRemove()
{
- Opie::Core::owarn << "void ConfigDlg::slotItemRemove()" << oendl;
+ owarn << "void ConfigDlg::slotItemRemove()" << oendl;
int i = fieldListBox->currentItem();
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
@@ -79,5 +79,5 @@ ContactEditor::~ContactEditor() {
void ContactEditor::init() {
- Opie::Core::owarn << "init() START" << oendl;
+ owarn << "init() START" << oendl;
uint i = 0;
@@ -688,9 +688,9 @@ 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)
@@ -699,5 +699,5 @@ void ContactEditor::defaultEmailChanged(int i){
defaultEmail = cmbDefaultEmail->text(i);
- Opie::Core::odebug << "Changed to: " << defaultEmail << oendl;
+ odebug << "Changed to: " << defaultEmail << oendl;
}
@@ -718,10 +718,10 @@ void ContactEditor::populateDefaultEmailCmb(){
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;
}
@@ -739,5 +739,5 @@ void ContactEditor::populateDefaultEmailCmb(){
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;
@@ -747,5 +747,5 @@ 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;
@@ -781,5 +781,5 @@ 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;
@@ -806,5 +806,5 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
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"
@@ -842,10 +842,10 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
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;
@@ -853,5 +853,5 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
}else if (type == "Emails"){
- Opie::Core::odebug << "emails" << oendl;
+ odebug << "emails" << oendl;
QString de;
@@ -866,10 +866,10 @@ 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);
@@ -877,10 +877,10 @@ void ContactEditor::slotChooser2Change( const QString &textChanged ) {
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);
}
@@ -952,5 +952,5 @@ 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) ){
@@ -963,5 +963,5 @@ 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) ){
@@ -974,5 +974,5 @@ 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) ){
@@ -985,5 +985,5 @@ 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) ){
@@ -1030,5 +1030,5 @@ 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();
@@ -1054,5 +1054,5 @@ 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
@@ -1136,9 +1136,9 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
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
@@ -1149,5 +1149,5 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
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.
@@ -1183,8 +1183,8 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
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) {
@@ -1269,5 +1269,5 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
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() );
@@ -1329,5 +1329,5 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
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" )
@@ -1353,5 +1353,5 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
if ( *it == "Nickname" ){
- Opie::Core::owarn << "**** Nichname: " << ent.nickname() << oendl;
+ owarn << "**** Nichname: " << ent.nickname() << oendl;
(*itLE)->setText( ent.nickname() );
}
@@ -1586,6 +1586,6 @@ void ContactEditor::saveEntry() {
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 );
}
@@ -1739,5 +1739,5 @@ 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();
@@ -1746,5 +1746,5 @@ void ContactEditor::slotRemoveBirthday()
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
@@ -240,5 +240,5 @@ void LetterPicker::clear()
void LetterPicker::newLetter( char letter )
{
- Opie::Core::owarn << "LetterClicked" << oendl;
+ owarn << "LetterClicked" << oendl;
emit letterClicked( letter );