Permalink
Browse files

Avoid deprecated macros

  • Loading branch information...
1 parent bea7d48 commit a5460566dc9486c008b0985c83c8ad491d3ac754 @thynson committed Mar 26, 2012
@@ -25,13 +25,13 @@
// ------------------------------------------
//
-#define QQ_CHAT_TEXTVIEW(obj) GTK_CHECK_CAST(obj\
+#define QQ_CHAT_TEXTVIEW(obj) G_TYPE_CHECK_INSTANCE_CAST(obj\
, qq_chat_textview_get_type()\
, QQChatTextview)
-#define QQ_CHAT_TEXTVIEWCLASS(c) GTK_CHECK_CLASS_CAST(c\
+#define QQ_CHAT_TEXTVIEWCLASS(c) G_TYPE_CHECK_CLASS_CAST(c\
, qq_chat_textview_get_type()\
, QQChatTextviewClass)
-#define QQ_IS_CHAT_TEXTVIEW(obj) GTK_CHECK_TYPE(obj\
+#define QQ_IS_CHAT_TEXTVIEW(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj\
, qq_chat_textview_get_type())
typedef struct __QQChatTextview QQChatTextview;
@@ -25,12 +25,12 @@
// | |
// ----------------------------------------------
//
-#define QQ_CHATWIDGET(obj) GTK_CHECK_CAST(obj, qq_chatwidget_get_type()\
+#define QQ_CHATWIDGET(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, qq_chatwidget_get_type()\
, QQChatWidget)
-#define QQ_CHATWIDGETCLASS(c) GTK_CHECK_CLASS_CAST(c\
+#define QQ_CHATWIDGETCLASS(c) G_TYPE_CHECK_CLASS_CAST(c\
, qq_chatwidget_get_type()\
, QQChatWidgetClass)
-#define QQ_IS_CHATWIDGET(obj) GTK_CHECK_TYPE(obj, qq_chatwidget_get_type())
+#define QQ_IS_CHATWIDGET(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, qq_chatwidget_get_type())
typedef struct __QQChatWidget QQChatWidget;
typedef struct __QQChatWidgetClass QQChatWidgetClass;
@@ -3,12 +3,12 @@
#include <gtk/gtk.h>
#include <qq.h>
-#define QQ_CHATWINDOW(obj) GTK_CHECK_CAST(obj, qq_chatwindow_get_type()\
+#define QQ_CHATWINDOW(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, qq_chatwindow_get_type()\
, QQChatWindow)
-#define QQ_CHATWINDOWCLASS(c) GTK_CHECK_CLASS_CAST(c\
+#define QQ_CHATWINDOWCLASS(c) G_TYPE_CHECK_CLASS_CAST(c\
, qq_chatwindow_get_type()\
, QQChatWindowClass)
-#define QQ_IS_CHATWINDOW(obj) GTK_CHECK_TYPE(obj, qq_chatwindow_get_type())
+#define QQ_IS_CHATWINDOW(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, qq_chatwindow_get_type())
typedef struct __QQChatWindow QQChatWindow;
typedef struct __QQChatWindowClass QQChatWindowClass;
@@ -5,13 +5,13 @@
#include <qq.h>
#define QQ_TYPE_FACE_POPUP_WINDOW qq_face_popup_window_get_type()
-#define QQ_FACE_POPUP_WINDOW(obj) GTK_CHECK_CAST(obj\
+#define QQ_FACE_POPUP_WINDOW(obj) G_TYPE_CHECK_INSTANCE_CAST(obj\
, QQ_TYPE_FACE_POPUP_WINDOW\
, QQFacePopupWindow)
-#define QQ_FACE_POPUP_WINDOWCLASS(c) GTK_CHECK_CLASS_CAST(c\
+#define QQ_FACE_POPUP_WINDOWCLASS(c) G_TYPE_CHECK_CLASS_CAST(c\
, QQ_TYPE_FACE_POPUP_WINDOW\
, QQFacePopupWindowClass)
-#define QQ_IS_FACE_POPUP_WINDOW(obj) GTK_CHECK_TYPE(obj\
+#define QQ_IS_FACE_POPUP_WINDOW(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj\
, QQ_TYPE_FACE_POPUP_WINDOW)
typedef struct __QQFacePopupWindow QQFacePopupWindow;
@@ -4,13 +4,13 @@
#include <qq.h>
#define QQ_TYPE_GROUP_CHATWINDOW qq_group_chatwindow_get_type()
-#define QQ_GROUP_CHATWINDOW(obj) GTK_CHECK_CAST(obj\
+#define QQ_GROUP_CHATWINDOW(obj) G_TYPE_CHECK_INSTANCE_CAST(obj\
, QQ_TYPE_GROUP_CHATWINDOW\
, QQGroupChatWindow)
-#define QQ_GROUP_CHATWINDOWCLASS(c) GTK_CHECK_CLASS_CAST(c\
+#define QQ_GROUP_CHATWINDOWCLASS(c) G_TYPE_CHECK_CLASS_CAST(c\
, QQ_TYPE_GROUP_CHATWINDOW()\
, QQGroupChatWindowClass)
-#define QQ_IS_GROUP_CHATWINDOW(obj) GTK_CHECK_TYPE(obj\
+#define QQ_IS_GROUP_CHATWINDOW(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj\
, QQ_TYPE_GROUP_CHATWINDOW())
typedef struct __QQGroupChatWindow QQGroupChatWindow;
@@ -2,12 +2,12 @@
#define __GTKQQ_LOGINWIN_H
#include <gtk/gtk.h>
-#define QQ_LOGINPANEL(obj) GTK_CHECK_CAST(obj, qq_loginpanel_get_type()\
+#define QQ_LOGINPANEL(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, qq_loginpanel_get_type()\
, QQLoginPanel)
-#define QQ_LOGINPANEL_CLASS(c) GTK_CHECK_CLASS_CAST(c\
+#define QQ_LOGINPANEL_CLASS(c) G_TYPE_CHECK_CLASS_CAST(c\
, qq_loginpanel_get_type()\
, QQLoginPanelClass)
-#define QQ_IS_LOGINPANEL(obj) GTK_CHECK_TYPE(obj, qq_loginpanel_get_type())
+#define QQ_IS_LOGINPANEL(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, qq_loginpanel_get_type())
typedef struct _QQLoginPanel QQLoginPanel;
typedef struct _QQLoginPanelClass QQLoginPanelClass;
View
@@ -2,12 +2,12 @@
#define __GTKQQ_MAINPANEL_H
#include <gtk/gtk.h>
-#define QQ_MAINPANEL(obj) GTK_CHECK_CAST(obj, qq_mainpanel_get_type()\
+#define QQ_MAINPANEL(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, qq_mainpanel_get_type()\
, QQMainPanel)
-#define QQ_MAINPANELCLASS(c) GTK_CHECK_CLASS_CAST(c\
+#define QQ_MAINPANELCLASS(c) G_TYPE_CHECK_CLASS_CAST(c\
, qq_mainpanel_get_type()\
, QQMainPanelClass)
-#define QQ_IS_MAINPANEL(obj) GTK_CHECK_TYPE(obj, qq_mainpanel_get_type())
+#define QQ_IS_MAINPANEL(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, qq_mainpanel_get_type())
typedef struct _QQMainPanel QQMainPanel;
typedef struct _QQMainPanelClass QQMainPanelClass;
@@ -2,12 +2,12 @@
#define __GTKQQ_MAINWINDOW_H
#include <gtk/gtk.h>
-#define QQ_MAINWINDOW(obj) GTK_CHECK_CAST(obj, qq_mainwindow_get_type()\
+#define QQ_MAINWINDOW(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, qq_mainwindow_get_type()\
, QQMainWindow)
-#define QQ_MAINWINDOWCLASS(c) GTK_CHECK_CLASS_CAST(c\
+#define QQ_MAINWINDOWCLASS(c) G_TYPE_CHECK_CLASS_CAST(c\
, qq_mainwindow_get_type()\
, QQMainWindowClass)
-#define QQ_IS_MAINWINDOW(obj) GTK_CHECK_TYPE(obj, qq_mainwindow_get_type())
+#define QQ_IS_MAINWINDOW(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, qq_mainwindow_get_type())
typedef struct __QQMainWindow QQMainWindow;
typedef struct __QQMainWindowClass QQMainWindowClass;
@@ -2,12 +2,12 @@
#define __GTKQQ_SPLASHPANEL_H
#include <gtk/gtk.h>
-#define QQ_SPLASHPANEL(obj) GTK_CHECK_CAST(obj, qq_splashpanel_get_type(),\
+#define QQ_SPLASHPANEL(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, qq_splashpanel_get_type(),\
QQSplashPanel)
-#define QQ_SPLASHPANEL_CLASS(c) GTK_CHECK_CLASS_CAST(c,\
+#define QQ_SPLASHPANEL_CLASS(c) G_TYPE_CHECK_CLASS_CAST(c,\
qq_splashpanel_get_type(),\
QQSplashPanelClass)
-#define QQ_IS_SPLASHPANEL(obj) GTK_CHECK_TYPE(obj, qq_splashPanel_get_type())
+#define QQ_IS_SPLASHPANEL(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, qq_splashPanel_get_type())
typedef struct _QQSplashPanel QQSplashPanel;
typedef struct _QQSplashPanelClass QQSplashPanelClass;
@@ -7,13 +7,13 @@
* QQ status button.
* Show and change the status.
*/
-#define QQ_STATUSBUTTON(obj) GTK_CHECK_CAST(obj\
+#define QQ_STATUSBUTTON(obj) G_TYPE_CHECK_INSTANCE_CAST(obj\
, qq_statusbutton_get_type()\
, QQStatusButton)
-#define QQ_STATUSBUTTONCLASS(c) GTK_CHECK_CLASS_CAST(c\
+#define QQ_STATUSBUTTONCLASS(c) G_TYPE_CHECK_CLASS_CAST(c\
, qq_statusbutton_get_type()\
, QQStatusButtonClass)
-#define QQ_IS_STATUSBUTTON(obj) GTK_CHECK_TYPE(obj\
+#define QQ_IS_STATUSBUTTON(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj\
, qq_statusbutton_get_type())
#define QQ_TYPE_STATUSBUTTON qq_statusbutton_get_type()
View
@@ -3,10 +3,10 @@
#include <gtk/gtk.h>
#include <qq.h>
-#define QQ_TRAY(obj) GTK_CHECK_CAST(obj, qq_tray_get_type(), QQTray)
-#define QQ_TRAYCLASS(c) GTK_CHECK_CLASS_CAST(c, qq_tray_get_type()\
+#define QQ_TRAY(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, qq_tray_get_type(), QQTray)
+#define QQ_TRAYCLASS(c) G_TYPE_CHECK_CLASS_CAST(c, qq_tray_get_type()\
, QQTrayClass)
-#define QQ_IS_TRAY(obj) GTK_CHECK_TYPE(obj, qq_tray_get_type())
+#define QQ_IS_TRAY(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, qq_tray_get_type())
typedef struct __QQTray QQTray;
typedef struct __QQTrayClass QQTrayClass;

0 comments on commit a546056

Please sign in to comment.