Changed: namespace new versions of Okteta/Kasten libs with postfix 1

svn path=/trunk/KDE/kdesdk/okteta/; revision=1241470
parent 6e0c11c3
......@@ -39,17 +39,17 @@ add_definitions(
add_subdirectory( libs )
set( OKTETALIBS_MAJOR_VERSION 0 )
set( OKTETALIBS_MINOR_VERSION 7 )
set( OKTETALIBS_MINOR_VERSION 8 )
set( OKTETALIBS_PATCHLEVEL_VERSION 0 )
set( OKTETALIBS_VERSION "${OKTETALIBS_MAJOR_VERSION}.${OKTETALIBS_MINOR_VERSION}.${OKTETALIBS_PATCHLEVEL_VERSION}" )
set( OKTETALIBS_ABI_VERSION 1 )
set( OKTETALIBS_INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/okteta )#${OKTETAKASTEN_ABI_VERSION} )
set( OKTETALIBS_INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/okteta${OKTETALIBS_ABI_VERSION} )
set( oktetacore_LIB oktetacore ) # ${OKTETALIBS_ABI_VERSION} )
set( oktetagui_LIB oktetagui ) #${OKTETALIBS_ABI_VERSION} )
set( oktetacore_LIB okteta${OKTETALIBS_ABI_VERSION}core )
set( oktetagui_LIB okteta${OKTETALIBS_ABI_VERSION}gui )
set( OKTETALIBS_LIB_SOVERSION ${GENERIC_LIB_SOVERSION} ) #${OKTETALIBS_ABI_VERSION} )
set( OKTETALIBS_LIB_VERSION ${GENERIC_LIB_VERSION} ) #${OKTETALIBS_VERSION} )
set( OKTETALIBS_LIB_SOVERSION ${OKTETALIBS_ABI_VERSION} )
set( OKTETALIBS_LIB_VERSION ${OKTETALIBS_VERSION} )
# Okteta libs
add_subdirectory( core )
......@@ -62,7 +62,7 @@ add_subdirectory( kasten )
# special mimetypes
add_subdirectory( mimetypes )
# programs and parts for desktop
# programs and parts for desktop
add_subdirectory( parts )
add_subdirectory( program )
......
......@@ -34,12 +34,12 @@
<customwidget>
<class>Okteta::ByteArrayColumnView</class>
<extends>QFrame</extends>
<header>KDE/Okteta/ByteArrayColumnView</header>
<header>KDE/Okteta1/ByteArrayColumnView</header>
</customwidget>
<customwidget>
<class>Okteta::ByteArrayRowView</class>
<extends>QFrame</extends>
<header>KDE/Okteta/ByteArrayRowView</header>
<header>KDE/Okteta1/ByteArrayRowView</header>
</customwidget>
</customwidgets>
<resources/>
......
/*
This file is part of the Okteta project, made within the KDE community.
Copyright 2009 Friedrich W. H. Kossebau <kossebau@kde.org>
Copyright 2009,2011 Friedrich W. H. Kossebau <kossebau@kde.org>
Public domain.
*/
......@@ -11,9 +11,9 @@
#include "ui_example_widget.h"
//// include the header of the bytearray model you want to use
// Okteta core
#include <okteta/piecetablebytearraymodel.h>
#include <okteta1/piecetablebytearraymodel.h>
//// or
#include <Okteta/PieceTableByteArrayModel>
#include <Okteta1/PieceTableByteArrayModel>
//// only needed for the example
// KDE
......
#include "../../okteta/abstractbytearraycolumnrenderer.h"
#include "../../okteta1/abstractbytearraycolumnrenderer.h"
#include "../../okteta/abstractbytearraymodel.h"
#include "../../okteta1/abstractbytearraymodel.h"
#include "../../okteta/abstractbytearrayview.h"
#include "../../okteta1/abstractbytearrayview.h"
#include "../../okteta/abstractcolumnrenderer.h"
#include "../../okteta1/abstractcolumnrenderer.h"
#include "../../okteta/abstractcolumnstylist.h"
#include "../../okteta1/abstractcolumnstylist.h"
#include "../../okteta/address.h"
#include "../../okteta1/address.h"
#include "../../okteta/addressrange.h"
#include "../../okteta1/addressrange.h"
#include "../../okteta/arraychangemetrics.h"
#include "../../okteta1/arraychangemetrics.h"
#include "../../okteta/bookmark.h"
#include "../../okteta1/bookmark.h"
#include "../../okteta/bookmarkable.h"
#include "../../okteta1/bookmarkable.h"
#include "../../okteta/bookmarksconstiterator.h"
#include "../../okteta1/bookmarksconstiterator.h"
#include "../../okteta/bordercolumnrenderer.h"
#include "../../okteta1/bordercolumnrenderer.h"
#include "../../okteta/byte.h"
#include "../../okteta1/byte.h"
#include "../../okteta/bytearraychange.h"
#include "../../okteta1/bytearraychange.h"
#include "../../okteta/bytearraycolumnview.h"
#include "../../okteta1/bytearraycolumnview.h"
#include "../../okteta/bytearraymodel.h"
#include "../../okteta1/bytearraymodel.h"
#include "../../okteta/bytearrayrowcolumnrenderer.h"
#include "../../okteta1/bytearrayrowcolumnrenderer.h"
#include "../../okteta/bytearrayrowview.h"
#include "../../okteta1/bytearrayrowview.h"
#include "../../okteta/bytearraytablelayout.h"
#include "../../okteta1/bytearraytablelayout.h"
#include "../../okteta/bytearraytableranges.h"
#include "../../okteta1/bytearraytableranges.h"
......@@ -62,6 +62,6 @@ set( okteta_CamelCase_HDRS
)
install( FILES ${okteta_CamelCase_HDRS}
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Okteta
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Okteta${OKTETALIBS_ABI_VERSION}
COMPONENT Devel
)
#include "../../okteta/changehistory.h"
#include "../../okteta1/changehistory.h"
#include "../../okteta/changesdescribable.h"
#include "../../okteta1/changesdescribable.h"
#include "../../okteta/charbytearraycolumnrenderer.h"
#include "../../okteta1/charbytearraycolumnrenderer.h"
#include "../../okteta/charcodec.h"
#include "../../okteta1/charcodec.h"
#include "../../okteta/character.h"
#include "../../okteta1/character.h"
#include "../../okteta/columnsview.h"
#include "../../okteta1/columnsview.h"
#include "../../okteta/filebytearraymodel.h"
#include "../../okteta1/filebytearraymodel.h"
#include "../../okteta/line.h"
#include "../../okteta1/line.h"
#include "../../okteta/lineposition.h"
#include "../../okteta1/lineposition.h"
#include "../../okteta/linepositionrange.h"
#include "../../okteta1/linepositionrange.h"
#include "../../okteta/linerange.h"
#include "../../okteta1/linerange.h"
#include "../../okteta/numberrange.h"
#include "../../okteta1/numberrange.h"
#include "../../okteta/offsetcolumnrenderer.h"
#include "../../okteta1/offsetcolumnrenderer.h"
#include "../../okteta/offsetformat.h"
#include "../../okteta1/offsetformat.h"
#include "../../okteta/piecetablebytearraymodel.h"
#include "../../okteta1/piecetablebytearraymodel.h"
#include "../../okteta/range.h"
#include "../../okteta1/range.h"
#include "../../okteta/size.h"
#include "../../okteta1/size.h"
#include "../../okteta/valuebytearraycolumnrenderer.h"
#include "../../okteta1/valuebytearraycolumnrenderer.h"
#include "../../okteta/valuecodec.h"
#include "../../okteta1/valuecodec.h"
#include "../../okteta/versionable.h"
#include "../../okteta1/versionable.h"
#include "../../okteta/widgetcolumnstylist.h"
#include "../../okteta1/widgetcolumnstylist.h"
#include "../../okteta/wordbytearrayservice.h"
#include "../../okteta1/wordbytearrayservice.h"
......@@ -2,24 +2,24 @@ project( oktetakasten )
add_definitions( -DKDE_DEFAULT_DEBUG_AREA=1806 )
set( KASTEN_ABI_VERSION 1 )
set( KASTENCORE_LIBS kasten${KASTEN_ABI_VERSION}core )
set( KASTENGUI_LIBS kasten${KASTEN_ABI_VERSION}gui )
set( KASTENCONTROLLERS_LIBS kasten${KASTEN_ABI_VERSION}controllers )
set( OKTETAKASTEN_MAJOR_VERSION 0 )
set( OKTETAKASTEN_MINOR_VERSION 2 )
set( OKTETAKASTEN_PATCHLEVEL_VERSION 0 )
set( OKTETAKASTEN_VERSION "${OKTETAKASTEN_MAJOR_VERSION}.${OKTETAKASTEN_MINOR_VERSION}.${OKTETAKASTEN_PATCHLEVEL_VERSION}" )
set( OKTETAKASTEN_ABI_VERSION 1 )
set( OKTETAKASTEN_INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/kasten ) #/oktetakasten ) #${OKTETAKASTEN_ABI_VERSION} )
set( oktetakastencore_LIB oktetakastencore ) #${OKTETAKASTEN_ABI_VERSION} )
set( oktetakastengui_LIB oktetakastengui ) #${OKTETAKASTEN_ABI_VERSION} )
set( oktetakastencontrollers_LIB oktetakastencontrollers ) #${OKTETAKASTEN_ABI_VERSION} )
set( OKTETAKASTEN_INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/kasten${KASTEN_ABI_VERSION}/okteta${OKTETAKASTEN_ABI_VERSION} )
set( oktetakastencore_LIB kasten${KASTEN_ABI_VERSION}okteta${OKTETAKASTEN_ABI_VERSION}core )
set( oktetakastengui_LIB kasten${KASTEN_ABI_VERSION}okteta${OKTETAKASTEN_ABI_VERSION}gui )
set( oktetakastencontrollers_LIB kasten${KASTEN_ABI_VERSION}okteta${OKTETAKASTEN_ABI_VERSION}controllers )
set( OKTETAKASTEN_LIB_SOVERSION ${GENERIC_LIB_SOVERSION} ) #${OKTETAKASTEN_ABI_VERSION} )
set( OKTETAKASTEN_LIB_VERSION ${GENERIC_LIB_VERSION} ) #${OKTETAKASTEN_VERSION} )
set( KASTEN_ABI_VERSION 1 )
set( KASTENCORE_LIBS kastencore ) #${KASTEN_ABI_VERSION} )
set( KASTENGUI_LIBS kastengui ) #${KASTEN_ABI_VERSION} )
set( KASTENCONTROLLERS_LIBS kastencontrollers ) #${KASTEN_ABI_VERSION} )
set( OKTETAKASTEN_LIB_SOVERSION ${OKTETAKASTEN_ABI_VERSION} )
set( OKTETAKASTEN_LIB_VERSION ${OKTETAKASTEN_VERSION} )
add_subdirectory( core )
......
#include "../../kasten/abstractconnectjob.h"
#include "../../kasten1/abstractconnectjob.h"
#include "../../kasten/abstractdocument.h"
#include "../../kasten1/abstractdocument.h"
#include "../../kasten/abstractdocumentfactory.h"
#include "../../kasten1/abstractdocumentfactory.h"
#include "../../kasten/abstractexportjob.h"
#include "../../kasten1/abstractexportjob.h"
#include "../../kasten/abstractfilesystemconnectjob.h"
#include "../../kasten1/abstractfilesystemconnectjob.h"
#include "../../kasten/abstractfilesystemexportjob.h"
#include "../../kasten1/abstractfilesystemexportjob.h"
#include "../../kasten/abstractfilesystemloadjob.h"
#include "../../kasten1/abstractfilesystemloadjob.h"
#include "../../kasten/abstractfilesystemsyncfromremotejob.h"
#include "../../kasten1/abstractfilesystemsyncfromremotejob.h"
#include "../../kasten/abstractfilesystemsynctoremotejob.h"
#include "../../kasten1/abstractfilesystemsynctoremotejob.h"
#include "../../kasten/abstractfilesystemsyncwithremotejob.h"
#include "../../kasten1/abstractfilesystemsyncwithremotejob.h"
#include "../../kasten/abstractgroupedviews.h"
#include "../../kasten1/abstractgroupedviews.h"
#include "../../kasten/abstractlinepopup.h"
#include "../../kasten1/abstractlinepopup.h"
#include "../../kasten/abstractloadjob.h"
#include "../../kasten1/abstractloadjob.h"
#include "../../kasten/abstractmodel.h"
#include "../../kasten1/abstractmodel.h"
#include "../../kasten/abstractmodeldatagenerator.h"
#include "../../kasten1/abstractmodeldatagenerator.h"
#include "../../kasten/abstractmodeldatageneratorconfigeditor.h"
#include "../../kasten1/abstractmodeldatageneratorconfigeditor.h"
#include "../../kasten/abstractmodeldatageneratorconfigeditorfactory.h"
#include "../../kasten1/abstractmodeldatageneratorconfigeditorfactory.h"
#include "../../kasten/abstractmodelexporter.h"
#include "../../kasten1/abstractmodelexporter.h"
#include "../../kasten/abstractmodelexporterconfigeditor.h"
#include "../../kasten1/abstractmodelexporterconfigeditor.h"
#include "../../kasten/abstractmodelexporterconfigeditorfactory.h"
#include "../../kasten1/abstractmodelexporterconfigeditorfactory.h"
#include "../../kasten/abstractmodelfilesystemsynchronizer.h"
#include "../../kasten1/abstractmodelfilesystemsynchronizer.h"
#include "../../kasten/abstractmodelselection.h"
#include "../../kasten1/abstractmodelselection.h"
#include "../../kasten/abstractmodelstreamencoder.h"
#include "../../kasten1/abstractmodelstreamencoder.h"
#include "../../kasten/abstractmodelstreamencoderconfigeditor.h"
#include "../../kasten1/abstractmodelstreamencoderconfigeditor.h"
#include "../../kasten/abstractmodelstreamencoderconfigeditorfactory.h"
#include "../../kasten1/abstractmodelstreamencoderconfigeditorfactory.h"
#include "../../kasten/abstractmodelsynchronizer.h"
#include "../../kasten1/abstractmodelsynchronizer.h"
#include "../../kasten/abstractmodelsynchronizerfactory.h"
#include "../../kasten1/abstractmodelsynchronizerfactory.h"
#include "../../kasten/abstractselectionview.h"
#include "../../kasten1/abstractselectionview.h"
#include "../../kasten/abstractsyncfromremotejob.h"
#include "../../kasten1/abstractsyncfromremotejob.h"
#include "../../kasten/abstractsynctoremotejob.h"
#include "../../kasten1/abstractsynctoremotejob.h"
#include "../../kasten/abstractsyncwithremotejob.h"
#include "../../kasten1/abstractsyncwithremotejob.h"
#include "../../kasten/abstracttool.h"
#include "../../kasten1/abstracttool.h"
#include "../../kasten/abstracttoolfactory.h"
#include "../../kasten1/abstracttoolfactory.h"
#include "../../kasten/abstracttoolinlineview.h"
#include "../../kasten1/abstracttoolinlineview.h"
#include "../../kasten/abstracttoolview.h"
#include "../../kasten1/abstracttoolview.h"
#include "../../kasten/abstracttoolviewfactory.h"
#include "../../kasten1/abstracttoolviewfactory.h"
#include "../../kasten/abstracttoolwidget.h"
#include "../../kasten1/abstracttoolwidget.h"
#include "../../kasten/abstractview.h"
#include "../../kasten1/abstractview.h"
#include "../../kasten/abstractviewarea.h"
#include "../../kasten1/abstractviewarea.h"
#include "../../kasten/abstractviewfactory.h"
#include "../../kasten1/abstractviewfactory.h"
#include "../../kasten/abstractxmlguicontroller.h"
#include "../../kasten1/abstractxmlguicontroller.h"
......@@ -68,6 +68,8 @@ set( kastengui_CamelCase_HDRS
ToolInlineViewable
WidgetsDockable
SingleViewArea
SingleViewWindow
TabbedViews
MultiViewAreas
ShellWindow
......@@ -118,6 +120,6 @@ set( kasten_CamelCase_HDRS
)
install( FILES ${kasten_CamelCase_HDRS}
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Kasten #${KASTEN_ABI_VERSION}
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Kasten${KASTEN_ABI_VERSION}
COMPONENT Devel
)
#include "../../kasten/clipboardcontroller.h"
#include "../../kasten1/clipboardcontroller.h"
#include "../../kasten/closecontroller.h"
#include "../../kasten1/closecontroller.h"
#include "../../kasten/copyascontroller.h"
#include "../../kasten1/copyascontroller.h"
#include "../../kasten/creatorcontroller.h"
#include "../../kasten1/creatorcontroller.h"
#include "../../kasten/dataselectable.h"
#include "../../kasten1/dataselectable.h"
#include "../../kasten/documentcreatemanager.h"
#include "../../kasten1/documentcreatemanager.h"
#include "../../kasten/documentmanager.h"
#include "../../kasten1/documentmanager.h"
#include "../../kasten/documentsyncmanager.h"
#include "../../kasten1/documentsyncmanager.h"
#include "../../kasten/documentversiondata.h"
#include "../../kasten1/documentversiondata.h"
#include "../../kasten/documentstool.h"
#include "../../kasten1/documentstool.h"
#include "../../kasten/documentstoolview.h"
#include "../../kasten1/documentstoolview.h"
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment