From 54ec093b2d8458b9adb3151e28ef1392d790b515 Mon Sep 17 00:00:00 2001 From: Jacob Alexander Date: Sat, 25 Oct 2008 17:04:01 -0700 Subject: [PATCH] Small update to BaulkWidget Defaults and Library Loader (Bus-Dev) --- src/Common/baulkwidget.cpp | 9 +++++++++ src/Common/baulkwidget.h | 1 + src/Common/libraryloader.cpp | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Common/baulkwidget.cpp b/src/Common/baulkwidget.cpp index bc963bd..5ac838c 100644 --- a/src/Common/baulkwidget.cpp +++ b/src/Common/baulkwidget.cpp @@ -22,6 +22,7 @@ // Constructors *********************************************************************************** BaulkWidget::BaulkWidget( QWidget *parent ) : QWidget( parent ) { + widgetSetup(); } BaulkWidget::BaulkWidget( QWidget *wrapWidget, QWidget *parent ) : QWidget( parent ) { @@ -29,6 +30,14 @@ BaulkWidget::BaulkWidget( QWidget *wrapWidget, QWidget *parent ) : QWidget( pare layout->setContentsMargins( 0,0,0,0 ); layout->addWidget( wrapWidget ); setLayout( layout ); + + widgetSetup(); +} + +// Defaults *************************************************************************************** +void BaulkWidget::widgetSetup() { + setMinimumSize( 25, 25 ); + setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ); } // Properties ************************************************************************************* diff --git a/src/Common/baulkwidget.h b/src/Common/baulkwidget.h index a83d4dd..ac749cc 100644 --- a/src/Common/baulkwidget.h +++ b/src/Common/baulkwidget.h @@ -46,6 +46,7 @@ public: public slots: private: + void widgetSetup(); signals: void serverListenNameSet( QString listenName ); diff --git a/src/Common/libraryloader.cpp b/src/Common/libraryloader.cpp index 6cfa0bb..565f8ba 100644 --- a/src/Common/libraryloader.cpp +++ b/src/Common/libraryloader.cpp @@ -91,7 +91,7 @@ bool LibraryLoader::loadLibrary( QString libraryName, bool detectVersion, QStrin // Symbol Resolvers ******************************************************************************* void *LibraryLoader::lrResolve( QString symbol ) { - const char *symbolName = symbol.toAscii().data(); + const char *symbolName = symbol.toUtf8().data(); void *tmp = resolve( symbolName ); if ( allErrors.isEmpty() || allErrors.last() != errorString() ) allErrors << errorString(); -- 2.11.4.GIT