Co-authored-by: Alexander Akulich
---
src/aidapplication.cpp| 4 ++--
src/callmanager.cpp | 4 ++--
src/conformancesimapplication.cpp | 2 +-
src/control.h | 2 +-
src/hardwaremanipulator.cpp | 14 +++---
src/main.cpp | 3 ++-
src/phonesim.cpp | 2 +-
src/phonesim.h| 2 +-
src/qatresult.cpp | 2 +-
src/qatresultparser.cpp | 6 +++---
src/qatutils.cpp | 6 +++---
src/qcbsmessage.cpp | 4 ++--
src/qgsmcodec.cpp | 2 +-
src/qsimcommand.cpp | 8
src/qsimcontrolevent.cpp | 4 ++--
src/qsimenvelope.cpp | 2 +-
src/qsimenvelope.h| 2 +-
src/qsimterminalresponse.cpp | 4 ++--
src/qsimterminalresponse.h| 2 +-
src/qsmsmessage.cpp | 8
src/qsmsmessage_p.h | 4 ++--
src/qwsppdu.cpp | 2 +-
src/simapplication.cpp| 2 +-
src/simapplication.h | 8
src/simauth.cpp | 4 ++--
src/simfilesystem.cpp | 2 +-
26 files changed, 53 insertions(+), 52 deletions(-)
diff --git a/src/aidapplication.cpp b/src/aidapplication.cpp
index 807d7f9..e20b028 100644
--- a/src/aidapplication.cpp
+++ b/src/aidapplication.cpp
@@ -2,8 +2,8 @@
#include "simfilesystem.h"
#include "simauth.h"
-#include
-#include
+#include "qatutils.h"
+#include "qsimcontrolevent.h"
AidApplication::AidApplication( QObject *parent, SimXmlNode& n )
: QObject( parent )
diff --git a/src/callmanager.cpp b/src/callmanager.cpp
index 1fa13cf..40f9b3b 100644
--- a/src/callmanager.cpp
+++ b/src/callmanager.cpp
@@ -18,8 +18,8 @@
/
#include "callmanager.h"
-#include
-#include
+#include "qatutils.h"
+#include "qsimcontrolevent.h"
CallManager::CallManager( QObject *parent )
: QObject( parent )
diff --git a/src/conformancesimapplication.cpp
b/src/conformancesimapplication.cpp
index 2817b0c..ae2f1a9 100644
--- a/src/conformancesimapplication.cpp
+++ b/src/conformancesimapplication.cpp
@@ -17,7 +17,7 @@
/
#include "simapplication.h"
-#include
+#include "qatutils.h"
#include
#include
#include "qsmsmessage.h"
diff --git a/src/control.h b/src/control.h
index 79cd417..be4a366 100644
--- a/src/control.h
+++ b/src/control.h
@@ -20,12 +20,12 @@
#ifndef CONTROL_H
#define CONTROL_H
-#include
#include
#include
#include "ui_controlbase.h"
#include "attranslator.h"
#include "callmanager.h"
+#include "hardwaremanipulator.h"
class Control;
diff --git a/src/hardwaremanipulator.cpp b/src/hardwaremanipulator.cpp
index 7a61c0e..a8a9bfe 100644
--- a/src/hardwaremanipulator.cpp
+++ b/src/hardwaremanipulator.cpp
@@ -22,13 +22,13 @@
#include
#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include "qsmsmessage.h"
+#include "qcbsmessage.h"
+#include "qgsmcodec.h"
+#include "qwsppdu.h"
+#include "qatutils.h"
+#include "phonesim.h"
+#include "simapplication.h"
#define NIBBLE_MAX 15
#define TWO_BYTE_MAX 65535
diff --git a/src/main.cpp b/src/main.cpp
index 712e767..4892142 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,8 +17,9 @@
**
/
-#include
+#include "server.h"
#include "control.h"
+
#include
#include
#include
diff --git a/src/phonesim.cpp b/src/phonesim.cpp
index 58bce2e..89d5e9d 100644
--- a/src/phonesim.cpp
+++ b/src/phonesim.cpp
@@ -25,7 +25,7 @@
#include "callmanager.h"
#include "simauth.h"
#include "aidapplication.h"
-#include
+#include "qatutils.h"
#include
#include
diff --git a/src/phonesim.h b/src/phonesim.h
index 362a6a8..b72c62e 100644
--- a/src/phonesim.h
+++ b/src/phonesim.h
@@ -31,7 +31,6 @@
#include
#include
#include
-#include
#include
#include
@@ -45,6 +44,7 @@
#include
#include
+#include "qsimcontrolevent.h"
class SimState;
class SimItem;
diff --git a/src/qatresult.cpp b/src/qatresult.cpp
index 9a29503..8be80b5 100644
--- a/src/qatresult.cpp
+++ b/src/qatresult.cpp
@@ -17,7 +17,7 @@
**
/
-#include
+#include "qatresult.h"
/*!
\class QAtResult
diff --git a/src/qatresultparser.cpp b/src/qatresultparser.cpp
index cba41ad..b2a82de 100644
--- a/src/qatresultparser.cpp
+++ b/src/qatresultparser.cpp
@@ -17,9 +17,9 @@
**
/
-#include
-#include
-#include
+#include "qatresultparser.h"
+#include "qatresult.h"
+#include "qatutils.h"
/*!
\class QAtResultParser
diff --git a/src/qatutils.cpp b/src/qatutils.cpp
index 2479c31..2bfad5d 100644
--- a/src/qatutils.c
