aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Kenzior <denkenz@gmail.com>2011-08-10 23:46:48 -0500
committerDenis Kenzior <denkenz@gmail.com>2011-08-10 23:46:48 -0500
commit92f3676549b5d6347a10dabb0be0a413114d7e45 (patch)
tree41fceb623d76d26470e09a7305b86f6b7431e930
parentd3f2b0d17e77b8fd1f87041250cc7ef71d514eeb (diff)
downloadphonesim-92f3676549b5d6347a10dabb0be0a413114d7e45.tar.gz
phonesim: Remove dead code
-rw-r--r--src/phonesim.cpp18
-rw-r--r--src/phonesim.h5
2 files changed, 1 insertions, 22 deletions
diff --git a/src/phonesim.cpp b/src/phonesim.cpp
index aa49f46..b029a55 100644
--- a/src/phonesim.cpp
+++ b/src/phonesim.cpp
@@ -545,8 +545,6 @@ SimRules::SimRules( int fd, QObject *p, const QString& filename, HardwareManipu
// Initialize the local state.
currentState = 0;
defState = 0;
- return_error_string = "";
- return_error_count = 0;
usedCallIds = 0;
fileSystem = 0;
useGsm0710 = false;
@@ -1510,13 +1508,6 @@ SimPhoneBook *SimRules::currentPB() const
return 0;
}
-void SimRules::setReturnError( const QString &error, uint repeat )
-{
- return_error_string = error;
- return_error_count = repeat;
-}
-
-
int SimRules::newCall()
{
int id;
@@ -1591,15 +1582,8 @@ QString expandEscapes( const QString& data, bool eol )
void SimRules::respond( const QString& resp, int delay, bool eol )
{
QString r = expand( resp );
- if (return_error_string != "") {
- r = return_error_string;
- if (return_error_count > 0)
- return_error_count--;
- if (return_error_count == 0)
- return_error_string = "";
- }
-
QByteArray escaped = expandEscapes( r, eol ).toUtf8();
+
if ( !delay ) {
writeChatData(escaped.data(), escaped.length());
flush();
diff --git a/src/phonesim.h b/src/phonesim.h
index d8fd293..faf7e17 100644
--- a/src/phonesim.h
+++ b/src/phonesim.h
@@ -260,9 +260,6 @@ public:
// Expand variable references in a string.
QString expand( const QString& s );
- // force the next returned reply to be 'error'
- void setReturnError( const QString &error, uint repeat = 0 );
-
// Allocate a new call identifier.
int newCall();
@@ -340,8 +337,6 @@ private:
// Get a particular state object.
SimState *state( const QString& name ) const;
- QString return_error_string;
- uint return_error_count;
QString mPhoneNumber;
HardwareManipulator *machine;