yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Oopsie, namespace the config properly too.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=795808
This commit is contained in:
Luboš Luňák 2008-04-11 13:37:24 +00:00
parent 778c869e40
commit 2a9650a740
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
clients/ozone/config/CMakeLists.txt
View file

@ -3,16 +3,16 @@ include_directories( ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/lib )
########### next target ###############
set(kwin_oxygen_config_PART_SRCS config.cpp )
set(kwin_ozone_config_PART_SRCS config.cpp )
kde4_add_ui_files(kwin_oxygen_config_PART_SRCS oxygenconfig.ui )
kde4_add_ui_files(kwin_ozone_config_PART_SRCS oxygenconfig.ui )
kde4_add_plugin(kwin_oxygen_config ${kwin_oxygen_config_PART_SRCS})
kde4_add_plugin(kwin_ozone_config ${kwin_ozone_config_PART_SRCS})
target_link_libraries(kwin_oxygen_config ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
target_link_libraries(kwin_ozone_config ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
install(TARGETS kwin_oxygen_config DESTINATION ${PLUGIN_INSTALL_DIR} )
install(TARGETS kwin_ozone_config DESTINATION ${PLUGIN_INSTALL_DIR} )

4
clients/ozone/config/config.cpp
View file

@ -35,10 +35,11 @@ extern "C"
{
KDE_EXPORT QObject* allocate_config( KConfig* conf, QWidget* parent )
{
return ( new Oxygen::OxygenConfig( conf, parent ) );
return ( new Ozone::Oxygen::OxygenConfig( conf, parent ) );
}
}
namespace Ozone {
namespace Oxygen {
OxygenConfig::OxygenConfig( KConfig*, QWidget* parent )
@ -89,3 +90,4 @@ void OxygenConfig::defaults()
}
} //namespace Oxygen
} //namespace Ozone

2
clients/ozone/config/config.h
View file

@ -29,6 +29,7 @@
#include "ui_oxygenconfig.h"
namespace Ozone {
namespace Oxygen {
class OxygenConfigUI : public QWidget, public Ui::OxygenConfigUI
@ -60,5 +61,6 @@ private:
};
} //namespace Oxygen
} //namespace Ozone
#endif

2
clients/ozone/config/oxygenconfig.ui
View file

@ -1,5 +1,5 @@
<ui version="4.0" >
<class>OxygenConfigUI</class>
<class>Ozone::OxygenConfigUI</class>
<widget class="QWidget" name="OxygenConfigUI" >
<property name="geometry" >
<rect>