mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-23 20:14:05 +00:00
clean code:remove QT_VERSION check
This commit is contained in:
yifang
parent
e04aa50a99
commit
de3d7b8b19
|
|
@ -1928,7 +1928,6 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
|
|||
else
|
||||
if( result == saveImageAction || result == saveSoundAction )
|
||||
{
|
||||
#if QT_VERSION >= 0x040600
|
||||
// QUrl url = ( result == saveImageAction ) ? imageUrl : targetUrl;
|
||||
QUrl url = targetUrl;
|
||||
QString savePath;
|
||||
|
|
@ -1978,7 +1977,6 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
|
|||
emit storeResourceSavePath( QDir::toNativeSeparators( fileInfo.absoluteDir().absolutePath() ) );
|
||||
saveResource( url, ui.definition->url(), fileName );
|
||||
}
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1495,9 +1495,7 @@ bool BtreeDictionary::getHeadwords( QStringList &headwords )
|
|||
|
||||
if( setOfHeadwords.size() )
|
||||
{
|
||||
#if QT_VERSION >= 0x040700
|
||||
headwords.reserve( setOfHeadwords.size() );
|
||||
#endif
|
||||
|
||||
QSet< QString >::const_iterator it = setOfHeadwords.constBegin();
|
||||
QSet< QString >::const_iterator end = setOfHeadwords.constEnd();
|
||||
|
|
|
|||
|
|
@ -2,12 +2,8 @@
|
|||
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
|
||||
|
||||
#include "extlineedit.hh"
|
||||
|
||||
#include <QPainter>
|
||||
|
||||
#if QT_VERSION >= 0x040600
|
||||
#include <QPropertyAnimation>
|
||||
#endif
|
||||
|
||||
ExtLineEdit::ExtLineEdit(QWidget *parent) :
|
||||
QLineEdit(parent)
|
||||
|
|
@ -179,7 +175,6 @@ void IconButton::paintEvent(QPaintEvent *)
|
|||
|
||||
void IconButton::animate(bool visible)
|
||||
{
|
||||
#if QT_VERSION >= 0x040600
|
||||
QPropertyAnimation *animation = new QPropertyAnimation(this, "opacity");
|
||||
animation->setDuration(250);
|
||||
if (visible)
|
||||
|
|
@ -191,7 +186,4 @@ void IconButton::animate(bool visible)
|
|||
animation->setEndValue(0.0);
|
||||
}
|
||||
animation->start(QAbstractAnimation::DeleteWhenStopped);
|
||||
#else
|
||||
setOpacity(visible ? 1.0 : 0.0);
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
|
||||
#include "gdappstyle.hh"
|
||||
|
||||
#if QT_VERSION >= 0x040600
|
||||
|
||||
#include "dictionarybar.hh"
|
||||
|
||||
#include <QWidget>
|
||||
|
|
@ -53,5 +51,3 @@ bool GdAppStyle::dictionaryBarButton(const QWidget * widget) const {
|
|||
|
||||
return false;
|
||||
}
|
||||
|
||||
#endif // QT_VERSION
|
||||
|
|
|
|||
|
|
@ -5,9 +5,6 @@
|
|||
#define GDAPPSTYLE_HH
|
||||
|
||||
#include <QtGlobal>
|
||||
|
||||
#if QT_VERSION >= 0x040600
|
||||
|
||||
#include <QStyle>
|
||||
#include <QProxyStyle>
|
||||
#include <QStyleOption>
|
||||
|
|
@ -30,6 +27,4 @@ private:
|
|||
|
||||
};
|
||||
|
||||
#endif // QT_VERSION
|
||||
|
||||
#endif // GDAPPSTYLE_HH
|
||||
|
|
|
|||
|
|
@ -546,9 +546,7 @@ void DictListWidget::rowsAboutToBeRemoved( QModelIndex const & parent, int start
|
|||
DictGroupsWidget::DictGroupsWidget( QWidget * parent ):
|
||||
QTabWidget( parent ), nextId( 1 ), allDicts( 0 ), activeDicts( 0 )
|
||||
{
|
||||
#if QT_VERSION >= 0x040500
|
||||
setMovable( true );
|
||||
#endif
|
||||
setContextMenuPolicy( Qt::CustomContextMenu );
|
||||
connect( this, SIGNAL( customContextMenuRequested( QPoint ) ),
|
||||
this, SLOT( contextMenu( QPoint ) ) );
|
||||
|
|
@ -1023,9 +1021,7 @@ QuickFilterLine::QuickFilterLine( QWidget * parent ): ExtLineEdit( parent ), m_f
|
|||
{
|
||||
m_proxyModel.setFilterCaseSensitivity( Qt::CaseInsensitive );
|
||||
|
||||
#if QT_VERSION >= 0x040700
|
||||
setPlaceholderText( tr( "Dictionary search/filter (Ctrl+F)" ) );
|
||||
#endif
|
||||
|
||||
m_focusAction.setShortcut( QKeySequence( "Ctrl+F" ) );
|
||||
connect( &m_focusAction, SIGNAL( triggered() ),
|
||||
|
|
|
|||
|
|
@ -353,11 +353,7 @@ bool LangCoder::isLanguageRTL( quint32 code )
|
|||
GDLangCode &lc = LangCodes[ langCoder.codeMap[ code ] ];
|
||||
if( lc.isRTL < 0 )
|
||||
{
|
||||
#if QT_VERSION >= 0x040700
|
||||
lc.isRTL = ( int )( QLocale( lc.code ).textDirection() == Qt::RightToLeft );
|
||||
#else
|
||||
lc.isRTL = 0;
|
||||
#endif
|
||||
}
|
||||
return lc.isRTL != 0;
|
||||
}
|
||||
|
|
|
|||
2
main.cc
2
main.cc
|
|
@ -310,9 +310,7 @@ int main( int argc, char ** argv )
|
|||
|
||||
app.setApplicationName( "GoldenDict" );
|
||||
app.setOrganizationDomain( "http://goldendict.org/" );
|
||||
#if QT_VERSION >= 0x040600
|
||||
app.setStyle(new GdAppStyle);
|
||||
#endif
|
||||
|
||||
#ifndef Q_OS_MAC
|
||||
app.setWindowIcon( QIcon( ":/icons/programicon.png" ) );
|
||||
|
|
|
|||
|
|
@ -655,9 +655,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
|
|||
connect( ui.tabWidget, SIGNAL( customContextMenuRequested(QPoint)) ,
|
||||
this, SLOT( tabMenuRequested(QPoint)) );
|
||||
|
||||
#if QT_VERSION >= 0x040500
|
||||
ui.tabWidget->setTabsClosable( true );
|
||||
#endif
|
||||
|
||||
connect( ui.quit, SIGNAL( triggered() ),
|
||||
this, SLOT( quitApp() ) );
|
||||
|
|
|
|||
|
|
@ -98,10 +98,7 @@ TranslateBox::TranslateBox(QWidget *parent) : QWidget(parent),
|
|||
|
||||
setFocusProxy(translate_line);
|
||||
translate_line->setObjectName("translateLine");
|
||||
#if QT_VERSION >= 0x040700
|
||||
translate_line->setPlaceholderText( tr( "Type a word or phrase to search dictionaries" ) );
|
||||
#endif
|
||||
|
||||
word_list->setTranslateLine(translate_line);
|
||||
|
||||
// completer = new QCompleter(m_completionList->model(), this);
|
||||
|
|
|
|||
Loading…
Reference in a new issue