Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Q
qt-creator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tobias Hunger
qt-creator
Commits
de333ba0
Commit
de333ba0
authored
Jun 12, 2009
by
Daniel Molkentin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
No need to pass non-required parameters around.
Reviewed-by: dt
parent
ad93155a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
13 deletions
+11
-13
src/plugins/coreplugin/welcomemode.cpp
src/plugins/coreplugin/welcomemode.cpp
+3
-3
src/plugins/coreplugin/welcomemode.h
src/plugins/coreplugin/welcomemode.h
+2
-2
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/qt4projectmanager/qtversionmanager.cpp
+5
-7
src/plugins/qt4projectmanager/qtversionmanager.h
src/plugins/qt4projectmanager/qtversionmanager.h
+1
-1
No files found.
src/plugins/coreplugin/welcomemode.cpp
View file @
de333ba0
...
...
@@ -160,8 +160,8 @@ WelcomeMode::WelcomeMode() :
connect
(
m_d
->
ui
.
openExampleButton
,
SIGNAL
(
clicked
()),
SLOT
(
slotOpenExample
()));
connect
(
m_d
->
ui
.
examplesComboBox
,
SIGNAL
(
currentIndexChanged
(
int
)),
SLOT
(
slotEnableExampleButton
(
int
)));
connect
(
this
,
SIGNAL
(
updatedExamples
(
QString
,
QString
,
QString
)),
this
,
SLOT
(
slotUpdateExamples
(
QString
,
QString
,
QString
)));
connect
(
this
,
SIGNAL
(
updatedExamples
(
QString
,
QString
)),
this
,
SLOT
(
slotUpdateExamples
(
QString
,
QString
)));
connect
(
m_d
->
rssFetcher
,
SIGNAL
(
newsItemReady
(
QString
,
QString
,
QString
)),
m_d
->
ui
.
newsTreeWidget
,
SLOT
(
slotAddNewsItem
(
QString
,
QString
,
QString
)));
...
...
@@ -310,7 +310,7 @@ void WelcomeMode::slotUrlClicked(const QString &data)
QDesktopServices
::
openUrl
(
QUrl
(
data
));
}
void
WelcomeMode
::
slotUpdateExamples
(
const
QString
&
examplePath
,
const
QString
&
demosPath
,
const
QString
&
docPath
)
void
WelcomeMode
::
slotUpdateExamples
(
const
QString
&
examplePath
,
const
QString
&
demosPath
)
{
QString
demoxml
=
demosPath
+
"/qtdemo/xml/examples.xml"
;
if
(
!
QFile
::
exists
(
demoxml
))
...
...
src/plugins/coreplugin/welcomemode.h
View file @
de333ba0
...
...
@@ -81,14 +81,14 @@ signals:
void
openHelpPage
(
const
QString
&
url
);
void
openContextHelpPage
(
const
QString
&
url
);
void
manageSessions
();
void
updatedExamples
(
const
QString
&
examplePath
,
const
QString
&
demosPath
,
const
QString
&
docPath
);
void
updatedExamples
(
const
QString
&
examplePath
,
const
QString
&
demosPath
);
private
slots
:
void
slotFeedback
();
void
slotSessionClicked
(
const
QString
&
data
);
void
slotProjectClicked
(
const
QString
&
data
);
void
slotUrlClicked
(
const
QString
&
data
);
void
slotUpdateExamples
(
const
QString
&
examplePath
,
const
QString
&
demosPath
,
const
QString
&
docPath
);
void
slotUpdateExamples
(
const
QString
&
examplePath
,
const
QString
&
demosPath
);
void
slotEnableExampleButton
(
int
);
void
slotOpenExample
();
void
slotCreateNewProject
();
...
...
src/plugins/qt4projectmanager/qtversionmanager.cpp
View file @
de333ba0
...
...
@@ -104,8 +104,8 @@ QtVersionManager::QtVersionManager()
if
(
Core
::
Internal
::
WelcomeMode
*
welcomeMode
=
qobject_cast
<
Core
::
Internal
::
WelcomeMode
*>
(
Core
::
ICore
::
instance
()
->
modeManager
()
->
mode
(
Core
::
Constants
::
MODE_WELCOME
)))
{
connect
(
this
,
SIGNAL
(
updatedExamples
(
QString
,
QString
,
QString
)),
welcomeMode
,
SIGNAL
(
updatedExamples
(
QString
,
QString
,
QString
)));
connect
(
this
,
SIGNAL
(
updatedExamples
(
QString
,
QString
)),
welcomeMode
,
SIGNAL
(
updatedExamples
(
QString
,
QString
)));
}
updateDocumentation
();
updateExamples
();
...
...
@@ -156,16 +156,14 @@ void QtVersionManager::updateExamples()
QString
docPath
;
QString
demosPath
;
QtVersion
*
version
=
0
;
// try to find a version which has both,
examples and doc
s, starting with default Qt
// try to find a version which has both,
demos and example
s, starting with default Qt
foreach
(
version
,
versions
)
{
if
(
version
->
hasExamples
())
examplesPath
=
version
->
examplesPath
();
if
(
version
->
hasDemos
())
demosPath
=
version
->
demosPath
();
if
(
version
->
hasDocumentation
())
docPath
=
version
->
documentationPath
();
if
(
!
examplesPath
.
isEmpty
()
&&
!
demosPath
.
isEmpty
()
&&
!
docPath
.
isEmpty
())
{
emit
updatedExamples
(
examplesPath
,
demosPath
,
docPath
);
if
(
!
examplesPath
.
isEmpty
()
&&
!
demosPath
.
isEmpty
())
{
emit
updatedExamples
(
examplesPath
,
demosPath
);
return
;
}
}
...
...
src/plugins/qt4projectmanager/qtversionmanager.h
View file @
de333ba0
...
...
@@ -184,7 +184,7 @@ public:
signals:
void
defaultQtVersionChanged
();
void
qtVersionsChanged
();
void
updatedExamples
(
const
QString
&
examplesPath
,
const
QString
&
demosPath
,
const
QString
&
docPath
);
void
updatedExamples
(
const
QString
&
examplesPath
,
const
QString
&
demosPath
);
private:
// Used by QtOptionsPage
void
setNewQtVersions
(
QList
<
QtVersion
*>
newVersions
,
int
newDefaultVersion
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment