Commit cfd70f1e authored by Michael Reeves's avatar Michael Reeves

Cleanup headers

parent 245744b5
......@@ -66,8 +66,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kdiff3.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdiff3.h )
add_subdirectory(src)
#add_subdirectory(po)
add_subdirectory(doc)
......
......@@ -24,14 +24,14 @@
#include <QMenu>
#include <QUrl>
#include <klocalizedstring.h>
#include <kpluginfactory.h>
#include <kpluginloader.h>
#include <kconfig.h>
#include <kconfiggroup.h>
#include <kmessagebox.h>
#include <kprocess.h>
#include <KIOCore/kfileitem.h>
#include <KLocalizedString>
#include <KPluginFactory>
#include <KPluginLoader>
#include <KConfig>
#include <KConfigGroup>
#include <KMessageBox>
#include <KProcess>
#include <KIOCore/KFileItem>
//#include <iostream>
......
......@@ -19,40 +19,37 @@
#endif
#include "directorymergewindow.h"
#include "guiutils.h"
#include "options.h"
#include "progress.h"
#include <vector>
#include <algorithm>
#include <assert.h>
#include <map>
#include <vector>
#include <QDir>
#include <QAction>
#include <QApplication>
#include <QPixmap>
#include <QDir>
#include <QImage>
#include <QTextStream>
#include <QFileDialog>
#include <QKeyEvent>
#include <QLabel>
#include <QLayout>
#include <QMenu>
#include <QRegExp>
#include <QMessageBox>
#include <QLayout>
#include <QLabel>
#include <QPixmap>
#include <QPushButton>
#include <QRegExp>
#include <QSplitter>
#include <QTextEdit>
#include <QStyledItemDelegate>
#include <QPushButton>
#include <algorithm>
#include <QMenu>
#include <QAction>
#include <kmessagebox.h>
#include <kiconloader.h>
#include <klocalizedstring.h>
#include <ktoggleaction.h>
#include <assert.h>
//#include <konq_popupmenu.h>
#include <QFileDialog>
#include <QTextEdit>
#include <QTextStream>
#include "guiutils.h"
#include <KMessageBox>
#include <KIconLoader>
#include <KLocalizedString>
#include <KToggleAction>
static bool conflictingFileTypes(MergeFileInfos& mfi);
static QPixmap getOnePixmap( e_Age eAge, bool bLink, bool bDir );
......
......@@ -15,18 +15,18 @@
#include <QRegExp>
#include <QTextStream>
#include <QProcess>
#include <QTemporaryFile>
#include <vector>
#include <cstdlib>
#include <KLocalizedString>
#include <QTemporaryFile>
#include <kio/global.h>
#include <kio/job.h>
#include <KIO/Job>
#include <kio/jobclasses.h>
#include <kmessagebox.h>
#include <KMessageBox>
#include <kio/jobuidelegate.h>
#include <kio/copyjob.h>
#include <KIO/CopyJob>
#include <sys/types.h>
#include <sys/stat.h>
......
......@@ -19,8 +19,6 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. */
# include <config-kdiff3.h>
#include <sys/types.h>
......
......@@ -44,7 +44,7 @@
// include files for KDE
#include <KMessageBox>
#include <KLocalizedString>
#include <kconfig.h>
#include <KConfig>
#include <KStandardAction>
//#include <kkeydialog.h>
#include <KToggleAction>
......
......@@ -20,12 +20,11 @@
#include "diff.h"
#include <config-kdiff3.h>
// include files for Qt
#include <QSplitter>
#include <QScrollBar>
#include <QPointer>
#include <QEventLoop>
// include files for KDE
#include <QApplication>
......@@ -49,7 +48,16 @@ class Overview;
class QScrollBar;
class QSplitter;
class QStatusBar;
class QMenu;
class KToggleAction;
class KToolBar;
class KActionCollection;
namespace KParts {
class MainWindow;
}
class KDiff3Part;
class DirectoryMergeWindow;
......@@ -184,16 +192,16 @@ class KDiff3App : public QSplitter
//KConfig *config;
// QAction pointers to enable/disable actions
QAction * fileOpen;
QAction * fileSave;
QAction * fileSaveAs;
QAction * filePrint;
QAction * fileQuit;
QAction * fileReload;
QAction * editCut;
QAction * editCopy;
QAction * editPaste;
QAction * editSelectAll;
QAction *fileOpen;
QAction *fileSave;
QAction *fileSaveAs;
QAction *filePrint;
QAction *fileQuit;
QAction *fileReload;
QAction *editCut;
QAction *editCopy;
QAction *editPaste;
QAction *editSelectAll;
KToggleAction* viewToolBar;
KToggleAction* viewStatusBar;
......@@ -241,7 +249,7 @@ class KDiff3App : public QSplitter
KToggleAction *showWindowC;
QAction *winFocusNext;
QAction *winFocusPrev;
QAction * winToggleSplitOrientation;
QAction *winToggleSplitOrientation;
KToggleAction *dirShowBoth;
QAction *dirViewToggle;
KToggleAction *overviewModeNormal;
......
......@@ -69,11 +69,11 @@ os2 {
}
unix {
documentation.path = /usr/share/doc/kdiff3
# documentation.files = ../doc/*
documentation.path = /usr/local/share/doc/kdiff3
documentation.files = ../doc/*
INSTALLS += documentation
target.path = /usr/bin
target.path = /usr/local/bin
INSTALLS += target
}
......@@ -21,7 +21,7 @@
#include <KAboutData>
#include <QAction>
#include <kstandardaction.h>
#include <KStandardAction>
#include <QFile>
#include <QTextStream>
......@@ -30,8 +30,8 @@
#include "kdiff3.h"
#include "fileaccess.h"
#include <kmessagebox.h>
#include <klocalizedstring.h>
#include <KMessageBox>
#include <KLocalizedString>
#include "version.h"
......
......@@ -22,7 +22,7 @@
#include <kparts/part.h>
#include <KPluginFactory>
#include <kparts/readwritepart.h>
#include <KParts/ReadWritePart>
class QWidget;
class KDiff3App;
......
......@@ -21,25 +21,21 @@
#include "kdiff3.h"
#include "kdiff3_part.h"
#include <KPluginMetaData>
#include <KPluginLoader>
#include <kshortcutsdialog.h>
#include <kconfig.h>
#include <QUrl>
#include <kedittoolbar.h>
#include <QAction>
#include <kstandardaction.h>
#include <kmessagebox.h>
#include <QStatusBar>
#include <klocalizedstring.h>
#include <QStatusBar>
#include <QCloseEvent>
#include <ktoolbar.h>
#include <KPluginMetaData>
#include <KPluginLoader>
#include <KShortcutsDialog>
#include <KConfig>
#include <KStandardAction>
#include <KEditToolBar>
#include <KMessageBox>
#include <KLocalizedString>
#include <KToolBar>
KDiff3Shell::KDiff3Shell( bool bCompleteInit )
: KParts::MainWindow( )
......@@ -60,6 +56,7 @@ KDiff3Shell::KDiff3Shell( bool bCompleteInit )
}*/
m_part = new KDiff3Part( this, this, QVariantList() << QVariant(QLatin1String("KDiff3Part")) );
m_widget = qobject_cast<KDiff3App *>(m_part->widget());
if (m_part)
{
......@@ -68,11 +65,11 @@ KDiff3Shell::KDiff3Shell( bool bCompleteInit )
//toolBar()->setToolButtonStyle( Qt::ToolButtonIconOnly );
// tell the KParts::MainWindow that this is indeed the main widget
setCentralWidget(m_part->widget());
setCentralWidget(m_widget);
if (bCompleteInit)
((KDiff3App*)m_part->widget())->completeInit();
connect(((KDiff3App*)m_part->widget()), SIGNAL(createNewInstance(const QString&, const QString&, const QString&)), this, SLOT(slotNewInstance(const QString&, const QString&, const QString&)));
m_widget ->completeInit();
connect(m_widget, SIGNAL(createNewInstance(const QString&, const QString&, const QString&)), this, SLOT(slotNewInstance(const QString&, const QString&, const QString&)));
}
else
{
......
......@@ -20,15 +20,17 @@
#ifndef _KDIFF3SHELL_H_
#define _KDIFF3SHELL_H_
#include <config-kdiff3.h>
#include <KParts/MainWindow>
#include <QCommandLineParser>
#include <QApplication>
#include <kparts/mainwindow.h>
#include <kparts/readwritepart.h>
class KToggleAction;
namespace KParts {
class ReadWritePart;
}
class KDiff3App;
/**
* This is the application "Shell". It has a menubar, toolbar, and
* statusbar but relies on the "Part" to do all the real work.
......@@ -69,6 +71,7 @@ private Q_SLOTS:
private:
KParts::ReadWritePart *m_part;
KDiff3App *m_widget;
KToggleAction *m_toolbarAction;
KToggleAction *m_statusbarAction;
......
......@@ -49,8 +49,8 @@
#include <QTextStream>
#include <QMimeData>
#include <klocalizedstring.h>
#include <kmessagebox.h>
#include <KLocalizedString>
#include <KMessageBox>
int g_bAutoSolve = true;
......@@ -100,7 +100,7 @@ MergeResultWindow::MergeResultWindow(
m_bCursorOn = true;
m_bCursorUpdate = false;
m_maxTextWidth = -1;
connect(&m_cursorTimer, &QTimer::timeout, this, &MergeResultWindow::slotCursorUpdate);
connect( &m_cursorTimer, SIGNAL(timeout()), this, SLOT( slotCursorUpdate() ) );
m_cursorTimer.setSingleShot(true);
m_cursorTimer.start( 500 /*ms*/ );
m_selection.reset();
......
......@@ -43,10 +43,10 @@
#include <QDropEvent>
#include <QUrl>
#include <QProcess>
#include <QStatusBar>
#include <klocalizedstring.h>
#include <kmessagebox.h>
#include <qstatusbar.h>
#include <KLocalizedString>
#include <KMessageBox>
#include <assert.h>
......
......@@ -18,9 +18,9 @@
#include <QApplication>
#include <QThread>
#include <QStatusBar>
#include <kio/job.h>
#include <klocalizedstring.h>
#include <KIO/Job>
#include <KLocalizedString>
ProgressDialog* g_pProgressDialog=0;
......
......@@ -36,7 +36,7 @@
#include <QMimeData>
#include <QFileDialog>
#include <klocalizedstring.h>
#include <KLocalizedString>
// OpenDialog **************************************************************
......@@ -252,6 +252,7 @@ void OpenDialog::selectURL( QComboBox* pLine, bool bDir, int i, bool bSave )
//QFileDialog::setStartDir( KIO::upUrl( newURL ) );
pLine->setEditText( newURL.url() );
}
// newURL won't be modified if nothing was selected.
}
void OpenDialog::selectFileA() { selectURL( m_pLineA, false, 1, false ); }
......
#undef VERSION
#define VERSION "0.9.98b"
#define VERSION "1.7.0"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment