summaryrefslogtreecommitdiff
path: root/src/findsubtitles
diff options
context:
space:
mode:
Diffstat (limited to 'src/findsubtitles')
-rw-r--r--src/findsubtitles/filedownloader/filedownloader.cpp6
-rw-r--r--src/findsubtitles/filedownloader/filedownloader.h5
-rw-r--r--src/findsubtitles/findsubtitlesconfigdialog.cpp2
-rw-r--r--src/findsubtitles/findsubtitlesconfigdialog.h2
-rw-r--r--src/findsubtitles/findsubtitleswindow.cpp4
-rw-r--r--src/findsubtitles/findsubtitleswindow.h2
-rw-r--r--src/findsubtitles/main.cpp2
-rw-r--r--src/findsubtitles/osparser.cpp2
-rw-r--r--src/findsubtitles/osparser.h2
-rw-r--r--src/findsubtitles/simplehttp.cpp2
-rw-r--r--src/findsubtitles/simplehttp.h2
-rw-r--r--src/findsubtitles/subchooserdialog.cpp2
-rw-r--r--src/findsubtitles/subchooserdialog.h2
13 files changed, 17 insertions, 18 deletions
diff --git a/src/findsubtitles/filedownloader/filedownloader.cpp b/src/findsubtitles/filedownloader/filedownloader.cpp
index 8a0bec8..19f7bd7 100644
--- a/src/findsubtitles/filedownloader/filedownloader.cpp
+++ b/src/findsubtitles/filedownloader/filedownloader.cpp
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+ Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -61,7 +61,7 @@ void FileDownloader::download(QUrl url) {
http->setUser(url.userName(), url.password());
http_request_aborted = false;
- http_get_id = http->get(url.path(), &buffer);
+ http_get_id = http->get(url.path());
setLabelText(tr("Downloading %1").arg(url.toString()));
}
@@ -86,7 +86,7 @@ void FileDownloader::httpRequestFinished(int request_id, bool error) {
if (error) {
emit downloadFailed(http->errorString());
} else {
- emit downloadFinished(buffer.data());
+ emit downloadFinished(http->readAll());
}
}
diff --git a/src/findsubtitles/filedownloader/filedownloader.h b/src/findsubtitles/filedownloader/filedownloader.h
index 5386e3e..4160ff9 100644
--- a/src/findsubtitles/filedownloader/filedownloader.h
+++ b/src/findsubtitles/filedownloader/filedownloader.h
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+ Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@
#include <QProgressDialog>
#include <QUrl>
-#include <QBuffer>
#include <QNetworkProxy>
class QHttp;
@@ -56,7 +55,7 @@ private:
QHttp * http;
int http_get_id;
bool http_request_aborted;
- QBuffer buffer;
+
};
#endif
diff --git a/src/findsubtitles/findsubtitlesconfigdialog.cpp b/src/findsubtitles/findsubtitlesconfigdialog.cpp
index 9b438b7..e4b170a 100644
--- a/src/findsubtitles/findsubtitlesconfigdialog.cpp
+++ b/src/findsubtitles/findsubtitlesconfigdialog.cpp
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+ Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/src/findsubtitles/findsubtitlesconfigdialog.h b/src/findsubtitles/findsubtitlesconfigdialog.h
index d7dcb8e..1a53018 100644
--- a/src/findsubtitles/findsubtitlesconfigdialog.h
+++ b/src/findsubtitles/findsubtitlesconfigdialog.h
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+ Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/src/findsubtitles/findsubtitleswindow.cpp b/src/findsubtitles/findsubtitleswindow.cpp
index 6d1d2c7..f1c51b9 100644
--- a/src/findsubtitles/findsubtitleswindow.cpp
+++ b/src/findsubtitles/findsubtitleswindow.cpp
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+ Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -128,7 +128,7 @@ FindSubtitlesWindow::FindSubtitlesWindow( QWidget * parent, Qt::WindowFlags f )
include_lang_on_filename = true;
file_downloader = new FileDownloader(this);
- file_downloader->setModal(true);
+ file_downloader->setModal(false);
connect( file_downloader, SIGNAL(downloadFailed(QString)),
this, SLOT(showError(QString)), Qt::QueuedConnection );
connect( file_downloader, SIGNAL(downloadFinished(const QByteArray &)),
diff --git a/src/findsubtitles/findsubtitleswindow.h b/src/findsubtitles/findsubtitleswindow.h
index 362146b..511f934 100644
--- a/src/findsubtitles/findsubtitleswindow.h
+++ b/src/findsubtitles/findsubtitleswindow.h
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+ Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/src/findsubtitles/main.cpp b/src/findsubtitles/main.cpp
index 97def70..9f8902f 100644
--- a/src/findsubtitles/main.cpp
+++ b/src/findsubtitles/main.cpp
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+ Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/src/findsubtitles/osparser.cpp b/src/findsubtitles/osparser.cpp
index fbe974e..2adf9ea 100644
--- a/src/findsubtitles/osparser.cpp
+++ b/src/findsubtitles/osparser.cpp
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+ Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/src/findsubtitles/osparser.h b/src/findsubtitles/osparser.h
index e2237f1..aeca7b3 100644
--- a/src/findsubtitles/osparser.h
+++ b/src/findsubtitles/osparser.h
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+ Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/src/findsubtitles/simplehttp.cpp b/src/findsubtitles/simplehttp.cpp
index 9f44ccd..8800839 100644
--- a/src/findsubtitles/simplehttp.cpp
+++ b/src/findsubtitles/simplehttp.cpp
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+ Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/src/findsubtitles/simplehttp.h b/src/findsubtitles/simplehttp.h
index 6fb989c..94b50f7 100644
--- a/src/findsubtitles/simplehttp.h
+++ b/src/findsubtitles/simplehttp.h
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+ Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/src/findsubtitles/subchooserdialog.cpp b/src/findsubtitles/subchooserdialog.cpp
index 770583f..cd64a69 100644
--- a/src/findsubtitles/subchooserdialog.cpp
+++ b/src/findsubtitles/subchooserdialog.cpp
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+ Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/src/findsubtitles/subchooserdialog.h b/src/findsubtitles/subchooserdialog.h
index a31adaf..e3c71d2 100644
--- a/src/findsubtitles/subchooserdialog.h
+++ b/src/findsubtitles/subchooserdialog.h
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+ Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 09:15:43 +0000