From 3ddf918a91680bdc490fd12c707f2d4166d68681 Mon Sep 17 00:00:00 2001 From: Akos Polster Date: Mon, 1 Nov 2010 00:47:08 +0100 Subject: [PATCH 1/1] Simplify in/out traces. --- bookview.cpp | 30 +++++++++++++++--------------- librarydialog.cpp | 5 ++--- mainwindow.cpp | 29 +++++++++++++++++++---------- model/book.cpp | 22 +++++++++++----------- model/bookdb.cpp | 14 ++++++-------- model/bookfinder.cpp | 2 +- model/library.cpp | 12 ++++++------ search.cpp | 8 ++++---- searchdialog.cpp | 2 +- searchresultsdialog.cpp | 8 ++++---- trace.h | 3 +++ widgets/adopterwindow.cpp | 14 +++++++------- widgets/listview.cpp | 4 ++-- widgets/listwindow.cpp | 7 +++---- widgets/progress.cpp | 2 +- widgets/progressdialog.cpp | 2 +- widgets/translucentbutton.cpp | 1 - 17 files changed, 86 insertions(+), 79 deletions(-) diff --git a/bookview.cpp b/bookview.cpp index cd6ba22..f273d1f 100644 --- a/bookview.cpp +++ b/bookview.cpp @@ -23,7 +23,7 @@ BookView::BookView(QWidget *parent): restorePositionAfterLoad(false), positionAfterLoad(0), loaded(false), contentsHeight(0) { - Trace t("BookView::BookView"); + TRACE; settings()->setAttribute(QWebSettings::AutoLoadImages, true); settings()->setAttribute(QWebSettings::JavascriptEnabled, true); settings()->setAttribute(QWebSettings::JavaEnabled, false); @@ -85,12 +85,12 @@ BookView::BookView(QWidget *parent): BookView::~BookView() { - Trace t("BookView::~BookView"); + TRACE; } void BookView::loadContent(int index) { - Trace t("BookView::loadContent"); + TRACE; if (!mBook) { return; } @@ -115,7 +115,7 @@ void BookView::loadContent(int index) void BookView::setBook(Book *book) { - Trace t("BookView::setBook"); + TRACE; // Save position in current book setLastBookmark(); @@ -147,7 +147,7 @@ Book *BookView::book() void BookView::goPrevious() { - Trace t("BookView::goPrevious"); + TRACE; if (mBook && (contentIndex > 0)) { mBook->setLastBookmark(contentIndex - 1, 0); loadContent(contentIndex - 1); @@ -156,7 +156,7 @@ void BookView::goPrevious() void BookView::goNext() { - Trace t("BookView::goNext"); + TRACE; if (mBook && (contentIndex < (mBook->parts.size() - 1))) { mBook->setLastBookmark(contentIndex + 1, 0); loadContent(contentIndex + 1); @@ -165,7 +165,7 @@ void BookView::goNext() void BookView::setLastBookmark() { - Trace t("BookView::setLastBookmark"); + TRACE; if (mBook) { int height = contentsHeight; int pos = page()->mainFrame()->scrollPosition().y(); @@ -177,7 +177,7 @@ void BookView::setLastBookmark() void BookView::restoreLastBookmark() { - Trace t("BookView::restoreLastBookmark"); + TRACE; if (mBook) { goToBookmark(mBook->lastBookmark()); } @@ -185,7 +185,7 @@ void BookView::restoreLastBookmark() void BookView::goToBookmark(const Book::Bookmark &bookmark) { - Trace t("BookView::goToBookmark"); + TRACE; if (mBook) { if (bookmark.part != contentIndex) { qDebug () << "Loading new part" << bookmark.part; @@ -201,7 +201,7 @@ void BookView::goToBookmark(const Book::Bookmark &bookmark) void BookView::onLoadFinished(bool ok) { - Trace t("BookView::onLoadFinished"); + TRACE; if (!ok) { qDebug() << "Not OK"; return; @@ -214,7 +214,7 @@ void BookView::onLoadFinished(bool ok) void BookView::onSettingsChanged(const QString &key) { - Trace t("BookView::onSettingsChanged " + key); + TRACE; if (key == "zoom") { setZoomFactor(Settings::instance()->value(key).toFloat() / 100.); } @@ -289,7 +289,7 @@ void BookView::wheelEvent(QWheelEvent *e) void BookView::addBookmark(const QString ¬e) { - Trace t("BookView::addBookmark"); + TRACE; if (!mBook) { return; } @@ -360,7 +360,7 @@ void BookView::onContentsSizeChanged(const QSize &size) void BookView::leaveEvent(QEvent *e) { - Trace t("BookView::leaveEvent"); + TRACE; // Save current position, to be restored later setLastBookmark(); QWebView::leaveEvent(e); @@ -368,7 +368,7 @@ void BookView::leaveEvent(QEvent *e) void BookView::enterEvent(QEvent *e) { - Trace t("BookView::enterEvent"); + TRACE; // Restore position saved at Leave event. This seems to be required, // after temporarily switching from portrait to landscape and back restoreLastBookmark(); @@ -444,7 +444,7 @@ void BookView::goPreviousPage() void BookView::goNextPage() { - Trace t("BookView::goNextPage"); + TRACE; QWebFrame *frame = page()->mainFrame(); int pos = frame->scrollPosition().y(); frame->scroll(0, height()); diff --git a/librarydialog.cpp b/librarydialog.cpp index bdecff5..6ca466a 100644 --- a/librarydialog.cpp +++ b/librarydialog.cpp @@ -131,7 +131,6 @@ void LibraryDialog::onRemove() void LibraryDialog::onRead() { - qDebug() << "LibraryDialog::onRead"; QModelIndex current = sortedLibrary->mapToSource(list->currentIndex()); if (current.isValid()) { Library::instance()->setNowReading(current); @@ -147,7 +146,7 @@ void LibraryDialog::onDetails() void LibraryDialog::onItemActivated(const QModelIndex &index) { - qDebug() << "LibraryDialog::onItemActivated"; + TRACE; QModelIndex libraryIndex = sortedLibrary->mapToSource(index); Book *book = Library::instance()->book(libraryIndex); (new InfoDialog(book, this))->exec(); @@ -192,7 +191,7 @@ QModelIndex LibraryDialog::selected() const void LibraryDialog::onAddFolder() { - Trace t("LibraryDialog::onAddFolder"); + TRACE; // Get folder name Settings *settings = Settings::instance(); diff --git a/mainwindow.cpp b/mainwindow.cpp index 9ca9fb5..f8093ee 100755 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -46,7 +46,7 @@ const int DORIAN_PROGRESS_HEIGHT = 17; MainWindow::MainWindow(QWidget *parent): AdopterWindow(parent), view(0), preventBlankingTimer(-1) { - Trace t("MainWindow::MainWindow"); + TRACE; #ifdef Q_WS_MAEMO_5 setAttribute(Qt::WA_Maemo5StackedWindow, true); #endif @@ -189,7 +189,7 @@ void MainWindow::onCurrentBookChanged() void MainWindow::showRegular() { - Trace t("MainWindow::showRegular"); + TRACE; // Re-parent children fullScreenWindow->leaveChildren(); @@ -222,7 +222,12 @@ void MainWindow::showRegular() fullScreenWindow->hide(); show(); +#if defined(Q_OS_SYMBIAN) activateWindow(); +#elif defined(Q_WS_MAEMO_5) + // FIXME: This is ugly. + view->restoreLastBookmark(); +#endif progress->flash(); nextButton->flash(1500); previousButton->flash(1500); @@ -230,7 +235,7 @@ void MainWindow::showRegular() void MainWindow::showBig() { - Trace t("MainWindow::showBig"); + TRACE; // Re-parent children leaveChildren(); @@ -251,9 +256,13 @@ void MainWindow::showBig() previousButton->setGeometry(0, screen.height() - TranslucentButton::pixels, TranslucentButton::pixels, TranslucentButton::pixels); +#ifdef Q_OS_SYMBIAN hide(); +#endif fullScreenWindow->showFullScreen(); +#ifdef Q_OS_SYMBIAN fullScreenWindow->activateWindow(); +#endif progress->flash(); nextButton->flash(1500); previousButton->flash(1500); @@ -306,7 +315,7 @@ void MainWindow::showBookmarks() void MainWindow::closeEvent(QCloseEvent *event) { - Trace t("MainWindow::closeEvent"); + TRACE; view->setLastBookmark(); event->accept(); } @@ -344,7 +353,7 @@ void MainWindow::onSettingsChanged(const QString &key) void MainWindow::onPartLoadStart() { - Trace t("MainWindow::onPartLoadStart"); + TRACE; #ifdef Q_WS_MAEMO_5 setAttribute(Qt::WA_Maemo5ShowProgressIndicator, true); #endif @@ -352,7 +361,7 @@ void MainWindow::onPartLoadStart() void MainWindow::onPartLoadEnd(int index) { - Trace t("MainWindow::onPartLoadEnd"); + TRACE; bool enablePrevious = false; bool enableNext = false; Book *book = Library::instance()->book(mCurrent); @@ -371,13 +380,13 @@ void MainWindow::onPartLoadEnd(int index) void MainWindow::onAddBookmark(const QString ¬e) { - Trace t("MainWindow:onAddBookmark"); + TRACE; view->addBookmark(note); } void MainWindow::onGoToBookmark(int index) { - Trace t("MainWindow::onGoToBookmark"); + TRACE; Book *book = Library::instance()->book(mCurrent); view->goToBookmark(book->bookmarks()[index]); } @@ -396,7 +405,7 @@ void MainWindow::showChapters() void MainWindow::onGoToChapter(int index) { - Trace t("MainWindow::onGoToChapter"); + TRACE; Book *book = Library::instance()->book(mCurrent); if (book) { @@ -422,7 +431,7 @@ void MainWindow::timerEvent(QTimerEvent *event) void MainWindow::resizeEvent(QResizeEvent *e) { - Trace t("MainWindow::resizeEvent"); + TRACE; progress->setGeometry(QRect(0, 0, e->size().width(), DORIAN_PROGRESS_HEIGHT)); #if defined(Q_WS_MAEMO_5) previousButton->setGeometry(0, diff --git a/model/book.cpp b/model/book.cpp index f403769..0a5c8d1 100644 --- a/model/book.cpp +++ b/model/book.cpp @@ -47,7 +47,7 @@ QString Book::path() const bool Book::open() { - Trace t("Book::open"); + TRACE; qDebug() << path(); close(); clear(); @@ -68,7 +68,7 @@ bool Book::open() void Book::peek() { - Trace t("Book::peek"); + TRACE; qDebug() << path(); close(); clear(); @@ -88,7 +88,7 @@ void Book::peek() void Book::close() { - Trace t("Book::close"); + TRACE; content.clear(); parts.clear(); QDir::setCurrent(QDir::rootPath()); @@ -104,7 +104,7 @@ QString Book::tmpDir() const bool Book::extract(const QStringList &excludedExtensions) { - Trace t("Book::extract"); + TRACE; bool ret = false; QString tmp = tmpDir(); qDebug() << "Extracting" << mPath << "to" << tmp; @@ -150,7 +150,7 @@ bool Book::extract(const QStringList &excludedExtensions) bool Book::parse() { - Trace t("Book::parse"); + TRACE; // Parse OPS file bool ret = false; @@ -276,7 +276,7 @@ void Book::clear() void Book::load() { - Trace t("Book::load"); + TRACE; qDebug() << "path" << path(); QVariantHash data = BookDb::instance()->load(path()); @@ -307,7 +307,7 @@ void Book::load() void Book::save() { - Trace t("Book::save"); + TRACE; QVariantHash data; data["title"] = title; @@ -332,7 +332,7 @@ void Book::save() void Book::setLastBookmark(int part, qreal position) { - Trace t("Book:setLastBookmark"); + TRACE; qDebug() << "part" << part << "position" << position; mLastBookmark.part = part; mLastBookmark.pos = position; @@ -364,7 +364,7 @@ QList Book::bookmarks() const QString Book::opsPath() { - Trace t("Book::opsPath"); + TRACE; QString ret; QFile container(tmpDir() + "/META-INF/container.xml"); @@ -487,7 +487,7 @@ bool Book::extractMetaData() void Book::upgrade() { - Trace t("Book::upgrade"); + TRACE; qDebug() << path(); @@ -529,6 +529,6 @@ void Book::upgrade() void Book::remove() { - Trace t("Book::remove"); + TRACE; BookDb::instance()->remove(path()); } diff --git a/model/bookdb.cpp b/model/bookdb.cpp index 2e13c80..609f555 100644 --- a/model/bookdb.cpp +++ b/model/bookdb.cpp @@ -24,7 +24,7 @@ void BookDb::close() BookDb::BookDb() { - Trace t("BookDb::BookDb"); + TRACE; bool shouldCreate = false; QFileInfo info(Platform::dbPath()); if (!info.exists()) { @@ -52,7 +52,7 @@ BookDb::~BookDb() void BookDb::create() { - Trace t("BookDb::create"); + TRACE; QSqlQuery query; if (!query.exec("create table book " "(name text primary key, content blob)")) { @@ -63,7 +63,7 @@ void BookDb::create() QVariantHash BookDb::load(const QString &book) { - Trace t("BookDb::load"); + TRACE; qDebug() << book; QVariantHash ret; QByteArray bytes; @@ -80,15 +80,13 @@ QVariantHash BookDb::load(const QString &book) in >> ret; break; } - qDebug() << ret; return ret; } void BookDb::save(const QString &book, const QVariantHash &data) { - Trace t("BookDb::save"); + TRACE; qDebug() << book; - qDebug() << data; QByteArray bytes; QDataStream out(&bytes, QIODevice::WriteOnly); out << data; @@ -102,7 +100,7 @@ void BookDb::save(const QString &book, const QVariantHash &data) void BookDb::remove(const QString &book) { - Trace t("BookDb::remove"); + TRACE; qDebug() << book; QSqlQuery query("delete from book where name = ?"); query.bindValue(0, book); @@ -113,7 +111,7 @@ void BookDb::remove(const QString &book) QStringList BookDb::books() { - Trace t("BookDb::books"); + TRACE; QStringList ret; QSqlQuery query("select name from book"); query.setForwardOnly(true); diff --git a/model/bookfinder.cpp b/model/bookfinder.cpp index e33024b..7eca25e 100644 --- a/model/bookfinder.cpp +++ b/model/bookfinder.cpp @@ -11,7 +11,7 @@ BookFinder::BookFinder(QObject *parent): QObject(parent) void BookFinder::find(const QString &path, const QStringList &books) { - Trace t("BookFinder::find"); + TRACE; QStringList booksFound; int toAdd = 0; int added = 0; diff --git a/model/library.cpp b/model/library.cpp index f4a5ef9..bc18925 100644 --- a/model/library.cpp +++ b/model/library.cpp @@ -75,7 +75,7 @@ void Library::close() void Library::load() { - Trace t("Library::load"); + TRACE; clear(); QStringList books = BookDb::instance()->books(); @@ -98,7 +98,7 @@ void Library::load() void Library::save() { - Trace t("Library::save"); + TRACE; QSettings settings; Book *currentBook = book(mNowReading); settings.setValue("lib/nowreading", @@ -107,7 +107,7 @@ void Library::save() bool Library::add(const QString &path) { - Trace t("Library::add " + path); + TRACE; if (path == "") { qCritical() << "Library::add: Empty path"; return false; @@ -128,7 +128,7 @@ bool Library::add(const QString &path) void Library::remove(const QModelIndex &index) { - Trace t("Library::remove"); + TRACE; Book *toRemove = book(index); if (!toRemove) { return; @@ -199,7 +199,7 @@ QModelIndex Library::find(const Book *book) const void Library::onBookOpened(const QString &path) { - Trace t("Library::onBookOpened " + path); + TRACE; QModelIndex index = find(path); if (index.isValid()) { emit dataChanged(index, index); @@ -217,7 +217,7 @@ QStringList Library::bookPaths() void Library::upgrade() { - Trace t("Library::upgrade"); + TRACE; QSettings settings; QString oldVersion = settings.value("lib/version").toString(); if (/* true */ oldVersion.isEmpty()) { diff --git a/search.cpp b/search.cpp index 97755a0..6243d86 100644 --- a/search.cpp +++ b/search.cpp @@ -35,7 +35,7 @@ Search::Search(): QObject(0), reply(0), downloadReply(0) void Search::start(const Query &query) { - Trace t("Search::start"); + TRACE; emit beginSearch(); @@ -62,7 +62,7 @@ QList Search::results() void Search::download(const Search::Result &result, const QString &fileName) { - Trace t("Search::download"); + TRACE; downloadResult = result; downloadFileName = fileName; qDebug() << "UID" << result.id; @@ -78,7 +78,7 @@ void Search::download(const Search::Result &result, const QString &fileName) void Search::finished() { - Trace t("Search::finished"); + TRACE; if (!reply) { return; @@ -129,7 +129,7 @@ void Search::finished() void Search::downloadFinished() { - Trace t("Search::downloadFinished"); + TRACE; if (!downloadReply) { return; diff --git a/searchdialog.cpp b/searchdialog.cpp index 0d9cd87..f5faf1d 100644 --- a/searchdialog.cpp +++ b/searchdialog.cpp @@ -23,7 +23,7 @@ SearchDialog::SearchDialog(QWidget *parent): Dyalog(parent) Search::Query SearchDialog::query() { - Trace t("SearchDialog::query"); + TRACE; Search::Query ret; ret.title = title->text(); ret.author = author->text(); diff --git a/searchresultsdialog.cpp b/searchresultsdialog.cpp index 7138133..6d7216b 100644 --- a/searchresultsdialog.cpp +++ b/searchresultsdialog.cpp @@ -47,7 +47,7 @@ SearchResultsDialog::SearchResultsDialog(const QList results_, void SearchResultsDialog::onItemActivated(const QModelIndex &index) { - Trace t("SearchResultsDialog::onItemActivated"); + TRACE; Search::Result result = results[index.row()]; qDebug() << "Book" << index.row() << ":" << result.title; SearchResultInfoDialog *d = new SearchResultInfoDialog(result, this); @@ -68,7 +68,7 @@ void SearchResultsDialog::onDownload() QString SearchResultsDialog::downloadName() const { - Trace t("SearchResultsDialog::downloadName"); + TRACE; QString dir = Platform::downloadDir(); QDir().mkpath(dir); // Not sure if this works. QDir API is quiet lame. unsigned i = 0; @@ -86,7 +86,7 @@ QString SearchResultsDialog::downloadName() const void SearchResultsDialog::onBeginDownload(int size) { Q_UNUSED(size); - Trace t("SearchResultsDialog::onBeginDownload"); + TRACE; progress->showWait(); } @@ -94,7 +94,7 @@ void SearchResultsDialog::onEndDownload(int status, const Search::Result &result const QString &fileName) { Q_UNUSED(result); - Trace t("SearchResultsDialog::onEndDownload"); + TRACE; progress->reset(); if (Search::Ok == status) { Library::instance()->add(fileName); diff --git a/trace.h b/trace.h index 843be64..74ade80 100644 --- a/trace.h +++ b/trace.h @@ -1,11 +1,14 @@ #ifndef TRACE_H #define TRACE_H +#include #include #include #include #include +#define TRACE Trace _(Q_FUNC_INFO) + /** Trace helper. */ class Trace { diff --git a/widgets/adopterwindow.cpp b/widgets/adopterwindow.cpp index 35883f2..e394847 100644 --- a/widgets/adopterwindow.cpp +++ b/widgets/adopterwindow.cpp @@ -13,7 +13,7 @@ AdopterWindow::AdopterWindow(QWidget *parent): QMainWindow(parent), grabbingZoomKeys(false), mainChild(0) { - Trace t("AdopterWindow::AdopterWindow"); + TRACE; #ifdef Q_WS_MAEMO_5 setAttribute(Qt::WA_Maemo5StackedWindow, true); @@ -45,7 +45,7 @@ AdopterWindow::AdopterWindow(QWidget *parent): void AdopterWindow::takeChildren(QWidget *main, const QList &others) { - Trace t("AdopterWindow::takeChildren"); + TRACE; leaveChildren(); if (main) { mainChild = main; @@ -62,7 +62,7 @@ void AdopterWindow::takeChildren(QWidget *main, const QList &others) void AdopterWindow::leaveChildren() { - Trace t("AdopterWindow::leaveChildren"); + TRACE; if (mainChild) { centralWidget()->layout()->removeWidget(mainChild); mainChild = 0; @@ -71,21 +71,21 @@ void AdopterWindow::leaveChildren() void AdopterWindow::grabZoomKeys(bool grab) { - Trace t("AdopterWindow::grabZoomKeys"); + TRACE; grabbingZoomKeys = grab; doGrabZoomKeys(grab); } void AdopterWindow::showEvent(QShowEvent *e) { - Trace t("AdopterWindow::showEvent"); + TRACE; doGrabZoomKeys(grabbingZoomKeys); QMainWindow::showEvent(e); } void AdopterWindow::doGrabZoomKeys(bool grab) { - Trace t("AdopterWindow::doGrabZoomKeys"); + TRACE; #ifdef Q_WS_MAEMO_5 if (!isVisible()) { qDebug() << "Not visible - skipping"; @@ -131,7 +131,7 @@ QAction *AdopterWindow::addToolBarAction(QObject *receiver, const QString &iconName, const QString &text) { - Trace t("AdopterWindow::addToolBarAction"); + TRACE; qDebug() << "icon" << iconName << "text" << text; #ifndef Q_OS_SYMBIAN return toolBar->addAction(QIcon(Platform::icon(iconName)), diff --git a/widgets/listview.cpp b/widgets/listview.cpp index 4e665f3..f8d43ed 100755 --- a/widgets/listview.cpp +++ b/widgets/listview.cpp @@ -26,14 +26,14 @@ int ListView::contentsHeight() const QPoint ListView::scrollOffset() const { - Trace t("ListView::scrollOffset"); + TRACE; qDebug() << "0," << offset; return QPoint(0, offset); } void ListView::setScrollOffset(const QPoint &o) { - Trace t("ListView::setScrollOffset"); + TRACE; qDebug() << o; offset = o.y(); QListView::scrollContentsBy(0, offset) diff --git a/widgets/listwindow.cpp b/widgets/listwindow.cpp index 37d34a4..c2d4fb0 100644 --- a/widgets/listwindow.cpp +++ b/widgets/listwindow.cpp @@ -56,7 +56,7 @@ ListWindow::ListWindow(QWidget *parent): QMainWindow(parent), list(0) void ListWindow::addList(ListView *listView) { - Trace t("ListWindow::addList"); + TRACE; list = listView; #if defined(Q_WS_MAEMO_5) list->installEventFilter(this); @@ -89,7 +89,7 @@ void ListWindow::addAction(const QString &title, QObject *receiver, const char *slot, const QString &iconName, QDialogButtonBox::ButtonRole role) { - Trace t("ListWindow::addAction"); + TRACE; #ifdef Q_WS_MAEMO_5 Q_UNUSED(role); QPushButton *button = @@ -113,7 +113,7 @@ void ListWindow::addAction(const QString &title, QObject *receiver, void ListWindow::addItemAction(const QString &title, QObject *receiver, const char *slot) { - Trace t("ListWindow::addItemAction"); + TRACE; #ifdef Q_WS_MAEMO_5 popup->addAction(title, receiver, slot); #elif defined Q_OS_SYMBIAN @@ -190,7 +190,6 @@ bool ListWindow::eventFilter(QObject *obj, QEvent *event) void ListWindow::onModelChanged() { - qDebug() << "ListWindow::onModelChanged"; list->setMinimumHeight(list->contentsHeight()); } diff --git a/widgets/progress.cpp b/widgets/progress.cpp index e3eb3b8..368a0c7 100644 --- a/widgets/progress.cpp +++ b/widgets/progress.cpp @@ -10,7 +10,7 @@ Progress::Progress(QWidget *parent): QLabel(parent), progress(-1.0), timer(-1) void Progress::setProgress(qreal p) { - Trace t("Progress::setProgress"); + TRACE; qDebug() << p; if (progress != p) { progress = p; diff --git a/widgets/progressdialog.cpp b/widgets/progressdialog.cpp index 16e16d7..0532866 100644 --- a/widgets/progressdialog.cpp +++ b/widgets/progressdialog.cpp @@ -7,7 +7,7 @@ ProgressDialog::ProgressDialog(const QString &label, QWidget *parent): QProgressDialog(label, "", 0, 0, parent) { - Trace t("ProgressDialog::ProgressDialog"); + TRACE; setMinimumDuration(0); setWindowModality(Qt::WindowModal); setCancelButton(0); diff --git a/widgets/translucentbutton.cpp b/widgets/translucentbutton.cpp index 0b33be1..3a37aa3 100644 --- a/widgets/translucentbutton.cpp +++ b/widgets/translucentbutton.cpp @@ -2,7 +2,6 @@ #include "translucentbutton.h" #include "platform.h" -#include "trace.h" const int TranslucentButton::pixels = 95; -- 1.7.9.5