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

List:       kde-commits
Subject:    [kdepim] calendarsupport: Remove it
From:       Montel Laurent <montel () kde ! org>
Date:       2014-12-19 22:08:41
Message-ID: E1Y25iz-0005NS-2f () scm ! kde ! org
[Download RAW message or body]

Git commit 2587eae36c0e4150a03810c38b1239c227f966e2 by Montel Laurent.
Committed on 19/12/2014 at 22:04.
Pushed by mlaurent into branch 'master'.

Remove it

M  +1    -1    calendarsupport/CMakeLists.txt
D  +0    -40   calendarsupport/calendarsupportcollectionpage_export.h
M  +0    -4    calendarsupport/collectiongeneralpage.cpp

http://commits.kde.org/kdepim/2587eae36c0e4150a03810c38b1239c227f966e2

diff --git a/calendarsupport/CMakeLists.txt b/calendarsupport/CMakeLists.txt
index 5a280a6..d272cea 100644
--- a/calendarsupport/CMakeLists.txt
+++ b/calendarsupport/CMakeLists.txt
@@ -99,7 +99,7 @@ target_link_libraries(
   KF5::KIOCore
   mailcommon
   pimcommon
-  akonadi-calendar
+  KF5::AkonadiCalendar
 )
 
 set_target_properties(calendarsupportcollectionpage
diff --git a/calendarsupport/calendarsupportcollectionpage_export.h \
b/calendarsupport/calendarsupportcollectionpage_export.h deleted file mode 100644
index e82d3f3..0000000
--- a/calendarsupport/calendarsupportcollectionpage_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-  This file is part of the KDE project
-  Copyright (C) 2007 David Faure <faure@kde.org>
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Library General Public
-  License as published by the Free Software Foundation; either
-  version 2 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Library General Public License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-*/
-
-#ifndef CALENDARSUPPORTCOLLECTIONPAGE_EXPORT_H
-#define CALENDARSUPPORTCOLLECTIONPAGE_EXPORT_H
-
-/* needed for KDE_EXPORT and KDE_IMPORT macros */
-#include <kdemacros.h>
-
-#ifndef CALENDARSUPPORTCOLLECTIONPAGE_EXPORT
-# if defined(KDEPIM_STATIC_LIBS)
-   /* No export/import for static libraries */
-#  define CALENDARSUPPORTCOLLECTIONPAGE_EXPORT
-# elif defined(MAKE_CALENDARSUPPORTCOLLECTIONPAGE_LIB)
-   /* We are building this library */
-#  define CALENDARSUPPORTCOLLECTIONPAGE_EXPORT KDE_EXPORT
-# else
-   /* We are using this library */
-#  define CALENDARSUPPORTCOLLECTIONPAGE_EXPORT KDE_IMPORT
-# endif
-#endif
-
-#endif
diff --git a/calendarsupport/collectiongeneralpage.cpp \
b/calendarsupport/collectiongeneralpage.cpp index e6fe31c..00c8310 100644
--- a/calendarsupport/collectiongeneralpage.cpp
+++ b/calendarsupport/collectiongeneralpage.cpp
@@ -57,11 +57,9 @@ CollectionGeneralPage::CollectionGeneralPage( QWidget *parent )
 void CollectionGeneralPage::init(const Akonadi::Collection &collection)
 {
   QVBoxLayout *topLayout = new QVBoxLayout( this );
-  topLayout->setSpacing( KDialog::spacingHint() );
 
   QHBoxLayout *hbox = new QHBoxLayout();
   topLayout->addItem( hbox );
-  hbox->setSpacing( KDialog::spacingHint() );
 
   QLabel *label = new QLabel( i18nc( "@label:textbox Name of the folder.", "&Name:" \
), this );  hbox->addWidget( label );
@@ -78,7 +76,6 @@ void CollectionGeneralPage::init(const Akonadi::Collection \
&collection)  // should replies to mails in this folder be kept in this same folder?
   hbox = new QHBoxLayout();
   topLayout->addItem( hbox );
-  hbox->setSpacing( KDialog::spacingHint() );
 
   mBlockAlarmsCheckBox = new QCheckBox( i18nc( "@option:check", "Block reminders \
locally" ), this );  mBlockAlarmsCheckBox->setToolTip(
@@ -88,7 +85,6 @@ void CollectionGeneralPage::init(const Akonadi::Collection \
                &collection)
            "Check this box if you do not want to receive reminders from items "
            "associated with this calendar." ) );
   hbox->addWidget( mBlockAlarmsCheckBox );
->>>>>>> origin/KDE/4.14
 
 #ifndef KDEPIM_MOBILE_UI
     hbox = new QHBoxLayout();


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