Fix minor EBN issues

remotes/origin/work/aacid/use_mimes_open_dialog
Yuri Chornoivan 6 years ago
parent 3d69157736
commit 4d75045cd8
  1. 4
      autotests/searchtest.cpp
  2. 2
      core/form.h
  3. 2
      core/scripter.h
  4. 2
      core/textpage.h
  5. 4
      ui/embeddedfilesdialog.cpp
  6. 2
      ui/latexrenderer.cpp
  7. 2
      ui/pageviewutils.h

@ -294,12 +294,12 @@ void SearchTest::testHyphenAtEndOfLineWithoutYOverlap()
QCOMPARE(*result, expected); QCOMPARE(*result, expected);
delete result; delete result;
// If the user is looking for the text explicitely with the hyphen also find it // If the user is looking for the text explicitly with the hyphen also find it
result = tp->findText(0, QStringLiteral("super-cali-fragilistic"), Okular::FromTop, Qt::CaseSensitive, nullptr); result = tp->findText(0, QStringLiteral("super-cali-fragilistic"), Okular::FromTop, Qt::CaseSensitive, nullptr);
QVERIFY(result); QVERIFY(result);
delete result; delete result;
// If the user is looking for the text explicitely with the hyphen also find it // If the user is looking for the text explicitly with the hyphen also find it
result = tp->findText(0, QStringLiteral("super-cali-fragilistic"), Okular::FromBottom, Qt::CaseSensitive, nullptr); result = tp->findText(0, QStringLiteral("super-cali-fragilistic"), Okular::FromBottom, Qt::CaseSensitive, nullptr);
QVERIFY(result); QVERIFY(result);
delete result; delete result;

@ -431,7 +431,7 @@ class OKULARCORE_EXPORT FormFieldChoice : public FormField
/** /**
* The possible choices of the choice field. * The possible choices of the choice field.
* The key is the the display name of the choice, * The key is the display name of the choice,
* The value is the export value (i.e. for use in javascript, etc) of the choice * The value is the export value (i.e. for use in javascript, etc) of the choice
* *
* @since 1.11 * @since 1.11

@ -41,7 +41,7 @@ class Scripter
friend class ScripterPrivate; friend class ScripterPrivate;
ScripterPrivate* d; ScripterPrivate* d;
Scripter( DocumentPrivate *doc ); explicit Scripter( DocumentPrivate *doc );
}; };
} }

@ -131,7 +131,7 @@ class OKULARCORE_EXPORT TextPage
/** /**
* Creates a new text page with the given @p words. * Creates a new text page with the given @p words.
*/ */
TextPage( const TextEntity::List &words ); explicit TextPage( const TextEntity::List &words );
/** /**
* Destroys the text page. * Destroys the text page.

@ -181,10 +181,10 @@ void EmbeddedFilesDialog::viewFile( Okular::EmbeddedFile* ef )
// using QTemporaryFile's XXXXXX placeholder // using QTemporaryFile's XXXXXX placeholder
QTemporaryFile *tmpFile = new QTemporaryFile( QTemporaryFile *tmpFile = new QTemporaryFile(
QDir::tempPath() QDir::tempPath()
+ "/" + '/'
+ fileInfo.baseName() + fileInfo.baseName()
+ ".XXXXXX" + ".XXXXXX"
+ (fileInfo.completeSuffix().isEmpty() ? QLatin1String("") : QString("." + fileInfo.completeSuffix())) + (fileInfo.completeSuffix().isEmpty() ? QLatin1String("") : QString('.' + fileInfo.completeSuffix()))
); );
GuiUtils::writeEmbeddedFile( ef, this, *tmpFile ); GuiUtils::writeEmbeddedFile( ef, this, *tmpFile );

@ -121,7 +121,7 @@ LatexRenderer::Error LatexRenderer::handleLatex( QString& fileName, const QStrin
tempFile->open(); tempFile->open();
QString tempFileName = tempFile->fileName(); QString tempFileName = tempFile->fileName();
QFileInfo *tempFileInfo = new QFileInfo(tempFileName); QFileInfo *tempFileInfo = new QFileInfo(tempFileName);
QString tempFileNameNS = tempFileInfo->absolutePath() + "/" + tempFileInfo->baseName(); QString tempFileNameNS = tempFileInfo->absolutePath() + '/' + tempFileInfo->baseName();
QString tempFilePath = tempFileInfo->absolutePath(); QString tempFilePath = tempFileInfo->absolutePath();
delete tempFileInfo; delete tempFileInfo;
QTextStream tempStream(tempFile); QTextStream tempStream(tempFile);

@ -41,7 +41,7 @@ class Page;
class PageViewItem class PageViewItem
{ {
public: public:
PageViewItem( const Okular::Page * page ); explicit PageViewItem( const Okular::Page * page );
~PageViewItem(); ~PageViewItem();
PageViewItem(const PageViewItem &) = delete; PageViewItem(const PageViewItem &) = delete;

Loading…
Cancel
Save