diff --git a/kde/src/AccountListModel.h b/kde/src/AccountListModel.h
index 7d5546362fafe88d882c08e3255a88be6aaaa5ef..08e9d4117a6670628da7c9bac81d968e8e85357a 100755
--- a/kde/src/AccountListModel.h
+++ b/kde/src/AccountListModel.h
@@ -26,7 +26,7 @@
 //SFLPhone
 class ConfigAccountList;
 
-///@class AccountListModel Model for the account list widget
+/// AccountListModel Model for the account list widget
 class AccountListModel : public QAbstractListModel
 {
 Q_OBJECT
diff --git a/kde/src/AccountView.h b/kde/src/AccountView.h
index 5f29748cef380f495c03a7b2ed67b8b6845e2ec8..c7e562e25dca63551ab9098fe75d5189bdbbc2ee 100644
--- a/kde/src/AccountView.h
+++ b/kde/src/AccountView.h
@@ -30,7 +30,7 @@ class QListWidgetItem;
 //SFLPhone
 class AccountItemWidget;
 
-///@class AccountView List widgets displaying accounts
+///AccountView: List widgets displaying accounts
 class AccountView : public Account, public Item<AccountItemWidget> {
    public:
       //Constructor
diff --git a/kde/src/ActionSetAccountFirst.h b/kde/src/ActionSetAccountFirst.h
index 07e044c02c60b3b4da73bee08f84545cfcd46ae6..f3e1f6c02cbbb306247ee9fb9409cd716979651d 100755
--- a/kde/src/ActionSetAccountFirst.h
+++ b/kde/src/ActionSetAccountFirst.h
@@ -26,7 +26,7 @@
 
 #include "lib/Account.h"
 
-///@class ActionSetAccountFirst Set an account to be the first
+///ActionSetAccountFirst Set an account to be the first
 class ActionSetAccountFirst : public QAction
 {
 Q_OBJECT
diff --git a/kde/src/CallView.cpp b/kde/src/CallView.cpp
index ec0e9888223bd61b4c53f75847e6212d979142ba..d43e6792ade779f1d5ec8b02b68695231ccef1c8 100644
--- a/kde/src/CallView.cpp
+++ b/kde/src/CallView.cpp
@@ -48,7 +48,7 @@
 #include "klib/ConfigurationSkeleton.h"
 #include "SFLPhoneAccessibility.h"
 
-///@class CallTreeItemDelegate Delegates for CallTreeItem
+///CallTreeItemDelegate: Delegates for CallTreeItem
 class CallTreeItemDelegate : public QStyledItemDelegate
 {
 public:
diff --git a/kde/src/CallView.h b/kde/src/CallView.h
index 6da609f11209b80f429c183e8f2e3e7f4d0e67b8..ebde9c19733a363dd1250d403a0cfdc12004cd79 100644
--- a/kde/src/CallView.h
+++ b/kde/src/CallView.h
@@ -40,7 +40,7 @@ class CallTreeItemDelegate;
 //Typedef
 typedef CallModel<CallTreeItem*,QTreeWidgetItem*> TreeWidgetCallModel;
 
-///@class CallViewOverlay Display overlay on top of the call tree
+///CallViewOverlay: Display overlay on top of the call tree
 class CallViewOverlay : public QWidget {
    Q_OBJECT
 
@@ -70,7 +70,7 @@ private slots:
    void changeVisibility();
 };
 
-///@class CallView Central tree widget managing active calls
+///CallView: Central tree widget managing active calls
 class CallView : public QTreeWidget {
    Q_OBJECT
    friend class CallTreeItemDelegate;
diff --git a/kde/src/Codec.h b/kde/src/Codec.h
index d577f639142f6007b15a51edc1bc46ce3e4dd2e2..ef1bf2b54ea0f570efb8be4235ab2b484fdb0bde 100755
--- a/kde/src/Codec.h
+++ b/kde/src/Codec.h
@@ -26,7 +26,7 @@
 //Qt
 class QString;
 
-///@class Codec A SIP codec
+///Codec: A SIP codec
 class Codec : public QObject
 {
 Q_OBJECT
diff --git a/kde/src/SFLPhoneAccessibility.cpp b/kde/src/SFLPhoneAccessibility.cpp
index 033ff986b0eeae4eedd4b71502b0d0af042d2196..ce81b89c4d79d5780a1fed87a0a5836b9b9d40cf 100644
--- a/kde/src/SFLPhoneAccessibility.cpp
+++ b/kde/src/SFLPhoneAccessibility.cpp
@@ -24,8 +24,9 @@
 #include <KLocale>
 #include "SFLPhone.h"
 
-SFLPhoneAccessibility* SFLPhoneAccessibility::m_pInstance=0;
+SFLPhoneAccessibility* SFLPhoneAccessibility::m_pInstance=nullptr;
 
+///Constructor
 SFLPhoneAccessibility::SFLPhoneAccessibility() : QObject(0),QList<KAction*>()
 {
    KAction* action = new KAction(0);
@@ -45,6 +46,7 @@ SFLPhoneAccessibility::SFLPhoneAccessibility() : QObject(0),QList<KAction*>()
    connect(action,SIGNAL(triggered(bool)),this,SLOT(currentCallDetails()));
 }
 
+///Signleton
 SFLPhoneAccessibility* SFLPhoneAccessibility::getInstance()
 {
    if (not m_pInstance) {
@@ -53,6 +55,7 @@ SFLPhoneAccessibility* SFLPhoneAccessibility::getInstance()
    return m_pInstance;
 }
 
+///Use the speech daemon to read details about the current calls
 void SFLPhoneAccessibility::listCall()
 {
    if (SFLPhone::model()->getCallList().size()>0) {
@@ -66,6 +69,7 @@ void SFLPhoneAccessibility::listCall()
    }
 }
 
+///Convert number to digit so the speech daemon say "one two three" instead of "one hundred and twenty three"
 QString SFLPhoneAccessibility::numberToDigit(QString number)
 {
    QString toReturn;
@@ -78,6 +82,7 @@ QString SFLPhoneAccessibility::numberToDigit(QString number)
    return toReturn;
 }
 
+///Use the speech daemon to read the current call details
 void SFLPhoneAccessibility::currentCallDetails()
 {
    foreach (Call* call,SFLPhone::model()->getCallList()) {
@@ -99,6 +104,7 @@ void SFLPhoneAccessibility::currentCallDetails()
    }
 }
 
+///Helper function is make code shorter
 void SFLPhoneAccessibility::say(QString message)
 {
    KSpeechInterfaceSingleton::getInstance()->say(message, KSpeech::soPlainText);
diff --git a/kde/src/SFLPhoneAccessibility.h b/kde/src/SFLPhoneAccessibility.h
index c9442dbaeff43d70d23ab32c8f1da39e2bab1bb0..411bde9a7d083ae5b73a70bb0b0efa24de9dc298 100644
--- a/kde/src/SFLPhoneAccessibility.h
+++ b/kde/src/SFLPhoneAccessibility.h
@@ -23,6 +23,7 @@
 #include <QtCore/QList>
 #include <KAction>
 
+///SFLPhoneAccessibility: Functions to improve accessibility for disabled peoples
 class SFLPhoneAccessibility : public QObject, public QList<KAction*>
 {
    Q_OBJECT
diff --git a/kde/src/SFLPhoneView.cpp b/kde/src/SFLPhoneView.cpp
index a826334eb282f80843f36170d1ddd1b677f27cf4..964497ce38838384c449251a0575501033697682 100755
--- a/kde/src/SFLPhoneView.cpp
+++ b/kde/src/SFLPhoneView.cpp
@@ -686,22 +686,6 @@ void SFLPhoneView::contextMenuEvent(QContextMenuEvent *event)
    menu.exec(event->globalPos());
 }
 
-///
-void SFLPhoneView::editBeforeCall()
-{
-   QString name;
-   QString number;
-
-   bool ok;
-   QString newNumber = QInputDialog::getText(this, i18n("Edit before call"), QString(), QLineEdit::Normal, number, &ok);
-   if(ok) {
-      Call* call = SFLPhone::model()->addDialingCall(name);
-      call->appendText(newNumber);
-      //callView->selectItem(addCallToCallList(call));
-      action(call, CALL_ACTION_ACCEPT);
-   }
-}
-
 ///Pick the default account and load it
 void SFLPhoneView::setAccountFirst(Account * account)
 {
@@ -729,7 +713,7 @@ void SFLPhoneView::configureSflPhone()
    configDialog->show();
 }
 
-///Show the accoutn creation wizard
+///Show the account creation wizard
 void SFLPhoneView::accountCreationWizard()
 {
    if (!wizard) {
diff --git a/kde/src/SFLPhoneView.h b/kde/src/SFLPhoneView.h
index e611fa2552e2643d528671ce1fb808dfdc08c8d2..82ba5cfa52f63bccfc47ea8ed22b0768be26c177 100755
--- a/kde/src/SFLPhoneView.h
+++ b/kde/src/SFLPhoneView.h
@@ -142,14 +142,6 @@ private slots:
     */
    void enter();
 
-   /**
-    *   Displays a message window with editable text of the selected
-    *   phone number in history or address book.
-    *   Once the user accepts, place a call with the chosen phone number.
-    *   Keeps the peer name of the contact or past call.
-    */
-   void editBeforeCall();
-
    /**
     * Updates the history's search bar's display according to the current
     * text searched.
diff --git a/kde/src/SFLPhoneapplication.h b/kde/src/SFLPhoneapplication.h
index 129a3b8e5e0bea6301040c06657b7bf2f3043403..b7bd24697ca664b87e25549aa4a1602b8ed28b6d 100755
--- a/kde/src/SFLPhoneapplication.h
+++ b/kde/src/SFLPhoneapplication.h
@@ -28,7 +28,7 @@
 //SFLPhone
 class SFLPhone;
 
-///@class SFLPhoneApplication Main application
+///SFLPhoneApplication: Main application
 class SFLPhoneApplication : public KApplication
 {
   Q_OBJECT
diff --git a/kde/src/conf/ConfigAccountList.h b/kde/src/conf/ConfigAccountList.h
index d1ac987410a2e12ced975293b47fa7f3a4cb1631..74a832329aeaccf70fdbef8468944b9777926db6 100644
--- a/kde/src/conf/ConfigAccountList.h
+++ b/kde/src/conf/ConfigAccountList.h
@@ -24,7 +24,7 @@
 #include "../lib/AccountList.h"
 #include "../AccountView.h"
 
-///@class ConfigAccountList Account list model
+///ConfigAccountList: Account list model
 class ConfigAccountList : public QObject {
    Q_OBJECT
    public:
diff --git a/kde/src/conf/dlgaccessibility.h b/kde/src/conf/dlgaccessibility.h
index 8d3c3ea31802385a9ffb49d9c6bda2adf71d37d1..0b4810d3f3fb91fc89a67c3183cc93bab6fca0a2 100644
--- a/kde/src/conf/dlgaccessibility.h
+++ b/kde/src/conf/dlgaccessibility.h
@@ -24,7 +24,7 @@
 
 #include "ui_dlgaccessibility.h"
 
-///@class DlgAccessibility Display option for the visually impaired
+///DlgAccessibility: Display option for the visually impaired
 class DlgAccessibility : public QWidget, public Ui_DlgAccessibility
 {
 Q_OBJECT
diff --git a/kde/src/conf/dlgaccounts.h b/kde/src/conf/dlgaccounts.h
index 4aa58039d0846b37e4513592681e8320de367900..574e6d451c49d70aedeff35b8a10777f92b81fb2 100755
--- a/kde/src/conf/dlgaccounts.h
+++ b/kde/src/conf/dlgaccounts.h
@@ -47,7 +47,7 @@ typedef QHash<QString, QString> StringHash;                          //Needed to
 typedef QHash<QListWidgetItem*, CredentialData> QListWidgetItemHash; //Needed to fix a Qt foreach macro argument parsing bug
 typedef QList<CredentialData> CredentialList;
 
-///@class Private_AddCodecDialog Little dialog to add codec to the list
+///Private_AddCodecDialog: Little dialog to add codec to the list
 class Private_AddCodecDialog : public KDialog {
   Q_OBJECT
   public:
@@ -63,7 +63,7 @@ class Private_AddCodecDialog : public KDialog {
     void addCodec(QString alias);
 };
 
-///@class RingToneListItem Ringtone list widget
+///RingToneListItem: Ringtone list widget
 class RingToneListItem : public QWidget
 {
    Q_OBJECT
diff --git a/kde/src/conf/dlgvideo.h b/kde/src/conf/dlgvideo.h
index df463d62cb414b7095673871ab394f28ef6ee743..8a30dc137217a9efec71f4209e024ed6df29c637 100644
--- a/kde/src/conf/dlgvideo.h
+++ b/kde/src/conf/dlgvideo.h
@@ -26,7 +26,7 @@
 
 class VideoDevice;
 
-///@class DlgVideo video preferences for sflphone
+///DlgVideo: video preferences for sflphone
 class DlgVideo : public QWidget, public Ui_DlgVideoBase
 {
 Q_OBJECT
diff --git a/kde/src/klib/AkonadiBackend.cpp b/kde/src/klib/AkonadiBackend.cpp
index 32d6e4f159c0118f9a13b7537724ad25ced81d62..5014f3907bf1cac6202512700743221a2d99b6ef 100644
--- a/kde/src/klib/AkonadiBackend.cpp
+++ b/kde/src/klib/AkonadiBackend.cpp
@@ -96,7 +96,7 @@ ContactBackend* AkonadiBackend::getInstance()
    return m_pInstance;
 }
 
-///Find contact using a phone number,
+///Find contact using a phone number
 ///@param resolveDNS check if the DNS is used by an account, then assume contact with that phone number / extension is the same as the caller
 Contact* AkonadiBackend::getContactByPhone(const QString& phoneNumber,bool resolveDNS)
 {
diff --git a/kde/src/klib/AkonadiBackend.h b/kde/src/klib/AkonadiBackend.h
index b6ca9cf4babe17973c8952beaf9064eea287120c..1ddebe16ecf428f80202e8bc820b6b14d7e891b8 100644
--- a/kde/src/klib/AkonadiBackend.h
+++ b/kde/src/klib/AkonadiBackend.h
@@ -44,7 +44,7 @@ namespace Akonadi {
 //SFLPhone
 class Contact;
 
-///@class AkonadiBackend Implement a backend for Akonadi
+///AkonadiBackend: Implement a backend for Akonadi
 class LIB_EXPORT AkonadiBackend : public ContactBackend {
    Q_OBJECT
 public:
diff --git a/kde/src/klib/HelperFunctions.h b/kde/src/klib/HelperFunctions.h
index 9eeef93c7ce20008e939785ac92e00908fdcde6e..8f6f99f081ab6bff4fca67fd4bfa9c93663e6308 100644
--- a/kde/src/klib/HelperFunctions.h
+++ b/kde/src/klib/HelperFunctions.h
@@ -33,7 +33,7 @@
 //Typedef
 typedef QHash<QString,QHash<QString,QVariant> > ContactHash;
 
-///@class HelperFunctions little visitor not belonging to libqtsflphone
+///HelperFunctions: little visitor not belonging to libqtsflphone
 ///Ramdom mix of dynamic property and transtypping
 class LIB_EXPORT HelperFunctions {
 public:
diff --git a/kde/src/klib/SortableDockCommon.h b/kde/src/klib/SortableDockCommon.h
index 32e2e75bf7e5b42bf510dba8e40613b97fe13211..a86af26ec78944cb3b6547ffd2bf5164eba3d50b 100644
--- a/kde/src/klib/SortableDockCommon.h
+++ b/kde/src/klib/SortableDockCommon.h
@@ -56,7 +56,7 @@ enum HistorySortingMode {
    Length     = 3,
 };
 
-///@class SortableDockCommon Common code for filtering
+///SortableDockCommon: Common code for filtering
 template  <typename CallWidget = QWidget*, typename Index = QModelIndex*>
 class LIB_EXPORT SortableDockCommon {
    public:
@@ -111,7 +111,7 @@ class LIB_EXPORT SortableDockCommon {
 };
 
 
-///@class StaticEventHandler "cron jobs" for static member;
+///StaticEventHandler: "cron jobs" for static member;
 class LIB_EXPORT StaticEventHandler : public QObject
 {
    Q_OBJECT
diff --git a/kde/src/klib/dataengine/sflphonEngine.h b/kde/src/klib/dataengine/sflphonEngine.h
index bf510b6c6d33a411c958ea1ae116777014d8c624..e13f42f696f7c0c6bc9cbb6b38871fef93e181fc 100644
--- a/kde/src/klib/dataengine/sflphonEngine.h
+++ b/kde/src/klib/dataengine/sflphonEngine.h
@@ -41,6 +41,7 @@ typedef QHash<QString,QVariant>                 HashStringString;
 typedef QHash<QString,QHash<QString,QVariant> > ContactHash     ;
 class Call;
 
+///SFLPhoneEngine: SFLPhone KDE plasma dataengine
 class SFLPhoneEngine : public Plasma::DataEngine,public SortableDockCommon<>
 {
    Q_OBJECT
diff --git a/kde/src/klib/dataengine/sflphoneService.h b/kde/src/klib/dataengine/sflphoneService.h
index b5004f863d71320eb664d908e59d0821bb15ab6b..bc65bd71953e4ff51f14595596a1eb33d9681360 100644
--- a/kde/src/klib/dataengine/sflphoneService.h
+++ b/kde/src/klib/dataengine/sflphoneService.h
@@ -33,7 +33,7 @@ using namespace Plasma;
 
 class Account;
 
-///@class SFLPhoneService RPC between the plasmoid and the library
+///SFLPhoneService: RPC between the plasmoid and the library
 class SFLPhoneService : public Plasma::Service
 {
    Q_OBJECT
@@ -46,7 +46,7 @@ private:
    SFLPhoneEngine *m_engine;
 };
 
-///@class CallJob Call using and account and a number
+///CallJob: Call using and account and a number
 class CallJob : public Plasma::ServiceJob
 {
    Q_OBJECT
@@ -60,7 +60,7 @@ private:
     QString  m_Number  ;
 };
 
-///@class DTMFJob Play a sound when called
+///DTMFJob: Play a sound when called
 class DTMFJob : public Plasma::ServiceJob
 {
    Q_OBJECT
@@ -72,7 +72,7 @@ private:
    QString m_mStr;
 };
 
-///@class HangUpJob Hang up a call using an id
+///HangUpJob: Hang up a call using an id
 class HangUpJob : public Plasma::ServiceJob
 {
    Q_OBJECT
@@ -84,7 +84,7 @@ private:
    QString m_CallId;
 };
 
-///@class TransferJob Transfer a call
+///TransferJob: Transfer a call
 class TransferJob : public Plasma::ServiceJob
 {
    Q_OBJECT
@@ -97,7 +97,7 @@ private:
    QString m_transferNumber;
 };
 
-///@class HoldJob Put or remove a call from hold mode
+///HoldJob: Put or remove a call from hold mode
 class HoldJob : public Plasma::ServiceJob
 {
    Q_OBJECT
@@ -109,7 +109,7 @@ private:
    QString m_CallId;
 };
 
-///@class RecordJob Record a call
+///RecordJob: Record a call
 class RecordJob : public Plasma::ServiceJob
 {
    Q_OBJECT
diff --git a/kde/src/lib/Account.h b/kde/src/lib/Account.h
index 408e0819bc0b365ced79303bbea66fee8cdea7e6..acd98458cdbeb9fb33747deaf0657218c1e76f10 100644
--- a/kde/src/lib/Account.h
+++ b/kde/src/lib/Account.h
@@ -33,7 +33,7 @@ class QString;
 
 const QString& account_state_name(const QString& s);
 
-///@class Account a daemon account (SIP or AIX)
+///Account: a daemon account (SIP or AIX)
 class LIB_EXPORT Account : public QObject {
    Q_OBJECT
 
diff --git a/kde/src/lib/AccountList.cpp b/kde/src/lib/AccountList.cpp
index 833b0244b59b0fe6fb4df4658d84c65683ede433..33ac61aff7f0d9c187b34d7a0ebf271b1eaaa791 100644
--- a/kde/src/lib/AccountList.cpp
+++ b/kde/src/lib/AccountList.cpp
@@ -219,13 +219,13 @@ void AccountList::removeAccount(Account* account)
  *                                                                           *
  ****************************************************************************/
 
-///Get the accoutn from its index
+///Get the account from its index
 const Account* AccountList::operator[] (int i) const
 {
    return (*m_pAccounts)[i];
 }
 
-///Get the accoutn from its index
+///Get the account from its index
 Account* AccountList::operator[] (int i)
 {
    return (*m_pAccounts)[i];
diff --git a/kde/src/lib/AccountList.h b/kde/src/lib/AccountList.h
index e0c5aac0a220ba2c575316715c5aa2d18e02cf02..16bca59d9b0404e9f0b7549da0f53d19e944d773 100644
--- a/kde/src/lib/AccountList.h
+++ b/kde/src/lib/AccountList.h
@@ -27,7 +27,7 @@
 #include "Account.h"
 #include "typedefs.h"
 
-///@class AccountList List of all daemon accounts
+///AccountList: List of all daemon accounts
 class LIB_EXPORT AccountList : public QObject{
    Q_OBJECT
 
diff --git a/kde/src/lib/CallModel.h b/kde/src/lib/CallModel.h
index 0cca16f49ed8dc2edee29c56a3336a1c6f8addd3..a30e8b5fa401353b5d774b3bbb72ad892f105d27 100644
--- a/kde/src/lib/CallModel.h
+++ b/kde/src/lib/CallModel.h
@@ -44,7 +44,7 @@ class HistoryModel;
 typedef QMap<QString, Call*>  CallMap;
 typedef QList<Call*>          CallList;
 
-///@class CallModelBase Base class for the central model/frontend          
+///CallModelBase: Base class for the central model/frontend
 ///This class need to exist because template classes can't have signals and
 ///slots because Qt MOC generator can't guess the type at precompilation   
 class LIB_EXPORT CallModelBase : public QObject
@@ -103,7 +103,7 @@ signals:
  * Using QAbstractModel resulted in a failure. Managing all corner case bloated the code to the point of no
  * return. This frontend may not be cleaner from a design point of view, but it is from a code point of view
  */
-///@class CallModel Central model/frontend to deal with sflphoned
+///CallModel: Central model/frontend to deal with sflphoned
 template  <typename CallWidget = QWidget*, typename Index = QModelIndex*>
 class LIB_EXPORT CallModel : public CallModelBase {
    public:
diff --git a/kde/src/lib/Contact.h b/kde/src/lib/Contact.h
index bad7467bd023c4c5a97975cba5950cb1669b024b..83c119b83bd7511e51a88718931f13f6e4ff8533 100644
--- a/kde/src/lib/Contact.h
+++ b/kde/src/lib/Contact.h
@@ -38,7 +38,7 @@ namespace KABC {
 
 #include "typedefs.h"
 
-///@class Contact Abstract version of a contact
+///Contact: Abstract version of a contact
 class LIB_EXPORT Contact : public QObject{
    Q_OBJECT
 public:
diff --git a/kde/src/lib/ContactBackend.h b/kde/src/lib/ContactBackend.h
index d46a281bf057f4db24faf871850ff24478a58769..c62c3fb9906fb37328bbb49013e050bda908cd8b 100644
--- a/kde/src/lib/ContactBackend.h
+++ b/kde/src/lib/ContactBackend.h
@@ -35,7 +35,7 @@ class Contact;
 //Typedef
 typedef QList<Contact*> ContactList;
 
-///@class ContactBackend Allow different way to handle contact without poluting the library
+///ContactBackend: Allow different way to handle contact without poluting the library
 class LIB_EXPORT ContactBackend : public QObject {
    Q_OBJECT
 public:
diff --git a/kde/src/lib/HistoryModel.cpp b/kde/src/lib/HistoryModel.cpp
index cdfc4bfc632630e9f96299225fbb0534891b101e..05be16fcb03d382cb30abe678da34778e5d9c25f 100644
--- a/kde/src/lib/HistoryModel.cpp
+++ b/kde/src/lib/HistoryModel.cpp
@@ -27,6 +27,7 @@
  *                             Private classes                               *
  *                                                                           *
  ****************************************************************************/
+///SortableCallSource: helper class to make sorting possible
 class SortableCallSource {
 public:
    SortableCallSource(Call* call=0) : count(0),callInfo(call) {}
diff --git a/kde/src/lib/HistoryModel.h b/kde/src/lib/HistoryModel.h
index f26a0c6c22cda891dc646103edca51dbd264dedc..8d3cd7be1f24175c83b0d62e7ba7f7fa87c198ed 100644
--- a/kde/src/lib/HistoryModel.h
+++ b/kde/src/lib/HistoryModel.h
@@ -33,7 +33,7 @@ class Call;
 typedef QMap<QString, Call*>  CallMap;
 typedef QList<Call*>          CallList;
 
-///@class HistoryModel History call manager
+///HistoryModel: History call manager
 class LIB_EXPORT HistoryModel : public QObject {
    Q_OBJECT
 public:
diff --git a/kde/src/lib/VideoCodec.h b/kde/src/lib/VideoCodec.h
index 792a1eb99228acf95d27bdf6e85bbf9a1a93d36b..c693006af4601a76e46ee6e922a7f32e33dd6f7e 100644
--- a/kde/src/lib/VideoCodec.h
+++ b/kde/src/lib/VideoCodec.h
@@ -32,7 +32,7 @@ class Account;
 class VideoCodec;
 typedef QHash<QString,VideoCodec*> CodecHash;
 
-///@class VideoCodec Codecs used for video calls
+///VideoCodec: Codecs used for video calls
 class LIB_EXPORT VideoCodec {
    public:
 
diff --git a/kde/src/lib/VideoDevice.h b/kde/src/lib/VideoDevice.h
index 768990f3c4e6bec0d5676f8842613e667592b732..18322baf556ed1c9fb5c1f762de3304071dab699 100644
--- a/kde/src/lib/VideoDevice.h
+++ b/kde/src/lib/VideoDevice.h
@@ -51,7 +51,7 @@ struct LIB_EXPORT Resolution {
    }
 };
 
-///@class VideoDevice V4L devices used to record video for video call
+///VideoDevice: V4L devices used to record video for video call
 class LIB_EXPORT VideoDevice {
    public:
       //Singleton
diff --git a/kde/src/lib/VideoModel.h b/kde/src/lib/VideoModel.h
index 1b6b647386fab39c5f012cbfa7186326cabe9b6e..3cb03a25ed211da0e97969e2e5ff87fc5a8a33a7 100644
--- a/kde/src/lib/VideoModel.h
+++ b/kde/src/lib/VideoModel.h
@@ -29,7 +29,7 @@ class QTimer;
 //SFLPhone
 #include "VideoDevice.h"
 
-///@class VideoModel Video event dispatcher
+///VideoModel: Video event dispatcher
 class LIB_EXPORT VideoModel : public QObject {
    Q_OBJECT
 public:
diff --git a/kde/src/widgets/AccountItemWidget.h b/kde/src/widgets/AccountItemWidget.h
index 3c76f74ddd3dc46a054ac4e13995e5f308ad5bbd..5bbc583a21988a578ed5e2467f46e4ca7060c0e4 100755
--- a/kde/src/widgets/AccountItemWidget.h
+++ b/kde/src/widgets/AccountItemWidget.h
@@ -30,7 +30,7 @@ class QCheckBox;
 class QLabel;
 
 
-///@class AccountItemWidget Widget for the config dialog account list
+///AccountItemWidget: Widget for the config dialog account list
 class AccountItemWidget : public QWidget
 {
 Q_OBJECT
diff --git a/kde/src/widgets/BookmarkDock.cpp b/kde/src/widgets/BookmarkDock.cpp
index de96add74445c7f516a284d0c130fc865524b475..61774fee17cf8e8f8f2347f19fa299d2fe8664f4 100644
--- a/kde/src/widgets/BookmarkDock.cpp
+++ b/kde/src/widgets/BookmarkDock.cpp
@@ -44,7 +44,7 @@
 #include "klib/HelperFunctions.h"
 #include "lib/HistoryModel.h"
 
-///@class QNumericTreeWidgetItem : Tree widget with different sorting criterias
+///QNumericTreeWidgetItem : Tree widget with different sorting criterias
 class QNumericTreeWidgetItem : public QTreeWidgetItem {
    public:
       QNumericTreeWidgetItem(QTreeWidget* parent):QTreeWidgetItem(parent),widget(0),weight(-1){}
diff --git a/kde/src/widgets/BookmarkDock.h b/kde/src/widgets/BookmarkDock.h
index 30f58298d26fe970a5f8ca755c674a3c85974b00..d9ecb2e1ccfd667c19c7e0676fd7df2eaefe0012 100644
--- a/kde/src/widgets/BookmarkDock.h
+++ b/kde/src/widgets/BookmarkDock.h
@@ -39,7 +39,7 @@ class CategorizedTreeWidget;
 //Typedef
 typedef QList<HistoryTreeItem*> BookmarkList;
 
-///@class BookmarkDock Dock for managing favorite contacts
+///BookmarkDock: Dock for managing favorite contacts
 class BookmarkDock : public QDockWidget {
    Q_OBJECT
 public:
diff --git a/kde/src/widgets/CallTreeItem.h b/kde/src/widgets/CallTreeItem.h
index 43cc1041dd7b1e9d69612b6a3744de98f12b956d..5c7669331d1e863d616ba705e1c33820e5b93240 100644
--- a/kde/src/widgets/CallTreeItem.h
+++ b/kde/src/widgets/CallTreeItem.h
@@ -41,7 +41,7 @@ class Call;
 class TranslucentButtons;
 class Contact;
 
-///@class CallTreeItem Widget for the central call treeview
+///CallTreeItem: Widget for the central call treeview
 class CallTreeItem : public QWidget
 {
    Q_OBJECT
diff --git a/kde/src/widgets/CategorizedTreeWidget.h b/kde/src/widgets/CategorizedTreeWidget.h
index 0652281e6403b55aa956bf048341b135f23f80ba..f486bd28feb407dd3ad8fd872d70eb3a4cd51063 100644
--- a/kde/src/widgets/CategorizedTreeWidget.h
+++ b/kde/src/widgets/CategorizedTreeWidget.h
@@ -28,6 +28,7 @@ class KConfigGroup;
 class KateColorTreeItem;
 class QTreeWidgetItem;
 
+///CategorizedTreeWidget: A better looking widget than the plain QListWidget
 class CategorizedTreeWidget : public QTreeWidget
 {
   Q_OBJECT
diff --git a/kde/src/widgets/CategoryDrawer.h b/kde/src/widgets/CategoryDrawer.h
index 4973491f6171d97178939ea865cac3d3c440905e..ae8e07b340f5828ed87b189818cf8e19271d1185 100644
--- a/kde/src/widgets/CategoryDrawer.h
+++ b/kde/src/widgets/CategoryDrawer.h
@@ -29,6 +29,7 @@ class QPainter;
 class QModelIndex;
 class QStyleOption;
 
+///CategoryDrawer: A better looking widget than the plain QListWidget
 class CategoryDrawer : public KCategoryDrawerV2
 {
 public:
diff --git a/kde/src/widgets/ContactDock.cpp b/kde/src/widgets/ContactDock.cpp
index 8b2f677c76f8a3731f3dc3a588002aacbd0e88dd..32b33be49560c34858decb1cc04f84f0d08bfc42 100644
--- a/kde/src/widgets/ContactDock.cpp
+++ b/kde/src/widgets/ContactDock.cpp
@@ -54,7 +54,7 @@
 
 #define CURRENT_SORTING_MODE m_pSortByCBB->currentIndex()
 
-///@class QNumericTreeWidgetItem_hist TreeWidget using different sorting criterias
+///QNumericTreeWidgetItem_hist: TreeWidget using different sorting criterias
 class QNumericTreeWidgetItem_hist : public QTreeWidgetItem {
    public:
       QNumericTreeWidgetItem_hist(QTreeWidget* parent):QTreeWidgetItem(parent),widget(0),weight(-1){}
diff --git a/kde/src/widgets/ContactDock.h b/kde/src/widgets/ContactDock.h
index 902edbe9d04e608161b260c6cad88d64c2150ea8..38f5b64f5a07ca39eb0ffb11ecf917f34322fb52 100644
--- a/kde/src/widgets/ContactDock.h
+++ b/kde/src/widgets/ContactDock.h
@@ -58,7 +58,7 @@ class ContactItemWidget;
 class StaticEventHandler;
 class Contact;
 
-///@class ContactDock Dock to access contacts
+///ContactDock: Dock to access contacts
 class ContactDock : public QDockWidget, public SortableDockCommon<CallTreeItem*,QTreeWidgetItem*>
 {
    Q_OBJECT
@@ -88,7 +88,7 @@ private slots:
    void reloadHistoryConst (                       );
 };
 
-///@class ContactTree tree view with additinal drag and drop
+///ContactTree: tree view with additinal drag and drop
 class ContactTree : public CategorizedTreeWidget {
    Q_OBJECT
 public:
@@ -97,7 +97,7 @@ public:
    bool dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action);
 };
 
-///@class KeyPressEaterC keygrabber
+///KeyPressEaterC: keygrabber
 class KeyPressEaterC : public QObject
 {
    Q_OBJECT
diff --git a/kde/src/widgets/ContactItemWidget.h b/kde/src/widgets/ContactItemWidget.h
index dfa356fe84312e6cee633e18a373236c7affae1f..3e6c8aed47c1aab23cc1f410aa4a1887d7306b2d 100644
--- a/kde/src/widgets/ContactItemWidget.h
+++ b/kde/src/widgets/ContactItemWidget.h
@@ -42,7 +42,7 @@ namespace KABC {
 class Contact;
 class TranslucentButtons;
 
-///@class ContactItemWidget Item for the contact tree
+///ContactItemWidget: Item for the contact tree
 class ContactItemWidget : public QWidget
 {
    Q_OBJECT
diff --git a/kde/src/widgets/Dialpad.h b/kde/src/widgets/Dialpad.h
index 5dd1784a98415732234cf54cf39c0bf05f624c65..576f341ddd4c5b701c083f62dd61285b2e2cfed4 100755
--- a/kde/src/widgets/Dialpad.h
+++ b/kde/src/widgets/Dialpad.h
@@ -27,7 +27,7 @@
 //Qt
 class QGridLayout;
 
-///@class DialpadButton the 12 button of the dialpad
+///DialpadButton: the 12 button of the dialpad
 class DialpadButton : public QPushButton
 {
    Q_OBJECT
@@ -44,7 +44,7 @@ signals:
 };
 
 
-///@class Dialpad A widget that representing a phone dialpad with associated numbers and letters
+///Dialpad: A widget that representing a phone dialpad with associated numbers and letters
 class Dialpad : public QWidget
 {
 Q_OBJECT
diff --git a/kde/src/widgets/HistoryDock.cpp b/kde/src/widgets/HistoryDock.cpp
index c6e989f976b9f17ae08e3706c63c1efb46458cb6..44690af5016d1f34f192fc956f69324390db9697 100644
--- a/kde/src/widgets/HistoryDock.cpp
+++ b/kde/src/widgets/HistoryDock.cpp
@@ -52,7 +52,7 @@
 
 #define CURRENT_SORTING_MODE m_pSortByCBB->currentIndex()
 
-///@class QNumericTreeWidgetItem Qt lack official functional sorting algo, so this hack around it
+///QNumericTreeWidgetItem: Qt lack official functional sorting algo, so this hack around it
 class QNumericTreeWidgetItem : public QTreeWidgetItem {
    public:
       QNumericTreeWidgetItem(QTreeWidget* parent=0):QTreeWidgetItem(parent),widget(0),weight(-1){}
diff --git a/kde/src/widgets/HistoryDock.h b/kde/src/widgets/HistoryDock.h
index 1b0755caab45fac0b7ddecc3688a6d28cf7c4d25..c0aade1564f06798223ffa678e275dad64ec74d9 100644
--- a/kde/src/widgets/HistoryDock.h
+++ b/kde/src/widgets/HistoryDock.h
@@ -52,7 +52,7 @@ class QNumericTreeWidgetItem;
 typedef QList<HistoryTreeItem*> HistoryList;
 typedef QHash<QString,QNumericTreeWidgetItem*> GroupHash;
 
-///@class HistoryDock Dock to see the previous SFLPhone calls
+///HistoryDock: Dock to see the previous SFLPhone calls
 class HistoryDock : public QDockWidget, public SortableDockCommon<CallTreeItem*,QTreeWidgetItem*> {
    Q_OBJECT
 
@@ -99,7 +99,7 @@ private slots:
 };
 
 
-///@class HistoryTree Simple tree view with additional keybpard filter
+///HistoryTree: Simple tree view with additional keybpard filter
 class HistoryTree : public CategorizedTreeWidget {
    Q_OBJECT
 public:
@@ -108,7 +108,7 @@ public:
    bool dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action);
 };
 
-///@class KeyPressEater Intercept each keypress to manage it globally
+///KeyPressEater: Intercept each keypress to manage it globally
 class KeyPressEater : public QObject
 {
    Q_OBJECT
diff --git a/kde/src/widgets/HistoryTreeItem.cpp b/kde/src/widgets/HistoryTreeItem.cpp
index a0471e44158a44ab0a6d0e8b30ef04f2886f11c3..440b29d72c1a2c37e83dd4d8c6643dbedecddb4b 100644
--- a/kde/src/widgets/HistoryTreeItem.cpp
+++ b/kde/src/widgets/HistoryTreeItem.cpp
@@ -60,6 +60,7 @@
 
 const char * HistoryTreeItem::callStateIcons[12] = {ICON_INCOMING, ICON_RINGING, ICON_CURRENT, ICON_DIALING, ICON_HOLD, ICON_FAILURE, ICON_BUSY, ICON_TRANSFER, ICON_TRANSF_HOLD, "", "", ICON_CONFERENCE};
 
+///PlayerWidget: A small widget to play call recording
 class PlayerWidget : public QWidget {
 public:
    PlayerWidget(QWidget* parent = 0) : QWidget(parent) {}
diff --git a/kde/src/widgets/HistoryTreeItem.h b/kde/src/widgets/HistoryTreeItem.h
index 670301dafd4b16d7e89de402a17f5cbafc5f2876..4970adea763759f1250df21a2a44742555880ced 100644
--- a/kde/src/widgets/HistoryTreeItem.h
+++ b/kde/src/widgets/HistoryTreeItem.h
@@ -49,7 +49,7 @@ class QMimeData;
 //KDE
 class KAction;
 
-///@class HistoryTreeItem Items for the history dock
+///HistoryTreeItem: Items for the history dock
 class HistoryTreeItem : public QWidget
 {
    Q_OBJECT
diff --git a/kde/src/widgets/SFLPhoneTray.h b/kde/src/widgets/SFLPhoneTray.h
index bfad9dae09306b412759d7f2127899077ac9c799..9f0da19c270618050622f4c7ecb77da6891efae6 100755
--- a/kde/src/widgets/SFLPhoneTray.h
+++ b/kde/src/widgets/SFLPhoneTray.h
@@ -31,7 +31,7 @@ class KAction;
 class QMenu;
 class QIcon;
 
-///@class SFLPhoneTray The old system try, should be totally replaced by a plasmoid some day
+///SFLPhoneTray: The old system try, should be totally replaced by a plasmoid some day
 class SFLPhoneTray : public KSystemTrayIcon
 {
 Q_OBJECT
diff --git a/kde/src/widgets/TranslucentButtons.h b/kde/src/widgets/TranslucentButtons.h
index 8176c54452395d80257ebafeabfd6a0e9b233123..7051ff54908a2cfd92aeabc6c129bed8214fbda5 100644
--- a/kde/src/widgets/TranslucentButtons.h
+++ b/kde/src/widgets/TranslucentButtons.h
@@ -7,7 +7,7 @@ class QTimer;
 class QMimeData;
 class QImage;
 
-///@class TranslucentButtons Fancy buttons for the call widget
+///TranslucentButtons: Fancy buttons for the call widget
 class TranslucentButtons : public QPushButton
 {
    Q_OBJECT
diff --git a/kde/src/widgets/VideoWidget.h b/kde/src/widgets/VideoWidget.h
index 1a06f6fd80ae594e5fbef22e857222314b717498..7c9e116005fe84fe187ed3ba8b9893e9b8e19f6e 100644
--- a/kde/src/widgets/VideoWidget.h
+++ b/kde/src/widgets/VideoWidget.h
@@ -24,6 +24,7 @@
 
 #include "../lib/VideoModel.h"
 
+///VideoWidget: A widget to display video from a framebuffer
 class VideoWidget : public QWidget {
    Q_OBJECT
 public: