summaryrefslogtreecommitdiffstats
path: root/kandy/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
commit9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch)
treeab537a329b9613e11dce8195761f93ffe82aed24 /kandy/src
parent3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff)
downloadtdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz
tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'kandy/src')
-rw-r--r--kandy/src/atcommand.cpp2
-rw-r--r--kandy/src/cmdpropertiesdialog_base.ui2
-rw-r--r--kandy/src/commandset.cpp2
-rw-r--r--kandy/src/kandy.cpp10
-rw-r--r--kandy/src/kandy.kcfg2
-rw-r--r--kandy/src/kandyprefsdialog.cpp6
-rw-r--r--kandy/src/kandyview.cpp8
-rw-r--r--kandy/src/mobilegui.cpp8
-rw-r--r--kandy/src/mobilegui.h2
-rw-r--r--kandy/src/mobilegui_base.ui20
-rw-r--r--kandy/src/mobilemain.cpp2
-rw-r--r--kandy/src/modem.cpp20
12 files changed, 42 insertions, 42 deletions
diff --git a/kandy/src/atcommand.cpp b/kandy/src/atcommand.cpp
index 2fcf5f24..f03bb679 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").arg(TQString::number(argNum++)),
+ addParameter(new ATParameter(*it,i18n("Arg %1").tqarg(TQString::number(argNum++)),
false));
++it;
}
diff --git a/kandy/src/cmdpropertiesdialog_base.ui b/kandy/src/cmdpropertiesdialog_base.ui
index fed3a7a5..2fd540ae 100644
--- a/kandy/src/cmdpropertiesdialog_base.ui
+++ b/kandy/src/cmdpropertiesdialog_base.ui
@@ -110,7 +110,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>79</width>
<height>20</height>
diff --git a/kandy/src/commandset.cpp b/kandy/src/commandset.cpp
index 1b8e94a3..e6e5d70f 100644
--- a/kandy/src/commandset.cpp
+++ b/kandy/src/commandset.cpp
@@ -24,7 +24,7 @@
#include <tqdom.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <kdebug.h>
diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp
index 512f1550..5e68abe4 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").arg(filename));
+ KMessageBox::error(this,i18n("Could not load file %1").tqarg(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.").arg(filename));
+ KMessageBox::error(this,i18n("Could not save file %1.").tqarg(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?").arg(mFilename), TQString(), KStdGuiItem::save(), KStdGuiItem::discard())) {
+ i18n("Save changes to profile %1?").tqarg(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 device %1.")
- .arg(KandyPrefs::serialDevice()), i18n("Modem Error"));
+ i18n("Cannot open modem tqdevice %1.")
+ .tqarg(KandyPrefs::serialDevice()), i18n("Modem Error"));
return;
}
diff --git a/kandy/src/kandy.kcfg b/kandy/src/kandy.kcfg
index a93f674b..f8d44ab3 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 device</label>
+ <label>Serial tqdevice</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 9d3eedfe..1bb03eb1 100644
--- a/kandy/src/kandyprefsdialog.cpp
+++ b/kandy/src/kandyprefsdialog.cpp
@@ -22,7 +22,7 @@
without including the source code for TQt in the source distribution.
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqgroupbox.h>
#include <tqbuttongroup.h>
@@ -30,7 +30,7 @@
#include <tqfont.h>
#include <tqslider.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqcombobox.h>
#include <tqvbox.h>
#include <tqhbox.h>
@@ -81,7 +81,7 @@ void KandyPrefsDialog::setupSerialTab()
topLayout->setSpacing(spacingHint());
topLayout->setMargin(marginHint());
- // Define serial device
+ // Define serial tqdevice
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 749b0e81..d47f5bcb 100644
--- a/kandy/src/kandyview.cpp
+++ b/kandy/src/kandyview.cpp
@@ -25,13 +25,13 @@
#include <unistd.h>
#include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqhbox.h>
#include <tqvbox.h>
-#include <textedit.h>
+#include <tqtextedit.h>
#include <tqlistview.h>
#include <tqdom.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqfile.h>
#include <tqlineedit.h>
#include <tqcheckbox.h>
@@ -250,7 +250,7 @@ void KandyView::executeCommand()
if (p->userInput()) {
bool ok = false;
TQString value = KInputDialog::getText(TQString(),
- i18n("Enter value for %1:").arg(p->name()),TQString(),&ok,this);
+ i18n("Enter value for %1:").tqarg(p->name()),TQString(),&ok,this);
if (!ok)
return;
p->setValue(value);
diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp
index ce7d8696..70d0656f 100644
--- a/kandy/src/mobilegui.cpp
+++ b/kandy/src/mobilegui.cpp
@@ -27,10 +27,10 @@
#include <tqlabel.h>
#include <tqlistview.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqmessagebox.h>
-#include <textedit.h>
+#include <tqtextedit.h>
#include <tqgroupbox.h>
#include <tqpushbutton.h>
@@ -954,7 +954,7 @@ void MobileGui::writeKabc()
}
-void MobileGui::refreshStatus()
+void MobileGui::refreshtqStatus()
{
mScheduler->executeId( "+cbc" );
mScheduler->executeId( "+csq" );
@@ -1453,7 +1453,7 @@ void MobileGui::toggleConnection()
emit connectModem();
readModelInformation();
- refreshStatus();
+ refreshtqStatus();
mConnectButton->setText( tr2i18n( "Disconnect" ) );
PushButton1->setEnabled( true );
diff --git a/kandy/src/mobilegui.h b/kandy/src/mobilegui.h
index ea5f2896..b8bfeba2 100644
--- a/kandy/src/mobilegui.h
+++ b/kandy/src/mobilegui.h
@@ -61,7 +61,7 @@ class MobileGui : public MobileGui_base, virtual public KandyIface
void readModelInformation();
void readPhonebook();
void savePhonebook();
- void refreshStatus();
+ void refreshtqStatus();
void writePhonebook();
void readKabc();
void writeKabc();
diff --git a/kandy/src/mobilegui_base.ui b/kandy/src/mobilegui_base.ui
index 9140a2a9..62d399a1 100644
--- a/kandy/src/mobilegui_base.ui
+++ b/kandy/src/mobilegui_base.ui
@@ -124,7 +124,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -207,7 +207,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -261,7 +261,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -318,7 +318,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>layout21</cstring>
+ <cstring>tqlayout21</cstring>
</property>
<hbox>
<property name="name">
@@ -342,7 +342,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>321</width>
<height>20</height>
@@ -385,7 +385,7 @@
</sizepolicy>
</property>
<property name="title">
- <string>Status</string>
+ <string>tqStatus</string>
</property>
<grid>
<property name="name">
@@ -399,7 +399,7 @@
</property>
<widget class="TQLabel" row="0" column="0">
<property name="name">
- <cstring>mStatus</cstring>
+ <cstring>mtqStatus</cstring>
</property>
<property name="text">
<string>Battery charge:</string>
@@ -439,7 +439,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<height>20</height>
</size>
@@ -537,7 +537,7 @@
<sender>PushButton1</sender>
<signal>clicked()</signal>
<receiver>MobileGui_base</receiver>
- <slot>refreshStatus()</slot>
+ <slot>refreshtqStatus()</slot>
</connection>
<connection>
<sender>mConnectButton</sender>
@@ -569,7 +569,7 @@
<slot>readKabc()</slot>
<slot>readModelInformation()</slot>
<slot>readPhonebook()</slot>
- <slot>refreshStatus()</slot>
+ <slot>refreshtqStatus()</slot>
<slot>savePhonebook()</slot>
<slot>setClock()</slot>
<slot>syncPhonebooks()</slot>
diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp
index 945ff7c4..de3e2b3e 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?").arg(mFilename))) {
+ i18n("Save changes to profile %1?").tqarg(mFilename))) {
case KMessageBox::Yes :
fileSave();
return true;
diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp
index a7d24695..3956376a 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 device '%1'. "
+ emit errorMessage( i18n( "Unable to open tqdevice '%1'. "
"Please check that you have sufficient permissions." )
- .arg( fdev ) );
+ .tqarg( 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)" )
- .arg(strerror(errnumber)) );
+ .tqarg(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 device '%1'." ).arg(
+ emit errorMessage( i18n( "Unable to lock tqdevice '%1'." ).tqarg(
(*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'.")
- .arg( fileName ) );
+ .tqarg( fileName ) );
return false;
}
@@ -307,7 +307,7 @@ bool Modem::lockDevice()
if ( count < 0 ) {
emit errorMessage( i18n( "Unable to read lock file '%1'.")
- .arg( fileName ) );
+ .tqarg( 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'.")
- .arg( fileName ) );
+ .tqarg( fileName ) );
return false;
}
if ( !kill( (pid_t) pid, 0 ) ) {
- emit errorMessage( i18n( "Process with PID %1, which is locking the device, is still running.")
- .arg( pid ) );
+ emit errorMessage( i18n( "Process with PID %1, which is locking the tqdevice, is still running.")
+ .tqarg( 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.")
- .arg( fileName ) );
+ .tqarg( fileName ) );
return false;
}