From 3080724f2078f91cdc724709400ef3252b8df9a6 Mon Sep 17 00:00:00 2001
From: llea <llea>
Date: Wed, 13 Jul 2005 18:53:43 +0000
Subject: [PATCH] fix apply skin feature
---
ChangeLog | 1 +
src/configurationtree.cpp | 2 +-
src/error.cpp | 2 +-
src/gui/qt/qtGUImainwindow.cpp | 4 ----
src/sipcall.cpp | 2 +-
src/sipvoiplink.cpp | 4 ++--
src/skin.cpp | 1 -
7 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c6601ba944..9b838436c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
Laurielle LEA (13 July 2005) version 0.4
- Fix bug if network is not available.
+- Fix apply skin feature
Laurielle LEA (11 July 2005) version 0.4
- Check functions return.
diff --git a/src/configurationtree.cpp b/src/configurationtree.cpp
index e885d5c15a..4a3db9e45a 100644
--- a/src/configurationtree.cpp
+++ b/src/configurationtree.cpp
@@ -7,9 +7,9 @@
#include <iostream>
#include <string>
+#include "global.h"
#include "configitem.h"
#include "configurationtree.h"
-#include "global.h"
using namespace std;
diff --git a/src/error.cpp b/src/error.cpp
index 6d8e736fff..9de2b7fc78 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -19,8 +19,8 @@
#include <string>
-#include "error.h"
#include "global.h"
+#include "error.h"
#include "manager.h"
using namespace std;
diff --git a/src/gui/qt/qtGUImainwindow.cpp b/src/gui/qt/qtGUImainwindow.cpp
index 6ad650a579..4c480ecdab 100644
--- a/src/gui/qt/qtGUImainwindow.cpp
+++ b/src/gui/qt/qtGUImainwindow.cpp
@@ -204,10 +204,6 @@ QtGUIMainWindow::deleteButtons (void) {
delete phoneKey_transf;
delete phoneKey_msg;
delete phoneKey_conf;
- delete phoneKey_line0;
- delete phoneKey_line1;
- delete phoneKey_line2;
- delete phoneKey_line3;
delete reduce_button;
delete quit_button;
delete addr_book_button;
diff --git a/src/sipcall.cpp b/src/sipcall.cpp
index 10f9c1b587..334c86b8b9 100644
--- a/src/sipcall.cpp
+++ b/src/sipcall.cpp
@@ -24,9 +24,9 @@
#include <iostream>
+#include "global.h"
#include "audio/audiocodec.h"
#include "audio/codecDescriptor.h"
-#include "global.h"
#include "sipcall.h"
using namespace std;
diff --git a/src/sipvoiplink.cpp b/src/sipvoiplink.cpp
index 630fe166f7..592388a403 100644
--- a/src/sipvoiplink.cpp
+++ b/src/sipvoiplink.cpp
@@ -30,15 +30,15 @@
#include <string>
#include <vector>
+#include "global.h"
+#include "sipvoiplink.h"
#include "audio/audiortp.h"
#include "audio/codecDescriptor.h"
#include "call.h"
#include "error.h"
#include "eventthread.h"
-#include "global.h"
#include "manager.h"
#include "sipcall.h"
-#include "sipvoiplink.h"
#include "user_cfg.h"
#include "voIPLink.h"
diff --git a/src/skin.cpp b/src/skin.cpp
index eb02d22bd2..97d1261e55 100644
--- a/src/skin.cpp
+++ b/src/skin.cpp
@@ -18,7 +18,6 @@
*/
-#include "global.h"
#include "skin.h"
#ifndef PROGSHAREDIR
--
GitLab