Skip to content

Commit

Permalink
Fix Windows compilation issues (pull request #8)
Browse files Browse the repository at this point in the history
Cleaned unnecessary stuff
Added windows build instructions
  • Loading branch information
Gleb Baryshev committed Jun 26, 2014
1 parent a11722d commit 1a8de6d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
13 changes: 11 additions & 2 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ To install BasKet Note Pads, just run the installer executable in a terminal and
follow the on screen instructions.

Dependencies
============
------------

To build BasKet, the following development packages are required:

Expand All @@ -18,4 +18,13 @@ GnuPG 1.x (optional)
If you get an error message about FindGPGMe.cmake not found, you are probably
missing kdepimlibs.

I have not tested with KDE libraries versions 4.0.x and below.
In addition, handbook generation requires DocBook stylesheets, which are typically found in docbook-xsl package.

Building on Windows from source
-------------------------------
. install cmake (http://cmake.org), automoc (git://anongit.kde.org/automoc.git)
. download and run KDE for Windows installer (http://download.kde.org/stable/kdewin/installer/kdewin-installer-gui-latest.exe)
.. choose Install Mode: Package Manager, Compiler Mode: (for example) MSVC 2010 32bit
.. install essential packages as described on http://techbase.kde.org/Projects/KDE_on_Windows/Compiling_Applications
.. besides, install oxygen-icons-* package
. use CMake to configure and build Basket
5 changes: 0 additions & 5 deletions src/basketscene.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4686,11 +4686,6 @@ Note* BasketScene::lastNoteShownInStack()
return last;
}

inline int abs(int n)
{
return (n < 0 ? -n : n);
}

Note* BasketScene::noteOn(NoteOn side)
{
Note *bestNote = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/bnpview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ void BNPView::lateInit()
}
}
#else
#warning Proper fix for the systray problem
#pragma message ("Proper fix for the systray problem")
#endif


Expand Down
7 changes: 2 additions & 5 deletions src/note.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -395,10 +395,7 @@ void Note::selectIn(const QRectF &rect, bool invertSelection, bool unselectOther

bool toSelect = intersects || (!unselectOthers && isSelected());
if (invertSelection) {
if (m_wasInLastSelectionRect == intersects)
toSelect = isSelected();
else if (intersects xor m_wasInLastSelectionRect)
toSelect = !isSelected();// xor intersects;
toSelect = (m_wasInLastSelectionRect == intersects) ? isSelected() : !isSelected();
}
setSelected(toSelect);
m_wasInLastSelectionRect = intersects;
Expand Down Expand Up @@ -764,7 +761,7 @@ Note::Zone Note::zoneAt(const QPointF &pos, bool toAdd)
if (!linkAt(pos).isEmpty())
return Link;

qreal customZone = content()->zoneAt(pos - QPointF(contentX(), NOTE_MARGIN));
int customZone = content()->zoneAt(pos - QPointF(contentX(), NOTE_MARGIN));
if (customZone)
return (Note::Zone)customZone;

Expand Down

0 comments on commit 1a8de6d

Please sign in to comment.