diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
| commit | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch) | |
| tree | fb31321c80b12ee8e2237bdcf8c228fe44e67772 /kivio/kiviopart/kiviosdk/kivio_stencil.h | |
| parent | fe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff) | |
| download | koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kivio/kiviopart/kiviosdk/kivio_stencil.h')
| -rw-r--r-- | kivio/kiviopart/kiviosdk/kivio_stencil.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil.h b/kivio/kiviopart/kiviosdk/kivio_stencil.h index ef056c3d..9fcfc81b 100644 --- a/kivio/kiviopart/kiviosdk/kivio_stencil.h +++ b/kivio/kiviopart/kiviosdk/kivio_stencil.h @@ -197,7 +197,7 @@ class KIVIO_EXPORT KivioStencil virtual TQColor textColor() { return TQColor(0,0,0); } virtual void setTextColor( TQColor ) {;} - virtual TQFont textFont() { return KGlobalSettings::generalFont(); } + virtual TQFont textFont() { return TDEGlobalSettings::generalFont(); } virtual void setTextFont( const TQFont & ) {;} virtual int hTextAlign() { return -1; } @@ -272,7 +272,7 @@ class KIVIO_EXPORT KivioStencil virtual TQColor textColor(const TQString& /*textBoxName*/) { return TQColor(); } virtual void setTextColor(const TQString& /*textBoxName*/, const TQColor& /*color*/) {} - virtual TQFont textFont(const TQString& /*textBoxName*/) { return KGlobalSettings::generalFont(); } + virtual TQFont textFont(const TQString& /*textBoxName*/) { return TDEGlobalSettings::generalFont(); } virtual void setTextFont(const TQString& /*textBoxName*/, const TQFont& /*font*/) {} virtual int hTextAlign(const TQString& /*textBoxName*/) { return -1; } |