Changeset 5723

Timestamp:

10/29/07 00:34:43 (13 months ago)

Author:

eugene

Message:

Moved emoticon.* into config dir.

Location:

branches/qt-gui_qt4/src

Files:

• CMakeLists.txt (modified) (1 diff)
• config/CMakeLists.txt (modified) (1 diff)
• config/emoticons.cpp (moved) (moved from branches/qt-gui_qt4/src/emoticon.cpp) (1 diff)
• config/emoticons.h (moved) (moved from branches/qt-gui_qt4/src/emoticon.h) (2 diffs)
• dialogs/skinbrowser.cpp (modified) (2 diffs)
• mainwin.cpp (modified) (2 diffs)
• mlview.cpp (modified) (1 diff)
• userevents/selectemoticon.cpp (modified) (1 diff)
• userevents/usersendcommon.cpp (modified) (2 diffs)

branches/qt-gui_qt4/src/CMakeLists.txt

@@ -1 +1 @@
 # Sources common for both Qt4- and KDE4-GUI
 set(Qt-GUI_SRCS
-  emoticon.cpp
   ewidgets.cpp
   historyview.cpp

branches/qt-gui_qt4/src/config/CMakeLists.txt

@@ -3 +3 @@
   chat.cpp
   contactlist.cpp
+  emoticons.cpp
   general.cpp
   iconmanager.cpp

branches/qt-gui_qt4/src/config/emoticons.cpp

@@ -18 +18 @@
  */
 
-#include "emoticon.h"
+#include "emoticons.h"
 
 #include "config.h"

branches/qt-gui_qt4/src/config/emoticons.h

@@ -18 +18 @@
  */
 
-#ifndef EMOTICON_H
-#define EMOTICON_H
+#ifndef EMOTICONS_H
+#define EMOTICONS_H
 
 #include <QMap>
@@ -100 +100 @@
 } // namespace LicqQtGui
 
-#endif // EMOTICON_H
+#endif // EMOTICONS_H

branches/qt-gui_qt4/src/dialogs/skinbrowser.cpp

@@ -37 +37 @@
 
 #include "config/iconmanager.h"
+#include "config/emoticons.h"
 #include "config/skin.h"
 
@@ -49 +50 @@
 
 #include "editfiledlg.h"
-#include "emoticon.h"
 #include "ewidgets.h"
 #include "gui-defines.h"

branches/qt-gui_qt4/src/mainwin.cpp

@@ -75 +75 @@
 #include "config/chat.h"
 #include "config/contactlist.h"
+#include "config/emoticons.h"
 #include "config/general.h"
 #include "config/iconmanager.h"
@@ -132 +133 @@
 #include "views/floatyview.h"
 
-#include "emoticon.h"
 #include "ewidgets.h"
 #include "gui-defines.h"

branches/qt-gui_qt4/src/mlview.cpp

@@ -33 +33 @@
 #include <QRegExp>
 
-#include "emoticon.h"
+#include "config/emoticons.h"
 
 using namespace LicqQtGui;

branches/qt-gui_qt4/src/userevents/selectemoticon.cpp

@@ -26 +26 @@
 #include <QMap>
 
+#include "config/emoticons.h"
+
 #include "helpers/support.h"
-
-#include "emoticon.h"
 
 #include "emoticonlabel.h"

branches/qt-gui_qt4/src/userevents/usersendcommon.cpp

@@ -45 +45 @@
 
 #include "config/chat.h"
+#include "config/emoticons.h"
 #include "config/iconmanager.h"
 
@@ -59 +60 @@
 #include "widgets/mledit.h"
 
-#include "emoticon.h"
 #include "ewidgets.h"
 #include "historyview.h"