diff --git a/src/widgets/qqtcheckbox.cpp b/src/widgets/qqtcheckbox.cpp index b87a66df..302d28d3 100644 --- a/src/widgets/qqtcheckbox.cpp +++ b/src/widgets/qqtcheckbox.cpp @@ -163,12 +163,6 @@ void QQtCheckBox::paintEvent ( QPaintEvent* event ) //把imageTable()[stat]设置到mImage。 translateImage(); -#if 0 - //如果把translateImage放在外边,就需要这个代码,作为对初始化的判断。 - if ( mImage.isNull() ) - translateImage(); -#endif - if ( mImage.isNull() ) return QCheckBox::paintEvent ( event ); diff --git a/test/giftest/giftestdialog.cpp b/test/giftest/giftestdialog.cpp index e64ea2c9..644ad13e 100644 --- a/test/giftest/giftestdialog.cpp +++ b/test/giftest/giftestdialog.cpp @@ -1,4 +1,4 @@ -#include "giftestdialog.h" +#include "giftestdialog.h" #include "ui_giftestdialog.h" #include "qqtframe.h" @@ -28,10 +28,10 @@ GifTestDialog::GifTestDialog ( QWidget* parent ) : #endif //使用了res函数以后 代码得到了极大简化 - pline() << res ( "waiting.gif" ); - pline() << res ( "../waiting.gif" ); + pline() << conf_res ( "waiting.gif" ); + pline() << conf_res ( "../waiting.gif" ); pline() << QDir ( "." ).relativeFilePath ( "skin/yun.png" ); - pline() << QDir ( res ( "../waiting.gif" ) ).absolutePath(); + pline() << QDir ( conf_res ( "../waiting.gif" ) ).absolutePath(); ui->labelGif->setGifFile ( conf_skin ( "waiting.gif" ) ); ui->widgetGif->setGifFile ( conf_skin ( "waiting.gif" ) ); ui->widgetQQt->setPixmap ( conf_skin ( "yun.png" ) );