[Ktutorial-commits] SF.net SVN: ktutorial:[368] trunk/ktutorial
Status: Alpha
Brought to you by:
danxuliu
Menu
▾
▴
[Ktutorial-commits] SF.net SVN: ktutorial:[368] trunk/ktutorial
|
From: <dan...@us...> - 2012-08-11 01:33:32
|
Revision: 368
http://ktutorial.svn.sourceforge.net/ktutorial/?rev=368&view=rev
Author: danxuliu
Date: 2012-08-11 01:33:20 +0000 (Sat, 11 Aug 2012)
Log Message:
-----------
Include all the library classes in "ktutorial" namespace.
Modified Paths:
--------------
trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp
trunk/ktutorial/ktutorial-library/src/KTutorial.cpp
trunk/ktutorial/ktutorial-library/src/KTutorial.h
trunk/ktutorial/ktutorial-library/src/ObjectFinder.cpp
trunk/ktutorial/ktutorial-library/src/ObjectFinder.h
trunk/ktutorial/ktutorial-library/src/Option.h
trunk/ktutorial/ktutorial-library/src/Step.cpp
trunk/ktutorial/ktutorial-library/src/Step.h
trunk/ktutorial/ktutorial-library/src/Tutorial.cpp
trunk/ktutorial/ktutorial-library/src/Tutorial.h
trunk/ktutorial/ktutorial-library/src/TutorialInformation.h
trunk/ktutorial/ktutorial-library/src/TutorialManager.cpp
trunk/ktutorial/ktutorial-library/src/TutorialManager.h
trunk/ktutorial/ktutorial-library/src/WaitFor.h
trunk/ktutorial/ktutorial-library/src/WaitForAnd.cpp
trunk/ktutorial/ktutorial-library/src/WaitForAnd.h
trunk/ktutorial/ktutorial-library/src/WaitForComposed.cpp
trunk/ktutorial/ktutorial-library/src/WaitForComposed.h
trunk/ktutorial/ktutorial-library/src/WaitForEvent.cpp
trunk/ktutorial/ktutorial-library/src/WaitForEvent.h
trunk/ktutorial/ktutorial-library/src/WaitForNot.cpp
trunk/ktutorial/ktutorial-library/src/WaitForNot.h
trunk/ktutorial/ktutorial-library/src/WaitForOr.cpp
trunk/ktutorial/ktutorial-library/src/WaitForOr.h
trunk/ktutorial/ktutorial-library/src/WaitForProperty.cpp
trunk/ktutorial/ktutorial-library/src/WaitForProperty.h
trunk/ktutorial/ktutorial-library/src/WaitForSignal.cpp
trunk/ktutorial/ktutorial-library/src/WaitForSignal.h
trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.cpp
trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.h
trunk/ktutorial/ktutorial-library/src/WaitForWindow.cpp
trunk/ktutorial/ktutorial-library/src/WaitForWindow.h
trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.cpp
trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.h
trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.cpp
trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.h
trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.cpp
trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.h
trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.cpp
trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.h
trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.cpp
trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.h
trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.cpp
trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.h
trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.cpp
trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.h
trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.cpp
trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.h
trunk/ktutorial/ktutorial-library/src/extendedinformation/WidgetHighlighter.cpp
trunk/ktutorial/ktutorial-library/src/extendedinformation/WidgetHighlighter.h
trunk/ktutorial/ktutorial-library/src/extendedinformation/WidgetHighlighterManager.cpp
trunk/ktutorial/ktutorial-library/src/extendedinformation/WidgetHighlighterManager.h
trunk/ktutorial/ktutorial-library/src/scripting/ScriptManager.cpp
trunk/ktutorial/ktutorial-library/src/scripting/ScriptManager.h
trunk/ktutorial/ktutorial-library/src/scripting/ScriptedStep.cpp
trunk/ktutorial/ktutorial-library/src/scripting/ScriptedStep.h
trunk/ktutorial/ktutorial-library/src/scripting/ScriptedTutorial.cpp
trunk/ktutorial/ktutorial-library/src/scripting/ScriptedTutorial.h
trunk/ktutorial/ktutorial-library/src/scripting/ScriptingModule.cpp
trunk/ktutorial/ktutorial-library/src/scripting/ScriptingModule.h
trunk/ktutorial/ktutorial-library/src/tutorials/UsingKTutorial.cpp
trunk/ktutorial/ktutorial-library/src/tutorials/UsingKTutorial.h
trunk/ktutorial/ktutorial-library/src/view/StepTextWidget.cpp
trunk/ktutorial/ktutorial-library/src/view/StepTextWidget.h
trunk/ktutorial/ktutorial-library/src/view/StepWidget.cpp
trunk/ktutorial/ktutorial-library/src/view/StepWidget.h
trunk/ktutorial/ktutorial-library/src/view/StepWidget.ui
trunk/ktutorial/ktutorial-library/src/view/TutorialListModel.cpp
trunk/ktutorial/ktutorial-library/src/view/TutorialListModel.h
trunk/ktutorial/ktutorial-library/src/view/TutorialManagerDialog.cpp
trunk/ktutorial/ktutorial-library/src/view/TutorialManagerDialog.h
trunk/ktutorial/ktutorial-library/src/view/WindowOnTopEnforcer.cpp
trunk/ktutorial/ktutorial-library/src/view/WindowOnTopEnforcer.h
trunk/ktutorial/ktutorial-library/tests/ObjectFinderTest.cpp
trunk/ktutorial/ktutorial-library/tests/OptionTest.cpp
trunk/ktutorial/ktutorial-library/tests/StepTest.cpp
trunk/ktutorial/ktutorial-library/tests/TutorialInformationTest.cpp
trunk/ktutorial/ktutorial-library/tests/TutorialManagerTest.cpp
trunk/ktutorial/ktutorial-library/tests/TutorialTest.cpp
trunk/ktutorial/ktutorial-library/tests/WaitForAndTest.cpp
trunk/ktutorial/ktutorial-library/tests/WaitForComposedTest.cpp
trunk/ktutorial/ktutorial-library/tests/WaitForEventTest.cpp
trunk/ktutorial/ktutorial-library/tests/WaitForNotTest.cpp
trunk/ktutorial/ktutorial-library/tests/WaitForOrTest.cpp
trunk/ktutorial/ktutorial-library/tests/WaitForPropertyTest.cpp
trunk/ktutorial/ktutorial-library/tests/WaitForSignalTest.cpp
trunk/ktutorial/ktutorial-library/tests/WaitForStepActivationTest.cpp
trunk/ktutorial/ktutorial-library/tests/WaitForTest.cpp
trunk/ktutorial/ktutorial-library/tests/WaitForWindowTest.cpp
trunk/ktutorial/ktutorial-library/tests/common/WindowVisibilitySpyTest.cpp
trunk/ktutorial/ktutorial-library/tests/editorsupport/ClassRegisterAdaptorTest.cpp
trunk/ktutorial/ktutorial-library/tests/editorsupport/EditorSupportAdaptorTest.cpp
trunk/ktutorial/ktutorial-library/tests/editorsupport/EditorSupportTest.cpp
trunk/ktutorial/ktutorial-library/tests/editorsupport/EventSpyAdaptorTest.cpp
trunk/ktutorial/ktutorial-library/tests/editorsupport/EventSpyTest.cpp
trunk/ktutorial/ktutorial-library/tests/editorsupport/ObjectRegisterAdaptorTest.cpp
trunk/ktutorial/ktutorial-library/tests/editorsupport/ObjectRegisterTest.cpp
trunk/ktutorial/ktutorial-library/tests/extendedinformation/WidgetHighlighterManagerTest.cpp
trunk/ktutorial/ktutorial-library/tests/extendedinformation/WidgetHighlighterTest.cpp
trunk/ktutorial/ktutorial-library/tests/scripting/ScriptManagerTest.cpp
trunk/ktutorial/ktutorial-library/tests/scripting/ScriptedStepTest.cpp
trunk/ktutorial/ktutorial-library/tests/scripting/ScriptedTutorialTest.cpp
trunk/ktutorial/ktutorial-library/tests/scripting/ScriptingModuleTest.cpp
trunk/ktutorial/ktutorial-library/tests/scripting/ScriptingTest.cpp
trunk/ktutorial/ktutorial-library/tests/view/StepTextWidgetTest.cpp
trunk/ktutorial/ktutorial-library/tests/view/StepWidgetTest.cpp
trunk/ktutorial/ktutorial-library/tests/view/TutorialListModelTest.cpp
trunk/ktutorial/ktutorial-library/tests/view/TutorialManagerDialogTest.cpp
trunk/ktutorial/ktutorial-library/tests/view/WindowOnTopEnforcerTest.cpp
trunk/ktutorial/ktutorial-test-app/TestApp.cpp
trunk/ktutorial/ktutorial-test-app/TutorialClearText.cpp
trunk/ktutorial/ktutorial-test-app/TutorialClearText.h
trunk/ktutorial/ktutorial-test-app/TutorialMoveText.cpp
trunk/ktutorial/ktutorial-test-app/TutorialMoveText.h
Modified: trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp
===================================================================
--- trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010-2011 by Daniel Calviño Sánchez *
+ * Copyright (C) 2010-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -68,7 +68,7 @@
mFileActions->newTutorial();
- KTutorial::self()->setup(this);
+ ktutorial::KTutorial::self()->setup(this);
setupGUI();
}
Modified: trunk/ktutorial/ktutorial-library/src/KTutorial.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/KTutorial.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/KTutorial.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -33,11 +33,13 @@
#include "editorsupport/EditorSupport.h"
#endif
-using scripting::ScriptingModule;
-using scripting::ScriptManager;
-using view::StepWidget;
-using view::TutorialManagerDialog;
+using ktutorial::scripting::ScriptingModule;
+using ktutorial::scripting::ScriptManager;
+using ktutorial::view::StepWidget;
+using ktutorial::view::TutorialManagerDialog;
+namespace ktutorial {
+
//public:
//It inherits from QObject to be automatically destroyed when the parent
@@ -133,5 +135,7 @@
mTutorialsAction->setEnabled(true);
}
+}
+
#include "moc_KTutorial.cpp"
#include "KTutorial.moc"
Modified: trunk/ktutorial/ktutorial-library/src/KTutorial.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/KTutorial.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/KTutorial.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -16,8 +16,8 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef KTUTORIAL_H
-#define KTUTORIAL_H
+#ifndef KTUTORIAL_KTUTORIAL_H
+#define KTUTORIAL_KTUTORIAL_H
#include <kxmlguiwindow.h>
@@ -28,6 +28,8 @@
class KAction;
+namespace ktutorial {
+
/**
* Main class of KTutorial.
* This class is used to setup KTutorial, register WaitFor classes to be created
@@ -246,4 +248,6 @@
};
+}
+
#endif
Modified: trunk/ktutorial/ktutorial-library/src/ObjectFinder.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/ObjectFinder.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/ObjectFinder.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -18,6 +18,8 @@
#include "ObjectFinder.h"
+namespace ktutorial {
+
//private:
QList<QObject*> ObjectFinder::getBestMatches(const QString& name,
@@ -159,3 +161,5 @@
return filteredPaths;
}
+
+}
Modified: trunk/ktutorial/ktutorial-library/src/ObjectFinder.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/ObjectFinder.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/ObjectFinder.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -16,14 +16,16 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef OBJECTFINDER_H
-#define OBJECTFINDER_H
+#ifndef KTUTORIAL_OBJECTFINDER_H
+#define KTUTORIAL_OBJECTFINDER_H
#include <QObject>
#include <QRegExp>
#include "ktutorial_export.h"
+namespace ktutorial {
+
/**
* Helper class to find objects.
* This class is not intended to be used directly. Instead, use
@@ -239,4 +241,6 @@
};
+}
+
#endif
Modified: trunk/ktutorial/ktutorial-library/src/Option.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/Option.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/Option.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008 by Daniel Calviño Sánchez *
+ * Copyright (C) 2008-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,13 +16,15 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef OPTION_H
-#define OPTION_H
+#ifndef KTUTORIAL_OPTION_H
+#define KTUTORIAL_OPTION_H
#include <QObject>
#include "ktutorial_export.h"
+namespace ktutorial {
+
/**
* An option shown to the user.
* An option is something a user can choose to do in a Step. For example, in the
@@ -86,4 +88,6 @@
};
+}
+
#endif
Modified: trunk/ktutorial/ktutorial-library/src/Step.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/Step.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/Step.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008-2010 by Daniel Calviño Sánchez *
+ * Copyright (C) 2008-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -23,6 +23,8 @@
#include "WaitFor.h"
#include "WaitForSignal.h"
+namespace ktutorial {
+
//public:
void Step::setActive(bool active) {
@@ -220,4 +222,6 @@
emit nextStepRequested(mNextStepForWaitFor.value(waitFor));
}
+}
+
#include "Step.moc"
Modified: trunk/ktutorial/ktutorial-library/src/Step.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/Step.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/Step.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008-2011 by Daniel Calviño Sánchez *
+ * Copyright (C) 2008-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,8 +16,8 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef STEP_H
-#define STEP_H
+#ifndef KTUTORIAL_STEP_H
+#define KTUTORIAL_STEP_H
#include <QHash>
#include <QList>
@@ -26,9 +26,13 @@
#include "ktutorial_export.h"
+namespace ktutorial {
class Option;
class WaitFor;
+}
+namespace ktutorial {
+
/**
* A step in a Tutorial.
* It is each of the tasks that must be accomplished when following a Tutorial.
@@ -477,4 +481,6 @@
};
+}
+
#endif
Modified: trunk/ktutorial/ktutorial-library/src/Tutorial.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/Tutorial.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/Tutorial.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008-2011 by Daniel Calviño Sánchez *
+ * Copyright (C) 2008-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -22,6 +22,8 @@
#include "Step.h"
#include "TutorialInformation.h"
+namespace ktutorial {
+
//public:
Tutorial::~Tutorial() {
@@ -116,3 +118,5 @@
emit stepActivated(step);
}
+
+}
Modified: trunk/ktutorial/ktutorial-library/src/Tutorial.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/Tutorial.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/Tutorial.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008-2011 by Daniel Calviño Sánchez *
+ * Copyright (C) 2008-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,17 +16,21 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef TUTORIAL_H
-#define TUTORIAL_H
+#ifndef KTUTORIAL_TUTORIAL_H
+#define KTUTORIAL_TUTORIAL_H
#include <QMap>
#include <QObject>
#include "ktutorial_export.h"
+namespace ktutorial {
class Step;
class TutorialInformation;
+}
+namespace ktutorial {
+
/**
* A tutorial.
* A tutorial is composed by some information about it and several steps. The
@@ -224,4 +228,6 @@
};
+}
+
#endif
Modified: trunk/ktutorial/ktutorial-library/src/TutorialInformation.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/TutorialInformation.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/TutorialInformation.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008 by Daniel Calviño Sánchez *
+ * Copyright (C) 2008-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,13 +16,15 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef TUTORIALINFORMATION_H
-#define TUTORIALINFORMATION_H
+#ifndef KTUTORIAL_TUTORIALINFORMATION_H
+#define KTUTORIAL_TUTORIALINFORMATION_H
#include <QObject>
#include "ktutorial_export.h"
+namespace ktutorial {
+
/**
* Information about a Tutorial.
* Contains the identifier, name and description of a Tutorial.
@@ -112,4 +114,6 @@
};
+}
+
#endif
Modified: trunk/ktutorial/ktutorial-library/src/TutorialManager.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/TutorialManager.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/TutorialManager.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008-2010 by Daniel Calviño Sánchez *
+ * Copyright (C) 2008-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -22,6 +22,8 @@
#include "Tutorial.h"
#include "TutorialInformation.h"
+namespace ktutorial {
+
//public:
TutorialManager::~TutorialManager() {
@@ -66,3 +68,5 @@
disconnect(this, SLOT(finish()));
emit finished();
}
+
+}
Modified: trunk/ktutorial/ktutorial-library/src/TutorialManager.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/TutorialManager.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/TutorialManager.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008-2010 by Daniel Calviño Sánchez *
+ * Copyright (C) 2008-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,8 +16,8 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef TUTORIALMANAGER_H
-#define TUTORIALMANAGER_H
+#ifndef KTUTORIAL_TUTORIALMANAGER_H
+#define KTUTORIAL_TUTORIALMANAGER_H
#include <QMap>
#include <QObject>
@@ -25,9 +25,13 @@
#include "ktutorial_export.h"
+namespace ktutorial {
class Tutorial;
class TutorialInformation;
+}
+namespace ktutorial {
+
/**
* Manager for tutorials.
* A TutorialManager contains several tutorials and is responsible for start the
@@ -120,4 +124,6 @@
};
+}
+
#endif
Modified: trunk/ktutorial/ktutorial-library/src/WaitFor.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/WaitFor.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/WaitFor.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008 by Daniel Calviño Sánchez *
+ * Copyright (C) 2008-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,13 +16,15 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef WAITFOR_H
-#define WAITFOR_H
+#ifndef KTUTORIAL_WAITFOR_H
+#define KTUTORIAL_WAITFOR_H
#include <QObject>
#include "ktutorial_export.h"
+namespace ktutorial {
+
/**
* Abstract base class for conditions to be waited for.
* Classes derived from this one model a condition to be waited for. WaitFor
@@ -108,4 +110,6 @@
};
+}
+
#endif
Modified: trunk/ktutorial/ktutorial-library/src/WaitForAnd.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/WaitForAnd.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/WaitForAnd.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008 by Daniel Calviño Sánchez *
+ * Copyright (C) 2008-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -18,6 +18,8 @@
#include "WaitForAnd.h"
+namespace ktutorial {
+
//public:
bool WaitForAnd::conditionMet() const {
@@ -34,3 +36,5 @@
return true;
}
+
+}
Modified: trunk/ktutorial/ktutorial-library/src/WaitForAnd.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/WaitForAnd.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/WaitForAnd.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008 by Daniel Calviño Sánchez *
+ * Copyright (C) 2008-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,13 +16,15 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef WAITFORAND_H
-#define WAITFORAND_H
+#ifndef KTUTORIAL_WAITFORAND_H
+#define KTUTORIAL_WAITFORAND_H
#include "ktutorial_export.h"
#include "WaitForComposed.h"
+namespace ktutorial {
+
/**
* Composed WaitFor that performs an AND between its children.
*/
@@ -46,4 +48,6 @@
};
+}
+
#endif
Modified: trunk/ktutorial/ktutorial-library/src/WaitForComposed.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/WaitForComposed.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/WaitForComposed.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008-2011 by Daniel Calviño Sánchez *
+ * Copyright (C) 2008-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -18,6 +18,8 @@
#include "WaitForComposed.h"
+namespace ktutorial {
+
//public:
void WaitForComposed::setActive(bool active) {
@@ -56,3 +58,5 @@
emit waitEnded(this);
}
}
+
+}
Modified: trunk/ktutorial/ktutorial-library/src/WaitForComposed.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/WaitForComposed.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/WaitForComposed.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008 by Daniel Calviño Sánchez *
+ * Copyright (C) 2008-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,13 +16,15 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef WAITFORCOMPOSED_H
-#define WAITFORCOMPOSED_H
+#ifndef KTUTORIAL_WAITFORCOMPOSED_H
+#define KTUTORIAL_WAITFORCOMPOSED_H
#include "ktutorial_export.h"
#include "WaitFor.h"
+namespace ktutorial {
+
/**
* Abstract base class for composed conditions to wait for.
* Classes derived from this one model a composed condition to be waited for.
@@ -94,4 +96,6 @@
};
+}
+
#endif
Modified: trunk/ktutorial/ktutorial-library/src/WaitForEvent.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/WaitForEvent.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/WaitForEvent.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010 by Daniel Calviño Sánchez *
+ * Copyright (C) 2010-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -22,6 +22,8 @@
#include <KDebug>
+namespace ktutorial {
+
//public:
WaitForEvent::WaitForEvent():
@@ -97,4 +99,6 @@
emit waitEnded(this);
}
+}
+
#include "WaitForEvent.moc"
Modified: trunk/ktutorial/ktutorial-library/src/WaitForEvent.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/WaitForEvent.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/WaitForEvent.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010-2011 by Daniel Calviño Sánchez *
+ * Copyright (C) 2010-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,8 +16,8 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef WAITFOREVENT_H
-#define WAITFOREVENT_H
+#ifndef KTUTORIAL_WAITFOREVENT_H
+#define KTUTORIAL_WAITFOREVENT_H
#include <QEvent>
@@ -25,6 +25,8 @@
#include "WaitFor.h"
+namespace ktutorial {
+
/**
* Waits for an event of some specific type to be sent to an object.
* When an event of the expected type is sent and the WaitForEvent is active,
@@ -151,4 +153,6 @@
};
+}
+
#endif
Modified: trunk/ktutorial/ktutorial-library/src/WaitForNot.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/WaitForNot.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/WaitForNot.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008 by Daniel Calviño Sánchez *
+ * Copyright (C) 2008-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -18,6 +18,8 @@
#include "WaitForNot.h"
+namespace ktutorial {
+
//public:
WaitForNot::WaitForNot(): WaitFor(),
@@ -32,3 +34,5 @@
mWaitFor = waitFor;
mWaitFor->setParent(this);
}
+
+}
Modified: trunk/ktutorial/ktutorial-library/src/WaitForNot.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/WaitForNot.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/WaitForNot.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008 by Daniel Calviño Sánchez *
+ * Copyright (C) 2008-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,13 +16,15 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef WAITFORNOT_H
-#define WAITFORNOT_H
+#ifndef KTUTORIAL_WAITFORNOT_H
+#define KTUTORIAL_WAITFORNOT_H
#include "ktutorial_export.h"
#include "WaitFor.h"
+namespace ktutorial {
+
/**
* Special WaitFor class to negate other WaitFor objects.
* This WaitFor is intended to be used only as a child of WaitForComposed
@@ -118,4 +120,6 @@
};
+}
+
#endif
Modified: trunk/ktutorial/ktutorial-library/src/WaitForOr.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/WaitForOr.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/WaitForOr.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008 by Daniel Calviño Sánchez *
+ * Copyright (C) 2008-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -18,6 +18,8 @@
#include "WaitForOr.h"
+namespace ktutorial {
+
//public:
bool WaitForOr::conditionMet() const {
@@ -30,3 +32,5 @@
return false;
}
+
+}
Modified: trunk/ktutorial/ktutorial-library/src/WaitForOr.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/WaitForOr.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/WaitForOr.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008 by Daniel Calviño Sánchez *
+ * Copyright (C) 2008-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,13 +16,15 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef WAITFOROR_H
-#define WAITFOROR_H
+#ifndef KTUTORIAL_WAITFOROR_H
+#define KTUTORIAL_WAITFOROR_H
#include "ktutorial_export.h"
#include "WaitForComposed.h"
+namespace ktutorial {
+
/**
* Composed WaitFor that performs an OR between its children.
*/
@@ -48,4 +50,6 @@
};
+}
+
#endif
Modified: trunk/ktutorial/ktutorial-library/src/WaitForProperty.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/WaitForProperty.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/WaitForProperty.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2011 by Daniel Calviño Sánchez *
+ * Copyright (C) 2011-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -22,6 +22,8 @@
#include <KDebug>
+namespace ktutorial {
+
//public:
WaitForProperty::WaitForProperty(): WaitFor() {
@@ -98,3 +100,5 @@
emit waitEnded(this);
}
}
+
+}
Modified: trunk/ktutorial/ktutorial-library/src/WaitForProperty.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/WaitForProperty.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/WaitForProperty.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2011 by Daniel Calviño Sánchez *
+ * Copyright (C) 2011-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,8 +16,8 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef WAITFORPROPERTY_H
-#define WAITFORPROPERTY_H
+#ifndef KTUTORIAL_WAITFORPROPERTY_H
+#define KTUTORIAL_WAITFORPROPERTY_H
#include <QVariant>
@@ -25,6 +25,8 @@
#include "WaitFor.h"
+namespace ktutorial {
+
/**
* Waits for a property to have a specific value.
* When the property changes its value to the specified one and the
@@ -160,4 +162,6 @@
};
+}
+
#endif
Modified: trunk/ktutorial/ktutorial-library/src/WaitForSignal.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/WaitForSignal.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/WaitForSignal.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -20,6 +20,8 @@
#include <KDebug>
+namespace ktutorial {
+
//public:
WaitForSignal::WaitForSignal(): WaitFor(),
@@ -56,3 +58,5 @@
mConditionMet = true;
emit waitEnded(this);
}
+
+}
Modified: trunk/ktutorial/ktutorial-library/src/WaitForSignal.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/WaitForSignal.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/WaitForSignal.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008 by Daniel Calviño Sánchez *
+ * Copyright (C) 2008-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,13 +16,15 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef WAITFORSIGNAL_H
-#define WAITFORSIGNAL_H
+#ifndef KTUTORIAL_WAITFORSIGNAL_H
+#define KTUTORIAL_WAITFORSIGNAL_H
#include "ktutorial_export.h"
#include "WaitFor.h"
+namespace ktutorial {
+
/**
* Waits for a signal to be emitted.
* When the signal is emitted and the WaitForSignal is active, the wait ends.
@@ -113,4 +115,6 @@
};
+}
+
#endif
Modified: trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2011 by Daniel Calviño Sánchez *
+ * Copyright (C) 2011-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -24,6 +24,8 @@
#include "Tutorial.h"
+namespace ktutorial {
+
//public:
WaitForStepActivation::WaitForStepActivation(): WaitFor(),
@@ -70,3 +72,5 @@
emit waitEnded(this);
mDuringStepActivation = false;
}
+
+}
Modified: trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/WaitForStepActivation.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2011 by Daniel Calviño Sánchez *
+ * Copyright (C) 2011-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,16 +16,20 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef WAITFORSTEPACTIVATION_H
-#define WAITFORSTEPACTIVATION_H
+#ifndef KTUTORIAL_WAITFORSTEPACTIVATION_H
+#define KTUTORIAL_WAITFORSTEPACTIVATION_H
#include "ktutorial_export.h"
#include "WaitFor.h"
+namespace ktutorial {
class Step;
class Tutorial;
+}
+namespace ktutorial {
+
/**
* Waits for the activation of a step.
* When the step is activated, the wait ends.
@@ -116,4 +120,6 @@
};
+}
+
#endif
Modified: trunk/ktutorial/ktutorial-library/src/WaitForWindow.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/WaitForWindow.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/WaitForWindow.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010 by Daniel Calviño Sánchez *
+ * Copyright (C) 2010-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -20,8 +20,10 @@
#include "KTutorial.h"
#include "common/WindowVisibilitySpy.h"
-using common::WindowVisibilitySpy;
+using ktutorial::common::WindowVisibilitySpy;
+namespace ktutorial {
+
//public:
WaitForWindow::WaitForWindow(): WaitFor(),
@@ -75,4 +77,6 @@
emit waitEnded(this);
}
+}
+
#include "WaitForWindow.moc"
Modified: trunk/ktutorial/ktutorial-library/src/WaitForWindow.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/WaitForWindow.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/WaitForWindow.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010 by Daniel Calviño Sánchez *
+ * Copyright (C) 2010-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,13 +16,15 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef WAITFORWINDOW_H
-#define WAITFORWINDOW_H
+#ifndef KTUTORIAL_WAITFORWINDOW_H
+#define KTUTORIAL_WAITFORWINDOW_H
#include "ktutorial_export.h"
#include "WaitFor.h"
+namespace ktutorial {
+
/**
* Waits for a specific window to be shown.
* When the window with the expected object name is shown and the WaitForEvent
@@ -117,4 +119,6 @@
};
+}
+
#endif
Modified: trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010 by Daniel Calviño Sánchez *
+ * Copyright (C) 2010-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -21,6 +21,7 @@
#include "WindowVisibilitySpy.h"
+namespace ktutorial {
namespace common {
//public:
@@ -68,5 +69,6 @@
}
}
+}
#include "WindowVisibilitySpy.moc"
Modified: trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/common/WindowVisibilitySpy.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010 by Daniel Calviño Sánchez *
+ * Copyright (C) 2010-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,11 +16,12 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef COMMON_WINDOWVISIBILITYSPY_H
-#define COMMON_WINDOWVISIBILITYSPY_H
+#ifndef KTUTORIAL_COMMON_WINDOWVISIBILITYSPY_H
+#define KTUTORIAL_COMMON_WINDOWVISIBILITYSPY_H
#include <QObject>
+namespace ktutorial {
namespace common {
/**
@@ -85,5 +86,6 @@
};
}
+}
#endif
Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010-2011 by Daniel Calviño Sánchez *
+ * Copyright (C) 2010-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -21,6 +21,7 @@
#include "ClassRegisterAdaptor.h"
#include "ObjectRegister.h"
+namespace ktutorial {
namespace editorsupport {
//public:
@@ -114,3 +115,4 @@
}
}
+}
Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/editorsupport/ClassRegisterAdaptor.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010-2011 by Daniel Calviño Sánchez *
+ * Copyright (C) 2010-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,16 +16,19 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef EDITORSUPPORT_CLASSREGISTERADAPTOR_H
-#define EDITORSUPPORT_CLASSREGISTERADAPTOR_H
+#ifndef KTUTORIAL_EDITORSUPPORT_CLASSREGISTERADAPTOR_H
+#define KTUTORIAL_EDITORSUPPORT_CLASSREGISTERADAPTOR_H
#include <QDBusAbstractAdaptor>
#include <QStringList>
+namespace ktutorial {
namespace editorsupport {
class ObjectRegister;
}
+}
+namespace ktutorial {
namespace editorsupport {
/**
@@ -120,5 +123,6 @@
};
}
+}
#endif
Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -32,9 +32,10 @@
#include "../extendedinformation/WidgetHighlighterManager.h"
#include "../scripting/ScriptedTutorial.h"
-using extendedinformation::WidgetHighlighterManager;
-using scripting::ScriptedTutorial;
+using ktutorial::extendedinformation::WidgetHighlighterManager;
+using ktutorial::scripting::ScriptedTutorial;
+namespace ktutorial {
namespace editorsupport {
//public:
@@ -147,3 +148,4 @@
}
+}
Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupport.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -16,20 +16,25 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef EDITORSUPPORT_EDITORSUPPORT_H
-#define EDITORSUPPORT_EDITORSUPPORT_H
+#ifndef KTUTORIAL_EDITORSUPPORT_EDITORSUPPORT_H
+#define KTUTORIAL_EDITORSUPPORT_EDITORSUPPORT_H
#include <QObject>
+namespace ktutorial {
class ObjectFinder;
class Tutorial;
+}
+namespace ktutorial {
namespace editorsupport {
class EventSpy;
class EventSupportAdaptor;
class ObjectRegister;
}
+}
+namespace ktutorial {
namespace editorsupport {
/**
@@ -189,5 +194,6 @@
};
}
+}
#endif
Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -22,6 +22,7 @@
#include "EditorSupport.h"
#include "ObjectRegister.h"
+namespace ktutorial {
namespace editorsupport {
//public:
@@ -63,3 +64,4 @@
}
}
+}
Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/editorsupport/EditorSupportAdaptor.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -16,16 +16,19 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef EDITORSUPPORT_EDITORSUPPORTADAPTOR_H
-#define EDITORSUPPORT_EDITORSUPPORTADAPTOR_H
+#ifndef KTUTORIAL_EDITORSUPPORT_EDITORSUPPORTADAPTOR_H
+#define KTUTORIAL_EDITORSUPPORT_EDITORSUPPORTADAPTOR_H
#include <QDBusAbstractAdaptor>
+namespace ktutorial {
namespace editorsupport {
class EditorSupport;
class ObjectRegister;
}
+}
+namespace ktutorial {
namespace editorsupport {
/**
@@ -110,5 +113,6 @@
};
}
+}
#endif
Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010 by Daniel Calviño Sánchez *
+ * Copyright (C) 2010-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -20,6 +20,7 @@
#include "EventSpy.h"
+namespace ktutorial {
namespace editorsupport {
//public:
@@ -48,3 +49,4 @@
}
}
+}
Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpy.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010 by Daniel Calviño Sánchez *
+ * Copyright (C) 2010-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,11 +16,12 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef EDITORSUPPORT_EVENTSPY_H
-#define EDITORSUPPORT_EVENTSPY_H
+#ifndef KTUTORIAL_EDITORSUPPORT_EVENTSPY_H
+#define KTUTORIAL_EDITORSUPPORT_EVENTSPY_H
#include <QObject>
+namespace ktutorial {
namespace editorsupport {
/**
@@ -73,5 +74,6 @@
};
}
+}
#endif
Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010 by Daniel Calviño Sánchez *
+ * Copyright (C) 2010-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -23,6 +23,7 @@
#include "EventSpy.h"
#include "ObjectRegister.h"
+namespace ktutorial {
namespace editorsupport {
//public:
@@ -48,3 +49,4 @@
}
}
+}
Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/editorsupport/EventSpyAdaptor.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010 by Daniel Calviño Sánchez *
+ * Copyright (C) 2010-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,16 +16,19 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef EDITORSUPPORT_EVENTSPYADAPTOR_H
-#define EDITORSUPPORT_EVENTSPYADAPTOR_H
+#ifndef KTUTORIAL_EDITORSUPPORT_EVENTSPYADAPTOR_H
+#define KTUTORIAL_EDITORSUPPORT_EVENTSPYADAPTOR_H
#include <QDBusAbstractAdaptor>
+namespace ktutorial {
namespace editorsupport {
class EventSpy;
class ObjectRegister;
}
+}
+namespace ktutorial {
namespace editorsupport {
/**
@@ -79,5 +82,6 @@
};
}
+}
#endif
Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -18,6 +18,7 @@
#include "ObjectRegister.h"
+namespace ktutorial {
namespace editorsupport {
//public:
@@ -83,3 +84,4 @@
}
}
+}
Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegister.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -16,12 +16,13 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifndef EDITORSUPPORT_OBJECTREGISTER_H
-#define EDITORSUPPORT_OBJECTREGISTER_H
+#ifndef KTUTORIAL_EDITORSUPPORT_OBJECTREGISTER_H
+#define KTUTORIAL_EDITORSUPPORT_OBJECTREGISTER_H
#include <QHash>
#include <QObject>
+namespace ktutorial {
namespace editorsupport {
/**
@@ -119,5 +120,6 @@
};
}
+}
#endif
Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.cpp 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.cpp 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010-2011 by Daniel Calviño Sánchez *
+ * Copyright (C) 2010-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -19,6 +19,7 @@
#include "ObjectRegisterAdaptor.h"
#include "ObjectRegister.h"
+namespace ktutorial {
namespace editorsupport {
//public:
@@ -77,3 +78,4 @@
}
}
+}
Modified: trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.h
===================================================================
--- trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.h 2012-08-10 18:15:15 UTC (rev 367)
+++ trunk/ktutorial/ktutorial-library/src/editorsupport/ObjectRegisterAdaptor.h 2012-08-11 01:33:20 UTC (rev 368)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010 by Daniel Calviño Sánchez *
+ * Copyright (C) 2010-2012 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -16,15 +16,18 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#ifnd...
[truncated message content] |
