diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c530f52337a59aa7f08ebddb18ce6bd2b57046fe..6032a4e66cfffc344463165db3e18ce4ceb317fd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -26,20 +26,20 @@ INCLUDE_DIRECTORIES ( ${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) #File to compile set( qtsflphone_LIB_SRCS - Call.cpp - Account.cpp - AccountList.cpp - CallModel.cpp - HistoryModel.cpp - Contact.cpp - ContactBackend.cpp - VideoCodecModel.cpp - VideoModel.cpp - VideoRenderer.cpp - VideoDevice.cpp - CredentialModel.cpp - AudioCodecModel.cpp - InstantMessagingModel.cpp + call.cpp + account.cpp + accountlist.cpp + callmodel.cpp + historymodel.cpp + contact.cpp + contactbackend.cpp + videocodecmodel.cpp + videomodel.cpp + videorenderer.cpp + videodevice.cpp + credentialmodel.cpp + audiocodecmodel.cpp + instantmessagingmodel.cpp configurationmanager_interface_singleton.cpp callmanager_interface_singleton.cpp instance_interface_singleton.cpp @@ -120,25 +120,25 @@ set_target_properties( qtsflphone ) set( qtsflphone_LIB_HDRS - Account.h - AccountList.h - Call.h - CallModel.h - HistoryModel.h - Contact.h - ContactBackend.h - VideoCodecModel.h - VideoModel.h - VideoDevice.h - VideoRenderer.h - CredentialModel.h - AudioCodecModel.h + account.h + accountlist.h + call.h + callmodel.h + historymodel.h + contact.h + contactbackend.h + videocodecmodel.h + videomodel.h + videodevice.h + videorenderer.h + credentialmodel.h + audiocodecmodel.h configurationmanager_interface_singleton.h callmanager_interface_singleton.h instance_interface_singleton.h video_interface_singleton.h sflphone_const.h - InstantMessagingModel.h + instantmessagingmodel.h ) install( FILES ${qtsflphone_LIB_HDRS} diff --git a/src/Account.cpp b/src/account.cpp similarity index 99% rename from src/Account.cpp rename to src/account.cpp index 4a851b325d257b8e96cee4b923ac28f37371f553..24d05d1365a364608f4537736c9eace252c4fc70 100644 --- a/src/Account.cpp +++ b/src/account.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ //Parent -#include "Account.h" +#include "account.h" //Qt #include <QtCore/QDebug> @@ -31,10 +31,10 @@ #include "configurationmanager_interface_singleton.h" #include "callmanager_interface_singleton.h" #include "video_interface_singleton.h" -#include "AccountList.h" -#include "CredentialModel.h" -#include "AudioCodecModel.h" -#include "VideoCodecModel.h" +#include "accountlist.h" +#include "credentialmodel.h" +#include "audiocodecmodel.h" +#include "videocodecmodel.h" const account_function Account::stateMachineActionsOnState[6][7] = { /* NOTHING EDIT RELOAD SAVE REMOVE MODIFY CANCEL */ diff --git a/src/Account.h b/src/account.h similarity index 99% rename from src/Account.h rename to src/account.h index 7fb44f94020ea89a805c5f1d90823845c25a6f96..f4cd3d33735643c1c4e90a791522b5ee8fc58c7c 100644 --- a/src/Account.h +++ b/src/account.h @@ -26,7 +26,7 @@ class QString; //SFLPhone -#include "VideoCodecModel.h" +#include "videocodecmodel.h" #include "sflphone_const.h" #include "typedefs.h" #include "dbus/metatypes.h" diff --git a/src/AccountList.cpp b/src/accountlist.cpp similarity index 99% rename from src/AccountList.cpp rename to src/accountlist.cpp index 55456d4e639ae1d615e2715b5959153c6c6dee38..d2a09c49ba8477159fd55e2c2f6744e430752b47 100644 --- a/src/AccountList.cpp +++ b/src/accountlist.cpp @@ -18,8 +18,8 @@ ***************************************************************************/ //Parent -#include "AccountList.h" - +#include "accountlist.h" + //SFLPhone #include "sflphone_const.h" diff --git a/src/AccountList.h b/src/accountlist.h similarity index 99% rename from src/AccountList.h rename to src/accountlist.h index 45337968b2cb71242a41bf67992013629cfa603b..c7e41a451ca5564ea5b3b19ecfadb5cc21fd54c1 100644 --- a/src/AccountList.h +++ b/src/accountlist.h @@ -24,7 +24,7 @@ #include <QtCore/QVector> #include <QtCore/QAbstractListModel> -#include "Account.h" +#include "account.h" #include "typedefs.h" #include "dbus/metatypes.h" diff --git a/src/AudioCodecModel.cpp b/src/audiocodecmodel.cpp similarity index 99% rename from src/AudioCodecModel.cpp rename to src/audiocodecmodel.cpp index 5d739387f1c0b0e6c795ac0ef4d453c7fd5d56de..e5bbe1c966995d7f9ecaef20d9648f4fc510a9dd 100644 --- a/src/AudioCodecModel.cpp +++ b/src/audiocodecmodel.cpp @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#include "AudioCodecModel.h" +#include "audiocodecmodel.h" //Qt #include <QtCore/QDebug> diff --git a/src/AudioCodecModel.h b/src/audiocodecmodel.h similarity index 100% rename from src/AudioCodecModel.h rename to src/audiocodecmodel.h diff --git a/src/Call.cpp b/src/call.cpp similarity index 99% rename from src/Call.cpp rename to src/call.cpp index 3627c981eb2965b57a63d4f44825c89cdbc59494..fb406f30c327628655af9b2ee9110777b1f7ffee 100644 --- a/src/Call.cpp +++ b/src/call.cpp @@ -18,17 +18,17 @@ ***************************************************************************/ //Parent -#include "Call.h" +#include "call.h" //SFLPhone library #include "callmanager_interface_singleton.h" #include "configurationmanager_interface_singleton.h" -#include "ContactBackend.h" -#include "Contact.h" -#include "Account.h" -#include "AccountList.h" -#include "VideoModel.h" -#include "InstantMessagingModel.h" +#include "contactbackend.h" +#include "contact.h" +#include "account.h" +#include "accountlist.h" +#include "videomodel.h" +#include "instantmessagingmodel.h" const call_state Call::actionPerformedStateMap [13][5] = diff --git a/src/Call.h b/src/call.h similarity index 100% rename from src/Call.h rename to src/call.h diff --git a/src/CallModel.cpp b/src/callmodel.cpp similarity index 99% rename from src/CallModel.cpp rename to src/callmodel.cpp index c873e2a4ef3f2fa1839b9446883201daa5ddb5b9..9915317514b90021b0ffcbca1a8e85f87ba5ef44 100644 --- a/src/CallModel.cpp +++ b/src/callmodel.cpp @@ -18,9 +18,9 @@ ***************************************************************************/ //Parent -#include <CallModel.h> +#include <callmodel.h> #include "video_interface_singleton.h" -#include "HistoryModel.h" +#include "historymodel.h" bool CallModelBase::dbusInit = false; CallMap CallModelBase::m_sActiveCalls; diff --git a/src/CallModel.h b/src/callmodel.h similarity index 99% rename from src/CallModel.h rename to src/callmodel.h index ca61533c4d6d81f3bd5bff935dc241b5c4cde1eb..ba10189274c80f8b05df5cbc1902e2c62925debe 100644 --- a/src/CallModel.h +++ b/src/callmodel.h @@ -217,6 +217,6 @@ class LIB_EXPORT CallModel : public CallModelBase { Call* addCallCommon(Call* call); bool updateCommon (Call* call); }; -#include "CallModel.hpp" +#include "callmodel.hpp" #endif diff --git a/src/CallModel.hpp b/src/callmodel.hpp similarity index 99% rename from src/CallModel.hpp rename to src/callmodel.hpp index 115c05e2a2bb0a4f5518a4118767a7dd7e79ea1a..e01b429e206a86edef4930e1484de1ed9aa72083 100644 --- a/src/CallModel.hpp +++ b/src/callmodel.hpp @@ -23,15 +23,15 @@ #include <QtGui/QDragEnterEvent> //SFLPhone library -#include "Call.h" -#include "AccountList.h" +#include "call.h" +#include "accountlist.h" #include "dbus/metatypes.h" #include "callmanager_interface_singleton.h" #include "configurationmanager_interface_singleton.h" #include "instance_interface_singleton.h" #include "sflphone_const.h" #include "typedefs.h" -#include "ContactBackend.h" +#include "contactbackend.h" //System #include "unistd.h" diff --git a/src/Contact.cpp b/src/contact.cpp similarity index 99% rename from src/Contact.cpp rename to src/contact.cpp index dc3be4cdf055103b01415fa3e5c66172edcc6f93..415c80abf5fbbd4c2cbc7b04c9ac1f143b013608 100644 --- a/src/Contact.cpp +++ b/src/contact.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ //Parent -#include "Contact.h" +#include "contact.h" //Qt #include <QtGui/QPixmap> diff --git a/src/Contact.h b/src/contact.h similarity index 100% rename from src/Contact.h rename to src/contact.h diff --git a/src/ContactBackend.cpp b/src/contactbackend.cpp similarity index 98% rename from src/ContactBackend.cpp rename to src/contactbackend.cpp index e230b27df46b57f87d5ecfae790c41f01f3e002f..5eb36f3477a5f005fb4d3aac59295319393555d3 100644 --- a/src/ContactBackend.cpp +++ b/src/contactbackend.cpp @@ -19,10 +19,10 @@ ***********************************************************************************/ //Parent -#include "ContactBackend.h" +#include "contactbackend.h" //SFLPhone library -#include "Contact.h" +#include "contact.h" //Qt #include <QtCore/QHash> diff --git a/src/ContactBackend.h b/src/contactbackend.h similarity index 99% rename from src/ContactBackend.h rename to src/contactbackend.h index b833971b3f9653929b3604b8637e13cbfa2e11e7..e8d390ed4dcf98f6ae0e4fd7740808e3f5d3845e 100644 --- a/src/ContactBackend.h +++ b/src/contactbackend.h @@ -26,7 +26,7 @@ #include <QVariant> #include "typedefs.h" -#include "Contact.h" +#include "contact.h" //SFLPhone class Contact; diff --git a/src/CredentialModel.cpp b/src/credentialmodel.cpp similarity index 99% rename from src/CredentialModel.cpp rename to src/credentialmodel.cpp index ba37f0161ba28c63ec01b04db3122baecdaa60b7..69a75fab56554703910b9eb137e623dbbff29279 100644 --- a/src/CredentialModel.cpp +++ b/src/credentialmodel.cpp @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#include "CredentialModel.h" +#include "credentialmodel.h" #include <QtCore/QDebug> diff --git a/src/CredentialModel.h b/src/credentialmodel.h similarity index 100% rename from src/CredentialModel.h rename to src/credentialmodel.h diff --git a/src/HistoryModel.cpp b/src/historymodel.cpp similarity index 99% rename from src/HistoryModel.cpp rename to src/historymodel.cpp index a2408f3cbb03d4bbf62f376c9835e52e765c185d..cee693dcc94c21ca1126510009a39290a163bebe 100644 --- a/src/HistoryModel.cpp +++ b/src/historymodel.cpp @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#include "HistoryModel.h" +#include "historymodel.h" #include "callmanager_interface_singleton.h" #include "configurationmanager_interface_singleton.h" -#include "Call.h" +#include "call.h" /***************************************************************************** diff --git a/src/HistoryModel.h b/src/historymodel.h similarity index 100% rename from src/HistoryModel.h rename to src/historymodel.h diff --git a/src/InstantMessagingModel.cpp b/src/instantmessagingmodel.cpp similarity index 98% rename from src/InstantMessagingModel.cpp rename to src/instantmessagingmodel.cpp index f4a031a0cb696934157867cd7c71927391fe25ca..3006b513dc5f4793929c310f791019e3da3859ba 100644 --- a/src/InstantMessagingModel.cpp +++ b/src/instantmessagingmodel.cpp @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#include "InstantMessagingModel.h" +#include "instantmessagingmodel.h" -#include "CallModel.h" +#include "callmodel.h" #include "callmanager_interface_singleton.h" -#include "Call.h" +#include "call.h" InstantMessagingModelManager* InstantMessagingModelManager::m_spInstance = nullptr; CallModelBase* InstantMessagingModelManager::m_spCallModel = nullptr; diff --git a/src/InstantMessagingModel.h b/src/instantmessagingmodel.h similarity index 100% rename from src/InstantMessagingModel.h rename to src/instantmessagingmodel.h diff --git a/src/VideoCodecModel.cpp b/src/videocodecmodel.cpp similarity index 98% rename from src/VideoCodecModel.cpp rename to src/videocodecmodel.cpp index 60487a60a3101112d1b3bcfab3f1cd8eec7e6e20..d4ded3bdadb5d66f115966ff7cd55daefb79e3ca 100644 --- a/src/VideoCodecModel.cpp +++ b/src/videocodecmodel.cpp @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#include "VideoCodecModel.h" -#include "Call.h" -#include "Account.h" +#include "videocodecmodel.h" +#include "call.h" +#include "account.h" #include "video_interface_singleton.h" ///Get data from the model diff --git a/src/VideoCodecModel.h b/src/videocodecmodel.h similarity index 100% rename from src/VideoCodecModel.h rename to src/videocodecmodel.h diff --git a/src/VideoDevice.cpp b/src/videodevice.cpp similarity index 99% rename from src/VideoDevice.cpp rename to src/videodevice.cpp index 1e6f8b46d3963e0d2d6ee1756475b4b1950cbc3b..bdee16def4f6882475f074abde59d231105acfbf 100644 --- a/src/VideoDevice.cpp +++ b/src/videodevice.cpp @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#include "VideoDevice.h" +#include "videodevice.h" #include "video_interface_singleton.h" QHash<QString,VideoDevice*> VideoDevice::m_slDevices; diff --git a/src/VideoDevice.h b/src/videodevice.h similarity index 100% rename from src/VideoDevice.h rename to src/videodevice.h diff --git a/src/VideoModel.cpp b/src/videomodel.cpp similarity index 97% rename from src/VideoModel.cpp rename to src/videomodel.cpp index d78b42f6c80207d5376e6b051bb0414decfef600..53b6b69c7ee93e6bde4e138088248aa30eae35e2 100644 --- a/src/VideoModel.cpp +++ b/src/videomodel.cpp @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#include "VideoModel.h" +#include "videomodel.h" //SFLPhone #include "video_interface_singleton.h" -#include "VideoDevice.h" -#include "Call.h" -#include "CallModel.h" -#include "VideoRenderer.h" +#include "videodevice.h" +#include "call.h" +#include "callmodel.h" +#include "videorenderer.h" //Static member VideoModel* VideoModel::m_spInstance = nullptr; diff --git a/src/VideoModel.h b/src/videomodel.h similarity index 99% rename from src/VideoModel.h rename to src/videomodel.h index fee62da419039f0fe9b23fe1fd1afc7d46ca73f7..2f6795a0815bb8900a5d06aa10f78f27cb54544e 100644 --- a/src/VideoModel.h +++ b/src/videomodel.h @@ -25,7 +25,7 @@ #include <QtCore/QHash> //SFLPhone -#include "VideoDevice.h" +#include "videodevice.h" class VideoRenderer; class Call; struct SHMHeader; diff --git a/src/VideoRenderer.cpp b/src/videorenderer.cpp similarity index 99% rename from src/VideoRenderer.cpp rename to src/videorenderer.cpp index f267a57b2498dd1cd32f42d963ef5722053191b1..78947b8061a0120322b0c35b82eb3ccb69626759 100644 --- a/src/VideoRenderer.cpp +++ b/src/videorenderer.cpp @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#include "VideoRenderer.h" +#include "videorenderer.h" #include <QtCore/QDebug> diff --git a/src/VideoRenderer.h b/src/videorenderer.h similarity index 99% rename from src/VideoRenderer.h rename to src/videorenderer.h index 024b49f94d817fb76bcefb2550bf36c9979782ce..9c22b9b7b5ac2f1efff8b8b2c9b8d0978bdb833e 100644 --- a/src/VideoRenderer.h +++ b/src/videorenderer.h @@ -26,7 +26,7 @@ class QTimer; //SFLPhone -#include "VideoDevice.h" +#include "videodevice.h" struct SHMHeader; ///Manage shared memory and convert it to QByteArray