From e4e2dd75cc86909d66062a7655b8cbc3a959932d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 15 Mar 2012 22:18:56 +0100 Subject: [PATCH] removed QQ hacks from yesod-auth-oauth --- yesod-auth-oauth/Yesod/Auth/OAuth.hs | 6 ++---- yesod-auth-oauth/include/qq.h | 10 ---------- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 yesod-auth-oauth/include/qq.h diff --git a/yesod-auth-oauth/Yesod/Auth/OAuth.hs b/yesod-auth-oauth/Yesod/Auth/OAuth.hs index de531d01..3949edc5 100644 --- a/yesod-auth-oauth/Yesod/Auth/OAuth.hs +++ b/yesod-auth-oauth/Yesod/Auth/OAuth.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE CPP, QuasiQuotes, OverloadedStrings #-} +{-# LANGUAGE QuasiQuotes, OverloadedStrings #-} {-# OPTIONS_GHC -fwarn-unused-imports #-} module Yesod.Auth.OAuth ( authOAuth @@ -10,8 +10,6 @@ module Yesod.Auth.OAuth , module Web.Authenticate.OAuth ) where -#include "qq.h" - import Yesod.Auth import Yesod.Form import Yesod.Handler @@ -78,7 +76,7 @@ authOAuth oauth mkCreds = AuthPlugin name dispatch login render <- lift getUrlRender let oaUrl = render $ tm $ oauthUrl name addHtml - [QQ(shamlet)| Login via #{name} |] + [shamlet| Login via #{name} |] authTwitter :: YesodAuth m => ByteString -- ^ Consumer Key diff --git a/yesod-auth-oauth/include/qq.h b/yesod-auth-oauth/include/qq.h deleted file mode 100644 index 6b742913..00000000 --- a/yesod-auth-oauth/include/qq.h +++ /dev/null @@ -1,10 +0,0 @@ - --- CPP macro which choses which quasyquotes syntax to use depending --- on GHC version. --- --- QQ stands for quasyquote. -#if GHC7 -# define QQ(x) x -#else -# define QQ(x) $x -#endif