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

List:       kde-commits
Subject:    branches/work/konvi-kde4/src/dcc
From:       Laurent Montel <montel () kde ! org>
Date:       2009-01-30 9:01:12
Message-ID: 1233306072.051065.19444.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 918570 by mlaurent:

Port 


 M  +11 -7     chat.cpp  
 M  +2 -2      common.cpp  


--- branches/work/konvi-kde4/src/dcc/chat.cpp #918569:918570
@@ -41,11 +41,12 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-include <k3serversocket.h>
-#include <ksocketaddress.h>
-#include <kstreamsocket.h>
+#include <k3serversocket.h>
+#include <k3socketaddress.h>
+#include <k3streamsocket.h>
+#include <KActionCollection>
 #include <kaction.h>
-
+#include <kmenu.h>
 #define DCCCHAT_BUFFER_SIZE 1024
 
 
@@ -80,16 +81,16 @@
     ChatWindow::setName( '-' + m_partnerNick + '-' );
     ChatWindow::setLogfileName( '-' + m_partnerNick + '-' );
 
-    Q3PopupMenu* popup = textView->getPopup();
+    KMenu* popup = textView->getPopup();
 
     if (popup)
     {
-        KAction* action = \
KonversationApplication::instance()->getMainWindow()->actionCollection()->action("open_logfile");
 +        QAction* action = \
KonversationApplication::instance()->getMainWindow()->actionCollection()->action("open_logfile");
  
         if (action)
         {
             popup->insertSeparator();
-            action->plug(popup);
+            action->setMenu(popup);
         }
     }
 
@@ -389,9 +390,12 @@
     else
     {
         int para = 0, index = 0;
+#warning "port it"
+#if 0
         m_dccChatInput->getCursorPosition(&para, &index);
         m_dccChatInput->insertAt(s, para, index);
         m_dccChatInput->setCursorPosition(para, index + s.length());
+#endif
     }
 }
 
--- branches/work/konvi-kde4/src/dcc/common.cpp #918569:918570
@@ -9,7 +9,7 @@
   Copyright (C) 2007 Shintaro Matsuoka <shin@shoegazed.org>
 */
 
-#include "dcccommon.h"
+#include "common.h"
 #include "channel.h"
 #include "preferences.h"
 #include "server.h"
@@ -20,7 +20,7 @@
 
 #include <klocale.h>
 #include <k3resolver.h>
-include <k3serversocket.h>
+#include <k3serversocket.h>
 
 
 QString DccCommon::textIpToNumericalIp( const QString& ipString )


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