From a86bbe9053efe6b5a15e4114b57a33c693c643e1 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 22 Sep 2010 11:52:46 +0000 Subject: [PATCH] Use QLatin1String svn path=/trunk/KDE/kdegraphics/okular/; revision=1178207 --- core/bookmarkmanager.cpp | 2 +- generators/dvi/fontpool.cpp | 2 +- ui/bookmarklist.cpp | 2 +- ui/minibar.cpp | 4 ++-- ui/pageviewutils.cpp | 2 +- ui/presentationwidget.cpp | 4 ++-- ui/searchlineedit.cpp | 2 +- ui/searchwidget.cpp | 2 +- ui/side_reviews.cpp | 2 +- ui/thumbnaillist.cpp | 4 ++-- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/bookmarkmanager.cpp b/core/bookmarkmanager.cpp index af12ae609..298c58d82 100644 --- a/core/bookmarkmanager.cpp +++ b/core/bookmarkmanager.cpp @@ -101,7 +101,7 @@ static inline KUrl urlForGroup(const KBookmark &group) BookmarkManager::BookmarkManager( DocumentPrivate * document ) : QObject( document->m_parent ), d( new Private( this ) ) { - setObjectName( "Okular::BookmarkManager" ); + setObjectName( QLatin1String( "Okular::BookmarkManager" ) ); d->document = document; diff --git a/generators/dvi/fontpool.cpp b/generators/dvi/fontpool.cpp index 2ee24dfa3..a437ce258 100644 --- a/generators/dvi/fontpool.cpp +++ b/generators/dvi/fontpool.cpp @@ -48,7 +48,7 @@ fontPool::fontPool(bool useFontHinting) kDebug(kvs::dvi) << "fontPool::fontPool() called"; #endif - setObjectName("Font Pool"); + setObjectName( QLatin1String("Font Pool" )); displayResolution_in_dpi = 100.0; // A not-too-bad-default useFontHints = useFontHinting; diff --git a/ui/bookmarklist.cpp b/ui/bookmarklist.cpp index c582987a7..cb37a5c2b 100644 --- a/ui/bookmarklist.cpp +++ b/ui/bookmarklist.cpp @@ -145,7 +145,7 @@ BookmarkList::BookmarkList( Okular::Document *document, QWidget *parent ) QToolBar * bookmarkController = new QToolBar( this ); mainlay->addWidget( bookmarkController ); - bookmarkController->setObjectName( "BookmarkControlBar" ); + bookmarkController->setObjectName( QLatin1String( "BookmarkControlBar" ) ); // change toolbar appearance bookmarkController->setIconSize( QSize( 16, 16 ) ); bookmarkController->setMovable( false ); diff --git a/ui/minibar.cpp b/ui/minibar.cpp index 19e2bff40..7f314268d 100644 --- a/ui/minibar.cpp +++ b/ui/minibar.cpp @@ -66,7 +66,7 @@ MiniBar::MiniBar( QWidget * parent, Okular::Document * document ) : QWidget( parent ), m_document( document ), m_currentPage( -1 ) { - setObjectName( "miniBar" ); + setObjectName( QLatin1String( "miniBar" ) ); QHBoxLayout * horLayout = new QHBoxLayout( this ); @@ -211,7 +211,7 @@ ProgressWidget::ProgressWidget( QWidget * parent, Okular::Document * document ) : QWidget( parent ), m_document( document ), m_currentPage( -1 ), m_progressPercentage( -1 ) { - setObjectName( "progress" ); + setObjectName( QLatin1String( "progress" ) ); setAttribute( Qt::WA_OpaquePaintEvent, true ); setFixedHeight( 4 ); setMouseTracking( true ); diff --git a/ui/pageviewutils.cpp b/ui/pageviewutils.cpp index c3c512ee0..8ef4bc4f3 100644 --- a/ui/pageviewutils.cpp +++ b/ui/pageviewutils.cpp @@ -220,7 +220,7 @@ PageViewMessage::PageViewMessage( QWidget * parent ) : QWidget( parent ), m_timer( 0 ) , m_lineSpacing( 0 ) { - setObjectName( "pageViewMessage" ); + setObjectName( QLatin1String( "pageViewMessage" ) ); setFocusPolicy( Qt::NoFocus ); QPalette pal = palette(); pal.setColor( QPalette::Active, QPalette::Window, QApplication::palette().color( QPalette::Active, QPalette::Window ) ); diff --git a/ui/presentationwidget.cpp b/ui/presentationwidget.cpp index 465f7b03b..056ecfb86 100644 --- a/ui/presentationwidget.cpp +++ b/ui/presentationwidget.cpp @@ -135,7 +135,7 @@ PresentationWidget::PresentationWidget( QWidget * parent, Okular::Document * doc Q_UNUSED( parent ) setAttribute( Qt::WA_DeleteOnClose ); setAttribute( Qt::WA_OpaquePaintEvent ); - setObjectName( "presentationWidget" ); + setObjectName( QLatin1String( "presentationWidget" ) ); QString caption = doc->metaData( "DocumentTitle" ).toString(); if ( caption.trimmed().isEmpty() ) caption = doc->currentDocument().fileName(); @@ -147,7 +147,7 @@ PresentationWidget::PresentationWidget( QWidget * parent, Okular::Document * doc // create top toolbar m_topBar = new PresentationToolBar( this ); - m_topBar->setObjectName( "presentationBar" ); + m_topBar->setObjectName( QLatin1String( "presentationBar" ) ); m_topBar->setIconSize( QSize( 32, 32 ) ); m_topBar->setMovable( false ); m_topBar->layout()->setMargin(0); diff --git a/ui/searchlineedit.cpp b/ui/searchlineedit.cpp index 4ad0acee7..e247ad737 100644 --- a/ui/searchlineedit.cpp +++ b/ui/searchlineedit.cpp @@ -28,7 +28,7 @@ SearchLineEdit::SearchLineEdit( QWidget * parent, Okular::Document * document ) m_moveViewport( false ), m_changed( false ), m_fromStart( true ), m_searchRunning( false ) { - setObjectName( "SearchLineEdit" ); + setObjectName( QLatin1String( "SearchLineEdit" ) ); setClearButtonShown( true ); // a timer to ensure that we don't flood the document with requests to search diff --git a/ui/searchwidget.cpp b/ui/searchwidget.cpp index e0f2aba5b..ec1d77968 100644 --- a/ui/searchwidget.cpp +++ b/ui/searchwidget.cpp @@ -24,7 +24,7 @@ SearchWidget::SearchWidget( QWidget * parent, Okular::Document * document ) : QWidget( parent ) { - setObjectName( "iSearchBar" ); + setObjectName( QLatin1String( "iSearchBar" ) ); QSizePolicy sp = sizePolicy(); sp.setVerticalPolicy( QSizePolicy::Minimum ); diff --git a/ui/side_reviews.cpp b/ui/side_reviews.cpp index 3d1124b7f..8e9dbb4d4 100644 --- a/ui/side_reviews.cpp +++ b/ui/side_reviews.cpp @@ -96,7 +96,7 @@ Reviews::Reviews( QWidget * parent, Okular::Document * document ) m_view->header()->hide(); QToolBar *toolBar = new QToolBar( this ); - toolBar->setObjectName( "reviewOptsBar" ); + toolBar->setObjectName( QLatin1String( "reviewOptsBar" ) ); QSizePolicy sp = toolBar->sizePolicy(); sp.setVerticalPolicy( QSizePolicy::Minimum ); toolBar->setSizePolicy( sp ); diff --git a/ui/thumbnaillist.cpp b/ui/thumbnaillist.cpp index aa58a390e..5087cf08a 100644 --- a/ui/thumbnaillist.cpp +++ b/ui/thumbnaillist.cpp @@ -199,7 +199,7 @@ void ThumbnailListPrivate::paintEvent( QPaintEvent * e ) ThumbnailList::ThumbnailList( QWidget *parent, Okular::Document *document ) : QScrollArea( parent ), d( new ThumbnailListPrivate( this, document ) ) { - setObjectName( "okular::Thumbnails" ); + setObjectName( QLatin1String( "okular::Thumbnails" ) ); // set scrollbars setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn ); @@ -1002,7 +1002,7 @@ void ThumbnailWidget::paint( QPainter &p, const QRect &_clipRect ) ThumbnailController::ThumbnailController( QWidget * parent, ThumbnailList * list ) : QToolBar( parent ) { - setObjectName( "ThumbsControlBar" ); + setObjectName( QLatin1String( "ThumbsControlBar" ) ); // change toolbar appearance setIconSize( QSize( 16, 16 ) ); setMovable( false );