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
=== added file '.bzrignore'
--- .bzrignore 1970-01-01 00:00:00 +0000
+++ .bzrignore 2013-06-14 07:58:28 +0000
@@ -0,0 +1,1 @@
1SudokuTouch.qmlproject.user
02
=== removed file 'SudokuBlocksGrid'
--- SudokuBlocksGrid 2013-02-26 01:05:17 +0000
+++ SudokuBlocksGrid 1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
1import QtQuick 2.0
2import Ubuntu.Components 0.1
3
4
5Grid {
6 id: sudokuGrid;
7 //anchors.centerIn: parent;
8 columns: 3;
9 spacing:units.gu(1);
10 width: units.gu(45);
11
12 SudokuGridBlock {
13 id: block1;
14 }
15 SudokuGridBlock {
16 id: block2;
17 }
18 SudokuGridBlock {
19 id: block3;
20 }
21 SudokuGridBlock {
22 id: block4;
23 }
24 SudokuGridBlock {
25 id: block5;
26 }
27 SudokuGridBlock {
28 id: block6;
29 }
30 SudokuGridBlock {
31 id: block7;
32 }
33 SudokuGridBlock {
34 id: block8;
35 }
36 SudokuGridBlock {
37 id: block9;
38 }
39
40}
410
=== removed file 'SudokuTouch.qmlproject.user'
--- SudokuTouch.qmlproject.user 2013-06-05 14:46:42 +0000
+++ SudokuTouch.qmlproject.user 1970-01-01 00:00:00 +0000
@@ -1,134 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<!DOCTYPE QtCreatorProject>
3<!-- Written by QtCreator 2.7.1, 2013-06-05T16:45:28. -->
4<qtcreator>
5 <data>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
7 <value type="int">0</value>
8 </data>
9 <data>
10 <variable>ProjectExplorer.Project.EditorSettings</variable>
11 <valuemap type="QVariantMap">
12 <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
13 <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
14 <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
15 <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
16 <value type="QByteArray" key="language">Cpp</value>
17 <valuemap type="QVariantMap" key="value">
18 <value type="QString" key="CurrentPreferences">CppGlobal</value>
19 </valuemap>
20 </valuemap>
21 <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
22 <value type="QByteArray" key="language">QmlJS</value>
23 <valuemap type="QVariantMap" key="value">
24 <value type="QString" key="CurrentPreferences">QmlJSGlobal</value>
25 </valuemap>
26 </valuemap>
27 <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
28 <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
29 <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
30 <value type="int" key="EditorConfiguration.IndentSize">4</value>
31 <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
32 <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
33 <value type="int" key="EditorConfiguration.PaddingMode">1</value>
34 <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
35 <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
36 <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
37 <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
38 <value type="int" key="EditorConfiguration.TabSize">8</value>
39 <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
40 <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
41 <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
42 <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
43 <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
44 <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
45 </valuemap>
46 </data>
47 <data>
48 <variable>ProjectExplorer.Project.PluginSettings</variable>
49 <valuemap type="QVariantMap"/>
50 </data>
51 <data>
52 <variable>ProjectExplorer.Project.Target.0</variable>
53 <valuemap type="QVariantMap">
54 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
55 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
56 <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">{a3cdb542-0bdf-41d4-b93b-5554ebd28d6b}</value>
57 <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">-1</value>
58 <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
59 <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
60 <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">0</value>
61 <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
62 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
63 <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
64 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
65 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
66 <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
67 </valuemap>
68 <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
69 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
70 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
71 <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
72 </valuemap>
73 <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
74 <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
75 <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
76 <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
77 <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
78 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
79 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
80 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
81 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
82 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
83 <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
84 <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
85 <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
86 <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
87 <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
88 <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
89 <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
90 <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
91 <value type="int">0</value>
92 <value type="int">1</value>
93 <value type="int">2</value>
94 <value type="int">3</value>
95 <value type="int">4</value>
96 <value type="int">5</value>
97 <value type="int">6</value>
98 <value type="int">7</value>
99 <value type="int">8</value>
100 <value type="int">9</value>
101 <value type="int">10</value>
102 <value type="int">11</value>
103 <value type="int">12</value>
104 <value type="int">13</value>
105 <value type="int">14</value>
106 </valuelist>
107 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
108 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QML Scene</value>
109 <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">QmlProjectManager.QmlRunConfiguration.QmlScene</value>
110 <value type="QString" key="QmlProjectManager.QmlRunConfiguration.MainScript">CurrentFile</value>
111 <value type="QString" key="QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"></value>
112 <valuelist type="QVariantList" key="QmlProjectManager.QmlRunConfiguration.UserEnvironmentChanges"/>
113 <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
114 <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
115 <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
116 <value type="bool" key="RunConfiguration.UseQmlDebugger">true</value>
117 <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value>
118 </valuemap>
119 <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
120 </valuemap>
121 </data>
122 <data>
123 <variable>ProjectExplorer.Project.TargetCount</variable>
124 <value type="int">1</value>
125 </data>
126 <data>
127 <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
128 <value type="QString">{c67d546e-bf3c-43b0-8995-bdd61cf7538c}</value>
129 </data>
130 <data>
131 <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
132 <value type="int">12</value>
133 </data>
134</qtcreator>
1350
=== removed file 'avatar@8.png'
136Binary files avatar@8.png 2013-02-26 01:05:17 +0000 and avatar@8.png 1970-01-01 00:00:00 +0000 differ1Binary files avatar@8.png 2013-02-26 01:05:17 +0000 and avatar@8.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'sudokugame.cpp'
--- sudokugame.cpp 2013-02-26 01:05:17 +0000
+++ sudokugame.cpp 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1#include "sudokugame.h"
2
3SudokuGame::SudokuGame(QObject *parent) :
4 QObject(parent)
5{
6}
70
=== removed file 'sudokugame.h'
--- sudokugame.h 2013-02-26 01:05:17 +0000
+++ sudokugame.h 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
1#ifndef SUDOKUGAME_H
2#define SUDOKUGAME_H
3
4#include <QObject>
5
6class SudokuGame : public QObject
7{
8 Q_OBJECT
9public:
10 explicit SudokuGame(QObject *parent = 0);
11
12signals:
13
14public slots:
15
16};
17
18#endif // SUDOKUGAME_H
190
=== removed file 'sudokugamebackend.cpp'
--- sudokugamebackend.cpp 2013-02-26 01:05:17 +0000
+++ sudokugamebackend.cpp 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1#include "sudokugamebackend.h"
2
3SudokuGameBackend::SudokuGameBackend(QWidget *parent) :
4 QObject(parent)
5{
6}
70
=== removed file 'sudokugamebackend.h'
--- sudokugamebackend.h 2013-02-26 01:05:17 +0000
+++ sudokugamebackend.h 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
1#ifndef SUDOKUGAMEBACKEND_H
2#define SUDOKUGAMEBACKEND_H
3
4#include <QObject>
5
6class SudokuGameBackend : public QObject
7{
8 Q_OBJECT
9public:
10 explicit SudokuGameBackend(QWidget *parent = 0);
11
12signals:
13
14public slots:
15
16};
17
18#endif // SUDOKUGAMEBACKEND_H

Subscribers

People subscribed via source and target branches