diff options
Diffstat (limited to 'kandy')
-rw-r--r-- | kandy/RELEASENOTES | 4 | ||||
-rw-r--r-- | kandy/configure.in.in | 2 | ||||
-rw-r--r-- | kandy/src/atcommand.cpp | 2 | ||||
-rw-r--r-- | kandy/src/kandy.cpp | 10 | ||||
-rw-r--r-- | kandy/src/kandy.kcfg | 2 | ||||
-rw-r--r-- | kandy/src/kandyprefsdialog.cpp | 2 | ||||
-rw-r--r-- | kandy/src/kandyview.cpp | 2 | ||||
-rw-r--r-- | kandy/src/mobilemain.cpp | 2 | ||||
-rw-r--r-- | kandy/src/modem.cpp | 20 |
9 files changed, 23 insertions, 23 deletions
diff --git a/kandy/RELEASENOTES b/kandy/RELEASENOTES index 8527e34e4..f40c0f818 100644 --- a/kandy/RELEASENOTES +++ b/kandy/RELEASENOTES @@ -1,7 +1,7 @@ Kandy 0.5.1 (18.11.2004) ------------------------ -+ Support of user-defined baud rates via setting in serial tqdevice configuration ++ Support of user-defined baud rates via setting in serial device configuration dialog. + Full support for SIM phone books starting with an entry != 1 and having an @@ -65,7 +65,7 @@ Kandy 0.5 (16.11.2004) + The GUI is heavily restructured and simplified. -+ All the improvements of Kandy 0.5 were tested with the following tqdevices: ++ All the improvements of Kandy 0.5 were tested with the following devices: + Phones: - Siemens ME45 - Siemens C65 diff --git a/kandy/configure.in.in b/kandy/configure.in.in index 7d1a00af0..c21c2e307 100644 --- a/kandy/configure.in.in +++ b/kandy/configure.in.in @@ -1,4 +1,4 @@ -# check for lockdev, optionally used to lock serial tqdevice +# check for lockdev, optionally used to lock serial device AH_TEMPLATE(HAVE_LOCKDEV) AC_CHECK_HEADERS(lockdev.h, HAVE_LOCKDEV_H=1, HAVE_LOCKDEV_H=) AC_SUBST(HAVE_LOCKDEV_H) diff --git a/kandy/src/atcommand.cpp b/kandy/src/atcommand.cpp index f03bb6794..2fcf5f24c 100644 --- a/kandy/src/atcommand.cpp +++ b/kandy/src/atcommand.cpp @@ -306,7 +306,7 @@ void ATCommand::extractParameters() TQStringList::ConstIterator end = paraList.end(); int argNum = 1; while(it != end) { - addParameter(new ATParameter(*it,i18n("Arg %1").tqarg(TQString::number(argNum++)), + addParameter(new ATParameter(*it,i18n("Arg %1").arg(TQString::number(argNum++)), false)); ++it; } diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp index 5e68abe43..512f1550e 100644 --- a/kandy/src/kandy.cpp +++ b/kandy/src/kandy.cpp @@ -102,7 +102,7 @@ Kandy::~Kandy() void Kandy::load(const TQString& filename) { if (!mView->loadFile(filename)) { - KMessageBox::error(this,i18n("Could not load file %1").tqarg(filename)); + KMessageBox::error(this,i18n("Could not load file %1").arg(filename)); } mFilename = filename; @@ -113,7 +113,7 @@ void Kandy::save(const TQString & filename) { if (!filename.isEmpty()) { if (!mView->saveFile(filename)) { - KMessageBox::error(this,i18n("Could not save file %1.").tqarg(filename)); + KMessageBox::error(this,i18n("Could not save file %1.").arg(filename)); } else { mFilename = filename; setTitle(); @@ -300,7 +300,7 @@ bool Kandy::queryClose() { if (mView->isModified()) { switch (KMessageBox::warningYesNoCancel(this, - i18n("Save changes to profile %1?").tqarg(mFilename), TQString(), KStdGuiItem::save(), KStdGuiItem::discard())) { + i18n("Save changes to profile %1?").arg(mFilename), TQString(), KStdGuiItem::save(), KStdGuiItem::discard())) { case KMessageBox::Yes : fileSave(); return true; @@ -318,8 +318,8 @@ void Kandy::modemConnect() { if (!mScheduler->modem()->open()) { KMessageBox::sorry(this, - i18n("Cannot open modem tqdevice %1.") - .tqarg(KandyPrefs::serialDevice()), i18n("Modem Error")); + i18n("Cannot open modem device %1.") + .arg(KandyPrefs::serialDevice()), i18n("Modem Error")); return; } diff --git a/kandy/src/kandy.kcfg b/kandy/src/kandy.kcfg index f8d44ab35..a93f674b8 100644 --- a/kandy/src/kandy.kcfg +++ b/kandy/src/kandy.kcfg @@ -7,7 +7,7 @@ <group name="Serial Port"> <entry type="String" key="Serial Device"> - <label>Serial tqdevice</label> + <label>Serial device</label> <default>/dev/ttyS1</default> </entry> <entry type="String" key="Baud Rate"> diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp index 1bb03eb1a..3be5ed72d 100644 --- a/kandy/src/kandyprefsdialog.cpp +++ b/kandy/src/kandyprefsdialog.cpp @@ -81,7 +81,7 @@ void KandyPrefsDialog::setupSerialTab() topLayout->setSpacing(spacingHint()); topLayout->setMargin(marginHint()); - // Define serial tqdevice + // Define serial device serialDevice = addWidString( KandyPrefs::self()->serialDeviceItem(), topFrame ); topLayout->addWidget(serialDevice->label(),0,0); diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp index d47f5bcb7..3791e8939 100644 --- a/kandy/src/kandyview.cpp +++ b/kandy/src/kandyview.cpp @@ -250,7 +250,7 @@ void KandyView::executeCommand() if (p->userInput()) { bool ok = false; TQString value = KInputDialog::getText(TQString(), - i18n("Enter value for %1:").tqarg(p->name()),TQString(),&ok,this); + i18n("Enter value for %1:").arg(p->name()),TQString(),&ok,this); if (!ok) return; p->setValue(value); diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp index de3e2b3e8..945ff7c47 100644 --- a/kandy/src/mobilemain.cpp +++ b/kandy/src/mobilemain.cpp @@ -169,7 +169,7 @@ bool MobileMain::queryClose() #if 0 if (m_view->isModified()) { switch (KMessageBox::warningYesNoCancel(this, - i18n("Save changes to profile %1?").tqarg(mFilename))) { + i18n("Save changes to profile %1?").arg(mFilename))) { case KMessageBox::Yes : fileSave(); return true; diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp index 3956376a8..a7d246950 100644 --- a/kandy/src/modem.cpp +++ b/kandy/src/modem.cpp @@ -194,9 +194,9 @@ bool Modem::open() TQCString dev = TQFile::encodeName( (*prefs).serialDevice() ); const char *fdev = dev.data(); if ( ( fd = ::open( fdev, O_RDWR | O_NOCTTY | O_NONBLOCK ) ) == -1 ) { - emit errorMessage( i18n( "Unable to open tqdevice '%1'. " + emit errorMessage( i18n( "Unable to open device '%1'. " "Please check that you have sufficient permissions." ) - .tqarg( fdev ) ); + .arg( fdev ) ); return false; } @@ -204,7 +204,7 @@ bool Modem::open() if ( tcgetattr( fd, &init_tty ) == -1 ) { int errnumber = errno; emit errorMessage( i18n( "Communication setup failed (tcgetattr code: %1)" ) - .tqarg(strerror(errnumber)) ); + .arg(strerror(errnumber)) ); ::close( fd ); fd = 0; return false; @@ -279,7 +279,7 @@ bool Modem::lockDevice() #ifdef HAVE_LOCKDEV is_locked = !dev_lock( (*prefs).serialDevice().local8Bit() ); if (!is_locked) - emit errorMessage( i18n( "Unable to lock tqdevice '%1'." ).tqarg( + emit errorMessage( i18n( "Unable to lock device '%1'." ).arg( (*prefs).serialDevice() )); return is_locked; #else @@ -299,7 +299,7 @@ bool Modem::lockDevice() if ( ( lfd = ::open( TQFile::encodeName( fileName ), O_RDONLY ) ) < 0 ) { emit errorMessage( i18n( "Unable to open lock file '%1'.") - .tqarg( fileName ) ); + .arg( fileName ) ); return false; } @@ -307,7 +307,7 @@ bool Modem::lockDevice() if ( count < 0 ) { emit errorMessage( i18n( "Unable to read lock file '%1'.") - .tqarg( fileName ) ); + .arg( fileName ) ); ::close( lfd ); return false; } @@ -317,13 +317,13 @@ bool Modem::lockDevice() count = sscanf( buf, "%d", &pid ); if ( ( count != 1 ) || ( pid <= 0 ) ) { emit errorMessage( i18n( "Unable to get PID from file '%1'.") - .tqarg( fileName ) ); + .arg( fileName ) ); return false; } if ( !kill( (pid_t) pid, 0 ) ) { - emit errorMessage( i18n( "Process with PID %1, which is locking the tqdevice, is still running.") - .tqarg( pid ) ); + emit errorMessage( i18n( "Process with PID %1, which is locking the device, is still running.") + .arg( pid ) ); return false; } @@ -336,7 +336,7 @@ bool Modem::lockDevice() if ( ( lfd = creat( TQFile::encodeName( fileName ).data(), 0644 ) ) == -1 ) { emit errorMessage( i18n( "Unable to create lock file '%1'. " "Please check that you have sufficient permissions.") - .tqarg( fileName ) ); + .arg( fileName ) ); return false; } |