Merge lp:~dpm/sudoku-app/clean-unused into lp:~dinko-metalac/sudoku-app/trunk

Proposed by David Planella on 2013-06-14
Status: Merged
Approved by: Dinko Osmankovic on 2013-06-14
Approved revision: 40
Merged at revision: 40
Proposed branch: lp:~dpm/sudoku-app/clean-unused
Merge into: lp:~dinko-metalac/sudoku-app/trunk
Diff against target: 259 lines (+1/-222)
7 files modified
.bzrignore (+1/-0)
SudokuBlocksGrid (+0/-40)
SudokuTouch.qmlproject.user (+0/-134)
sudokugame.cpp (+0/-6)
sudokugame.h (+0/-18)
sudokugamebackend.cpp (+0/-6)
sudokugamebackend.h (+0/-18)
To merge this branch: bzr merge lp:~dpm/sudoku-app/clean-unused
Reviewer Review Type Date Requested Status
Dinko Osmankovic 2013-06-14 Approve on 2013-06-14
Review via email: mp+169357@code.launchpad.net

Commit message

Remove unused files from the source tree

Description of the change

Remove unused files from the source tree

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file '.bzrignore'
2--- .bzrignore 1970-01-01 00:00:00 +0000
3+++ .bzrignore 2013-06-14 07:58:28 +0000
4@@ -0,0 +1,1 @@
5+SudokuTouch.qmlproject.user
6
7=== removed file 'SudokuBlocksGrid'
8--- SudokuBlocksGrid 2013-02-26 01:05:17 +0000
9+++ SudokuBlocksGrid 1970-01-01 00:00:00 +0000
10@@ -1,40 +0,0 @@
11-import QtQuick 2.0
12-import Ubuntu.Components 0.1
13-
14-
15-Grid {
16- id: sudokuGrid;
17- //anchors.centerIn: parent;
18- columns: 3;
19- spacing:units.gu(1);
20- width: units.gu(45);
21-
22- SudokuGridBlock {
23- id: block1;
24- }
25- SudokuGridBlock {
26- id: block2;
27- }
28- SudokuGridBlock {
29- id: block3;
30- }
31- SudokuGridBlock {
32- id: block4;
33- }
34- SudokuGridBlock {
35- id: block5;
36- }
37- SudokuGridBlock {
38- id: block6;
39- }
40- SudokuGridBlock {
41- id: block7;
42- }
43- SudokuGridBlock {
44- id: block8;
45- }
46- SudokuGridBlock {
47- id: block9;
48- }
49-
50-}
51
52=== removed file 'SudokuTouch.qmlproject.user'
53--- SudokuTouch.qmlproject.user 2013-06-05 14:46:42 +0000
54+++ SudokuTouch.qmlproject.user 1970-01-01 00:00:00 +0000
55@@ -1,134 +0,0 @@
56-<?xml version="1.0" encoding="UTF-8"?>
57-<!DOCTYPE QtCreatorProject>
58-<!-- Written by QtCreator 2.7.1, 2013-06-05T16:45:28. -->
59-<qtcreator>
60- <data>
61- <variable>ProjectExplorer.Project.ActiveTarget</variable>
62- <value type="int">0</value>
63- </data>
64- <data>
65- <variable>ProjectExplorer.Project.EditorSettings</variable>
66- <valuemap type="QVariantMap">
67- <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
68- <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
69- <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
70- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
71- <value type="QByteArray" key="language">Cpp</value>
72- <valuemap type="QVariantMap" key="value">
73- <value type="QString" key="CurrentPreferences">CppGlobal</value>
74- </valuemap>
75- </valuemap>
76- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
77- <value type="QByteArray" key="language">QmlJS</value>
78- <valuemap type="QVariantMap" key="value">
79- <value type="QString" key="CurrentPreferences">QmlJSGlobal</value>
80- </valuemap>
81- </valuemap>
82- <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
83- <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
84- <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
85- <value type="int" key="EditorConfiguration.IndentSize">4</value>
86- <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
87- <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
88- <value type="int" key="EditorConfiguration.PaddingMode">1</value>
89- <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
90- <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
91- <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
92- <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
93- <value type="int" key="EditorConfiguration.TabSize">8</value>
94- <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
95- <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
96- <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
97- <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
98- <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
99- <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
100- </valuemap>
101- </data>
102- <data>
103- <variable>ProjectExplorer.Project.PluginSettings</variable>
104- <valuemap type="QVariantMap"/>
105- </data>
106- <data>
107- <variable>ProjectExplorer.Project.Target.0</variable>
108- <valuemap type="QVariantMap">
109- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
110- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
111- <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">{a3cdb542-0bdf-41d4-b93b-5554ebd28d6b}</value>
112- <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">-1</value>
113- <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
114- <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
115- <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">0</value>
116- <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
117- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
118- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
119- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
120- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
121- <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
122- </valuemap>
123- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
124- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
125- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
126- <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
127- </valuemap>
128- <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
129- <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
130- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
131- <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
132- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
133- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
134- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
135- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
136- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
137- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
138- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
139- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
140- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
141- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
142- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
143- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
144- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
145- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
146- <value type="int">0</value>
147- <value type="int">1</value>
148- <value type="int">2</value>
149- <value type="int">3</value>
150- <value type="int">4</value>
151- <value type="int">5</value>
152- <value type="int">6</value>
153- <value type="int">7</value>
154- <value type="int">8</value>
155- <value type="int">9</value>
156- <value type="int">10</value>
157- <value type="int">11</value>
158- <value type="int">12</value>
159- <value type="int">13</value>
160- <value type="int">14</value>
161- </valuelist>
162- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
163- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QML Scene</value>
164- <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">QmlProjectManager.QmlRunConfiguration.QmlScene</value>
165- <value type="QString" key="QmlProjectManager.QmlRunConfiguration.MainScript">CurrentFile</value>
166- <value type="QString" key="QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"></value>
167- <valuelist type="QVariantList" key="QmlProjectManager.QmlRunConfiguration.UserEnvironmentChanges"/>
168- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
169- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
170- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
171- <value type="bool" key="RunConfiguration.UseQmlDebugger">true</value>
172- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value>
173- </valuemap>
174- <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
175- </valuemap>
176- </data>
177- <data>
178- <variable>ProjectExplorer.Project.TargetCount</variable>
179- <value type="int">1</value>
180- </data>
181- <data>
182- <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
183- <value type="QString">{c67d546e-bf3c-43b0-8995-bdd61cf7538c}</value>
184- </data>
185- <data>
186- <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
187- <value type="int">12</value>
188- </data>
189-</qtcreator>
190
191=== removed file 'avatar@8.png'
192Binary files avatar@8.png 2013-02-26 01:05:17 +0000 and avatar@8.png 1970-01-01 00:00:00 +0000 differ
193=== removed file 'sudokugame.cpp'
194--- sudokugame.cpp 2013-02-26 01:05:17 +0000
195+++ sudokugame.cpp 1970-01-01 00:00:00 +0000
196@@ -1,6 +0,0 @@
197-#include "sudokugame.h"
198-
199-SudokuGame::SudokuGame(QObject *parent) :
200- QObject(parent)
201-{
202-}
203
204=== removed file 'sudokugame.h'
205--- sudokugame.h 2013-02-26 01:05:17 +0000
206+++ sudokugame.h 1970-01-01 00:00:00 +0000
207@@ -1,18 +0,0 @@
208-#ifndef SUDOKUGAME_H
209-#define SUDOKUGAME_H
210-
211-#include <QObject>
212-
213-class SudokuGame : public QObject
214-{
215- Q_OBJECT
216-public:
217- explicit SudokuGame(QObject *parent = 0);
218-
219-signals:
220-
221-public slots:
222-
223-};
224-
225-#endif // SUDOKUGAME_H
226
227=== removed file 'sudokugamebackend.cpp'
228--- sudokugamebackend.cpp 2013-02-26 01:05:17 +0000
229+++ sudokugamebackend.cpp 1970-01-01 00:00:00 +0000
230@@ -1,6 +0,0 @@
231-#include "sudokugamebackend.h"
232-
233-SudokuGameBackend::SudokuGameBackend(QWidget *parent) :
234- QObject(parent)
235-{
236-}
237
238=== removed file 'sudokugamebackend.h'
239--- sudokugamebackend.h 2013-02-26 01:05:17 +0000
240+++ sudokugamebackend.h 1970-01-01 00:00:00 +0000
241@@ -1,18 +0,0 @@
242-#ifndef SUDOKUGAMEBACKEND_H
243-#define SUDOKUGAMEBACKEND_H
244-
245-#include <QObject>
246-
247-class SudokuGameBackend : public QObject
248-{
249- Q_OBJECT
250-public:
251- explicit SudokuGameBackend(QWidget *parent = 0);
252-
253-signals:
254-
255-public slots:
256-
257-};
258-
259-#endif // SUDOKUGAMEBACKEND_H

Subscribers

People subscribed via source and target branches