diff options
| author |  Elvio Basello | 2008-04-20 03:01:40 +0000 |
|---|---|---|
| committer | Elvio Basello | 2008-04-20 03:01:40 +0000 |
| commit | a10bff05fcbe6835ff596f002d97d25495cbf4cc (patch) | |
| tree | c2903f48f88e83e7f9dd47c4017593f9c34e7787 /src/modules/notifier/notifierwindow.cpp | |
| parent | quick fix for win32. test it (diff) | |
| download | KVIrc-a10bff05fcbe6835ff596f002d97d25495cbf4cc.tar.gz KVIrc-a10bff05fcbe6835ff596f002d97d25495cbf4cc.tar.bz2 KVIrc-a10bff05fcbe6835ff596f002d97d25495cbf4cc.zip | |
defined COMPILE_ON_MAC and removed ugly Q_OS_MACX
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1528 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/notifier/notifierwindow.cpp')
| -rw-r--r-- | src/modules/notifier/notifierwindow.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index 2236f73f2..ed02067ec 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -66,7 +66,7 @@ KviNotifierWindow::KviNotifierWindow() #else Qt::WStyle_Customize | Qt::WStyle_NoBorder | -#ifndef Q_OS_MACX +#ifndef COMPILE_ON_MAC Qt::WStyle_Tool | Qt::WX11BypassWM | #endif @@ -310,7 +310,7 @@ void KviNotifierWindow::doShow(bool bDoAnimate) m_bNextDown = false; m_bWriteDown = false; m_bBlinkOn = false; - #if (!defined COMPILE_USE_QT4) || !(defined(COMPILE_USE_QT4) && (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX))) + #if (!defined COMPILE_USE_QT4) || !(defined(COMPILE_USE_QT4) && (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC))) m_imgDesktop = QPixmap::grabWindow( QApplication::desktop()->winId(), m_wndRect.x(), @@ -329,11 +329,11 @@ void KviNotifierWindow::doShow(bool bDoAnimate) m_dOpacity = OPACITY_STEP; m_eState = Showing; m_bCrashShowWorkAround=true; - #if (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX)) + #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC)) setWindowOpacity(m_dOpacity); #endif show(); - #if (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX)) + #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC)) m_pShowHideTimer->start(40); #else m_pShowHideTimer->start(100); @@ -398,7 +398,7 @@ void KviNotifierWindow::heartbeat() if(!isVisible())show(); //!!! if(m_pLineEdit->isVisible())m_pLineEdit->hide(); - #if (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX)) + #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC)) setWindowOpacity(m_dOpacity); #endif update(); @@ -441,7 +441,7 @@ void KviNotifierWindow::heartbeat() break; case Hiding: m_dOpacity -= OPACITY_STEP; - #if (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX)) + #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC)) setWindowOpacity(m_dOpacity); #endif if(m_pLineEdit->isVisible())m_pLineEdit->hide(); @@ -505,7 +505,7 @@ void KviNotifierWindow::doHide(bool bDoAnimate) connect(m_pShowHideTimer,SIGNAL(timeout()),this,SLOT(heartbeat())); m_dOpacity = 1.0 - OPACITY_STEP; m_eState = Hiding; - #if (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX)) + #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC)) setWindowOpacity(m_dOpacity); update(); m_pShowHideTimer->start(40); @@ -646,7 +646,7 @@ void KviNotifierWindow::paintEvent(QPaintEvent * e) { QPainter px(this); - #if (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX)) + #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC)) px.drawPixmap(0,0,m_pixForeground); #else QImage temp_image = m_pixForeground.convertToImage(); |