Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 3204 → Rev 3205

/branches/Version13x/Scribus/scribus/gtaction.cpp
27,8 → 27,8
#include "color.h"
#include "prefsmanager.h"
 
extern ScribusApp* ScApp;
 
 
gtAction::gtAction(bool append)
{
prefsManager=PrefsManager::instance();
/branches/Version13x/Scribus/scribus/mpalette.cpp
22,8 → 22,8
 
using namespace std;
 
extern ScribusApp* ScApp;
 
 
LabelButton::LabelButton(QWidget* parent, QString text1, QString text2) : QLabel(parent)
{
state = true;
/branches/Version13x/Scribus/scribus/util.cpp
93,8 → 93,8
extern int IntentMonitor;
extern int IntentPrinter;
#endif
extern ScribusApp* ScApp;
 
 
using namespace std;
 
QImage ProofImage(QImage *Image)
/branches/Version13x/Scribus/scribus/loremipsum.cpp
31,8 → 31,8
#include "prefsmanager.h"
#include "commonstrings.h"
 
extern ScribusApp *ScApp;
 
 
QString getLoremLocation(QString fname)
{
return QDir::convertSeparators(ScPaths::instance().shareDir() + "/loremipsum/" + fname);
/branches/Version13x/Scribus/scribus/checkDocument.cpp
19,8 → 19,8
#include "documentchecker.h"
 
extern QPixmap loadIcon(QString nam);
extern ScribusApp* ScApp;
 
 
static const unsigned char image0_data[] =
{
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
/branches/Version13x/Scribus/scribus/prefs.cpp
44,8 → 44,8
extern QPixmap loadIcon(QString nam);
extern bool CMSavail;
extern bool CMSuse;
extern ScribusApp *ScApp;
 
 
/*!
\fn Preferences::Preferences( QWidget* parent)
\author Franz Schmid
/branches/Version13x/Scribus/scribus/vruler.cpp
33,8 → 33,8
#define SPLITVC SplitVCursor
#endif
 
extern ScribusApp* ScApp;
 
 
Vruler::Vruler(ScribusView *pa, ScribusDoc *doc) : QWidget(pa)
{
prefsManager=PrefsManager::instance();
/branches/Version13x/Scribus/scribus/menumanager.cpp
21,8 → 21,8
#include "scmenu.h"
#include "scraction.h"
 
extern ScribusApp* ScApp;
 
 
MenuManager::MenuManager(QMenuBar *scrMenuBar, QObject *parent, const char *name) : QObject(parent, name)
{
scribusMenuBar=scrMenuBar;
/branches/Version13x/Scribus/scribus/werktoolb.cpp
26,8 → 26,8
#include "menumanager.h"
 
extern QPixmap loadIcon(QString nam);
extern ScribusApp* ScApp;
 
 
WerkToolB::WerkToolB(QMainWindow* parent) : QToolBar( tr("Tools"), parent)
{
SubMode = 0;
/branches/Version13x/Scribus/scribus/undogui.cpp
37,8 → 37,8
#include "menumanager.h"
 
extern QPixmap loadIcon(QString nam);
extern ScribusApp *ScApp;
 
 
UndoGui::UndoGui(QWidget* parent, const char* name, WFlags f) : QWidget(parent, name, f)
{
 
/branches/Version13x/Scribus/scribus/newfile.cpp
16,8 → 16,8
 
 
extern QPixmap loadIcon(QString nam);
extern ScribusApp* ScApp;
 
 
NewDoc::NewDoc( QWidget* parent, bool startUp ) : QDialog( parent, "newDoc", true, 0 )
{
prefsManager=PrefsManager::instance();
/branches/Version13x/Scribus/scribus/hruler.cpp
35,8 → 35,8
#endif
 
extern QPixmap loadIcon(QString nam);
extern ScribusApp* ScApp;
 
 
#ifdef QT_MAC
#define topline 1
#else
/branches/Version13x/Scribus/scribus/search.cpp
25,7 → 25,7
#include "scribus.h"
#include "commonstrings.h"
 
extern ScribusApp* ScApp;
 
extern QPixmap loadIcon(QString nam);
 
SearchReplace::SearchReplace( QWidget* parent, ScribusDoc *doc, PageItem* ite, bool mode )
/branches/Version13x/Scribus/scribus/page.cpp
21,8 → 21,8
#include "undostate.h"
 
extern QPixmap loadIcon(QString nam);
extern ScribusApp *ScApp;
 
 
Page::Page(const double x, const double y, const double b, const double h) : UndoObject(QObject::tr("Page"))
{
m_xOffset = x;
/branches/Version13x/Scribus/scribus/tabpdfoptions.cpp
21,10 → 21,10
#endif
extern bool CMSavail;
#include "scribus.h"
extern ScribusApp* ScApp;
 
 
 
 
TabPDFOptions::TabPDFOptions( QWidget* parent, PDFOptions *Optionen, SCFonts &AllFonts,
ProfilesL *PDFXProfiles, QMap<QString,QFont> DocFonts,
QValueList<PDFPresentationData> Eff, int unitIndex,
/branches/Version13x/Scribus/scribus/collect4output.cpp
18,9 → 18,9
#include <qdir.h>
 
extern ScribusQApp* ScQApp;
extern ScribusApp* ScApp;
 
 
 
CollectForOutput::CollectForOutput(bool withFonts, bool compressDoc)
: QObject(ScQApp, 0)
{
/branches/Version13x/Scribus/scribus/pdflib.cpp
54,8 → 54,8
#ifdef HAVE_TIFF
#include <tiffio.h>
#endif
extern ScribusApp* ScApp;
 
 
PDFlib::PDFlib(ScribusDoc *docu)
{
doc = docu;
/branches/Version13x/Scribus/scribus/scribusdoc.cpp
31,7 → 31,7
#include "units.h"
#include "filewatcher.h"
 
extern ScribusApp* ScApp;
 
extern ScribusQApp* ScQApp;
 
#ifdef HAVE_CMS
/branches/Version13x/Scribus/scribus/prefsmanager.cpp
36,7 → 36,7
#include "util.h"
#include "werktoolb.h"
 
extern ScribusApp* ScApp;
 
extern ScribusQApp* ScQApp;
extern bool emergencyActivated;
 
/branches/Version13x/Scribus/scribus/scribuswin.cpp
25,8 → 25,8
#include "util.h"
#include "commonstrings.h"
 
extern ScribusApp* ScApp;
 
 
ScribusWin::ScribusWin(QWidget* parent, ScribusDoc* ddoc) : QMainWindow(parent, "", WDestructiveClose)
{
setIcon(loadIcon("AppIcon2.png"));
/branches/Version13x/Scribus/scribus/layers.cpp
23,9 → 23,9
#include "layers.moc"
 
extern QPixmap loadIcon(QString nam);
extern ScribusApp* ScApp;
 
 
 
LayerTable::LayerTable(QWidget* parent) : QTable(parent)
{
}
/branches/Version13x/Scribus/scribus/keymanager.cpp
37,8 → 37,8
#include "scpaths.h"
 
extern bool overwrite(QWidget *parent, QString filename);
extern ScribusApp* ScApp;
 
 
KeyManager::KeyManager(QWidget* parent, QMap<QString,Keys> oldKeyMap): QWidget( parent, "key" )
{
keyMap.clear();
/branches/Version13x/Scribus/scribus/edit1format.cpp
18,9 → 18,9
#include "loremipsum.h"
#include "prefsmanager.h"
 
extern ScribusApp* ScApp;
 
 
 
EditStyle::EditStyle( QWidget* parent, struct ParagraphStyle *vor, QValueList<ParagraphStyle> v, bool neu, double au, int dEin, ScribusDoc *doc)
: QDialog( parent, "EditST", true, 0)
{
/branches/Version13x/Scribus/scribus/story.cpp
39,8 → 39,8
#include "serializer.h"
 
extern QPixmap loadIcon(QString nam);
extern ScribusApp* ScApp;
 
 
SideBar::SideBar(QWidget *pa) : QLabel(pa)
{
setEraseColor(QColor(255,255,255));
/branches/Version13x/Scribus/scribus/tabtools.cpp
16,8 → 16,8
#include "prefsmanager.h"
 
 
extern ScribusApp* ScApp;
 
 
TabTools::TabTools( QWidget* parent, struct toolPrefs *prefsData, int unitIndex, ScribusDoc* doc) : QWidget( parent, "tabtools", 0 )
{
PrefsManager* prefsManager=PrefsManager::instance();
/branches/Version13x/Scribus/scribus/picstatus.cpp
31,8 → 31,8
#include "filesearch.h"
#include "scribus.h"
extern QPixmap loadIcon(QString nam);
extern ScribusApp* ScApp;
 
 
const unsigned short PicStatus::COL_FILENAME = 0;
const unsigned short PicStatus::COL_PATH = 1;
const unsigned short PicStatus::COL_PAGE = 2;
/branches/Version13x/Scribus/scribus/seiten.cpp
3,8 → 3,8
#include <qcursor.h>
#include "scribus.h"
extern QPixmap loadIcon(QString nam);
extern ScribusApp* ScApp;
 
 
/* Code fuer DragObjekt */
SeDrag::SeDrag(QString secret, QWidget * parent, const char * name): QStoredDrag("page/magic", parent, name)
{
/branches/Version13x/Scribus/scribus/guidemanager.cpp
27,7 → 27,7
 
#include "commonstrings.h"
 
extern ScribusApp *ScApp;
 
extern QPixmap loadIcon(QString nam);
 
GuideManager::GuideManager(QWidget* parent) : QDialog(parent, "GuideManager", true, 0)
/branches/Version13x/Scribus/scribus/pageitem.cpp
48,8 → 48,8
 
using namespace std;
 
extern ScribusApp* ScApp;
 
 
PageItem::PageItem(ScribusDoc *pa, ItemType newType, double x, double y, double w, double h, double w2, QString fill, QString outline)
// Initialize superclasses
: QObject(pa),
/branches/Version13x/Scribus/scribus/scribusview.cpp
82,8 → 82,8
 
using namespace std;
 
extern ScribusApp* ScApp;
 
 
ScribusView::ScribusView(QWidget *parent, ScribusDoc *doc) : QScrollView(parent, "s", WRepaintNoErase | WNorthWestGravity)
{
Ready = false;
/branches/Version13x/Scribus/scribus/scimage.cpp
19,9 → 19,9
#endif
#include "util.h"
 
extern ScribusApp* ScApp;
 
 
 
typedef struct my_error_mgr
{
struct jpeg_error_mgr pub; /* "public" fields */
/branches/Version13x/Scribus/scribus/scribus.cpp
175,7 → 175,7
bool CMSavail;
 
QString DocDir;
extern ScribusApp* ScApp;
 
extern ScribusQApp* ScQApp;
extern bool emergencyActivated;
 
/branches/Version13x/Scribus/scribus/plugins/scriptplugin/pconsole.cpp
24,9 → 24,9
#include "prefsmanager.h"
 
extern QPixmap loadIcon(QString nam);
extern ScribusApp *ScApp;
 
 
 
PythonConsole::PythonConsole( QWidget* parent)
: QWidget( parent, "PythonConsole", WType_TopLevel )
{
/branches/Version13x/Scribus/scribus/fontprefs.cpp
13,8 → 13,8
#include "scconfig.h"
 
extern QPixmap loadIcon(QString nam);
extern ScribusApp *ScApp;
 
 
FontPrefs::FontPrefs( QWidget* parent, SCFonts &flist, bool Hdoc, QString PPath, ScribusDoc* doc ) : QTabWidget( parent, "fpre" )
{
RList = PrefsManager::instance()->appPrefs.GFontSub;
/branches/Version13x/Scribus/scribus/scribusapp.cpp
56,7 → 56,7
// Qt wants -display not --display or -d
#define ARG_DISPLAY_QT "-display"
 
extern ScribusApp* ScApp;
 
extern ScribusQApp* ScQApp;
 
bool ScribusQApp::useGUI=false;
/branches/Version13x/Scribus/scribus/scribus.h
91,6 → 91,10
class TOCGenerator;
class PrefsManager;
 
class ScribusApp;
 
extern ScribusApp* ScApp;
 
/**
* This Class is the base class for your application. It sets up the main
* window and providing a menubar, toolbar
/branches/Version13x/Scribus/scribus/scpreview.cpp
20,8 → 20,8
 
using namespace std;
 
extern ScribusApp* ScApp;
 
 
ScPreview::ScPreview()
{
prefsManager = PrefsManager::instance();
/branches/Version13x/Scribus/scribus/pluginmanager.cpp
24,7 → 24,7
#include <qlibrary.h>
#endif
 
extern ScribusApp *ScApp;
 
extern ScribusQApp *ScQApp;
 
 
/branches/Version13x/Scribus/scribus/colorm.cpp
27,8 → 27,8
#include "util.h"
#include "dynamictip.h"
 
extern ScribusApp* ScApp;
 
 
Farbmanager::Farbmanager( QWidget* parent, ColorList doco, bool HDoc, QString DcolSet, QStringList Cust )
: QDialog( parent, "dd", true, 0 )
{
/branches/Version13x/Scribus/scribus/gtgettext.cpp
24,8 → 24,8
#include "scribus.h"
 
extern QPixmap loadIcon(QString nam);
extern ScribusApp* ScApp;
 
 
gtGetText::gtGetText()
{
loadImporterPlugins();