minor compatibility updates (added missing headers, simple function name changes etc)

src/desktop/UBCustomCaptureWindow.cpp

@@ -24,6 +24,8 @@
 
 
 
+#include <QApplication>
+#include <QDesktopWidget>
 
 #include "UBCustomCaptureWindow.h"
 

src/desktop/UBCustomCaptureWindow.h

@@ -29,6 +29,9 @@
 #define UBCUSTOMCAPTUREWINDOW_H_
 
 #include <QtGui>
+#include <QDialog>
+#include <QRubberBand>
+
 /**
 * This class is used to do the custom capture of Uninotes
 **/

src/desktop/UBWindowCapture_linux.cpp

@@ -24,6 +24,7 @@
 
 
 
+#include <QDialog>
 
 #include "UBWindowCapture.h"
 #include "UBDesktopAnnotationController.h"

src/document/UBDocumentController.h

@@ -29,6 +29,7 @@
 #define UBDOCUMENTCONTROLLER_H_
 
 #include <QtGui>
+#include <QTreeWidgetItem>
 #include "document/UBDocumentContainer.h"
 
 namespace Ui

src/domain/UBGraphicsWidgetItem.cpp

@@ -27,6 +27,7 @@
 
 #include <QtNetwork>
 #include <QtXml>
+#include <QWebFrame>
 
 #include "UBGraphicsWidgetItem.h"
 #include "UBGraphicsScene.h"
@@ -121,7 +122,8 @@ void UBGraphicsWidgetItem::initialize()
     page()->setPalette(palette);
     page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
 
-    connect(page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(javaScriptWindowObjectCleared()));
+    connect(page()->mainFrame(), &QWebFrame::javaScriptWindowObjectCleared,
+            this, &UBGraphicsWidgetItem::javaScriptWindowObjectCleared);
     connect(page(), SIGNAL(geometryChangeRequested(const QRect&)), this, SLOT(geometryChangeRequested(const QRect&)));
     connect(this, SIGNAL(loadFinished(bool)), this, SLOT(mainFrameLoadFinished (bool)));
     connect(page()->mainFrame(), SIGNAL(initialLayoutCompleted()), this, SLOT(initialLayoutCompleted()));

src/domain/UBUndoCommand.h

@@ -29,6 +29,7 @@
 #define UBABSTRACTUNDOCOMMAND_H_
 
 #include <QtGui>
+#include <QUndoCommand>
 #include <core/UB.h>
 
 class UBUndoCommand : public QUndoCommand

src/frameworks/UBCryptoUtils.cpp

@@ -92,13 +92,13 @@ QString UBCryptoUtils::symetricEncrypt(const QString& clear)
 
     free(ciphertext);
 
-    return QString::fromAscii(cipheredData.toBase64());
+    return QString::fromLatin1(cipheredData.toBase64());
 }
 
 
 QString UBCryptoUtils::symetricDecrypt(const QString& encrypted)
 {
-    QByteArray encryptedData = QByteArray::fromBase64(encrypted.toAscii());
+    QByteArray encryptedData = QByteArray::fromBase64(encrypted.toLatin1());
 
     int encryptedLength = encryptedData.length();
     int paddingLength = 0;
@@ -132,10 +132,10 @@ void UBCryptoUtils::aesInit()
 {
     int i, nrounds = 5;
     unsigned char key[32], iv[32];
-    unsigned char *key_data = (unsigned char *)sAESKey.toAscii().data();
+    unsigned char *key_data = (unsigned char *)sAESKey.toLatin1().data();
     int key_data_len = sAESKey.length();
 
-    i = EVP_BytesToKey(EVP_aes_256_cbc(), EVP_sha1(), (unsigned char *)sAESSalt.toAscii().data(), key_data,
+    i = EVP_BytesToKey(EVP_aes_256_cbc(), EVP_sha1(), (unsigned char *)sAESSalt.toLatin1().data(), key_data,
             key_data_len, nrounds, key, iv);
 
     if (i != 32)

src/frameworks/UBPlatformUtils_linux.cpp

@@ -28,6 +28,7 @@
 #include "UBPlatformUtils.h"
 
 #include <QtGui>
+#include <QApplication>
 
 #include <unistd.h>
 #include <X11/Xlib.h>
@@ -98,7 +99,7 @@ void UBPlatformUtils::bringPreviousProcessToFront()
 QString UBPlatformUtils::osUserLoginName()
 {
     char *user = getenv("USER");
-    return QString::fromAscii(user);
+    return QString::fromLatin1(user);
 }
 
 QString UBPlatformUtils::computerName()
@@ -108,7 +109,7 @@ QString UBPlatformUtils::computerName()
     // if the name is longer than 255 the name is truncated but os doesn't ensure
     // that the last character returned is a null character
     if(!gethostname(hostname,255))
-        return QString::fromAscii(hostname);
+        return QString::fromLatin1(hostname);
     else
         return "NOT FOUND";
 }

src/gui/UBActionPalette.cpp

@@ -23,7 +23,8 @@
  */
 
 
-
+#include <QLayout>
+#include <QAction>
 
 #include "UBActionPalette.h"
 
@@ -103,8 +104,10 @@ UBActionPaletteButton* UBActionPalette::createPaletteButton(QAction* action, QWi
 
     mMapActionToButton[action] = button;
 
-    connect(button, SIGNAL(clicked()), this, SLOT(buttonClicked()));
+    connect(button, &UBActionPaletteButton::clicked,
-    connect(action, SIGNAL(changed()), this, SLOT(actionChanged()));
+            this, &UBActionPalette::buttonClicked);
+    connect(action, &QAction::changed,
+            this, &UBActionPalette::actionChanged);
 
     return button;
 }

src/gui/UBActionPalette.h

@@ -31,6 +31,8 @@
 #include <QtGui>
 #include <QPoint>
 #include <QButtonGroup>
+#include <QToolButton>
+
 #include "UBFloatingPalette.h"
 
 class UBActionPaletteButton;

src/gui/UBColorPicker.h

@@ -29,6 +29,7 @@
 #define UBCOLORPICKER_H_
 
 #include <QtGui>
+#include <QFrame>
 
 class UBColorPicker : public QFrame
 {

src/gui/UBDockPalette.cpp

@@ -654,9 +654,9 @@ void UBTabDockPalette::paintEvent(QPaintEvent *)
         }
 
         painter.save();
-        QPixmap transparencyPix(":/images/tab_mask.png");
+        //QPixmap transparencyPix(":/images/tab_mask.png");
         if (dock->mCurrentTab != i) {
-            iconPixmap.setAlphaChannel(transparencyPix);
+            //iconPixmap.setAlphaChannel(transparencyPix); // deprecated; removed for now, to be re-implemented
             QColor color(0x7F, 0x7F, 0x7F, 0x3F);
             painter.setBrush(QBrush(color));
         }

src/gui/UBDocumentTreeWidget.h

@@ -29,6 +29,7 @@
 #define UBDOCUMENTTREEWIDGET_H_
 
 #include <QtGui>
+#include <QTreeWidget>
 
 class UBDocumentProxy;
 class UBDocumentProxyTreeItem;

src/gui/UBDownloadWidget.cpp

@@ -61,8 +61,8 @@ UBDownloadWidget::UBDownloadWidget(QWidget *parent, const char *name):QWidget(pa
     mpTree->setRootIsDecorated(false);
     mpTree->setColumnCount(2);
     mpTree->header()->setStretchLastSection(false);
-    mpTree->header()->setResizeMode(eItemColumn_Desc, QHeaderView::Stretch);
+    mpTree->header()->setSectionResizeMode(eItemColumn_Desc, QHeaderView::Stretch);
-    mpTree->header()->setResizeMode(eItemColumn_Close, QHeaderView::Custom);
+    mpTree->header()->setSectionResizeMode(eItemColumn_Close, QHeaderView::Custom);
     mpTree->resizeColumnToContents(eItemColumn_Close);
     mpTree->header()->close();
     mpLayout->addWidget(mpTree, 1);

src/gui/UBFeaturesActionBar.cpp

@@ -23,7 +23,8 @@
  */
 
 
-
+#include <QButtonGroup>
+#include <QAction>
 
 #include "UBFeaturesActionBar.h"
 #include "core/memcheck.h"

src/gui/UBFeaturesActionBar.h

@@ -31,6 +31,9 @@
 #include <QWidget>
 #include <QToolButton>
 #include <QDropEvent>
+#include <QLineEdit>
+#include <QLayout>
+
 #include "board/UBFeaturesController.h"
 
 #define BUTTON_SIZE 24

src/gui/UBFeaturesWidget.cpp

@@ -27,6 +27,8 @@
 
 #include <QDomDocument>
 #include <QWebView>
+#include <QWebFrame>
+#include <QWidget>
 
 #include "UBFeaturesWidget.h"
 #include "gui/UBThumbnailWidget.h"
@@ -267,8 +269,8 @@ void UBFeaturesWidget::onDisplayMetadata( QMap<QString,QString> metadata )
 {
     QString previewImageUrl = ":images/libpalette/notFound.png";
 
-    QString widgetsUrl = QUrl::fromEncoded(metadata["Url"].toAscii()).toString()/*metadata.value("Url", QString())*/;
+    QString widgetsUrl = QUrl::fromEncoded(metadata["Url"].toLatin1()).toString()/*metadata.value("Url", QString())*/;
-    QString widgetsThumbsUrl = QUrl::fromEncoded(metadata["thumbnailUrl"].toAscii()).toString();
+    QString widgetsThumbsUrl = QUrl::fromEncoded(metadata["thumbnailUrl"].toLatin1()).toString();
 
     QString strType = UBFileSystemUtils::mimeTypeFromFileName(widgetsUrl);
     UBMimeType::Enum thumbType = UBFileSystemUtils::mimeTypeFromString(strType);
@@ -440,7 +442,7 @@ void UBFeaturesListView::dragMoveEvent( QDragMoveEvent *event )
 
 void UBFeaturesListView::dropEvent( QDropEvent *event )
 {
-    QWidget *eventSource = event->source();
+    QObject *eventSource = event->source();
     if (eventSource && eventSource->objectName() == UBFeaturesWidget::objNameFeatureList) {
         event->setDropAction( Qt::MoveAction );
     }
@@ -1172,7 +1174,7 @@ QMimeData* UBFeaturesModel::mimeData(const QModelIndexList &indexes) const
             if (!typeData.isNull()) {
                 typeData += UBFeaturesController::featureTypeSplitter();
             }
-            typeData += QString::number(element.getType()).toAscii();
+            typeData += QString::number(element.getType()).toLatin1();
         }
     }
 

src/gui/UBFeaturesWidget.h

@@ -41,6 +41,10 @@
 #include <QGraphicsLinearLayout>
 #include <QStackedWidget>
 #include <QDropEvent>
+#include <QPushButton>
+#include <QProgressBar>
+#include <QLabel>
+#include <QTreeWidget>
 
 #include "UBDockPaletteWidget.h"
 #include "core/UBSettings.h"

src/gui/UBMagnifer.h

@@ -29,6 +29,7 @@
 #define UBMAGNIFIER_H
 
 #include <QtGui>
+#include <QWidget>
 
 class UBMagnifierParams
 {

src/gui/UBMainWindow.cpp

@@ -26,6 +26,8 @@
 
 
 #include <QtGui>
+#include <QToolTip>
+#include <QStackedLayout>
 
 #include "UBMainWindow.h"
 #include "core/UBApplication.h"

src/gui/UBMessageWindow.h

@@ -29,6 +29,8 @@
 #define UBMESSAGEWINDOW_H_
 
 #include <QtGui>
+#include <QHBoxLayout>
+#include <QLabel>
 
 #include "UBFloatingPalette.h"
 

src/gui/UBMessagesDialog.cpp

@@ -23,7 +23,9 @@
  */
 
 
-
+#include <QLayout>
+#include <QTextEdit>
+#include <QPushButton>
 
 #include "UBMessagesDialog.h"
 
@@ -65,4 +67,4 @@ void UBMessagesDialog::setMessages(const QList<QString> messages)
 void UBMessagesDialog::dispose()
 {
     delete this;
-}
+}

src/gui/UBMessagesDialog.h

@@ -29,6 +29,7 @@
 #define UB_MESSAGES_DIALOG_H_
 
 #include <QtGui>
+#include <QWidget>
 
 class UBMessagesDialog : public QWidget
 {
@@ -46,4 +47,4 @@ private:
     int mMessagesFontSize;
 };
 
-#endif /* UB_MESSAGES_DIALOG_H_ */
+#endif /* UB_MESSAGES_DIALOG_H_ */

src/gui/UBMousePressFilter.cpp

@@ -23,7 +23,7 @@
  */
 
 
-
+#include <QApplication>
 
 #include "UBMousePressFilter.h"
 

src/gui/UBRubberBand.cpp

@@ -28,7 +28,6 @@
 #include "UBRubberBand.h"
 
 #include <QtGui>
-#include <QtGui/QPlastiqueStyle>
 #include <QStyleFactory>
 
 #ifdef Q_WS_MAC

src/gui/UBScreenMirror.cpp

@@ -24,6 +24,7 @@
 
 
 
+#include <QDesktopWidget>
 
 #include "UBScreenMirror.h"
 

src/gui/UBScreenMirror.h

@@ -29,6 +29,7 @@
 #define UBSCREENMIRROR_H_
 
 #include <QtGui>
+#include <QWidget>
 
 class UBScreenMirror : public QWidget
 {

src/gui/UBToolWidget.cpp

@@ -26,6 +26,9 @@
 
 
 #include <QtGui>
+#include <QWebView>
+#include <QWebFrame>
+
 #include "UBToolWidget.h"
 #include "api/UBWidgetUniboardAPI.h"
 #include "api/UBW3CWidgetAPI.h"
@@ -115,7 +118,8 @@ void UBToolWidget::initialize()
 
     setFixedSize(mToolWidget->boundingRect().width() + mContentMargin * 2, mToolWidget->boundingRect().height() + mContentMargin * 2);
 
-    connect(mWebView->page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(javaScriptWindowObjectCleared()));
+    connect(mWebView->page()->mainFrame(), &QWebFrame::javaScriptWindowObjectCleared,
+            this, &UBToolWidget::javaScriptWindowObjectCleared);
     mWebView->load(mToolWidget->mainHtml());
 
 

src/gui/UBToolWidget.h

@@ -29,6 +29,7 @@
 #define UBTOOLWIDGET_H_
 
 #include <QtGui>
+#include <QWidget>
 
 class UBGraphicsWidgetItem;
 class QWidget;

src/gui/UBToolbarButtonGroup.cpp

@@ -28,6 +28,8 @@
 #include "UBToolbarButtonGroup.h"
 
 #include <QtGui>
+#include <QLayout>
+#include <QStyleOption>
 
 #include "core/UBApplication.h"
 #include "core/UBSettings.h"

src/gui/UBToolbarButtonGroup.h

@@ -30,6 +30,10 @@
 
 
 #include <QtGui>
+#include <QWidget>
+#include <QToolBar>
+#include <QToolButton>
+#include <QActionGroup>
 
 class UBToolbarButtonGroup : public QWidget
 {

src/gui/UBWidgetMirror.h

@@ -29,6 +29,7 @@
 #define UBWIDGETMIRROR_H_
 
 #include <QtGui>
+#include <QWidget>
 
 class UBWidgetMirror : public QWidget
 {

src/gui/UBZoomPalette.cpp

@@ -28,6 +28,7 @@
 #include "UBZoomPalette.h"
 
 #include <QtGui>
+#include <QPushButton>
 #include <math.h>
 
 #include "core/UBApplication.h"

src/network/UBNetworkAccessManager.cpp

@@ -29,6 +29,8 @@
 
 #include <QtGui>
 #include <QtNetwork>
+#include <QMessageBox>
+#include <QPushButton>
 
 #include "core/UBApplication.h"
 #include "core/UBApplicationController.h"
@@ -115,7 +117,7 @@ void UBNetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthe
     passwordDialog.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
 
     QString introMessage = tr("<qt>Enter username and password for \"%1\" at %2</qt>");
-    introMessage = introMessage.arg(Qt::escape(reply->url().toString())).arg(Qt::escape(reply->url().toString()));
+    introMessage = introMessage.arg((reply->url().toString()).toHtmlEscaped()).arg((reply->url().toString()).toHtmlEscaped());
     passwordDialog.introLabel->setText(introMessage);
     passwordDialog.introLabel->setWordWrap(true);
 

src/pdf-merger/Utils.cpp

@@ -78,12 +78,12 @@ double Utils::stringToDouble(const std::string & s )
 
 std::string Utils::uIntToStr(unsigned int integer)
 {
-    return std::string(QString::number(integer).toAscii());
+    return std::string(QString::number(integer).toLatin1());
 }
 
 std::string Utils::doubleToStr(double doubleValue)
 {
-    return std::string(QString::number(doubleValue).toAscii());
+    return std::string(QString::number(doubleValue).toLatin1());
 }
 
 int Utils::_stringToInt(const std::string & str) //throw ConvertException

src/pdf/GraphicsPDFItem.cpp

@@ -29,7 +29,7 @@
 
 #include <qglobal.h>
 
-#include <QtGui/QStyleOptionGraphicsItem>
+#include <QStyleOptionGraphicsItem>
 
 #include "core/memcheck.h"
 

src/pdf/UBWebPluginPDFWidget.cpp

@@ -26,6 +26,7 @@
 
 
 #include <QtGui>
+#include <QAction>
 
 #include "UBWebPluginPDFWidget.h"
 #include "XPDFRenderer.h"

src/podcast/UBPodcastController.cpp

@@ -487,7 +487,7 @@ void UBPodcastController::processWidgetPaintEvent()
     {
         while(mWidgetRepaintRectQueue.size() > 0)
         {
-            repaintRect = repaintRect.unite(mWidgetRepaintRectQueue.dequeue());
+            repaintRect = repaintRect.united(mWidgetRepaintRectQueue.dequeue());
         }
     }
 
@@ -582,7 +582,7 @@ void UBPodcastController::sceneChanged(const QList<QRectF> & region)
         QRectF viewportRect = bv->mapToScene(QRect(0, 0, bv->width(), bv->height())).boundingRect();
         foreach(const QRectF rect, region)
         {
-            QRectF maxRect = rect.intersect(viewportRect);
+            QRectF maxRect = rect.intersected(viewportRect);
             mSceneRepaintRectQueue.enqueue(maxRect);
         }
 
@@ -623,7 +623,7 @@ void UBPodcastController::processScenePaintEvent()
     {
         while(mSceneRepaintRectQueue.size() > 0)
         {
-            repaintRect = repaintRect.unite(mSceneRepaintRectQueue.dequeue());
+            repaintRect = repaintRect.united(mSceneRepaintRectQueue.dequeue());
         }
     }
 
@@ -712,7 +712,7 @@ void UBPodcastController::encodingFinished(bool ok)
             {
                 QString location;
 
-                if (mPodcastRecordingPath == QDesktopServices::storageLocation(QDesktopServices::DesktopLocation))
+                if (mPodcastRecordingPath == QStandardPaths::writableLocation(QStandardPaths::DesktopLocation))
                     location = tr("on your desktop ...");
                 else
                 {

src/podcast/UBPodcastRecordingPalette.h

@@ -32,6 +32,7 @@
 #include "UBPodcastController.h"
 
 #include <QtGui>
+#include <QLabel>
 
 class UBVuMeter;
 

src/tools/UBAbstractDrawRuler.cpp

@@ -69,7 +69,7 @@ void UBAbstractDrawRuler::create(QGraphicsItem& item)
     item.setFlag(QGraphicsItem::ItemIsSelectable, true);
     item.setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
 
-    item.setAcceptsHoverEvents(true);
+    item.setAcceptHoverEvents(true);
 
     mCloseSvgItem = new QGraphicsSvgItem(":/images/closeTool.svg", &item);
     mCloseSvgItem->setVisible(false);

src/tools/UBAbstractDrawRuler.h

@@ -29,6 +29,7 @@
 #define UB_ABSTRACTDRAWRULER_H_
 
 #include <QtGui>
+#include <QGraphicsItem>
 #include "frameworks/UBGeometryUtils.h"
 
 class UBGraphicsScene;

src/tools/UBGraphicsCompass.cpp

@@ -72,7 +72,7 @@ UBGraphicsCompass::UBGraphicsCompass()
     setFlag(QGraphicsItem::ItemIsSelectable, true);
     setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
 
-    setAcceptsHoverEvents(true);
+    setAcceptHoverEvents(true);
 
     mCloseSvgItem = new QGraphicsSvgItem(":/images/closeTool.svg", this);
     mCloseSvgItem->setVisible(false);

src/web/UBOEmbedParser.cpp

@@ -226,8 +226,7 @@ sOEmbedContent UBOEmbedParser::getXMLInfos(const QString &xml)
 
 void UBOEmbedParser::onParseContent(QString url)
 {
-    QUrl qurl;
+    QUrl qurl = QUrl::fromEncoded(url.toLatin1());
-    qurl.setEncodedUrl(url.toAscii());
 
     QNetworkRequest req;
     req.setUrl(qurl);

src/web/UBWebController.cpp

@@ -28,6 +28,7 @@
 #include <QtGui>
 #include <QDomDocument>
 #include <QXmlQuery>
+#include <QWebFrame>
 
 #include "frameworks/UBPlatformUtils.h"
 

src/web/UBWebKitUtils.cpp

@@ -24,6 +24,7 @@
 
 
 #include <QDebug>
+#include <QWebFrame>
 
 #include "UBWebKitUtils.h"
 

src/web/browser/WBBrowserWindow.cpp

@@ -70,6 +70,7 @@
 
 #include <QtGui>
 #include <QtWebKit>
+#include <QDesktopWidget>
 
 #include "core/UBSettings.h"
 #include "core/UBSetting.h"

src/web/browser/WBChaseWidget.cpp

@@ -69,6 +69,7 @@
 #include "WBChaseWidget.h"
 
 #include <QtGui>
+#include <QApplication>
 
 #include "core/memcheck.h"
 

src/web/browser/WBChaseWidget.h

@@ -70,6 +70,7 @@
 #define WBCHASEWIDGET_H
 
 #include <QtGui>
+#include <QWidget>
 
 
 class WBChaseWidget : public QWidget

src/web/browser/WBDownloadManager.cpp

@@ -70,6 +70,7 @@
 
 #include <QtGui>
 #include <QtWebKit>
+#include <QFileDialog>
 
 #include "network/UBAutoSaver.h"
 #include "network/UBNetworkAccessManager.h"
@@ -145,7 +146,7 @@ void WBDownloadItem::getFileName()
 {
     QSettings settings;
     settings.beginGroup(QLatin1String("downloadmanager"));
-    QString defaultLocation = !mCustomDownloadPath.isEmpty() ? mCustomDownloadPath :  QDesktopServices::storageLocation(QDesktopServices::DesktopLocation);
+    QString defaultLocation = !mCustomDownloadPath.isEmpty() ? mCustomDownloadPath :  QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
     QString downloadDirectory = settings.value(QLatin1String("downloadDirectory"), defaultLocation).toString();
     if (!downloadDirectory.isEmpty())
         downloadDirectory += QLatin1Char('/');

src/web/browser/WBDownloadManager.h

@@ -74,6 +74,7 @@
 
 #include <QtNetwork>
 #include <QtCore>
+#include <QFileIconProvider>
 
 class WBDownloadItem : public QWidget, public Ui_DownloadItem
 {

src/web/browser/WBEditTableView.h

@@ -70,6 +70,7 @@
 #define WBEDITTABLEVIEW_H
 
 #include <QtGui>
+#include <QTableView>
 
 class WBEditTableView : public QTableView
 {

src/web/browser/WBModelMenu.h

@@ -70,6 +70,7 @@
 #define WBMODELMENU_H
 
 #include <QtGui>
+#include <QMenu>
 
 // A QMenu that is dynamically populated from a QAbstractItemModel
 class WBModelMenu : public QMenu

src/web/browser/WBSearchLineEdit.cpp

@@ -69,6 +69,7 @@
 #include "WBSearchLineEdit.h"
 
 #include <QtGui>
+#include <QMenu>
 
 #include "core/memcheck.h"
 

src/web/browser/WBSearchLineEdit.h

@@ -72,6 +72,7 @@
 #include "WBUrlLineEdit.h"
 
 #include <QtGui>
+#include <QAbstractButton>
 
 class WBSearchButton;
 

src/web/browser/WBSqueezeLabel.h

@@ -69,7 +69,7 @@
 #ifndef WBSQUEEZELABEL_H
 #define WBSQUEEZELABEL_H
 
-#include <QtGui/QLabel>
+#include <QLabel>
 
 class WBSqueezeLabel : public QLabel
 {

src/web/browser/WBTabWidget.cpp

@@ -78,6 +78,8 @@
 
 #include <QtGui>
 #include <QSvgWidget>
+#include <QListView>
+#include <QLabel>
 
 #include "core/memcheck.h"
 

src/web/browser/WBTabWidget.h

@@ -70,6 +70,14 @@
 #define WBTABWIDGET_H
 
 #include <QtGui>
+#include <QShortcut>
+#include <QStackedWidget>
+#include <QCompleter>
+#include <QTabBar>
+#include <QWebPage>
+#include <QTabWidget>
+#include <QLineEdit>
+
 /*
     Tab bar with a few more features such as a context menu and shortcuts
  */

src/web/browser/WBToolBarSearch.cpp

@@ -70,6 +70,8 @@
 
 #include <QtGui>
 #include <QtWebKit>
+#include <QMenu>
+#include <QCompleter>
 
 #include "network/UBAutoSaver.h"
 
@@ -142,10 +144,13 @@ void WBToolbarSearch::searchNow()
     }
 
     QUrl url(QLatin1String("http://www.google.com/search"));
-    url.addQueryItem(QLatin1String("q"), searchText);
+    QUrlQuery urlQuery;
-    url.addQueryItem(QLatin1String("ie"), QLatin1String("UTF-8"));
+
-    url.addQueryItem(QLatin1String("oe"), QLatin1String("UTF-8"));
+    urlQuery.addQueryItem(QLatin1String("q"), searchText);
-    url.addQueryItem(QLatin1String("client"), QLatin1String("uniboard-browser"));
+    urlQuery.addQueryItem(QLatin1String("ie"), QLatin1String("UTF-8"));
+    urlQuery.addQueryItem(QLatin1String("oe"), QLatin1String("UTF-8"));
+    urlQuery.addQueryItem(QLatin1String("client"), QLatin1String("uniboard-browser"));
+    url.setQuery(urlQuery);
     emit search(url);
 }
 

src/web/browser/WBUrlLineEdit.cpp

@@ -74,6 +74,10 @@
 #include "globals/UBGlobals.h"
 
 #include <QtGui>
+#include <QCompleter>
+#include <QLineEdit>
+#include <QLabel>
+#include <QApplication>
 
 #include "core/memcheck.h"
 

src/web/browser/WBUrlLineEdit.h

@@ -70,6 +70,9 @@
 #define WBURLLINEEDIT_H
 
 #include <QtGui>
+#include <QWidget>
+#include <QLineEdit>
+#include <QStyleOption>
 
 #include "WBWebView.h"
 

src/web/browser/WBWebTrapWebView.cpp

@@ -29,6 +29,8 @@
 
 #include <QtGui>
 #include <QtWebKit>
+#include <QWebHitTestResult>
+#include <QWebFrame>
 
 #include "web/UBWebKitUtils.h"
 

src/web/browser/WBWebTrapWebView.h

@@ -30,6 +30,7 @@
 
 #include <QtGui>
 #include <QtWebKit>
+#include <QWebView>
 
 
 class WBWebTrapWebView : public QWebView

src/web/browser/WBWebView.cpp

@@ -82,6 +82,8 @@
 #include <QtGui>
 #include <QtWebKit>
 #include <QtUiTools/QUiLoader>
+#include <QMessageBox>
+#include <QWebFrame>
 
 #include "core/memcheck.h"