11 files changed, 38 insertions, 38 deletions

diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 9c13017..312c663 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -268,3 +268,3 @@ void ContactEditor::init() {
         cmbCountry = new QComboBox( TRUE, container );
-        cmbCountry->insertItem( tr( "" ) );
+        cmbCountry->insertItem( "" );
         cmbCountry->insertItem( tr ( "United States" ) );
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index 798e1f1..4589c9d 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -201,3 +201,3 @@ void MainWindow::makeMenu()
   ClearSearchText = new QToolButton( searchBar, "ClearSearchText");
-  ClearSearchText->setText( tr( "" ) );
+  ClearSearchText->setText( "" );
   ClearSearchText->setPixmap( image1 );
diff --git a/core/settings/citytime/citytimebase.cpp b/core/settings/citytime/citytimebase.cpp
index 77cb91d..bcdd422 100644
--- a/core/settings/citytime/citytimebase.cpp
+++ b/core/settings/citytime/citytimebase.cpp
@@ -47,3 +47,3 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     cmdCity7->setFocusPolicy( QToolButton::TabFocus );
-    cmdCity7->setText( tr( "" ) );
+    cmdCity7->setText( "" );
     cmdCity7->setToggleButton( TRUE );
@@ -58,3 +58,3 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     lblCTime9->setFont( lblCTime9_font );
-    lblCTime9->setText( tr( "" ) );
+    lblCTime9->setText( "" );
     lblCTime9->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
@@ -69,3 +69,3 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     cmdCity8->setFocusPolicy( QToolButton::TabFocus );
-    cmdCity8->setText( tr( "" ) );
+    cmdCity8->setText( "" );
     cmdCity8->setToggleButton( TRUE );
@@ -80,3 +80,3 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     cmdCity2->setFocusPolicy( QToolButton::TabFocus );
-    cmdCity2->setText( tr( "" ) );
+    cmdCity2->setText( "" );
     cmdCity2->setToggleButton( TRUE );
@@ -90,3 +90,3 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     lblCTime6->setFont( lblCTime6_font );
-    lblCTime6->setText( tr( "" ) );
+    lblCTime6->setText( "" );
     lblCTime6->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
@@ -101,3 +101,3 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     cmdCity6->setFocusPolicy( QToolButton::TabFocus );
-    cmdCity6->setText( tr( "" ) );
+    cmdCity6->setText( "" );
     cmdCity6->setToggleButton( TRUE );
@@ -113,3 +113,3 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     cmdCity4->setFocusPolicy( QToolButton::TabFocus );
-    cmdCity4->setText( tr( "" ) );
+    cmdCity4->setText( "" );
     cmdCity4->setToggleButton( TRUE );
@@ -123,3 +123,3 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     lblCTime5->setFont( lblCTime5_font );
-    lblCTime5->setText( tr( "" ) );
+    lblCTime5->setText( "" );
     lblCTime5->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
@@ -133,3 +133,3 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     lblCTime2->setFont( lblCTime2_font );
-    lblCTime2->setText( tr( "" ) );
+    lblCTime2->setText( "" );
     lblCTime2->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
@@ -143,3 +143,3 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     lblCTime1->setFont( lblCTime1_font );
-    lblCTime1->setText( tr( "" ) );
+    lblCTime1->setText( "" );
     lblCTime1->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
@@ -154,3 +154,3 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     cmdCity3->setFocusPolicy( QToolButton::TabFocus );
-    cmdCity3->setText( tr( "" ) );
+    cmdCity3->setText( "" );
     cmdCity3->setToggleButton( TRUE );
@@ -165,3 +165,3 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     lblCTime8->setFont( lblCTime8_font );
-    lblCTime8->setText( tr( "" ) );
+    lblCTime8->setText( "" );
     lblCTime8->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
@@ -176,3 +176,3 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     cmdCity1->setFocusPolicy( QToolButton::TabFocus );
-    cmdCity1->setText( tr( "" ) );
+    cmdCity1->setText( "" );
     cmdCity1->setToggleButton( TRUE );
@@ -187,3 +187,3 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     lblCTime7->setFont( lblCTime7_font );
-    lblCTime7->setText( tr( "" ) );
+    lblCTime7->setText( "" );
     lblCTime7->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
@@ -196,3 +196,3 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     lblCTime4->setFont( lblCTime4_font );
-    lblCTime4->setText( tr( "" ) );
+    lblCTime4->setText( "" );
     lblCTime4->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
@@ -207,3 +207,3 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     cmdCity5->setFocusPolicy( QToolButton::TabFocus );
-    cmdCity5->setText( tr( "" ) );
+    cmdCity5->setText( "" );
     cmdCity5->setToggleButton( TRUE );
@@ -217,3 +217,3 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     lblCTime3->setFont( lblCTime3_font );
-    lblCTime3->setText( tr( "" ) );
+    lblCTime3->setText( "" );
     lblCTime3->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
@@ -228,3 +228,3 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     cmdCity9->setFocusPolicy( QToolButton::TabFocus );
-    cmdCity9->setText( tr( "" ) );
+    cmdCity9->setText( "" );
     cmdCity9->setToggleButton( TRUE );
diff --git a/noncore/applets/memoryapplet/swapfile.cpp b/noncore/applets/memoryapplet/swapfile.cpp
index a71078f..96010c8 100644
--- a/noncore/applets/memoryapplet/swapfile.cpp
+++ b/noncore/applets/memoryapplet/swapfile.cpp
@@ -101,3 +101,3 @@ Swapfile::Swapfile( QWidget *parent, const char *name, WFlags f )
         swapStatusIcon = new QLabel(hb4);
-        swapStatus = new QLabel(tr(""), hb4);
+        swapStatus = new QLabel("", hb4);
         hb4->setStretchFactor(swapStatus, 99);
diff --git a/noncore/apps/zsafe/scqtfiledlg.cpp b/noncore/apps/zsafe/scqtfiledlg.cpp
index c67bbd5..f036101 100644
--- a/noncore/apps/zsafe/scqtfiledlg.cpp
+++ b/noncore/apps/zsafe/scqtfiledlg.cpp
@@ -133,3 +133,3 @@ ScQtFileDlg::ScQtFileDlg( QWidget* parent,  const char* name, bool modal, WFlags
     OkButton = new QToolButton( this, "OkButton" );
-    OkButton->setText( tr( "" ) );
+    OkButton->setText( "" );
     OkButton->setPixmap( image0 );
@@ -141,3 +141,3 @@ ScQtFileDlg::ScQtFileDlg( QWidget* parent,  const char* name, bool modal, WFlags
     CancelButton = new QToolButton( this, "CancelButton" );
-    CancelButton->setText( tr( "" ) );
+    CancelButton->setText( "" );
     CancelButton->setPixmap( image1 );
@@ -163,3 +163,3 @@ ScQtFileDlg::ScQtFileDlg( QWidget* parent,  const char* name, bool modal, WFlags
     MkDirButton = new QToolButton( this, "MkDirButton" );
-    MkDirButton->setText( tr( "" ) );
+    MkDirButton->setText( "" );
     MkDirButton->setPixmap( image2 );
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index ca3ff52..189453e 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -589,3 +589,3 @@ ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
     New->setMouseTracking( TRUE );
-    New->setText( tr( "" ) );
+    New->setText( "" );
     New->setPixmap( new_img );
@@ -595,3 +595,3 @@ ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
     Edit->setGeometry( QRect( DeskW-64, 2, 20, 20 ) );
-    Edit->setText( tr( "" ) );
+    Edit->setText( "" );
     Edit->setPixmap( edit_img );
@@ -601,3 +601,3 @@ ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
     Delete->setGeometry( QRect( DeskW-44, 2, 20, 20 ) );
-    Delete->setText( tr( "" ) );
+    Delete->setText( "" );
     Delete->setPixmap( trash_img );
@@ -607,3 +607,3 @@ ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
     Find->setGeometry( QRect( DeskW-24, 2, 20, 20 ) );
-    Find->setText( tr( "" ) );
+    Find->setText( "" );
     Find->setPixmap( find_img );
diff --git a/noncore/multimedia/powerchord/powerchordbase.cpp b/noncore/multimedia/powerchord/powerchordbase.cpp
index 98fe3f7..f0d1487 100644
--- a/noncore/multimedia/powerchord/powerchordbase.cpp
+++ b/noncore/multimedia/powerchord/powerchordbase.cpp
@@ -200,3 +200,3 @@ PowerchordBase::PowerchordBase( QWidget* parent,  const char* name, WFlags fl )
     transport_rec->setGeometry( QRect( 170, 80, 30, 30 ) ); 
-    transport_rec->setText( tr( "" ) );
+    transport_rec->setText( "" );
     transport_rec->setPixmap( image2 );
@@ -205,3 +205,3 @@ PowerchordBase::PowerchordBase( QWidget* parent,  const char* name, WFlags fl )
     play_sound->setGeometry( QRect( 170, 180, 60, 55 ) ); 
-    play_sound->setText( tr( "" ) );
+    play_sound->setText( "" );
     play_sound->setPixmap( image3 );
@@ -216,3 +216,3 @@ PowerchordBase::PowerchordBase( QWidget* parent,  const char* name, WFlags fl )
     transport_play->setGeometry( QRect( 200, 80, 30, 30 ) ); 
-    transport_play->setText( tr( "" ) );
+    transport_play->setText( "" );
     transport_play->setPixmap( image3 );
@@ -222,3 +222,3 @@ PowerchordBase::PowerchordBase( QWidget* parent,  const char* name, WFlags fl )
     transport_rew->setGeometry( QRect( 170, 110, 30, 30 ) ); 
-    transport_rew->setText( tr( "" ) );
+    transport_rew->setText( "" );
     transport_rew->setPixmap( image4 );
@@ -228,3 +228,3 @@ PowerchordBase::PowerchordBase( QWidget* parent,  const char* name, WFlags fl )
     transport_fwd->setGeometry( QRect( 200, 110, 30, 30 ) ); 
-    transport_fwd->setText( tr( "" ) );
+    transport_fwd->setText( "" );
     transport_fwd->setPixmap( image5 );
@@ -235,3 +235,3 @@ PowerchordBase::PowerchordBase( QWidget* parent,  const char* name, WFlags fl )
     chordname->setAlignment( int( QLabel::AlignCenter ) );
-    QToolTip::add(  chordname, tr( "" ) );
+    QToolTip::add(  chordname, "" );
 
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 979b73a..6252fc2 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -99,3 +99,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     mailView = new QListView( view );
-    mailView->addColumn( tr( "" ) );
+    mailView->addColumn( "" );
     mailView->addColumn( tr( "Subject" ),QListView::Manual );
diff --git a/noncore/settings/mediummount/mediumglobal.cc b/noncore/settings/mediummount/mediumglobal.cc
index 0c6cf12..621784e 100644
--- a/noncore/settings/mediummount/mediumglobal.cc
+++ b/noncore/settings/mediummount/mediumglobal.cc
@@ -41,3 +41,3 @@ void MediumGlobalWidget::initGUI()
   m_label->setTextFormat( Qt::RichText );
-  m_label->setText( tr("") );
+  m_label->setText( "" );
   QWhatsThis::add( this, tr("If a medium gets inserted into this device Opie "
diff --git a/noncore/settings/sound/soundsettingsbase.cpp b/noncore/settings/sound/soundsettingsbase.cpp
index f283119..84187d2 100644
--- a/noncore/settings/sound/soundsettingsbase.cpp
+++ b/noncore/settings/sound/soundsettingsbase.cpp
@@ -129,3 +129,3 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent,  const char* name, bool m
     keyComboBox = new QComboBox( FALSE, this, "keyComboBox" );
-    keyComboBox->insertItem( tr( "" ) );
+    keyComboBox->insertItem( "" );
     keyComboBox->insertItem( tr( "Taskbar Icon" ) );
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 7f1c0b8..1719ed8 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -274,3 +274,3 @@ void MainWindow::makeMenu()
          a->addTo( helpMenu );
-        //a = new QAction( tr( "" ),
+        //a = new QAction( "",
         //                                      Resource::loadPixmap( "oipkg/" ), QString::null, 0, this, 0 );