1 files changed, 11 insertions, 13 deletions

diff --git a/noncore/settings/networksettings/ppp/modeminfo.cpp b/noncore/settings/networksettings/ppp/modeminfo.cpp
index 0bec186..dbb26db 100644
--- a/noncore/settings/networksettings/ppp/modeminfo.cpp
+++ b/noncore/settings/networksettings/ppp/modeminfo.cpp
@@ -36,4 +36,2 @@
 #include "modem.h"
-//#include <klocale.h>
-#define i18n QObject::tr
 
@@ -43,3 +41,3 @@ ModemTransfer::ModemTransfer(Modem *mo, QWidget *parent, const char *name)
 {
-  setCaption(i18n("ATI Query"));
+  setCaption(QObject::tr("ATI Query"));
 //  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
@@ -60,3 +58,3 @@ ModemTransfer::ModemTransfer(Modem *mo, QWidget *parent, const char *name)
   // 20 percent space. Hope this is enough.
-  statusBar->setText(i18n("Unable to create modem lock file."));
+  statusBar->setText(QObject::tr("Unable to create modem lock file."));
   statusBar->setFixedWidth((statusBar->sizeHint().width() * 12) / 10);
@@ -65,3 +63,3 @@ ModemTransfer::ModemTransfer(Modem *mo, QWidget *parent, const char *name)
   // set original text
-  statusBar->setText(i18n("Looking for modem..."));
+  statusBar->setText(QObject::tr("Looking for modem..."));
   progressBar->setFixedHeight(statusBar->minimumSize().height());
@@ -70,3 +68,3 @@ ModemTransfer::ModemTransfer(Modem *mo, QWidget *parent, const char *name)
 
-  cancel = new QPushButton(i18n("Cancel"), this);
+  cancel = new QPushButton(QObject::tr("Cancel"), this);
   cancel->setFocus();
@@ -120,3 +118,3 @@ void ModemTransfer::time_out_slot() {
 
-  QMessageBox::warning(this, tr("Error"), i18n("Modem Query timed out."));
+  QMessageBox::warning(this, tr("Error"), QObject::tr("Modem Query timed out."));
   reject();
@@ -132,3 +130,3 @@ void ModemTransfer::init() {
 
-    statusBar->setText(i18n("Modem device is locked."));
+    statusBar->setText(QObject::tr("Modem device is locked."));
     return;
@@ -138,3 +136,3 @@ void ModemTransfer::init() {
 
-    statusBar->setText(i18n("Unable to create modem lock file."));
+    statusBar->setText(QObject::tr("Unable to create modem lock file."));
     return;
@@ -148,3 +146,3 @@ void ModemTransfer::init() {
 
-      statusBar->setText(i18n("Modem Ready"));
+      statusBar->setText(QObject::tr("Modem Ready"));
       qApp->processEvents();
@@ -229,3 +227,3 @@ void ModemTransfer::cancelbutton() {
 
-  statusBar->setText(i18n("One moment please..."));
+  statusBar->setText(QObject::tr("One moment please..."));
   qApp->processEvents();
@@ -251,3 +249,3 @@ ModemInfo::ModemInfo(QWidget *parent, const char* name)
 
-  setCaption(i18n("Modem Query Results"));
+  setCaption(QObject::tr("Modem Query Results"));
   // KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
@@ -276,3 +274,3 @@ ModemInfo::ModemInfo(QWidget *parent, const char* name)
   QHBoxLayout *l2 = new QHBoxLayout;
-  QPushButton *ok = new QPushButton(i18n("Close"), this);
+  QPushButton *ok = new QPushButton(QObject::tr("Close"), this);
   ok->setDefault(TRUE);