Attachment #267383 for bug #360759

View | Details | Raw Unified | Return to bug 360759
Collapse All | Expand All

Lines 139-143 Link Here

(-)kdevplatform-1.2.0.orig/debugger/util/pathmappings.cpp (-1 / +1 lines)
139	if (index.parent().isValid()) return Qt::NoItemFlags;	139	if (index.parent().isValid()) return Qt::NoItemFlags;
140	if (!index.isValid()) return Qt::NoItemFlags;	140	if (!index.isValid()) return Qt::NoItemFlags;
141	return ( Qt::ItemIsSelectable \| Qt::ItemIsEditable \| Qt::ItemIsEnabled );	141	return static_cast<Qt::ItemFlags>( Qt::ItemIsSelectable \| Qt::ItemIsEditable \| Qt::ItemIsEnabled );
142		142
143	}	143	}

Lines 69-73 Link Here

(-)kdevplatform-1.2.0.orig/debugger/util/treemodel.cpp (-1 / +1 lines)
69	return 0;	69	return 0;
70		70
71	return Qt::ItemIsEnabled \| Qt::ItemIsSelectable;	71	return static_cast<Qt::ItemFlags>(Qt::ItemIsEnabled \| Qt::ItemIsSelectable);
72	}	72	}
73		73




#include <duchain/use.h>

#include "metatypes.h"

using namespace KTextEditor;

Q_DECLARE_METATYPE(KDevelop::IndexedString)
Q_DECLARE_METATYPE(KDevelop::IndexedTopDUContext)
Q_DECLARE_METATYPE(KDevelop::ReferencedTopDUContext)

static QMutex minimumFeaturesMutex;
static QHash<KDevelop::IndexedString, QList<KDevelop::TopDUContext::Features> > staticMinimumFeatures;

Lines 17-22 Link Here

(-)kdevplatform-1.2.0.orig/language/duchain/appendedlist_static.h (-2 / +2 lines)
17	*/	17	*/
18		18
19	#ifndef APPENDEDLIST_H	19	#ifndef APPENDEDLIST_STATIC_H
20	#define APPENDEDLIST_H	20	#define APPENDEDLIST_STATIC_H
21		21
22	#include <util/kdevvarlengtharray.h>	22	#include <util/kdevvarlengtharray.h>

Lines 65-71 Link Here

(-)kdevplatform-1.2.0.orig/language/duchain/duchain.cpp (-3 / +1 lines)
65	#include "importers.h"	65	#include "importers.h"
66		66
67	Q_DECLARE_METATYPE(KDevelop::IndexedString)	67	#include "metatypes.h"
68	Q_DECLARE_METATYPE(KDevelop::IndexedTopDUContext)
69	Q_DECLARE_METATYPE(KDevelop::ReferencedTopDUContext)
70		68
71	namespace {	69	namespace {

Lines 348-352 Link Here

(-)kdevplatform-1.2.0.orig/language/duchain/persistentsymboltable.cpp (-2 / +2 lines)
348	}	348	}
349		349
350	struct Visitor {	350	struct selfAnalysisVisitor {
351	bool operator() (const PersistentSymbolTableItem* item) {	351	bool operator() (const PersistentSymbolTableItem* item) {
352	QualifiedIdentifier id(item->id.identifier());	352	QualifiedIdentifier id(item->id.identifier());
Lines 384-388 Link Here
384	QMutexLocker lock(d->m_declarations.mutex());	384	QMutexLocker lock(d->m_declarations.mutex());
385		385
386	Visitor v;	386	selfAnalysisVisitor v;
387	kDebug() << d->m_declarations.statistics();	387	kDebug() << d->m_declarations.statistics();
388	d->m_declarations.visitAllItems(v);	388	d->m_declarations.visitAllItems(v);




/* This  is part of KDevelop
    Copyright 2006-2008 Hamish Rodda <rodda@kde.org>
    Copyright 2007-2008 David Nolden <david.nolden.kdevelop@art-master.de>

   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Library General Public
   License version 2 as published by the Free Software Foundation.

   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 LANGUAGE_METATYPES_H
#define LANGUAGE_METATYPES_H

Q_DECLARE_METATYPE(KDevelop::IndexedString)
Q_DECLARE_METATYPE(KDevelop::IndexedTopDUContext)
Q_DECLARE_METATYPE(KDevelop::ReferencedTopDUContext)

#endif

Lines 758-759 Link Here

(-)kdevplatform-1.2.0.orig/language/util/somehash.cpp (+2 lines)
758	return c;	758	return c;
759	}	759	}
		760
		761	#undef mix

Lines 11-14 Link Here

(-)kdevplatform-1.2.0.orig/plugins/grepview/greputil.h (+5 lines)
11	// some utility functions used at various places	11	// some utility functions used at various places
12		12
		13	#ifndef GREPUTIL_H
		14	#define GREPUTIL_H
		15
13	#include <QStringList>	16	#include <QStringList>
14	#include <QString>	17	#include <QString>
Lines 21-22 Link Here
21	/// Replaces each occurence of "%s" in pattern by searchString (and "%%" by "%")	24	/// Replaces each occurence of "%s" in pattern by searchString (and "%%" by "%")
22	QString substitudePattern(const QString& pattern, const QString& searchString);	25	QString substitudePattern(const QString& pattern, const QString& searchString);
		26
		27	#endif





#include "pastebinplugin.h"
#include "../urltodata.h"
#include <QVariantList>


#include <KMessageBox>
#include <KDebug>
#include <QFile>
#include <interfaces/icore.h>
#include <interfaces/iruncontroller.h>

{}

namespace
{
QByteArray urlToData(const KUrl& url)
{
    QByteArray ret;
    if(url.isLocalFile()) {
        QFile f(url.toLocalFile());
        Q_ASSERT(f.exists());
        bool corr=f.open(QFile::ReadOnly | QFile::Text);
        Q_ASSERT(corr);
        
        ret = f.readAll();
        
    } else {
#if defined(__GNUC__)
#warning TODO: add downloading the data
#endif
    }
    return ret;
}
}

void PastebinPlugin::exportPatch(IPatchSource::Ptr source)
{




}

static void appendContextMenuActions(QMenu& menu, const QList<QAction*>& actions)
{
    menu.addSeparator();

        }

        appendContextMenuActions(m, buildActions);
        appendContextMenuActions(m, runActions);
        appendContextMenuActions(m, fileActions);

        appendContextMenuActions(m, vcsActions);
        appendContextMenuActions(m, extActions);

        appendContextMenuActions(m, projectActions);
    }
    





#include "reviewboardjobs.h"
#include "../urltodata.h"
#include <qjson/parser.h>
#include <KLocalizedString>

#include <KRandom>
#include <KMimeType>
#include <QFile>
#include <QDebug>
#include <QNetworkAccessManager>

namespace
{
QByteArray urlToData(const KUrl& url)
{
    QByteArray ret;
    if (url.isLocalFile()) {
        QFile f(url.toLocalFile());
        Q_ASSERT(f.exists());
        bool corr=f.open(QFile::ReadOnly | QFile::Text);
        Q_ASSERT(corr);

        ret = f.readAll();

    } else {
#if defined(__GNUC__)
#warning TODO: add downloading the data
#endif
    }
    return ret;
}
static const QByteArray m_boundary = "----------" + KRandom::randomString( 42 + 13 ).toLatin1();





#include <KDebug>
#include <KIO/Job>
#include <QFile>
#include <interfaces/icore.h>
#include <interfaces/ipatchsource.h>

{}

QByteArray urlToData(const KUrl& url)
{
    QByteArray ret;
    if(url.isLocalFile()) {
        QFile f(url.toLocalFile());
        Q_ASSERT(f.exists());
        bool corr=f.open(QFile::ReadOnly | QFile::Text);
        Q_ASSERT(corr);
        
        ret = f.readAll();
        
    } else {
#if defined(__GNUC__)
#warning TODO: add downloading the data
#endif
    }
    return ret;
}

void ReviewBoardPlugin::exportPatch(IPatchSource::Ptr source)
{




/*
 * This file is part of KDevelop
 * Copyright 2010 Aleix Pol Gonzalez <aleixpol@kde.org>
 *
 * This program 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 program 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 General Public License for more details.
 *
 * You should have received a copy of the GNU General Public
 * License along with this program; if not, write to the
 * Free Software Foundation, Inc.,
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

#ifndef URLTODATA_H
#define URLTODATA_H

#include <QFile>

inline QByteArray urlToData(const KUrl& url)
{
    QByteArray ret;
    if (url.isLocalFile()) {
        QFile f(url.toLocalFile());
        Q_ASSERT(f.exists());
        bool corr=f.open(QFile::ReadOnly | QFile::Text);
        Q_ASSERT(corr);

        ret = f.readAll();

    } else {
#if defined(__GNUC__)
#warning TODO: add downloading the data
#endif
    }
    return ret;
}

#endif

Lines 75-79 Link Here

(-)kdevplatform-1.2.0.orig/shell/progresswidget.cpp (-1 / +1 lines)
75		75
76	m_pLabel = new QLabel( QString(), this );	76	m_pLabel = new QLabel( QString(), this );
77	m_pLabel->setAlignment( Qt::AlignHCenter \| Qt::AlignVCenter );	77	m_pLabel->setAlignment( static_cast<Qt::Alignment>(Qt::AlignHCenter \| Qt::AlignVCenter) );
78	m_pLabel->installEventFilter( this );	78	m_pLabel->installEventFilter( this );
79	m_pLabel->setMinimumWidth( w );	79	m_pLabel->setMinimumWidth( w );

Lines 90-94 Link Here

(-)kdevplatform-1.2.0.orig/shell/sessiondialog.cpp (-1 / +1 lines)
90	return 0;	90	return 0;
91	}	91	}
92	return Qt::ItemIsEnabled \| Qt::ItemIsSelectable \| Qt::ItemIsEditable;	92	return static_cast<Qt::ItemFlags>(Qt::ItemIsEnabled \| Qt::ItemIsSelectable \| Qt::ItemIsEditable);
93	}	93	}
94		94

Lines 26-30 Link Here

(-)kdevplatform-1.2.0.orig/tests/modeltest.cpp (-1 / +1 lines)
26	#include <QtGui/QtGui>	26	#include <QtGui/QtGui>
27		27
28	Q_DECLARE_METATYPE(QModelIndex)	28	#include "../project/tests/projectmodeltest.h"
29		29
30	/*!	30	/*!

Return to bug 360759

Lines 116-120 Link Here

(-)kdevplatform-1.2.0.orig/plugins/projectmanagerview/projectbuildsetwidget.cpp (-7 / +7 lines)
116	}	116	}
117		117
118	static void appendActions(QMenu& menu, const QList<QAction*>& actions)	118	static void appendContextMenuActions(QMenu& menu, const QList<QAction*>& actions)
119	{	119	{
120	menu.addSeparator();	120	menu.addSeparator();
Lines 171-182 Link Here
171	}	171	}
172		172
173	appendActions(m, buildActions);	173	appendContextMenuActions(m, buildActions);
174	appendActions(m, runActions);	174	appendContextMenuActions(m, runActions);
175	appendActions(m, fileActions);	175	appendContextMenuActions(m, fileActions);
176		176
177	appendActions(m, vcsActions);	177	appendContextMenuActions(m, vcsActions);
178	appendActions(m, extActions);	178	appendContextMenuActions(m, extActions);
179		179
180	appendActions(m, projectActions);	180	appendContextMenuActions(m, projectActions);
181	}	181	}
182		182

Lines 53-63 Link Here

(-)kdevplatform-1.2.0.orig/language/backgroundparser/parsejob.cpp (-4 / +1 lines)
53	#include <duchain/use.h>	53	#include <duchain/use.h>
54		54
		55	#include "metatypes.h"
55		56
56	using namespace KTextEditor;	57	using namespace KTextEditor;
57		58
58	Q_DECLARE_METATYPE(KDevelop::IndexedString)
59	Q_DECLARE_METATYPE(KDevelop::IndexedTopDUContext)
60	Q_DECLARE_METATYPE(KDevelop::ReferencedTopDUContext)
61
62	static QMutex minimumFeaturesMutex;	59	static QMutex minimumFeaturesMutex;
63	static QHash<KDevelop::IndexedString, QList<KDevelop::TopDUContext::Features> > staticMinimumFeatures;	60	static QHash<KDevelop::IndexedString, QList<KDevelop::TopDUContext::Features> > staticMinimumFeatures;

Line 0 Link Here

(-)kdevplatform-1.2.0.orig/language/metatypes.h (+27 lines)
	1	/* This is part of KDevelop
	2	Copyright 2006-2008 Hamish Rodda <rodda@kde.org>
	3	Copyright 2007-2008 David Nolden <david.nolden.kdevelop@art-master.de>
	4
	5	This library is free software; you can redistribute it and/or
	6	modify it under the terms of the GNU Library General Public
	7	License version 2 as published by the Free Software Foundation.
	8
	9	This library is distributed in the hope that it will be useful,
	10	but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	12	Library General Public License for more details.
	13
	14	You should have received a copy of the GNU Library General Public License
	15	along with this library; see the file COPYING.LIB. If not, write to
	16	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	17	Boston, MA 02110-1301, USA.
	18	*/
	19
	20	#ifndef LANGUAGE_METATYPES_H
	21	#define LANGUAGE_METATYPES_H
	22
	23	Q_DECLARE_METATYPE(KDevelop::IndexedString)
	24	Q_DECLARE_METATYPE(KDevelop::IndexedTopDUContext)
	25	Q_DECLARE_METATYPE(KDevelop::ReferencedTopDUContext)
	26
	27	#endif

Lines 20-23 Link Here

(-)kdevplatform-1.2.0.orig/plugins/pastebin/pastebinplugin.cpp (-23 / +1 lines)
20		20
21	#include "pastebinplugin.h"	21	#include "pastebinplugin.h"
		22	#include "../urltodata.h"
22	#include <QVariantList>	23	#include <QVariantList>
23		24
Lines 30-34 Link Here
30	#include <KMessageBox>	31	#include <KMessageBox>
31	#include <KDebug>	32	#include <KDebug>
32	#include <QFile>
33	#include <interfaces/icore.h>	33	#include <interfaces/icore.h>
34	#include <interfaces/iruncontroller.h>	34	#include <interfaces/iruncontroller.h>
Lines 48-73 Link Here
48	{}	48	{}
49		49
50	namespace
51	{
52	QByteArray urlToData(const KUrl& url)
53	{
54	QByteArray ret;
55	if(url.isLocalFile()) {
56	QFile f(url.toLocalFile());
57	Q_ASSERT(f.exists());
58	bool corr=f.open(QFile::ReadOnly \| QFile::Text);
59	Q_ASSERT(corr);
60
61	ret = f.readAll();
62
63	} else {
64	#if defined(__GNUC__)
65	#warning TODO: add downloading the data
66	#endif
67	}
68	return ret;
69	}
70	}
71
72	void PastebinPlugin::exportPatch(IPatchSource::Ptr source)	50	void PastebinPlugin::exportPatch(IPatchSource::Ptr source)
73	{	51	{

Lines 20-23 Link Here

(-)kdevplatform-1.2.0.orig/plugins/reviewboard/reviewboardjobs.cpp (-19 / +1 lines)
20		20
21	#include "reviewboardjobs.h"	21	#include "reviewboardjobs.h"
		22	#include "../urltodata.h"
22	#include <qjson/parser.h>	23	#include <qjson/parser.h>
23	#include <KLocalizedString>	24	#include <KLocalizedString>
Lines 25-29 Link Here
25	#include <KRandom>	26	#include <KRandom>
26	#include <KMimeType>	27	#include <KMimeType>
27	#include <QFile>
28	#include <QDebug>	28	#include <QDebug>
29	#include <QNetworkAccessManager>	29	#include <QNetworkAccessManager>
Lines 37-58 Link Here
37	namespace	37	namespace
38	{	38	{
39	QByteArray urlToData(const KUrl& url)
40	{
41	QByteArray ret;
42	if (url.isLocalFile()) {
43	QFile f(url.toLocalFile());
44	Q_ASSERT(f.exists());
45	bool corr=f.open(QFile::ReadOnly \| QFile::Text);
46	Q_ASSERT(corr);
47
48	ret = f.readAll();
49
50	} else {
51	#if defined(__GNUC__)
52	#warning TODO: add downloading the data
53	#endif
54	}
55	return ret;
56	}
57	static const QByteArray m_boundary = "----------" + KRandom::randomString( 42 + 13 ).toLatin1();	39	static const QByteArray m_boundary = "----------" + KRandom::randomString( 42 + 13 ).toLatin1();
58		40

Line 0 Link Here

(-)kdevplatform-1.2.0.orig/plugins/urltodata.h (+45 lines)
	1	/*
	2	* This file is part of KDevelop
	3	* Copyright 2010 Aleix Pol Gonzalez <aleixpol@kde.org>
	4	*
	5	* This program is free software; you can redistribute it and/or modify
	6	* it under the terms of the GNU Library General Public License as
	7	* published by the Free Software Foundation; either version 2 of the
	8	* License, or (at your option) any later version.
	9	*
	10	* This program is distributed in the hope that it will be useful,
	11	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	12	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	* GNU General Public License for more details.
	14	*
	15	* You should have received a copy of the GNU General Public
	16	* License along with this program; if not, write to the
	17	* Free Software Foundation, Inc.,
	18	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	19	*/
	20
	21	#ifndef URLTODATA_H
	22	#define URLTODATA_H
	23
	24	#include <QFile>
	25
	26	inline QByteArray urlToData(const KUrl& url)
	27	{
	28	QByteArray ret;
	29	if (url.isLocalFile()) {
	30	QFile f(url.toLocalFile());
	31	Q_ASSERT(f.exists());
	32	bool corr=f.open(QFile::ReadOnly \| QFile::Text);
	33	Q_ASSERT(corr);
	34
	35	ret = f.readAll();
	36
	37	} else {
	38	#if defined(__GNUC__)
	39	#warning TODO: add downloading the data
	40	#endif
	41	}
	42	return ret;
	43	}
	44
	45	#endif