Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Avoid deprecated macros

  • Loading branch information...
commit a5460566dc9486c008b0985c83c8ad491d3ac754 1 parent bea7d48
authored March 26, 2012
6  src/gui/chattextview.h
@@ -25,13 +25,13 @@
25 25
 // ------------------------------------------
26 26
 //
27 27
 
28  
-#define QQ_CHAT_TEXTVIEW(obj)	    GTK_CHECK_CAST(obj\
  28
+#define QQ_CHAT_TEXTVIEW(obj)	    G_TYPE_CHECK_INSTANCE_CAST(obj\
29 29
                                                 , qq_chat_textview_get_type()\
30 30
 						                        , QQChatTextview)
31  
-#define QQ_CHAT_TEXTVIEWCLASS(c)	GTK_CHECK_CLASS_CAST(c\
  31
+#define QQ_CHAT_TEXTVIEWCLASS(c)	G_TYPE_CHECK_CLASS_CAST(c\
32 32
 						                        , qq_chat_textview_get_type()\
33 33
 						                        , QQChatTextviewClass)
34  
-#define QQ_IS_CHAT_TEXTVIEW(obj)	GTK_CHECK_TYPE(obj\
  34
+#define QQ_IS_CHAT_TEXTVIEW(obj)	G_TYPE_CHECK_INSTANCE_TYPE(obj\
35 35
                                                 , qq_chat_textview_get_type())
36 36
 
37 37
 typedef struct __QQChatTextview 		QQChatTextview;
6  src/gui/chatwidget.h
@@ -25,12 +25,12 @@
25 25
 // |                                            |
26 26
 // ----------------------------------------------
27 27
 //
28  
-#define QQ_CHATWIDGET(obj)      GTK_CHECK_CAST(obj, qq_chatwidget_get_type()\
  28
+#define QQ_CHATWIDGET(obj)      G_TYPE_CHECK_INSTANCE_CAST(obj, qq_chatwidget_get_type()\
29 29
                                                 , QQChatWidget)
30  
-#define QQ_CHATWIDGETCLASS(c)   GTK_CHECK_CLASS_CAST(c\
  30
+#define QQ_CHATWIDGETCLASS(c)   G_TYPE_CHECK_CLASS_CAST(c\
31 31
                                                 , qq_chatwidget_get_type()\
32 32
                                                 , QQChatWidgetClass)
33  
-#define QQ_IS_CHATWIDGET(obj)   GTK_CHECK_TYPE(obj, qq_chatwidget_get_type())
  33
+#define QQ_IS_CHATWIDGET(obj)   G_TYPE_CHECK_INSTANCE_TYPE(obj, qq_chatwidget_get_type())
34 34
 
35 35
 typedef struct __QQChatWidget         QQChatWidget;
36 36
 typedef struct __QQChatWidgetClass    QQChatWidgetClass;
6  src/gui/chatwindow.h
@@ -3,12 +3,12 @@
3 3
 #include <gtk/gtk.h>
4 4
 #include <qq.h>
5 5
 
6  
-#define QQ_CHATWINDOW(obj)      GTK_CHECK_CAST(obj, qq_chatwindow_get_type()\
  6
+#define QQ_CHATWINDOW(obj)      G_TYPE_CHECK_INSTANCE_CAST(obj, qq_chatwindow_get_type()\
7 7
                                                 , QQChatWindow)
8  
-#define QQ_CHATWINDOWCLASS(c)   GTK_CHECK_CLASS_CAST(c\
  8
+#define QQ_CHATWINDOWCLASS(c)   G_TYPE_CHECK_CLASS_CAST(c\
9 9
                                                 , qq_chatwindow_get_type()\
10 10
                                                 , QQChatWindowClass)
11  
-#define QQ_IS_CHATWINDOW(obj)   GTK_CHECK_TYPE(obj, qq_chatwindow_get_type())
  11
+#define QQ_IS_CHATWINDOW(obj)   G_TYPE_CHECK_INSTANCE_TYPE(obj, qq_chatwindow_get_type())
12 12
 
13 13
 typedef struct __QQChatWindow         QQChatWindow;
14 14
 typedef struct __QQChatWindowClass    QQChatWindowClass;
6  src/gui/facepopupwindow.h
@@ -5,13 +5,13 @@
5 5
 #include <qq.h>
6 6
 
7 7
 #define QQ_TYPE_FACE_POPUP_WINDOW       qq_face_popup_window_get_type()
8  
-#define QQ_FACE_POPUP_WINDOW(obj)	    GTK_CHECK_CAST(obj\
  8
+#define QQ_FACE_POPUP_WINDOW(obj)	    G_TYPE_CHECK_INSTANCE_CAST(obj\
9 9
                                                 , QQ_TYPE_FACE_POPUP_WINDOW\
10 10
 						                        , QQFacePopupWindow)
11  
-#define QQ_FACE_POPUP_WINDOWCLASS(c)	GTK_CHECK_CLASS_CAST(c\
  11
+#define QQ_FACE_POPUP_WINDOWCLASS(c)	G_TYPE_CHECK_CLASS_CAST(c\
12 12
 						                        , QQ_TYPE_FACE_POPUP_WINDOW\
13 13
 						                        , QQFacePopupWindowClass)
14  
-#define QQ_IS_FACE_POPUP_WINDOW(obj)	GTK_CHECK_TYPE(obj\
  14
+#define QQ_IS_FACE_POPUP_WINDOW(obj)	G_TYPE_CHECK_INSTANCE_TYPE(obj\
15 15
                                                 , QQ_TYPE_FACE_POPUP_WINDOW)
16 16
 
17 17
 typedef struct __QQFacePopupWindow 		QQFacePopupWindow;
6  src/gui/groupchatwindow.h
@@ -4,13 +4,13 @@
4 4
 #include <qq.h>
5 5
 
6 6
 #define QQ_TYPE_GROUP_CHATWINDOW        qq_group_chatwindow_get_type()
7  
-#define QQ_GROUP_CHATWINDOW(obj)        GTK_CHECK_CAST(obj\
  7
+#define QQ_GROUP_CHATWINDOW(obj)        G_TYPE_CHECK_INSTANCE_CAST(obj\
8 8
                                                 , QQ_TYPE_GROUP_CHATWINDOW\
9 9
                                                 , QQGroupChatWindow)
10  
-#define QQ_GROUP_CHATWINDOWCLASS(c)     GTK_CHECK_CLASS_CAST(c\
  10
+#define QQ_GROUP_CHATWINDOWCLASS(c)     G_TYPE_CHECK_CLASS_CAST(c\
11 11
                                                 , QQ_TYPE_GROUP_CHATWINDOW()\
12 12
                                                 , QQGroupChatWindowClass)
13  
-#define QQ_IS_GROUP_CHATWINDOW(obj)     GTK_CHECK_TYPE(obj\
  13
+#define QQ_IS_GROUP_CHATWINDOW(obj)     G_TYPE_CHECK_INSTANCE_TYPE(obj\
14 14
                                                 , QQ_TYPE_GROUP_CHATWINDOW())
15 15
 
16 16
 typedef struct __QQGroupChatWindow         QQGroupChatWindow;
6  src/gui/loginpanel.h
@@ -2,12 +2,12 @@
2 2
 #define __GTKQQ_LOGINWIN_H
3 3
 #include <gtk/gtk.h>
4 4
 
5  
-#define QQ_LOGINPANEL(obj)    GTK_CHECK_CAST(obj, qq_loginpanel_get_type()\
  5
+#define QQ_LOGINPANEL(obj)    G_TYPE_CHECK_INSTANCE_CAST(obj, qq_loginpanel_get_type()\
6 6
                                         , QQLoginPanel)
7  
-#define QQ_LOGINPANEL_CLASS(c)    GTK_CHECK_CLASS_CAST(c\
  7
+#define QQ_LOGINPANEL_CLASS(c)    G_TYPE_CHECK_CLASS_CAST(c\
8 8
                                         , qq_loginpanel_get_type()\
9 9
                                         , QQLoginPanelClass)
10  
-#define QQ_IS_LOGINPANEL(obj)    GTK_CHECK_TYPE(obj, qq_loginpanel_get_type())
  10
+#define QQ_IS_LOGINPANEL(obj)    G_TYPE_CHECK_INSTANCE_TYPE(obj, qq_loginpanel_get_type())
11 11
 
12 12
 typedef struct _QQLoginPanel            QQLoginPanel;
13 13
 typedef struct _QQLoginPanelClass       QQLoginPanelClass;
6  src/gui/mainpanel.h
@@ -2,12 +2,12 @@
2 2
 #define __GTKQQ_MAINPANEL_H
3 3
 #include <gtk/gtk.h>
4 4
 
5  
-#define QQ_MAINPANEL(obj)       GTK_CHECK_CAST(obj, qq_mainpanel_get_type()\
  5
+#define QQ_MAINPANEL(obj)       G_TYPE_CHECK_INSTANCE_CAST(obj, qq_mainpanel_get_type()\
6 6
                                             , QQMainPanel)
7  
-#define QQ_MAINPANELCLASS(c)    GTK_CHECK_CLASS_CAST(c\
  7
+#define QQ_MAINPANELCLASS(c)    G_TYPE_CHECK_CLASS_CAST(c\
8 8
                                             , qq_mainpanel_get_type()\
9 9
                                             , QQMainPanelClass)
10  
-#define QQ_IS_MAINPANEL(obj)    GTK_CHECK_TYPE(obj, qq_mainpanel_get_type())
  10
+#define QQ_IS_MAINPANEL(obj)    G_TYPE_CHECK_INSTANCE_TYPE(obj, qq_mainpanel_get_type())
11 11
 
12 12
 typedef struct _QQMainPanel         QQMainPanel;
13 13
 typedef struct _QQMainPanelClass    QQMainPanelClass;
6  src/gui/mainwindow.h
@@ -2,12 +2,12 @@
2 2
 #define __GTKQQ_MAINWINDOW_H
3 3
 #include <gtk/gtk.h>
4 4
 
5  
-#define QQ_MAINWINDOW(obj)	GTK_CHECK_CAST(obj, qq_mainwindow_get_type()\
  5
+#define QQ_MAINWINDOW(obj)	G_TYPE_CHECK_INSTANCE_CAST(obj, qq_mainwindow_get_type()\
6 6
 						, QQMainWindow)
7  
-#define QQ_MAINWINDOWCLASS(c)	GTK_CHECK_CLASS_CAST(c\
  7
+#define QQ_MAINWINDOWCLASS(c)	G_TYPE_CHECK_CLASS_CAST(c\
8 8
 						, qq_mainwindow_get_type()\
9 9
 						, QQMainWindowClass)
10  
-#define QQ_IS_MAINWINDOW(obj)	GTK_CHECK_TYPE(obj, qq_mainwindow_get_type())
  10
+#define QQ_IS_MAINWINDOW(obj)	G_TYPE_CHECK_INSTANCE_TYPE(obj, qq_mainwindow_get_type())
11 11
 
12 12
 typedef struct __QQMainWindow 		QQMainWindow;
13 13
 typedef struct __QQMainWindowClass	QQMainWindowClass;
6  src/gui/splashpanel.h
@@ -2,12 +2,12 @@
2 2
 #define __GTKQQ_SPLASHPANEL_H
3 3
 #include <gtk/gtk.h>
4 4
 
5  
-#define QQ_SPLASHPANEL(obj)	GTK_CHECK_CAST(obj, qq_splashpanel_get_type(),\
  5
+#define QQ_SPLASHPANEL(obj)	G_TYPE_CHECK_INSTANCE_CAST(obj, qq_splashpanel_get_type(),\
6 6
 						QQSplashPanel)
7  
-#define QQ_SPLASHPANEL_CLASS(c)	GTK_CHECK_CLASS_CAST(c,\
  7
+#define QQ_SPLASHPANEL_CLASS(c)	G_TYPE_CHECK_CLASS_CAST(c,\
8 8
 						qq_splashpanel_get_type(),\
9 9
 						QQSplashPanelClass)
10  
-#define QQ_IS_SPLASHPANEL(obj)	GTK_CHECK_TYPE(obj, qq_splashPanel_get_type())
  10
+#define QQ_IS_SPLASHPANEL(obj)	G_TYPE_CHECK_INSTANCE_TYPE(obj, qq_splashPanel_get_type())
11 11
 
12 12
 typedef struct _QQSplashPanel 		QQSplashPanel;
13 13
 typedef struct _QQSplashPanelClass	QQSplashPanelClass;
6  src/gui/statusbutton.h
@@ -7,13 +7,13 @@
7 7
  * QQ status button.
8 8
  * Show and change the status.
9 9
  */
10  
-#define QQ_STATUSBUTTON(obj) 		GTK_CHECK_CAST(obj\
  10
+#define QQ_STATUSBUTTON(obj) 		G_TYPE_CHECK_INSTANCE_CAST(obj\
11 11
 						, qq_statusbutton_get_type()\
12 12
 						, QQStatusButton)
13  
-#define QQ_STATUSBUTTONCLASS(c)		GTK_CHECK_CLASS_CAST(c\
  13
+#define QQ_STATUSBUTTONCLASS(c)		G_TYPE_CHECK_CLASS_CAST(c\
14 14
 						, qq_statusbutton_get_type()\
15 15
 						, QQStatusButtonClass)
16  
-#define QQ_IS_STATUSBUTTON(obj) 	GTK_CHECK_TYPE(obj\
  16
+#define QQ_IS_STATUSBUTTON(obj) 	G_TYPE_CHECK_INSTANCE_TYPE(obj\
17 17
 						, qq_statusbutton_get_type())
18 18
 #define QQ_TYPE_STATUSBUTTON 		qq_statusbutton_get_type()
19 19
 
6  src/gui/tray.h
@@ -3,10 +3,10 @@
3 3
 #include <gtk/gtk.h>
4 4
 #include <qq.h>
5 5
 
6  
-#define QQ_TRAY(obj)	GTK_CHECK_CAST(obj, qq_tray_get_type(), QQTray)
7  
-#define QQ_TRAYCLASS(c)	GTK_CHECK_CLASS_CAST(c, qq_tray_get_type()\
  6
+#define QQ_TRAY(obj)	G_TYPE_CHECK_INSTANCE_CAST(obj, qq_tray_get_type(), QQTray)
  7
+#define QQ_TRAYCLASS(c)	G_TYPE_CHECK_CLASS_CAST(c, qq_tray_get_type()\
8 8
 						                    , QQTrayClass)
9  
-#define QQ_IS_TRAY(obj)	GTK_CHECK_TYPE(obj, qq_tray_get_type())
  9
+#define QQ_IS_TRAY(obj)	G_TYPE_CHECK_INSTANCE_TYPE(obj, qq_tray_get_type())
10 10
 
11 11
 typedef struct __QQTray 		QQTray;
12 12
 typedef struct __QQTrayClass	QQTrayClass;

0 notes on commit a546056

Please sign in to comment.
Something went wrong with that request. Please try again.