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

List:       kde-commits
Subject:    KDE/kdepim/kode
From:       Cornelius Schumacher <schumacher () kde ! org>
Date:       2006-07-04 22:36:39
Message-ID: 1152052599.848090.1257.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 558227 by cschumac:

Make it compile outside of KDE tree.


 M  +1 -1      common/common.pro  
 D             compat/formgui.moc  
 D             compat/guihandlerdialogs.moc  
 D             compat/guihandlerflat.moc  
 D             compat/input.moc  
 M  +5 -0      compat/kactivelabel.h  
 A             compat/kdemacros.h   [License: no copyright]
 M  +9 -2      compat/kdialog.cpp  
 M  +5 -1      compat/kdialog.h  
 M  +2 -2      compat/kfiledialog.cpp  
 M  +2 -2      compat/kfiledialog.h  
 D             compat/list.moc  
 D             compat/mainwindow.moc  
 M  +6 -1      kxforms/kxforms.pro  
 M  +1 -1      kxml_compiler/kschema.pro  
 M  +1 -1      schema/schema.pro  


--- trunk/KDE/kdepim/kode/common/common.pro #558226:558227
@@ -5,7 +5,7 @@
 TEMPLATE = lib
 TARGET = kxmlcommon
 DEPENDPATH += .
-INCLUDEPATH += . ..
+INCLUDEPATH += . .. ../compat
 
 # Input
 HEADERS += messagehandler.h nsmanager.h parsercontext.h qname.h
--- trunk/KDE/kdepim/kode/compat/kactivelabel.h #558226:558227
@@ -26,6 +26,11 @@
 {
   public:
     KActiveLabel( QWidget *parent ) : QLabel( parent ) {}
+
+    void setHtml( const QString &txt )
+    {
+      setText( txt );
+    }
 };
 
 #endif
--- trunk/KDE/kdepim/kode/compat/kdialog.cpp #558226:558227
@@ -20,8 +20,7 @@
 
 #include "kdialog.h"
 
-KDialog::KDialog( QWidget *parent, const QString &title,
-  ButtonCodes buttonMask )
+KDialog::KDialog( QWidget *parent )
   : QDialog( parent )
 {
 }
@@ -30,3 +29,11 @@
 {
   mMainWidget = widget;
 }
+
+void KDialog::setCaption( const QString & )
+{
+}
+
+void KDialog::setButtons( ButtonCodes )
+{
+}
--- trunk/KDE/kdepim/kode/compat/kdialog.h #558226:558227
@@ -46,13 +46,17 @@
     };
     Q_DECLARE_FLAGS(ButtonCodes, ButtonCode)
 
-    KDialog( QWidget *parent, const QString &title, ButtonCodes buttonMask = 0);
+    KDialog( QWidget *parent );
 
     void setMainWidget( QWidget * );
     QWidget *mainWidget() { return mMainWidget; };
 
     static int marginHint() { return 8; }
 
+    void setCaption( const QString & );
+
+    void setButtons( ButtonCodes );
+
   private:
     QWidget *mMainWidget;
 };
--- trunk/KDE/kdepim/kode/compat/kfiledialog.cpp #558226:558227
@@ -20,7 +20,7 @@
 
 #include "kfiledialog.h"
 
-KUrl KFileDialog::getOpenURL(const QString& startDir,
+KUrl KFileDialog::getOpenURL(const KUrl& startDir,
 			   const QString& filter,
 			   QWidget *parent,
 			   const QString& caption )
@@ -28,7 +28,7 @@
   return KUrl();
 }
 
-KUrl KFileDialog::getSaveURL(const QString& startDir,
+KUrl KFileDialog::getSaveURL(const KUrl& startDir,
 			   const QString& filter,
 			   QWidget *parent,
 			   const QString& caption )
--- trunk/KDE/kdepim/kode/compat/kfiledialog.h #558226:558227
@@ -33,11 +33,11 @@
 class KFileDialog
 {
   public:
-    static KUrl getOpenURL(const QString& startDir = QString(),
+    static KUrl getOpenURL(const KUrl& = KUrl(),
 			   const QString& filter= QString(),
 			   QWidget *parent= 0,
 			   const QString& caption = QString());
-    static KUrl getSaveURL(const QString& startDir= QString(),
+    static KUrl getSaveURL(const KUrl& startDir= KUrl(),
 			   const QString& filter= QString(),
 			   QWidget *parent= 0,
 			   const QString& caption = QString());
--- trunk/KDE/kdepim/kode/kxforms/kxforms.pro #558226:558227
@@ -5,7 +5,7 @@
 TEMPLATE = app
 TARGET += 
 DEPENDPATH += .
-INCLUDEPATH += ../compat . ..
+INCLUDEPATH += ../compat ../common . ..
 
 # Input
 HEADERS += form.h \
@@ -56,3 +56,8 @@
 LIBS += -L../schema -lschema
 LIBS += -L../common -lkxmlcommon
 LIBS += -L../compat -lcompat
+
+DUMMY_MOCS = formgui.moc guihandlerdialogs.moc guihandlerflat.moc \
+  input.moc list.moc mainwindow.moc remotefile.moc
+
+system( touch $$DUMMY_MOCS )
--- trunk/KDE/kdepim/kode/kxml_compiler/kschema.pro #558226:558227
@@ -5,7 +5,7 @@
 TEMPLATE = lib
 TARGET +=
 DEPENDPATH += . tests
-INCLUDEPATH += . ../compat ..
+INCLUDEPATH += . ../compat ../common ..
 
 # Input
 HEADERS += parserrelaxng.h \
--- trunk/KDE/kdepim/kode/schema/schema.pro #558226:558227
@@ -5,7 +5,7 @@
 TEMPLATE = lib
 TARGET += 
 DEPENDPATH += .
-INCLUDEPATH += ../compat . ..
+INCLUDEPATH += ../compat ../common . ..
 
 # Input
 HEADERS += annotation.h \
[prev in list] [next in list] [prev in thread] [next in thread]