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

List:       kde-commits
Subject:    kdenetwork/kopete/kopete/chatwindow
From:       Olivier Goffart <ogoffart () tiscalinet ! be>
Date:       2003-09-12 7:48:06
[Download RAW message or body]

CVS commit by ogoffart: 

Compilation fix for KDE 3.1

Jason: KTabWidget is in compat for the KSettings. And, i don't know why, but your #if \
did not work, i got compilations error at link.

CCMAIL: jason@keirstead.org 


  M +2 -3      Makefile.am   1.9
  M +1 -5      chatview.cpp   1.71
  M +478 -483  chatview.h   1.28
  M +8 -12     kopetechatwindow.cpp   1.39
  M +0 -5      kopetechatwindow.h   1.17
  R            kopetetabwidget.cpp   1.2
  R            kopetetabwidget.h   1.3


--- kdenetwork/kopete/kopete/chatwindow/Makefile.am  #1.8:1.9
@@ -2,14 +2,13 @@
 METASOURCES = AUTO
 
-AM_CPPFLAGS = $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private    \
$(all_includes) +AM_CPPFLAGS = $(KOPETE_INCLUDES) $(KOPETE_COMPAT_INCLUDES) \
-I$(top_srcdir)/kopete/libkopete/private    $(all_includes)  
 kopete_chatwindow_la_SOURCES = kopeteviewmanager.cpp kopeteemailwindow.cpp \
         kopetechatwindow.cpp chatview.cpp \
-        kopetetabwidget.cpp \
         emoticonselector.cpp \
         kopeteemoticonaction.cpp
 
 kopete_chatwindow_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-kopete_chatwindow_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KDEUI)
+kopete_chatwindow_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) \
$(LIB_KDEUI)  
 libkrichtexteditpart_la_SOURCES = krichtexteditpart.cpp

--- kdenetwork/kopete/kopete/chatwindow/chatview.cpp  #1.70:1.71
@@ -56,9 +56,5 @@
 #include "kopeteaccount.h"
 
-#if KDE_IS_VERSION(3,1,90)
-        #include <ktabwidget.h>
-#else
-        #include "kopetetabwidget.cpp"
-#endif
+#include <ktabwidget.h>
 
 ChatView::ChatView( KopeteMessageManager *mgr, const char *name )

--- kdenetwork/kopete/kopete/chatwindow/chatview.h  #1.27:1.28
@@ -39,9 +39,4 @@ class KHTMLView;
 class KRootPixmap;
 
-#include <kdeversion.h>
-#if KDE_IS_VERSION(3,1,90)
-#else
-        #define KTabWidget KopeteTabWidget
-#endif
 
 class KopeteChatWindow;

--- kdenetwork/kopete/kopete/chatwindow/kopetechatwindow.cpp  #1.38:1.39
@@ -37,4 +37,5 @@
 #include <ksqueezedtextlabel.h>
 #include <kpushbutton.h>
+#include <ktabwidget.h>
 
 #include "kopeteprotocol.h"
@@ -53,9 +54,6 @@
 #include "kopeteemoticonaction.h"
 
-#if KDE_IS_VERSION(3,1,90)
-        #include <ktabwidget.h>
-#else
-        #include "kopetetabwidget.cpp"
-#endif
+
+
 
 #if QT_VERSION >= 0x030200
@@ -576,9 +574,7 @@ void KopeteChatWindow::createTabBar()
                 m_tabBar = new KTabWidget( mainArea );
                 m_tabBar->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, \
                QSizePolicy::Expanding ) );
-                #if KDE_IS_VERSION(3,1,90)
                         m_tabBar->setHoverCloseButton(true);
                         m_tabBar->setTabReorderingEnabled(true);
                         connect( m_tabBar, SIGNAL( closeRequest( QWidget* )), this, \
                SLOT( slotCloseChat( QWidget* ) ) );
-                #endif
                 
                 #if QT_VERSION >= 0x030200

--- kdenetwork/kopete/kopete/chatwindow/kopetechatwindow.h  #1.16:1.17
@@ -19,9 +19,4 @@
 #define KOPETECHATWINDOW_H
 
-#if KDE_IS_VERSION(3,1,90)
-#else
-        #define KTabWidget KopeteTabWidget
-#endif
-
 #include <kparts/mainwindow.h>
 #include <qmovie.h>


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