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

List:       kde-commits
Subject:    KDE/kdepim
From:       Allen Winter <winter () kde ! org>
Date:       2005-12-04 17:55:33
Message-ID: 1133718933.257154.18635.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 485509 by winterz:

minor porting stuff


 M  +3 -3      kdgantt/KDGanttMinimizeSplitter.cpp  
 M  +2 -2      kdgantt/KDGanttViewSubwidgets.cpp  
 M  +1 -1      kgantt/kgantt/xQGanttBarViewPort_Events.cpp  
 M  +1 -1      libkdepim/komposer/core/core.cpp  
 M  +3 -3      libkdepim/komposer/plugins/default/defaulteditor.cpp  


--- trunk/KDE/kdepim/kdgantt/KDGanttMinimizeSplitter.cpp #485508:485509
@@ -95,7 +95,7 @@
 void KDGanttSplitterHandle::mouseMoveEvent( QMouseEvent *e )
 {
     updateCursor( e->pos() );
-    if ( !(e->state()&LeftButton) )
+    if ( !(e->state()&Qt::LeftButton) )
 	return;
 
     if ( _activeButton != 0)
@@ -115,7 +115,7 @@
 
 void KDGanttSplitterHandle::mousePressEvent( QMouseEvent *e )
 {
-    if ( e->button() == LeftButton ) {
+    if ( e->button() == Qt::LeftButton ) {
         _activeButton = onButton( e->pos() );
         mouseOffset = s->pick(e->pos());
         if ( _activeButton != 0)
@@ -169,7 +169,7 @@
         updateCursor( e->pos() );
     }
     else {
-        if ( !opaque() && e->button() == LeftButton ) {
+        if ( !opaque() && e->button() == Qt::LeftButton ) {
             QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
                 - mouseOffset;
             s->setRubberband( -1 );
--- trunk/KDE/kdepim/kdgantt/KDGanttViewSubwidgets.cpp #485508:485509
@@ -4217,7 +4217,7 @@
             }
             break;
             /*
-              case RightButton:
+              case Qt::RightButton:
               switch (getType(*it)) {
               case Type_is_KDGanttViewItem:
               mySignalSender->itemRightClicked(getItem(*it));
@@ -4229,7 +4229,7 @@
               break;
               }
               break;
-              case MidButton:
+              case Qt::MidButton:
               switch (getType(*it)) {
               case Type_is_KDGanttViewItem:
               mySignalSender->itemMidClicked(getItem(*it));
--- trunk/KDE/kdepim/kgantt/kgantt/xQGanttBarViewPort_Events.cpp #485508:485509
@@ -151,7 +151,7 @@
 
   
     
-  } // if(e->button() == LeftButton && _mode == Select)
+  } // if(e->button() == Qt::LeftButton && _mode == Select)
   
 }
 
--- trunk/KDE/kdepim/libkdepim/komposer/core/core.cpp #485508:485509
@@ -248,7 +248,7 @@
 {
   KStdAction::close( this, SLOT(slotClose()), actionCollection() );
 
-  (void) new KAction( i18n( "&Send" ), "mail_send", CTRL+Key_Return,
+  (void) new KAction( i18n( "&Send" ), "mail_send", Qt::CTRL+Qt::Key_Return,
                       this, SLOT(slotSendNow()), actionCollection(),
                       "send_default" );
 
--- trunk/KDE/kdepim/libkdepim/komposer/plugins/default/defaulteditor.cpp #485508:485509
@@ -144,18 +144,18 @@
   //
   // Character Formatting
   //
-  m_actionBold = new KToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B,
+  m_actionBold = new KToggleAction( i18n("&Bold"), "text_bold", Qt::CTRL+Qt::Key_B,
                                     ac, "format_bold" );
   connect( m_actionBold, SIGNAL(toggled(bool)),
            m_textEdit, SLOT(setBold(bool)) );
 
-  m_actionItalic = new KToggleAction( i18n("&Italic"), "text_italic", CTRL+Key_I,
+  m_actionItalic = new KToggleAction( i18n("&Italic"), "text_italic", Qt::CTRL+Qt::Key_I,
                                       ac, "format_italic" );
 
   connect( m_actionItalic, SIGNAL(toggled(bool)),
            m_textEdit, SLOT(setItalic(bool) ));
 
-  m_actionUnderline = new KToggleAction( i18n("&Underline"), "text_under", CTRL+Key_U,
+  m_actionUnderline = new KToggleAction( i18n("&Underline"), "text_under", Qt::CTRL+Qt::Key_U,
                                          ac, "format_underline" );
 
   connect( m_actionUnderline, SIGNAL(toggled(bool)),
[prev in list] [next in list] [prev in thread] [next in thread]