From 65dd88c3f6088c6efd99653e6da4b180c227cecd Mon Sep 17 00:00:00 2001 From: coolo Date: Tue, 4 Dec 2007 09:02:22 +0000 Subject: [PATCH] moving classes where they are used git-svn-id: http://svn.opensuse.org/svn/yast/branches/tmp/coolo/qt4-port@42645 e0cc52ee-31ee-0310-8b87-e83c4596d67c --- src/CMakeLists.txt | 4 ++-- src/YQDumbTab.cc | 2 -- src/YQOptionalWidgetFactory.h | 4 ++-- src/YQPackageSelectorPlugin.cc | 6 +++--- src/YQPackageSelectorPlugin.h | 6 +++--- src/YQUI_core.cc | 3 +-- src/YQWidgetFactory.h | 2 +- src/YQWizard.cc | 1 - src/pkg/CMakeLists.txt | 4 ++-- src/{ => pkg}/QY2LayoutUtils.cc | 0 src/{ => pkg}/QY2LayoutUtils.h | 0 11 files changed, 14 insertions(+), 18 deletions(-) rename src/{ => pkg}/QY2LayoutUtils.cc (100%) rename src/{ => pkg}/QY2LayoutUtils.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d8c7c57..610b60e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_SOURCE_DIR}/src/pkg" ) +INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) ADD_DEFINITIONS( -DY2LOG=\\\"QT4\\\" ${QT_DEFINITIONS} @@ -12,7 +12,7 @@ ADD_DEFINITIONS( SET(qt4_yast_plugin_SRCS QY2CharValidator.cc QY2ComboTabWidget.cc QY2DiskUsageList.cc - QY2LayoutUtils.cc QY2ListView.cc QY2Settings.cc Y2CCQt.cc + QY2ListView.cc QY2Settings.cc Y2CCQt.cc YFrameBuffer.cc YQAlignment.cc YQApplication.cc YQBarGraph.cc YQCheckBox.cc YQCheckBoxFrame.cc YQComboBox.cc YQDateField.cc YQDialog.cc YQDownloadProgress.cc YQDumbTab.cc YQEBunny.cc diff --git a/src/YQDumbTab.cc b/src/YQDumbTab.cc index 2c6167e..0355335 100644 --- a/src/YQDumbTab.cc +++ b/src/YQDumbTab.cc @@ -26,7 +26,6 @@ #include #include "YQSignalBlocker.h" -#include "QY2LayoutUtils.h" #include "utf8.h" #include "YQUI.h" #include "YQDumbTab.h" @@ -42,7 +41,6 @@ YQDumbTab::YQDumbTab( YWidget * parent ) , YDumbTab( parent ) { setWidgetRep( this ); - addVSpacing( this, YQDumbTabSpacing ); // // Tab bar diff --git a/src/YQOptionalWidgetFactory.h b/src/YQOptionalWidgetFactory.h index a073129..3c6115b 100644 --- a/src/YQOptionalWidgetFactory.h +++ b/src/YQOptionalWidgetFactory.h @@ -28,8 +28,8 @@ #include "YQDumbTab.h" #include "YQMultiProgressMeter.h" #include "YQPartitionSplitter.h" -#include "YQPatternSelector.h" -#include "YQSimplePatchSelector.h" +#include "pkg/YQPatternSelector.h" +#include "pkg/YQSimplePatchSelector.h" #include "YQSlider.h" #include "YQTimeField.h" diff --git a/src/YQPackageSelectorPlugin.cc b/src/YQPackageSelectorPlugin.cc index a715066..3ae7778 100644 --- a/src/YQPackageSelectorPlugin.cc +++ b/src/YQPackageSelectorPlugin.cc @@ -21,9 +21,9 @@ #include "YQPackageSelectorPlugin.h" #define y2log_component "qt-ui" #include -#include "YQPackageSelector.h" -#include "YQPatternSelector.h" -#include "YQSimplePatchSelector.h" +#include "pkg/YQPackageSelector.h" +#include "pkg/YQPatternSelector.h" +#include "pkg/YQSimplePatchSelector.h" #include "YUIException.h" #define PLUGIN_BASE_NAME "qt4_pkg" diff --git a/src/YQPackageSelectorPlugin.h b/src/YQPackageSelectorPlugin.h index 0704d26..72c53cb 100644 --- a/src/YQPackageSelectorPlugin.h +++ b/src/YQPackageSelectorPlugin.h @@ -21,9 +21,9 @@ #define YQPackageSelectorPlugin_h #include -#include "YQPackageSelector.h" -#include "YQPatternSelector.h" -#include "YQSimplePatchSelector.h" +#include "pkg/YQPackageSelector.h" +#include "pkg/YQPatternSelector.h" +#include "pkg/YQSimplePatchSelector.h" /** diff --git a/src/YQUI_core.cc b/src/YQUI_core.cc index 66d59ed..553696c 100644 --- a/src/YQUI_core.cc +++ b/src/YQUI_core.cc @@ -153,8 +153,7 @@ void YQUI::init_ui() _main_win->installEventFilter( this ); #endif - //_main_win->resize( _default_size ); - _main_win->setFixedSize( 1024, 768 ); + _main_win->resize( _default_size ); if ( _fullscreen || ! _have_wm ) _main_win->move( 0, 0 ); diff --git a/src/YQWidgetFactory.h b/src/YQWidgetFactory.h index 8f9c204..4648bfc 100644 --- a/src/YQWidgetFactory.h +++ b/src/YQWidgetFactory.h @@ -38,7 +38,7 @@ #include "YQMenuButton.h" #include "YQMultiLineEdit.h" #include "YQMultiSelectionBox.h" -#include "YQPackageSelector.h" +#include "pkg/YQPackageSelector.h" #include "YQProgressBar.h" #include "YQPushButton.h" #include "YQRadioButton.h" diff --git a/src/YQWizard.cc b/src/YQWizard.cc index ec69829..4e84af6 100644 --- a/src/YQWizard.cc +++ b/src/YQWizard.cc @@ -61,7 +61,6 @@ #include "YQIconPool.h" #include "YQWidgetFactory.h" #include "YQSignalBlocker.h" -#include "QY2LayoutUtils.h" #include "YEvent.h" using std::string; diff --git a/src/pkg/CMakeLists.txt b/src/pkg/CMakeLists.txt index 74d767e..bc280a5 100644 --- a/src/pkg/CMakeLists.txt +++ b/src/pkg/CMakeLists.txt @@ -17,7 +17,7 @@ ADD_DEFINITIONS( ) SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format-nonliteral -fmessage-length=0" ) -SET(qt4_yast_pkg_plugin_SRCS YQPackageSelectorBase.cc YQPackageSelector.cc YQPackageSelectorHelp.cc YQPatternSelector.cc YQPkgChangeLogView.cc YQPkgChangesDialog.cc YQPkgConflictDialog.cc YQPkgConflictList.cc YQPkgDependenciesView.cc YQPkgDescriptionDialog.cc YQPkgDescriptionView.cc YQPkgDiskUsageList.cc YQPkgDiskUsageWarningDialog.cc YQPkgFileListView.cc YQPkgGenericDetailsView.cc YQPkgLangList.cc YQPkgList.cc YQPkgObjList.cc YQPkgPatchFilterView.cc YQPkgPatchList.cc YQPkgPatternList.cc YQPkgProductDialog.cc YQPkgProductList.cc YQPkgRepoFilterView.cc YQPkgRepoList.cc YQPkgRpmGroupTagsFilterView.cc YQPkgSearchFilterView.cc YQPkgSelDescriptionView.cc YQPkgSelList.cc YQPkgSelMapper.cc YQPkgStatusFilterView.cc YQPkgTechnicalDetailsView.cc YQPkgTextDialog.cc YQPkgUpdateProblemFilterView.cc YQPkgVersionsView.cc YQSimplePatchSelector.cc ) +SET(qt4_yast_pkg_plugin_SRCS YQPackageSelectorBase.cc YQPackageSelector.cc YQPackageSelectorHelp.cc YQPatternSelector.cc YQPkgChangeLogView.cc YQPkgChangesDialog.cc YQPkgConflictDialog.cc YQPkgConflictList.cc YQPkgDependenciesView.cc YQPkgDescriptionDialog.cc YQPkgDescriptionView.cc YQPkgDiskUsageList.cc YQPkgDiskUsageWarningDialog.cc YQPkgFileListView.cc YQPkgGenericDetailsView.cc YQPkgLangList.cc YQPkgList.cc YQPkgObjList.cc YQPkgPatchFilterView.cc YQPkgPatchList.cc YQPkgPatternList.cc YQPkgProductDialog.cc YQPkgProductList.cc YQPkgRepoFilterView.cc YQPkgRepoList.cc YQPkgRpmGroupTagsFilterView.cc YQPkgSearchFilterView.cc YQPkgSelDescriptionView.cc YQPkgSelList.cc YQPkgSelMapper.cc YQPkgStatusFilterView.cc YQPkgTechnicalDetailsView.cc YQPkgTextDialog.cc YQPkgUpdateProblemFilterView.cc YQPkgVersionsView.cc YQSimplePatchSelector.cc QY2LayoutUtils.cc ) QT4_AUTOMOC(${qt4_yast_pkg_plugin_SRCS}) @@ -36,4 +36,4 @@ TARGET_LINK_LIBRARIES( py2qt4_pkg ${YAST_PLUGIN_UI_LIBRARY} ) TARGET_LINK_LIBRARIES( py2qt4_pkg ${ZYPP_LIBRARY} ) SET_TARGET_PROPERTIES( py2qt4_pkg PROPERTIES SOVERSION 2 ) -INSTALL(TARGETS py2qt4_pkg LIBRARY DESTINATION ${YAST_PLUGIN_DIR} ) \ No newline at end of file +INSTALL(TARGETS py2qt4_pkg LIBRARY DESTINATION ${YAST_PLUGIN_DIR} ) diff --git a/src/QY2LayoutUtils.cc b/src/pkg/QY2LayoutUtils.cc similarity index 100% rename from src/QY2LayoutUtils.cc rename to src/pkg/QY2LayoutUtils.cc diff --git a/src/QY2LayoutUtils.h b/src/pkg/QY2LayoutUtils.h similarity index 100% rename from src/QY2LayoutUtils.h rename to src/pkg/QY2LayoutUtils.h -- 2.39.2