diff --git a/src/ExMplayer.pro b/src/ExMplayer.pro index 0ef08fd..ced01f9 100644 --- a/src/ExMplayer.pro +++ b/src/ExMplayer.pro @@ -56,14 +56,14 @@ FORMS += searchsubtitle/searchsubtitle.ui \ coverartdialog.ui \ gifanimatordialog.ui -#miniz libarary to uncompress data +#miniz library to uncompress data SOURCES += searchsubtitle/miniz/miniz.c searchsubtitle/miniz/tinfl.c # xmlrpc client code to connect to opensubtitles.org HEADERS +=searchsubtitle/maia/maiaObject.h searchsubtitle/maia/maiaFault.h searchsubtitle/maia/maiaXmlRpcClient.h SOURCES += searchsubtitle/maia/maiaObject.cpp searchsubtitle/maia/maiaFault.cpp searchsubtitle/maia/maiaXmlRpcClient.cpp -#video dl suppport +#video dl support INCLUDEPATH += videodl DEPENDPATH += videodl diff --git a/src/pictureflow.cpp b/src/pictureflow.cpp index d7967c7..23067a9 100644 --- a/src/pictureflow.cpp +++ b/src/pictureflow.cpp @@ -635,7 +635,7 @@ static QImage* prepareSurface(const QImage* slideImage, int w, int h, QRgb bgcol QImage img = slideImage->smoothScale(w, h); #endif - // slightly larger, to accomodate for the reflection + // slightly larger, to accommodate for the reflection int hs = h * 2; int hofs = h / 3; diff --git a/src/playerwindow.cpp b/src/playerwindow.cpp index e54fff6..de93def 100644 --- a/src/playerwindow.cpp +++ b/src/playerwindow.cpp @@ -4110,7 +4110,7 @@ void PlayerWindow::saveCoverArt() if (!fileName.isEmpty()) { if(!cover->save(fileName,0,-1)) - QMessageBox::critical(this,qApp->applicationName(),tr("An error occured while saving"),QMessageBox::Ok,QMessageBox::Cancel); + QMessageBox::critical(this,qApp->applicationName(),tr("An error occurred while saving"),QMessageBox::Ok,QMessageBox::Cancel); } } diff --git a/src/preferencedialog.cpp b/src/preferencedialog.cpp index 933f043..35f87cf 100644 --- a/src/preferencedialog.cpp +++ b/src/preferencedialog.cpp @@ -252,7 +252,7 @@ void preferenceDialog::on_buttonBox_clicked(QAbstractButton* button) QString actHash="c8ba9d01342f8488c815fb5e63e96f53ba9f46fb";*/ // if ( QString(hashData.toHex())!=actHash) //{ - // qDebug() << "Differnt font config"; + // qDebug() << "Different font config"; if (ui->checkBoxUseCodePage->isChecked()) {QString exeFileName(qApp->applicationDirPath()+"/exmplayer-font-cache.exe"); diff --git a/src/qtsingleapplication/qtlockedfile.cpp b/src/qtsingleapplication/qtlockedfile.cpp index 21b7fb0..08e1770 100644 --- a/src/qtsingleapplication/qtlockedfile.cpp +++ b/src/qtsingleapplication/qtlockedfile.cpp @@ -164,8 +164,8 @@ QtLockedFile::LockMode QtLockedFile::lockMode() const can be locked. If \a block is true, this function will block until the lock is - aquired. If \a block is false, this function returns \e false - immediately if the lock cannot be aquired. + acquired. If \a block is false, this function returns \e false + immediately if the lock cannot be acquired. If this object already has a lock of type \a mode, this function returns \e true immediately. If this object has a lock of a diff --git a/src/screensaver.cpp b/src/screensaver.cpp index c215eec..91d8f81 100644 --- a/src/screensaver.cpp +++ b/src/screensaver.cpp @@ -64,7 +64,7 @@ void WinScreenSaver::retrieveState() { qDebug("WinScreenSaver::retrieveState: lowpower: %d, poweroff: %d, screensaver: %d", lowpower, poweroff, screensaver); #else state_saved = true; - qDebug("WinScreensaver::retrieveState: init done %s", SSCore_TempDisable ?"succesfully":"failed"); + qDebug("WinScreensaver::retrieveState: init done %s", SSCore_TempDisable ?"successfully":"failed"); #endif } else { qDebug("WinScreenSaver::retrieveState: state already saved previously, doing nothing"); diff --git a/src/searchsubtitle/maia/maiaXmlRpcServerConnection.cpp b/src/searchsubtitle/maia/maiaXmlRpcServerConnection.cpp index 39e486e..b152ff8 100644 --- a/src/searchsubtitle/maia/maiaXmlRpcServerConnection.cpp +++ b/src/searchsubtitle/maia/maiaXmlRpcServerConnection.cpp @@ -92,7 +92,7 @@ void MaiaXmlRpcServerConnection::parseCall(QString call) { QObject *responseObject; const char *responseSlot; - if(!doc.setContent(call)) { /* recieved invalid xml */ + if(!doc.setContent(call)) { /* received invalid xml */ MaiaFault fault(-32700, "parse error: not well formed"); sendResponse(fault.toString()); return; diff --git a/src/searchsubtitle/miniz/miniz.c b/src/searchsubtitle/miniz/miniz.c index 4454c80..fbde941 100644 --- a/src/searchsubtitle/miniz/miniz.c +++ b/src/searchsubtitle/miniz/miniz.c @@ -9,7 +9,7 @@ * Change History 10/13/13 v1.15 r4 - Interim bugfix release while I work on the next major release with Zip64 support (almost there!): - Critical fix for the MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY bug (thanks kahmyong.moon@hp.com) which could cause locate files to not find files. This bug - would only have occured in earlier versions if you explicitly used this flag, OR if you used mz_zip_extract_archive_file_to_heap() or mz_zip_add_mem_to_archive_file_in_place() + would only have occurred in earlier versions if you explicitly used this flag, OR if you used mz_zip_extract_archive_file_to_heap() or mz_zip_add_mem_to_archive_file_in_place() (which used this flag). If you can't switch to v1.15 but want to fix this bug, just remove the uses of this flag from both helper funcs (and of course don't use the flag). - Bugfix in mz_zip_reader_extract_to_mem_no_alloc() from kymoon when pUser_read_buf is not NULL and compressed size is > uncompressed size - Fixing mz_zip_reader_extract_*() funcs so they don't try to extract compressed data from directory entries, to account for weird zipfiles which contain zero-size compressed data on dir entries. diff --git a/src/searchsubtitle/opensubtitleclient.cpp b/src/searchsubtitle/opensubtitleclient.cpp index e1e0616..5b032f1 100644 --- a/src/searchsubtitle/opensubtitleclient.cpp +++ b/src/searchsubtitle/opensubtitleclient.cpp @@ -62,7 +62,7 @@ void OpenSubtitlesClient::handleLogin(QVariant& result) if (resultMap["status"].toString() == QLatin1String("200 OK")) { token = resultMap["token"].toString(); - qDebug()<<"Login succesful"<4) * (Frames). This class provides an API for - * gathering information about and modifying ID3v2 frames. Funtionallity + * gathering information about and modifying ID3v2 frames. Functionality * specific to a given frame type is handed in one of the many subclasses. */ @@ -165,7 +165,7 @@ namespace TagLib { * All other processing of \a data should be handled in a subclass. * * \note This need not contain anything more than a frame ID, but - * \e must constain at least that. + * \e must contain at least that. */ explicit Frame(const ByteVector &data); @@ -255,7 +255,7 @@ namespace TagLib { /*! - * Parses the contents of this frame as PropertyMap. If that fails, the returend + * Parses the contents of this frame as PropertyMap. If that fails, the returned * PropertyMap will be empty, and its unsupportedData() will contain this frame's * ID. * BIC: Will be a virtual function in future releases.