[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kutils
From:       Scott Wheeler <wheeler () kde ! org>
Date:       2004-08-31 16:08:16
Message-ID: 20040831160816.E63EC9266 () office ! kde ! org
[Download RAW message or body]

CVS commit by wheeler: 

Pre-C99 fixes.


  M +10 -8     kmultitabbar.cpp   1.64


--- kdelibs/kutils/kmultitabbar.cpp  #1.63:1.64
@@ -40,4 +40,6 @@
 #include <math.h>
 
+#define NEARBYINT(i) ((int(float(i) + 0.5)))
+
 class KMultiTabBarTabPrivate {
 public:
@@ -243,7 +245,7 @@ void KMultiTabBarInternal::resizeEvent(Q
                                                 kdDebug()<<"diff="<<diff<<endl;
                                                 tab->removeEventFilter(this);
-                                                \
tab->move((int)nearbyintf(tmp-tab->neededSize()),lines*24); +                         \
tab->move(NEARBYINT(tmp-tab->neededSize()),lines*24);  //                             \
                tab->setFixedWidth(tab->neededSize()+diff);
-                                                \
tab->setFixedWidth((int)nearbyintf((tmp+diff)-tab->x()));; +                          \
                tab->setFixedWidth(NEARBYINT(tmp+diff)-tab->x());;
                                                 tab->installEventFilter(this);
                                                 CALCDIFF(m_tabs,diff,(i+1))
@@ -259,6 +261,6 @@ void KMultiTabBarInternal::resizeEvent(Q
                                         //kdDebug()<<"diff="<<diff<<endl;
                                         tab->removeEventFilter(this);
-                                        \
                tab->move((int)nearbyintf(tmp-tab->neededSize()),lines*24);
-                                        \
tab->setFixedWidth((int)nearbyintf((tmp+diff)-tab->x()));; +                          \
tab->move(NEARBYINT(tmp-tab->neededSize()),lines*24); +                               \
tab->setFixedWidth(NEARBYINT(tmp+diff)-tab->x());;  
                                         \
//tab->setFixedWidth(tab->neededSize()+diff); @@ -288,6 +290,6 @@ void \
KMultiTabBarInternal::resizeEvent(Q  else {
                                                 tab->removeEventFilter(this);
-                                                \
                tab->move(lines*24,(int)nearbyintf(tmp-tab->neededSize()));
-                                                \
tab->setFixedHeight((int)nearbyintf((tmp+diff)-tab->y()));; +                         \
tab->move(lines*24,NEARBYINT(tmp-tab->neededSize())); +                               \
                tab->setFixedHeight(NEARBYINT(tmp+diff)-tab->y());;
                                                 tab->installEventFilter(this);
                                         }
@@ -297,6 +299,6 @@ void KMultiTabBarInternal::resizeEvent(Q
                                 } else  {
                                         tab->removeEventFilter(this);
-                                        \
                tab->move(lines*24,(int)nearbyintf(tmp-tab->neededSize()));
-                                        \
tab->setFixedHeight((int)nearbyintf((tmp+diff)-tab->y()));; +                         \
tab->move(lines*24,NEARBYINT(tmp-tab->neededSize())); +                               \
tab->setFixedHeight(NEARBYINT(tmp+diff)-tab->y());;  tab->installEventFilter(this);
                                 }


[prev in list] [next in list] [prev in thread] [next in thread]