mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-06 21:58:57 -04:00
fixed include headers
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@703 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
622914c923
commit
e261a8b515
12 changed files with 233 additions and 276 deletions
|
@ -31,7 +31,7 @@
|
|||
|
||||
#include "ui_ApplicationWindow.h"
|
||||
|
||||
#include "../config/rsharesettings.h"
|
||||
#include "gui/Preferences/rsharesettings.h"
|
||||
|
||||
class ApplicationWindow : public QMainWindow
|
||||
{
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include "mainpage.h"
|
||||
#include "ui_MessengerWindow.h"
|
||||
#include "NetworkDialog.h"
|
||||
#include <config/rsharesettings.h>
|
||||
#include <gui/Preferences/rsharesettings.h>
|
||||
|
||||
class LogoBar;
|
||||
class PeersDialog;
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
#include <QFileDialog>
|
||||
|
||||
#include <config/rsharesettings.h>
|
||||
#include <gui/Preferences/rsharesettings.h>
|
||||
|
||||
#include "configpage.h"
|
||||
#include "ui_CryptographyDialog.h"
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include "mainpage.h"
|
||||
#include "ui_SearchDialog.h"
|
||||
#include "advsearch/advancedsearchdialog.h"
|
||||
#include "../config/rsharesettings.h"
|
||||
#include "Preferences/rsharesettings.h"
|
||||
|
||||
class FileDetail;
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#ifndef _STARTDIALOG_H
|
||||
#define _STARTDIALOG_H
|
||||
|
||||
#include <config/rsharesettings.h>
|
||||
#include <gui/Preferences/rsharesettings.h>
|
||||
#include "rsiface/rsiface.h"
|
||||
/********
|
||||
#if (QT_VERSION >= 040300)
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include <QDateTime>
|
||||
//#include <QEvent>
|
||||
|
||||
#include <config/rsharesettings.h>
|
||||
#include <gui/Preferences/rsharesettings.h>
|
||||
|
||||
#include "mainpage.h"
|
||||
#include "ui_StatisticDialog.h"
|
||||
|
|
|
@ -27,8 +27,7 @@
|
|||
#include <QDateTime>
|
||||
#include <QEvent>
|
||||
|
||||
#include <config/rsharesettings.h>
|
||||
//#include <control/rscontrol.h>
|
||||
#include <gui/Preferences/rsharesettings.h>
|
||||
#include <gui/common/rwindow.h>
|
||||
|
||||
#include "ui_bwgraph.h"
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#ifndef _CONNECTDIALOG_H
|
||||
#define _CONNECTDIALOG_H
|
||||
|
||||
#include <config/rsharesettings.h>
|
||||
#include <gui/Preferences/rsharesettings.h>
|
||||
|
||||
#include "ui_ConnectDialog.h"
|
||||
|
||||
|
|
|
@ -1,32 +1,11 @@
|
|||
/****************************************************************
|
||||
* RetroShare is distributed under the following license:
|
||||
*
|
||||
* Copyright (C) 2008, defnax
|
||||
*
|
||||
* 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 the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
* Boston, MA 02110-1301, USA.
|
||||
****************************************************************/
|
||||
|
||||
#include <QtGui>
|
||||
//#include "ui_FileWindow.h"
|
||||
//#include "ui_window.h"
|
||||
#include "findwindow.h"
|
||||
#include "Gui/LibraryDialog.h"
|
||||
#include "mainwindowimpl.h"
|
||||
|
||||
extern QString fileToFind;
|
||||
|
||||
FindWindow::FindWindow(QWidget *parent)
|
||||
Window::Window(QWidget *parent)
|
||||
: QDialog(parent)
|
||||
{
|
||||
browseButton = createButton(tr("&Browse..."), SLOT(browse()));
|
||||
|
@ -64,7 +43,7 @@ extern QString fileToFind;
|
|||
resize(700, 300);
|
||||
}
|
||||
|
||||
void FindWindow::browse()
|
||||
void Window::browse()
|
||||
{
|
||||
QString directory = QFileDialog::getExistingDirectory(this,
|
||||
tr("Find Files"), QDir::currentPath());
|
||||
|
@ -74,7 +53,7 @@ extern QString fileToFind;
|
|||
}
|
||||
}
|
||||
|
||||
void FindWindow::find()
|
||||
void Window::find()
|
||||
{
|
||||
filesTable->setRowCount(0);
|
||||
|
||||
|
@ -112,7 +91,7 @@ extern QString fileToFind;
|
|||
}
|
||||
}
|
||||
}
|
||||
QStringList FindWindow::findFiles( QDir &directory, QStringList &files,
|
||||
QStringList Window::findFiles( QDir &directory, QStringList &files,
|
||||
QString &text)
|
||||
{
|
||||
QStringList foundFiles;
|
||||
|
@ -135,7 +114,7 @@ QStringList FindWindow::findFiles( QDir &directory, QStringList &files,
|
|||
return foundFiles;
|
||||
}
|
||||
|
||||
void FindWindow::showFiles(const QDir &directory, const QStringList &files)
|
||||
void Window::showFiles(const QDir &directory, const QStringList &files)
|
||||
{
|
||||
for (int i = 0; i < files.size(); ++i) {
|
||||
QFile file(directory.absoluteFilePath(files[i]));
|
||||
|
@ -156,7 +135,7 @@ QStringList FindWindow::findFiles( QDir &directory, QStringList &files,
|
|||
filesFoundLabel->setText(tr("%1 file(s) found").arg(files.size()));
|
||||
}
|
||||
|
||||
void FindWindow::showFolders(const QDir &directory, const QStringList &folders)
|
||||
void Window::showFolders(const QDir &directory, const QStringList &folders)
|
||||
{
|
||||
for (int i = 0; i < folders.size(); ++i) {
|
||||
QDir folder(directory.absoluteFilePath(folders[i]));
|
||||
|
@ -173,14 +152,14 @@ void FindWindow::showFolders(const QDir &directory, const QStringList &folders)
|
|||
return ;
|
||||
}
|
||||
|
||||
QPushButton *FindWindow::createButton(const QString &text, const char *member)
|
||||
QPushButton *Window::createButton(const QString &text, const char *member)
|
||||
{
|
||||
QPushButton *button = new QPushButton(text);
|
||||
connect(button, SIGNAL(clicked()), this, member);
|
||||
return button;
|
||||
}
|
||||
|
||||
QComboBox *FindWindow::createComboBox(const QString &text)
|
||||
QComboBox *Window::createComboBox(const QString &text)
|
||||
{
|
||||
QComboBox *comboBox = new QComboBox;
|
||||
comboBox->setEditable(true);
|
||||
|
@ -189,7 +168,7 @@ void FindWindow::showFolders(const QDir &directory, const QStringList &folders)
|
|||
return comboBox;
|
||||
}
|
||||
|
||||
void FindWindow::createFilesTable()
|
||||
void Window::createFilesTable()
|
||||
{
|
||||
filesTable = new QTableWidget(0, 2);
|
||||
QStringList labels;
|
||||
|
|
|
@ -1,24 +1,3 @@
|
|||
/****************************************************************
|
||||
* RetroShare is distributed under the following license:
|
||||
*
|
||||
* Copyright (C) 2008, defnax
|
||||
*
|
||||
* 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 the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
* Boston, MA 02110-1301, USA.
|
||||
****************************************************************/
|
||||
|
||||
#ifndef FINDWINDOW_H
|
||||
#define FINDWINDOW_H
|
||||
|
||||
|
@ -30,12 +9,12 @@
|
|||
class QPushButton;
|
||||
class QTableWidget;
|
||||
|
||||
class FindWindow : public QDialog
|
||||
class Window : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
FindWindow(QWidget *parent = 0);
|
||||
Window(QWidget *parent = 0);
|
||||
|
||||
private slots:
|
||||
void browse();
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include "rsiface/rspeers.h"
|
||||
#include "rsiface/rsmsgs.h"
|
||||
|
||||
#include <config/rsharesettings.h>
|
||||
#include <gui/Preferences/rsharesettings.h>
|
||||
|
||||
#include <sstream>
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include <QMainWindow>
|
||||
#include <QMap>
|
||||
#include <QPointer>
|
||||
#include <config/rsharesettings.h>
|
||||
#include <gui/Preferences/rsharesettings.h>
|
||||
|
||||
#include "ui_ChanMsgDialog.h"
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue